Refactor imports in acme_tools.py and app.py

acme_tools.py

@@ -1,4 +1,3 @@
-import sys
 import josepy as jose
 from acme import messages, jose
 from acme import client, messages

app.py

@@ -2,7 +2,6 @@ import os
 import sys
 import gradio as gr
 from main import main
-from tools import write_file
 
 def gen_ssl(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_curve=None):
     if key_type == "rsa":
@@ -14,17 +13,7 @@ def gen_ssl(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_
     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)
-    if email == "":
-        path = "error"
-    else:
-        path = email.split("@")[0]
-    try:
-        os.makedirs(path, exist_ok=True)
-    except:
-        print("Error creating directory")
-    write_file(f"{path}/private.pem", pvt)
-    write_file(f"{path}/domain.csr", csr)
-    write_file(f"{path}/cert.pem", cert)
+    print("SSL Certificate generated successfully")
     try:
         return pvt.decode('utf-8'), csr.decode('utf-8'), cert.decode('utf-8')
     except:

dns_cf.py

@@ -51,6 +51,7 @@ def del_txt(txt_name):
     for record_id, record_name in zip(record_ids, record_names):
         if record_name.startswith(txt_name):
             try:
+                print(f"Deleting record {record_name}")
                 cf_endpoint = f"zones/{cf_zone_id}/dns_records/{record_id}"
                 url = f"{cf_api}{cf_endpoint}"
                 requests.request("DELETE", url, headers=headers)

main.py

@@ -1,5 +1,4 @@
 import re
-import sys
 import time
 from genPVTCSR import gen_pvt_csr
 from tools import get_domains, get_ca_server, get_kid_hmac, extract_subdomains
@@ -8,6 +7,7 @@ from getTokenCert import get_tokens, verify_tokens
 from gen_records import txt_recs
 from dns_cf import add_txt, del_txt
 from verify_txt import verify_txt
+from send_mail import send_email
 
 def cf_non_wildcard(verification_tokens, email, exchange):
     tokens = verification_tokens
@@ -24,6 +24,7 @@ def cf_wildcard(verification_tokens, email, exchange):
     tokens = verification_tokens
     for key, value in tokens.items():
         txt_rec = txt_recs(key, exchange)
+        print("\nTXT record:", txt_rec, "\n")
         try:
             del_txt(txt_rec)
         except Exception as e:
