Update decode.py

decode.py

@@ -50,21 +50,14 @@ def get_key_data(public_key):
     return data
 
 def general_info(cert, public_key):
-    subject = None
-    sans = None
-    not_valid_after = None
-    not_valid_before = None
-    expiry = None
-    key_data = None
-    signature_algorithm = None
-    serial_number = None
-    subject = cert.subject.get_attributes_for_oid(x509.NameOID.COMMON_NAME)[0].value if subject else None
-    sans = cert.extensions.get_extension_for_class(x509.SubjectAlternativeName).value.get_values_for_type(x509.DNSName) if sans else None
-    not_valid_after = get_date(str(cert.not_valid_after_utc)) if not_valid_after else None
-    not_valid_before = get_date(str(cert.not_valid_before_utc)) if not_valid_before else None
-    expiry = check_expiry(str(cert.not_valid_after_utc)) if expiry else None
-    key_data = get_key_data(public_key) if key_data else None
-    signature_algorithm = cert.signature_algorithm_oid._name if signature_algorithm else None
+    subject = cert.subject.get_attributes_for_oid(x509.NameOID.COMMON_NAME)[0].value
+    print(subject)
+    sans = cert.extensions.get_extension_for_class(x509.SubjectAlternativeName).value.get_values_for_type(x509.DNSName)
+    not_valid_after = get_date(str(cert.not_valid_after_utc))
+    not_valid_before = get_date(str(cert.not_valid_before_utc))
+    expiry = check_expiry(str(cert.not_valid_after_utc))
+    key_data = get_key_data(public_key)
+    signature_algorithm = cert.signature_algorithm_oid._name
     serial_number = f"{cert.serial_number} ({hex(cert.serial_number)})"
     gen_info = {
         "subject": subject,
@@ -80,9 +73,9 @@ def general_info(cert, public_key):
 
 def issuer_info(cert):
     issuer = None; organization = None; country = None
-    issuer = cert.issuer.get_attributes_for_oid(x509.NameOID.COMMON_NAME)[0].value if issuer else None
-    organization = cert.issuer.get_attributes_for_oid(x509.NameOID.ORGANIZATION_NAME)[0].value if organization else None
-    country = cert.issuer.get_attributes_for_oid(x509.NameOID.COUNTRY_NAME)[0].value if country else None
+    issuer = cert.issuer.get_attributes_for_oid(x509.NameOID.COMMON_NAME)[0].value
+    organization = cert.issuer.get_attributes_for_oid(x509.NameOID.ORGANIZATION_NAME)[0].value
+    country = cert.issuer.get_attributes_for_oid(x509.NameOID.COUNTRY_NAME)[0].value
     return {
         "issuer": issuer,
         "organization": organization,
@@ -121,14 +114,14 @@ def extenstions_data(cert):
                 crl_distribution_points.extend(uris)
     except x509.ExtensionNotFound:
         crl_distribution_points.append("No CRL Distribution Points extension")
-    authorityinfo = cert.extensions.get_extension_for_oid(x509.OID_AUTHORITY_INFORMATION_ACCESS).value if authorityinfo else None
-    ocsp_url = authorityinfo[0].access_location.value if ocsp_url else None
-    ca_issuer_url = authorityinfo[1].access_location.value  if ca_issuer_url else None
+    authorityinfo = cert.extensions.get_extension_for_oid(x509.OID_AUTHORITY_INFORMATION_ACCESS).value
+    ocsp_url = authorityinfo[0].access_location.value
+    ca_issuer_url = authorityinfo[1].access_location.value
     authority_info_data = {
         "ocsp_url": ocsp_url,
         "ca_issuer_url": ca_issuer_url
     }
-    subject_alt_name = cert.extensions.get_extension_for_oid(x509.OID_SUBJECT_ALTERNATIVE_NAME).value.get_values_for_type(x509.DNSName) if subject_alt_name else None    
+    subject_alt_name = cert.extensions.get_extension_for_oid(x509.OID_SUBJECT_ALTERNATIVE_NAME).value.get_values_for_type(x509.DNSName)    
     return {
         "authorityKeyIdentifier": authorityKeyIdentifier,
         "subjectKeyIdentifier": subjectKeyIdentifier,
@@ -148,7 +141,7 @@ def get_openssl_data(cert_file):
     }
     return data
 
-def decode_ssl_certificate(cert) -> dict:
+def decode_ssl_certificate(cert):
     subject = cert.subject.get_attributes_for_oid(x509.NameOID.COMMON_NAME)[0].value
     with open(f'{subject}.pem', 'wb') as cert_file:
         cert_file.write(cert.public_bytes(Encoding.PEM))
@@ -164,4 +157,4 @@ def decode_ssl_certificate(cert) -> dict:
         "extensions_data": extensions_data_data,
         "raw_openssl_data": raw_openssl_data
     }
-    return data
+    return data