Update app.py

app.py

@@ -5,39 +5,72 @@ from cryptography.hazmat.backends import default_backend
 from decode import decode_ssl_certificate
 
 def decode(cert) -> dict:
-    cert = cert.encode()
-    ssl_out = {}
     try:
+        cert = cert.encode()
+        ssl_out = {}
         try:
-            decoded_cert = x509.load_pem_x509_certificate(cert, default_backend())
-        except:
-            decoded_cert = x509.load_pem_x509_csr(cert, default_backend())
-        if decoded_cert:
-            status = "Success"
-            message = "Certificate decoded successfully."
-            decoded_data = decode_ssl_certificate(decoded_cert)
+            try:
+                decoded_cert = x509.load_pem_x509_certificate(cert, default_backend())
+            except:
+                decoded_cert = x509.load_pem_x509_csr(cert, default_backend())
+            if decoded_cert:
+                status = "Success"
+                message = "Certificate decoded successfully."
+                decoded_data = decode_ssl_certificate(decoded_cert)
+                data = {
+                    "status": status,
+                    "message": message,
+                    "data": decoded_data
+                }
+                ssl_out = json.dumps(data, indent = 4)
+            else:
+                data = {
+                    "status": status,
+                    "message": message,
+                    "data": None
+                }
+                ssl_out = json.dumps(data, indent = 4)
+        except Exception as e:
+            status = "Failed"
+            message = "Failed to decode certificate. Please make sure you have uploaded a valid certificate file."
             data = {
-                "status": status,
-                "message": message,
-                "data": decoded_data
-            }
-            ssl_out = json.dumps(data, indent = 4)
-        else:
+                    "status": status,
+                    "message": message,
+                    "data": e
+                }
+    except:
+        ssl_out = {}
+        try:
+            try:
+                decoded_cert = x509.load_pem_x509_certificate(cert, default_backend())
+            except:
+                decoded_cert = x509.load_pem_x509_csr(cert, default_backend())
+            if decoded_cert:
+                status = "Success"
+                message = "Certificate decoded successfully."
+                decoded_data = decode_ssl_certificate(decoded_cert)
+                data = {
+                    "status": status,
+                    "message": message,
+                    "data": decoded_data
+                }
+                ssl_out = json.dumps(data, indent = 4)
+            else:
+                data = {
+                    "status": status,
+                    "message": message,
+                    "data": None
+                }
+                ssl_out = json.dumps(data, indent = 4)
+        except Exception as e:
+            status = "Failed"
+            message = "Failed to decode certificate. Please make sure you have uploaded a valid certificate file."
             data = {
-                "status": status,
-                "message": message,
-                "data": None
-            }
-            ssl_out = json.dumps(data, indent = 4)
-    except Exception as e:
-        status = "Failed"
-        message = "Failed to decode certificate. Please make sure you have uploaded a valid certificate file."
-        data = {
-                "status": status,
-                "message": message,
-                "data": e
-            }
-        ssl_out = json.dumps(data, indent = 4)
+                    "status": status,
+                    "message": message,
+                    "data": e
+                }
+    ssl_out = json.dumps(data, indent = 4)
     return ssl_out
 
 def app():