@@ -125,12 +126,9 @@ def main(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_cur
             cf_non_wildcard(verification_tokens, email, exchange)
     except Exception as e:
         print(f"Error adding TXT records: {e}")
-    # verify TXT
-    '''
     for i in range(60):
         print(f"Waiting for {60-i} seconds", end="\r")
         time.sleep(1)
-    '''
     while not verify_txt_records(verification_tokens, exchange):
         print("TXT records not verified yet")
         time.sleep(5)
@@ -145,6 +143,15 @@ def main(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_cur
     private_key = private_key.decode("utf-8")
     csr = csr.decode("utf-8")
     cert = cert.decode("utf-8")
+    generation_details = f"""
+    SSL Certificate for {i_domains} were generated successfully, using Project Gatekeeper, a free SSL Certificate creator tool.
+    SSL Provider = {ca_server}
+    Key Type = {key_type}
+    Key Curve = {key_curve}
+    Key Size = {key_size}
+    For more details, visit: https://projectgatekeeper.vercel.app/tool/decode.html
+    """
+    send_email(email, private_key, csr, cert, generation_details)
     return private_key, csr, cert
 
 if __name__ == "__main__":

requirements.txt

@@ -3,4 +3,5 @@ python-dotenv
 acme==2.11.0
 google-cloud-public-ca==0.3.9
 gradio==4.41.0
-dnspython==2.6.1
+dnspython==2.6.1
+sib-api-v3-sdk==7.6.0

send_mail.py

@@ -0,0 +1,83 @@
+import os
+import smtplib
+from email.mime.text import MIMEText
+from email.mime.multipart import MIMEMultipart
+from email.mime.base import MIMEBase
+from email import encoders
+from dotenv import load_dotenv
+
+load_dotenv()
+smtp_port = os.getenv("PORT")
+smtp_server = os.getenv("SERVER")
+smtp_login = os.getenv("LOGIN")
+smtp_passwd = os.getenv("PASSWD")
+
+def mail_body(email, generation_details):
+    body = f"""
+    Hello {email},
+    Thankyou for using Project Gatekeeper to generate your SSL certificate.
+    Your SSL certificate has been generated and is attached to this email. 
+    Please find the attached file for your SSL certificate.
+
+    {generation_details}
+
+    Regards,
+    Nayan Kasturi (Raanna),
+    Developer & Maintainer,
+    Project Gatekeeper.
+    """
+    return body
+
+def make_attachment(private_key, csr, cert):
+    pvt = perpare_pvt(private_key)
+    csr = perpare_csr(csr)
+    ssl = perpare_ssl(cert)
+    return pvt, csr, ssl
+
+def perpare_pvt(pvt):
+    filename = "private_key.key"
+    pvt= pvt.encode('utf-8')
+    pvtkey = MIMEBase('application', 'octet-stream')
+    pvtkey.set_payload(pvt)
+    encoders.encode_base64(pvtkey)
+    pvtkey.add_header('Content-Disposition', "attachment; filename= " + filename)
+    return pvtkey
+
+def perpare_csr(csr):
+    filename = "domain.csr"
+    csr= csr.encode('utf-8')
+    domaincsr = MIMEBase('application', 'octet-stream')
+    domaincsr.set_payload(csr)
+    encoders.encode_base64(domaincsr)
+    domaincsr.add_header('Content-Disposition', "attachment; filename= " + filename)
+    return domaincsr
+
+def perpare_ssl(ssl):
+    filename = "ssl_certificate.crt"
+    ssl= ssl.encode('utf-8')
+    sslcrt = MIMEBase('application', 'octet-stream')
+    sslcrt.set_payload(ssl)
+    encoders.encode_base64(sslcrt)
+    sslcrt.add_header('Content-Disposition', "attachment; filename= " + filename)
+    return sslcrt
+
+def prepare_email(email, private_key, csr, cert, generation_details):
+    body = mail_body(email, generation_details)
+    msg = MIMEMultipart()
+    msg['From'] = "Project Gatekeeper <{}>".format(smtp_login)
+    msg['To'] = email
+    msg['Subject'] = "Project Gatekeeper - Your SSL Certificate is ready!"
+    msg.attach(MIMEText(body, 'plain'))
+    p, c, s = make_attachment(private_key, csr, cert)
+    for attachment_package in [p, c, s]:
+        msg.attach(attachment_package)
+    text = msg.as_string()
+    return text
+
+def send_email(email, private_key, csr, cert, generation_details):
+    data = prepare_email(email, private_key, csr, cert, generation_details)
+    TIE_server = smtplib.SMTP(smtp_server, smtp_port)
+    TIE_server.starttls()
+    TIE_server.login(smtp_login, smtp_passwd)
+    TIE_server.sendmail(from_addr=smtp_login, to_addrs=email, msg=data)
+    TIE_server.quit()

tools.py

@@ -59,16 +59,3 @@ def get_kid_hmac(server):
         return kid, hmac
     else:
         return None, None
-
-def write_file(filename, data):
-    try:
-        try:
-            with open(filename, 'wb') as f:
-                f.write(data)
-        except:
-            with open(filename, 'w') as f:
-                f.write(data)
-        print(filename, " successfully written")
-    except Exception as e:
-        print("Error writing file: ", filename)
-        print(e)

verify_txt.py

@@ -10,6 +10,7 @@ def get_txt(rec):
                 redirect_domain = txt_record.split('.')[-1]
             else:
                 redirect_domain = txt_record
+        print(f"Resolved {rec} to {redirect_domain.strip('.')}")
         return redirect_domain.strip('"').strip('.')
     except Exception as e:
         print(f"An error occurred while resolving {rec}: {e}")