refactor: Update app.py for CNAME generation and verification

app.py

@@ -2,17 +2,22 @@ import os
 import sys
 import gradio as gr
 from main import main
-from tools import write_file
+from tools import write_file, get_domains
 from gen_client_cnames import gen_client_cnames
+from verify_cname import verify_cname
 
 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])
+    for rec, value in zip(cname_recs, cname_values):
+        table_data.append([rec, value])
     return table_data
 
+def check_cname(domains):
+    data = verify_cname(domains)
+    return 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
@@ -43,14 +48,21 @@ def update_ca_server(wildcard: bool):
         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.Blocks(title="Project Gatekeeper - Get free SSL Certificates") as webui:
         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")
+                cname_domains = 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)
+                btn1 = 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)
+            btn1.click(gen_cname, inputs=cname_domains, outputs=records)
+        with gr.Tab("STEP 2: Check CNAME Propagation"):
+            with gr.Row():
+                check_domains = gr.Textbox(label="Enter CNAME", placeholder="thenayankasturi.eu.org, dash.thenayankasturi.eu.org, www.thenayankasturi.eu.org", type="text", interactive=True)
+                btn2 = gr.Button(value="Check CNAME Propagation")
+            with gr.Row():
+                data = gr.Dataframe(label="CNAME Records", headers=["CNAME", "Expected CNAME Value", "Found CNAME Value", "CNAME Status"], row_count=(1), col_count=(4))
+            btn2.click(verify_cname, inputs=check_domains, outputs=data)
         with gr.Tab("STEP 3: Generate SSL"):
             with gr.Row():
                 with gr.Column():
@@ -65,7 +77,7 @@ def app():
             
             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")
+            btn3 = gr.Button(value="Generate SSL Certificate")
             
             with gr.Row():
                 with gr.Column():
@@ -77,8 +89,7 @@ def app():
                 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])
+            btn3.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()
     except Exception as e:

verify_cname.py

@@ -0,0 +1,48 @@
+from dns import resolver
+from gen_client_cnames import gen_client_cnames
+
+def verify_cname(i_domains):
+    cname_rec = []
+    cname_value_expected = []
+    cname_value_found = []
+    cname_status = []
+    cf_domain = "silerudaagartha.eu.org"
+    cname_recs, cname_values = gen_client_cnames(i_domains, cf_domain)
+    
+    for rec, value in zip(cname_recs, cname_values):
+        redirect_domain = None
+        cname_record = None
+        status = None
+        
+        try:
+            cname_answers = resolver.resolve(rec, 'CNAME')
+            for answer in cname_answers:
+                cname_record = answer.to_text().rstrip(".")
+                if cname_record.startswith('_acme-challenge'):
+                    redirect_domain = cname_record.split('.')[-1]
+                else:
+                    redirect_domain = cname_record
+        except Exception as e:
+            print(f"An error occurred while resolving {rec}: {e}")
+            redirect_domain = None
+            cname_record = None
+        
+        if redirect_domain in cname_values:
+            status = "Verified"
+        elif cname_record in cname_values:
+            status = "Verified"
+        else:
+            status = "Not Verified"
+        
+        cname_rec.append(rec)
+        cname_value_expected.append(value)
+        cname_value_found.append(redirect_domain or cname_record)
+        cname_status.append(status)
+    
+    table_data = []
+    for record, expvalue, foundval, stat in zip(cname_rec, cname_value_expected, cname_value_found, cname_status):
+        table_data.append([record, expvalue, foundval, stat])
+    
+    return table_data
+
+table_data = verify_cname("thenayankasturi.eu.org, dash.thenayankasturi.eu.org, www.thenayankasturi.eu.org")