Refactor get_zero_ssl_eab function to handle API key errors and exceptions

getZeroSSLEAB.py

@@ -4,14 +4,26 @@ from dotenv import load_dotenv
 
 def gen_zero_ssl_eab():
     load_dotenv()    
-    apikey = os.getenv("ZEROSSLAPI")
-    url = "https://api.zerossl.com/acme/eab-credentials"
+    apikey = os.getenv("ZEROSSL_API")
+    if not apikey:
+        print("Error: API key not found. Ensure it's set in your environment variables.")
+        return "Error", "Error"
+    
+    url = f"https://api.zerossl.com/acme/eab-credentials?access_key={apikey}"
     headers = {'Content-Type': 'application/json'}
-    resp = requests.post(url, params={'access_key': apikey}, headers=headers)
-    if resp.json()['success'] == False:
-        print("Error: ", resp.json()['error'])
+    
+    try:
+        resp = requests.post(url, headers=headers)
+        resp_json = resp.json()
+        
+        if resp.status_code == 200 and resp_json.get('success') == 1:
+            kid = resp_json.get('eab_kid')
+            hmac = resp_json.get('eab_hmac_key')
+            print(f"Kid: {kid}\nHMAC: {hmac}")
+            return kid, hmac
+        else:
+            print(f"Error: {resp_json.get('error', 'Unknown error')}")
+            return "Error", "Error"
+    except requests.exceptions.RequestException as e:
+        print(f"Request failed: {e}")
         return "Error", "Error"
-    else:
-        kid = resp.json()['eab_kid']
-        hmac = resp.json()['eab_hmac_key']
-    return kid, hmac

main.py

@@ -100,7 +100,6 @@ def main(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_cur
                         print("size", key_size)
                         print("curve", key_curve)
                         print("All data filled")
-    
     domains = get_domains(i_domains)
     exchange = extract_subdomains(domains=domains)
     if wildcard:
@@ -118,8 +117,7 @@ def main(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_cur
         account = new_account(pgk_client, email, kid=kid, hmac=hmac)
     except Exception as e:
         print(f"Account Error: {e}")
-    if not account:
-        return handle_error("Cannot generate your SSL. Too many requests for this domain.")
+        return handle_error(e)
     private_key, csr = gen_pvt_csr(domains=domains, email=email, key_type=key_type, key_curve=key_curve, key_size=key_size)
     verification_tokens, challs, order = get_tokens(pgk_client, csr, ca_server_url)
     try:
@@ -165,15 +163,15 @@ def main(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_cur
     return private_key, csr, cert, email_status
 
 if __name__ == "__main__":
-    DOMAINS = 'raannakasturi.eu.org'    
+    DOMAINS = 'thenayankasturi.eu.org'    
     ca_server = "Google" #Let's Encrypt (Testing), Let's Encrypt, Google (Testing), Google, Buypass (Testing), Buypass, ZeroSSL, SSL.com
     EMAIL = "[email protected]"
     key_type = "ecc"
     key_curve = "ec384"
-    key_size = None
+    key_size = "4096"
     KID = None
     HMAC = None
-    private_key, csr, cert = 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)
+    private_key, csr, cert, email_status = 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)
     print("Private Key:")
     print(private_key)
     print()
@@ -182,3 +180,6 @@ if __name__ == "__main__":
     print()
     print("Certificate:")
     print(cert)
+    print()
+    print(email_status)
+    print()