chore: Update app.py and requirements.txt files

.gitignore

@@ -4,3 +4,4 @@ certificate*
 /thenayankasturi*
 /__pycache__
 *.json
+/venv

app.py

@@ -1,9 +1,19 @@
+import os
+import sys
 import gradio as gr
 from main import main
+from tools import write_file
 
 def run(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_curve=None):
-    pvt, pvt_file, cert, cert_file = main(i_domains, wildcard, email, ca_server, key_type, key_size, key_curve)
-    return pvt, pvt_file, cert, cert_file
+    if key_size is not None:
+        key_size = int(key_size)
+    pvt, csr, cert = main(i_domains, wildcard, email, ca_server, key_type, key_size, key_curve)
+    path = email.split("@")[0]
+    os.makedirs(path, exist_ok=True)
+    write_file(f"{path}/private.pem", pvt)
+    write_file(f"{path}/domain.csr", csr)
+    write_file(f"{path}/cert.pem", cert)
+    return pvt, f"{path}/private.pem", csr, f"{path}/domain.csr", cert, f"{path}/cert.pem"
 
 def update_key_options(key_type):
     if key_type == "rsa":
@@ -11,6 +21,12 @@ def update_key_options(key_type):
     else:
         return gr.update(visible=False), gr.update(visible=True)
 
+def update_ca_server(wildcard: bool):
+    if wildcard:
+        return gr.update(choices=["Let's Encrypt (Testing)","Let's Encrypt", "ZeroSSL", "Google (Testing)","Google", "SSL.com"], value="Let's Encrypt (Testing)")
+    else:
+        return gr.update(choices=["Let's Encrypt (Testing)","Let's Encrypt", "Buypass (Testing)", "Buypass", "ZeroSSL", "Google (Testing)","Google", "SSL.com"], value="Let's Encrypt")
+
 def app():
     with gr.Blocks() as webui:
         with gr.Row():
@@ -31,12 +47,23 @@ def app():
             with gr.Column():
                 pvt = gr.Textbox(label="Your Private Key", placeholder="Your Private Key will appear here, after successful SSL generation", type="text", interactive=False, show_copy_button=True, lines=10, max_lines=10)
                 pvtfile = gr.File(label="Download your Private Key")
+            with gr.Column():
+                csr = gr.Textbox(label="Your SSL Certificate", placeholder="Your SSL Certificate will appear here, after successful SSL generation", type="text", interactive=False, show_copy_button=True, lines=10, max_lines=10)
+                csrfile = gr.File(label="Download your SSL Certificate")
             with gr.Column():
                 crt = gr.Textbox(label="Your SSL Certificate", placeholder="Your SSL Certificate will appear here, after successful SSL generation", type="text", interactive=False, show_copy_button=True, lines=10, max_lines=10)
                 crtfile = gr.File(label="Download your SSL Certificate")
         
-        btn.click(run, inputs=[domains_input, wildcard, email_input, ca_server, key_type, key_size_dropdown, key_curve_dropdown], outputs=[pvt, pvtfile, crt, crtfile])
-    webui.queue(default_concurrency_limit=15).launch()
+        btn.click(run, inputs=[domains_input, wildcard, email_input, ca_server, key_type, key_size_dropdown, key_curve_dropdown], outputs=[pvt, pvtfile, csr, csrfile, crt, crtfile])
+    try:
+        webui.queue(default_concurrency_limit=15).launch(share=True, server_port=7860)
+    except Exception as e:
+        print(f"Error: {e}")
+        sys.exit(1)
 
 if __name__ == "__main__":
-    app()
+    try:
+        app()
+    except Exception as e:
+        print(f"Error: {e}")
+        sys.exit(1)

main.py

@@ -2,7 +2,7 @@ import os
 import sys
 import time
 from genPVTCSR import gen_pvt_csr
-from tools import get_domains, get_ca_server, get_kid_hmac, extract_subdomains, write_file
+from tools import get_domains, get_ca_server, get_kid_hmac, extract_subdomains
 from acme_tools import pg_client, new_account
 from getTokenCert import get_tokens, verify_tokens
 from gen_records import txt_recs
@@ -46,9 +46,6 @@ def main(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_cur
     else:
         kid = nkid
         hmac = nhmac
-    print("KID:",kid)
-    print("HMAC:",hmac)
-    print(f"CA SERVER({ca_server}):", ca_server_url)
     account = new_account(pgk_client, email, kid=kid, hmac=hmac)
     if not account:
         exit()
@@ -73,16 +70,11 @@ def main(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_cur
             print("TXT records deleted successfully")
         except Exception as e:
             print(f"Error deleting TXT records or no TXT records exists: {e}")
-    path = email.split("@")[0]
-    os.makedirs(path, exist_ok=True)
-    write_file(f"{path}/private.pem", private_key)
-    write_file(f"{path}/domain.csr", csr)
-    write_file(f"{path}/cert.pem", cert)
-    return private_key, f"{path}/private.pem", cert, f"{path}/cert.pem"
-"""
+    return private_key, csr, cert
+'''
 if __name__ == "__main__":
     DOMAINS = 'thenayankasturi.eu.org, *.thenayankasturi.eu.org'    
-    ca_server = "Google (Testing)" #Let's Encrypt (Testing), Let's Encrypt, Buypass (Testing), Buypass, zerossl, google_test, google, ssccom
+    ca_server = "Let's Encrypt" #Let's Encrypt (Testing), Let's Encrypt, Buypass (Testing), Buypass, ZeroSSL, Google (Testing), Google, SSL.com
     EMAIL = "[email protected]"
     key_type = "ec"
     key_curve = "ec256"
@@ -90,4 +82,4 @@ if __name__ == "__main__":
     KID = None
     HMAC = None
     main(i_domains=DOMAINS, wildcard=True, email=EMAIL, ca_server=ca_server, key_type=key_type, key_size=key_size,key_curve=key_curve, kid=KID, hmac=HMAC)
-"""
+'''

requirements.txt

@@ -2,3 +2,4 @@ josepy==1.14.0
 python-dotenv
 acme==2.11.0
 google-cloud-public-ca==0.3.9
+gradio