chore: Refactor key_type logic in run function

app.py

@@ -3,8 +3,17 @@ import sys
 import gradio as gr
 from main import main
 from tools import write_file
+from gen_client_cnames import gen_client_cnames
 
-def run(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_curve=None):
+def gen_cname(i_domains):
+    cf_domain = "sileruagartha.eu.org"
+    cname_recs, cname_values = gen_client_cnames(i_domains, cf_domain)
+    table_data = []
+    for x, y in zip(cname_recs, cname_values):
+        table_data.append([x, y])
+    return table_data
+
+def gen_ssl(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_curve=None):
     if key_type == "rsa":
         key_curve = None
     elif key_type == "ec":
@@ -28,41 +37,50 @@ def update_key_options(key_type):
         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)")
+    if wildcard == False:
+        return gr.update(choices=["Let's Encrypt (Testing)","Let's Encrypt", "Buypass (Testing)", "Buypass", "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")
+        return gr.update(choices=["Let's Encrypt (Testing)","Let's Encrypt", "ZeroSSL", "Google (Testing)","Google", "SSL.com"], value="Let's Encrypt")
 
 def app():
     with gr.Blocks() as webui:
-        with gr.Row():
-            with gr.Column():
-                domains_input = gr.Textbox(label="Enter Domains", placeholder="thenayankasturi.eu.org, dash.thenayankasturi.eu.org, www.thenayankasturi.eu.org", type="text", interactive=True)
-                wildcard = gr.Checkbox(label="Wildcard SSL", interactive=True, value=False)
-            email_input = gr.Textbox(label="Enter your Email ID", placeholder="nayankasturi@gmail.com", type="text", interactive=True)
-        with gr.Row():
-            ca_server = gr.Dropdown(label="Select Certificate Authority", choices=["Let's Encrypt (Testing)","Let's Encrypt", "Buypass (Testing)", "Buypass", "ZeroSSL", "Google (Testing)","Google", "SSL.com"], interactive=True, value="Let's Encrypt (Testing)")
-            key_type = gr.Radio(label="Select SSL key type", choices=["rsa", "ec"], interactive=True, value='ec')
-            key_size_dropdown = gr.Dropdown(label="Select Key Size", choices=['2048', '4096'], value='4096', visible=False)  # Initially visible
-            key_curve_dropdown = gr.Dropdown(label="Select Key Curve", choices=['SECP256R1', 'SECP384R1'], value='SECP384R1', visible=True)  # Initially hidden
-        
-        key_type.change(fn=update_key_options, inputs=key_type, outputs=[key_size_dropdown, key_curve_dropdown])
-        btn = gr.Button(value="Generate SSL Certificate")
-        
-        with gr.Row():
-            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 CSR", placeholder="Your CSR 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 CSR")
-            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, csr, csrfile, crt, crtfile])
+        with gr.Tab("STEP 1: Generate CNAME Records"):
+            with gr.Row():
+                domains_input = gr.Textbox(value="thenayankasturi.eu.org, dash.thenayankasturi.eu.org, www.thenayankasturi.eu.org", label="Enter Domains", placeholder="thenayankasturi.eu.org, dash.thenayankasturi.eu.org, www.thenayankasturi.eu.org", type="text", interactive=True)
+                btn = gr.Button(value="Generate CNAME Records & Values")
+            with gr.Row():
+                records = gr.Dataframe(label="CNAME Records", headers=["CNAME", "CNAME VALUE"], row_count=(1), col_count=(2))
+            btn.click(gen_cname, inputs=domains_input, outputs=records)
+        with gr.Tab("STEP 3: Generate SSL"):
+            with gr.Row():
+                with gr.Column():
+                    domains_input = gr.Textbox(label="Enter Domains", placeholder="thenayankasturi.eu.org, dash.thenayankasturi.eu.org, www.thenayankasturi.eu.org", type="text", interactive=True)
+                    wildcard = gr.Checkbox(label="Wildcard SSL", interactive=True, value=False)
+                email_input = gr.Textbox(label="Enter your Email ID", placeholder="nayankasturi@gmail.com", type="text", interactive=True)
+            with gr.Row():
+                ca_server = gr.Dropdown(label="Select Certificate Authority", choices=["Let's Encrypt (Testing)","Let's Encrypt", "Buypass (Testing)", "Buypass", "ZeroSSL", "Google (Testing)","Google", "SSL.com"], interactive=True, value="Let's Encrypt (Testing)")
+                key_type = gr.Radio(label="Select SSL key type", choices=["rsa", "ec"], interactive=True, value='ec')
+                key_size_dropdown = gr.Dropdown(label="Select Key Size", choices=['2048', '4096'], value='4096', visible=False)  # Initially visible
+                key_curve_dropdown = gr.Dropdown(label="Select Key Curve", choices=['SECP256R1', 'SECP384R1'], value='SECP384R1', visible=True)  # Initially hidden
+            
+            key_type.change(fn=update_key_options, inputs=key_type, outputs=[key_size_dropdown, key_curve_dropdown])
+            wildcard.change(fn=update_ca_server, inputs=wildcard, outputs=ca_server)
+            btn = gr.Button(value="Generate SSL Certificate")
+            
+            with gr.Row():
+                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 CSR", placeholder="Your CSR 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 CSR")
+                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(gen_ssl, 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)
+        webui.queue(default_concurrency_limit=15).launch()
     except Exception as e:
         print(f"Error: {e}")
         sys.exit(1)

gen_client_cnames.py

@@ -0,0 +1,8 @@
+from gen_records import gen_cname
+from tools import get_domains, extract_subdomains
+
+def gen_client_cnames(i_domains, cf_domain):
+    domains = get_domains(i_domains)
+    exchange = extract_subdomains(domains=domains)
+    cname_recs, cname_values = gen_cname(domains, cf_domain, exchange)
+    return cname_recs, cname_values