diff options
| -rwxr-xr-x | monitor/josef_experimental.py | 34 | ||||
| -rwxr-xr-x | monitor/josef_leveldb.py | 4 | ||||
| -rwxr-xr-x | monitor/josef_reader.py | 1 |
3 files changed, 24 insertions, 15 deletions
diff --git a/monitor/josef_experimental.py b/monitor/josef_experimental.py index 9c141bc..d64012d 100755 --- a/monitor/josef_experimental.py +++ b/monitor/josef_experimental.py @@ -70,6 +70,7 @@ 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[6]["url"]]: @@ -77,21 +78,24 @@ if __name__ == '__main__': # for log in CTLOGS: # url = log["url"] # url = CTLOGS[1]["url"] - entry = get_entries(url, 3638637,3638637)["entries"][0] - # raw_entry = get_entries(log, leaf_index, leaf_index)["entries"][0] - cert = check_domain_all(entry) - print cert - # 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) diff --git a/monitor/josef_leveldb.py b/monitor/josef_leveldb.py index 49c5594..9e57e20 100755 --- a/monitor/josef_leveldb.py +++ b/monitor/josef_leveldb.py @@ -61,12 +61,14 @@ def db_append(db, key, val): pass else: tmpl.append(val) + print "Storing:",key,SEP.join(tmpl) db.Put(key,SEP.join(tmpl)) def db_add_domain_2(db_dir, key_in, val_in, db_in=None): if db_in == None: val = "###" + ast.literal_eval(val_in)["leaf_hash"] cert_db = db_open(db_dir + "certificates") + # print "Storing: ",val,val_in cert_db.Put(val, val_in) key_list = key_in.split('/')[0].split(',')[0].split('.') @@ -88,9 +90,11 @@ def db_add_domain_2(db_dir, key_in, val_in, db_in=None): return else: tmpl.append(val) + # print "Storing: ",key,SEP.join(tmpl) db.Put(key,SEP.join(tmpl)) except KeyError: + # print "Storing: ",key,SEP.join([val]) db.Put(key,SEP.join([val])) new_key = key.split('.',1)[-1] if new_key != key: diff --git a/monitor/josef_reader.py b/monitor/josef_reader.py index 5fb565a..82bdc61 100755 --- a/monitor/josef_reader.py +++ b/monitor/josef_reader.py @@ -106,6 +106,7 @@ class monitored_entry: def db_monitor_domain(domain, log=None, exclude_invalid=None, get_cert=None, issuer=None): # print domain raw = db_lookup_domain(DB_PATH, domain) + print raw cur_time = dt.now() count_valid = 0 |