proper handling of issuers and subjects in reader

1 files changed, 26 insertions, 14 deletions

diff --git a/monitor/josef_reader.py b/monitor/josef_reader.py
index 54f586a..5fb565a 100755
--- a/monitor/josef_reader.py
+++ b/monitor/josef_reader.py
@@ -165,21 +165,33 @@ def db_monitor_domain(domain, log=None, exclude_invalid=None, get_cert=None, iss
         # Print matching
         if success:
             try:
-                me = monitored_entry(entry["subject"].split("CN=")[1], \
-                    entry["issuer"].split("CN=")[1], \
-                    entry["log"], \
-                    valid, \
-                    entry["leaf_hash"])
-                # print str(me)
-
-                if get_cert:
-                    print get_full_cert(entry)
-                    if "index" in entry:
-                        print "INDEX:", entry["index"]
-                if me not in res:
-                    res.append(me)
+                tmp_issuer = entry["issuer"].split("CN=")[1]
             except:
-                print ERROR_STR + "READER failed to create monitored_entry"
+                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"])
+
+            if get_cert:
+                print get_full_cert(entry)
+                if "index" in entry:
+                    print "INDEX:", entry["index"]
+            if me not in res:
+                res.append(me)
 
 
     # print str(count_all) + " matches found. " \