Update app.py

app.py

@@ -4,83 +4,56 @@ from cryptography import x509
 from cryptography.hazmat.backends import default_backend
 from decode import decode_ssl_certificate
 
-def decode(cert) -> dict:
+def decode(cert) -> str:
     try:
-        cert = cert.encode()
-        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": e
-                }
-    except:
-        ssl_out = {}
+        # Ensure cert is a byte string
+        if isinstance(cert, str):
+            cert = cert.encode()
+
         try:
+            decoded_cert = None
             try:
                 decoded_cert = x509.load_pem_x509_certificate(cert, default_backend())
-            except:
+            except Exception:
                 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,
+                response = {
+                    "status": "Success",
+                    "message": "Certificate decoded successfully.",
                     "data": decoded_data
                 }
-                ssl_out = json.dumps(data, indent = 4)
             else:
-                data = {
-                    "status": status,
-                    "message": message,
+                response = {
+                    "status": "Failed",
+                    "message": "Invalid certificate format.",
                     "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)
-    return ssl_out
+            response = {
+                "status": "Failed",
+                "message": "Failed to decode certificate. Please upload a valid certificate file.",
+                "error": str(e)  # Convert Exception to a string
+            }
+    except Exception as e:
+        response = {
+            "status": "Failed",
+            "message": "Unexpected error while processing the certificate.",
+            "error": str(e)
+        }
+
+    return json.dumps(response, indent=4)  # Always return a JSON string
 
 def app():
     with gr.Blocks(title="Project Gatekeeper - Get free SSL Certificates") as webui:
         with gr.Row():
             ssl = gr.Textbox(label="Enter Domains", type="text", interactive=True)
         with gr.Row():
-            decoded_data = gr.Textbox(label="Enter Domains", type="text", interactive=False, show_copy_button=True)
+            decoded_data = gr.Textbox(label="Decoded SSL Data", type="text", interactive=False, show_copy_button=True)
         btn = gr.Button(value="Generate SSL Certificate")
         btn.click(decode, inputs=ssl, outputs=decoded_data)
+    
     try:
         webui.queue(default_concurrency_limit=15).launch()
     except Exception as e: