Merge branch 'master' of ssh://git.nordu.net/user/josef/catlfish

1 files changed, 21 insertions, 12 deletions

diff --git a/monitor/josef_experimental.py b/monitor/josef_experimental.py
index 579331b..d64012d 100755
--- a/monitor/josef_experimental.py
+++ b/monitor/josef_experimental.py
@@ -70,23 +70,32 @@ def update_roots(log):
 
 if __name__ == '__main__':
 
+    dbdir = "tmpdb/"
     # entry = get_entries(ctlogs[0]["url"], 1,1)["entries"]
     # print extract_original_entry(entry[0])
-    for url in [CTLOGS[0]["url"],CTLOGS[5]["url"],CTLOGS[6]["url"]]:
+    for url in [CTLOGS[6]["url"]]:
+    # for url in [CTLOGS[0]["url"],CTLOGS[5]["url"],CTLOGS[6]["url"]]:
     # for log in CTLOGS:
     #     url = log["url"]
     # url = CTLOGS[1]["url"]
-        # result = urlopen(url + "ct/v1/get-sth").info()
-        # print get_sth(url)
-        import urllib2, socket, urlparse
-        # set up your request as before, then:
-        data = urllib2.urlopen(url+ "ct/v1/get-sth")
-        addr = socket.gethostbyname(urlparse.urlparse(data.geturl()).hostname)
-        print addr, data.fp._sock.fp._sock.getpeername()[0]
-
-        # data =  urllib2.urlopen(request)
-
-        # print addr
+        entries = get_entries(url, 3638637,3638637)["entries"]
+        # entries = get_entries(url, first, last)["entries"]
+        tmp_cert_data = []
+        for item in entries:
+            tmp_data = check_domain(item, url)
+            entry_hash = get_leaf_hash(base64.b64decode(item["leaf_input"]))
+            if tmp_data:
+                tmp_data["leaf_hash"] = base64.b64encode(entry_hash)
+                tmp_cert_data.append(tmp_data)
+                print tmp_data
+            # new_leafs.append(entry_hash)
+        # if self.dbdir:/
+
+        # db_add_certs(dbdir, tmp_cert_data)
+        
+        # if CONFIG.DEFAULT_CERT_FILE:
+        #     append_file(CONFIG.DEFAULT_CERT_FILE, tmp_cert_data)
+        # subtree = reduce_tree(new_leafs, subtree)