diff options
Diffstat (limited to 'monitor/josef_reader.py')
| -rwxr-xr-x | monitor/josef_reader.py | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/monitor/josef_reader.py b/monitor/josef_reader.py index 9eb5094..bd069bb 100755 --- a/monitor/josef_reader.py +++ b/monitor/josef_reader.py @@ -16,7 +16,7 @@ except: print "No database support found." from datetime import datetime as dt import ast -from monitor_conf import DB_PATH, MONITORED_DOMAINS, OUTPUT_DIR +from monitor_conf import DB_PATH, MONITORED_DOMAINS, OUTPUT_DIR, ERROR_STR @@ -165,12 +165,27 @@ def db_monitor_domain(domain, log=None, exclude_invalid=None, get_cert=None, iss # Print matching if success: - me = monitored_entry(entry["subject"].split("CN=")[1], \ - entry["issuer"].split("CN=")[1], \ + try: + tmp_issuer = entry["issuer"].split("CN=")[1] + except: + if "issuer" in entry: + tmp_issuer = entry["issuer"] + else: + tmp_issuer = "No Issuer Found" + + try: + tmp_subject = entry["subject"].split("CN=")[1] + except: + if "subject" in entry: + tmp_subject = entry["subject"] + else: + tmp_subject = "No Subject Found" + + me = monitored_entry(tmp_subject, \ + tmp_issuer, \ entry["log"], \ valid, \ entry["leaf_hash"]) - # print str(me) if get_cert: print get_full_cert(entry) |