parser fix

1 files changed, 8 insertions, 6 deletions

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]