diff options
| author | josef <josef.gson@gmail.com> | 2015-11-10 16:49:01 +0100 |
|---|---|---|
| committer | josef <josef.gson@gmail.com> | 2015-11-10 16:49:01 +0100 |
| commit | 70aecc26d81eb62bc45a7b5e7328d4d5f3e28577 (patch) | |
| tree | 95d72d6af4e2566e014639296d7b7bc7d6baffae /monitor | |
| parent | 2525e73c7558ce3d79f1e785f3360a5f6bf445c8 (diff) | |
parser fix
Diffstat (limited to 'monitor')
| -rwxr-xr-x | monitor/josef_experimental.py | 4 | ||||
| -rw-r--r-- | monitor/josef_lib.py | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/monitor/josef_experimental.py b/monitor/josef_experimental.py index 255c883..a6d6aa9 100755 --- a/monitor/josef_experimental.py +++ b/monitor/josef_experimental.py @@ -184,7 +184,7 @@ if __name__ == '__main__': # Experimental - if True: + if False: log = CTLOGS[9] entries = get_entries(log["url"],1 ,1)["entries"] entry = entries[0] @@ -193,7 +193,7 @@ if __name__ == '__main__': # print parse_entry(res,0,log) # Data gathering for Niklas - if False: + if True: logs = [CTLOGS[9]] for log in logs: filename = log["name"] + "_content.txt" diff --git a/monitor/josef_lib.py b/monitor/josef_lib.py index 4e5278d..91e7f93 100644 --- a/monitor/josef_lib.py +++ b/monitor/josef_lib.py @@ -108,11 +108,11 @@ def check_domain(raw_entry, log=None): def check_domain_extended(raw_entry, log=None): orig_entry = extract_original_entry(raw_entry) - try: - cert_info = my_get_more_cert_info(orig_entry[0][0]) - except: - print "Error in my_get_more_cert_info" - return None + # try: + cert_info = my_get_more_cert_info(orig_entry[0][0]) + # except: + # print "Error in my_get_more_cert_info" + # return None try: # print len(orig_entry[0]) cert_info["chain_length"] = str(len(orig_entry[0])) @@ -272,9 +272,11 @@ def my_get_more_cert_info(s): if "Subject Alternative Name" in prev: result["SAN"] = line.lstrip() if "Serial Number:" in prev: - if len(prev.split("Serial Number:")) == 1: + if prev.split("Serial Number:")[1] == "": + # print prev, prev.split("Serial Number:") result["serial"] = line.lstrip() else: + # print prev, prev.split("Serial Number:") result["serial"] = prev.split("Serial Number: ")[1] if "Not After" in line: result["not_after"] = line.split(": ")[1] |