add newmail

[lets-encrypt-tiny.git] / letsencrypt-tiny

diff --git a/letsencrypt-tiny b/letsencrypt-tiny
index 658eb0739907898172e68f7765bdd2c8d186bbae..7ca3f556f821cd62b14724f4ca75bf03610f3dcf 100755 (executable)
--- a/letsencrypt-tiny
+++ b/letsencrypt-tiny
@@ -35,7 +35,7 @@ def make_backup(fname):
 
 def trigger_hook(hook):
     global config
 
 def trigger_hook(hook):
     global config

-    exe = config['hooks'][hook]
+    exe = config['hooks'].get(hook)

     if exe is not None:
         subprocess.check_call([exe])
 
     if exe is not None:
         subprocess.check_call([exe])
 


@@ -58,18 +58,20 @@ def acme(keyfilename, certfilename, domains):
     # Generating the CSR is done by a shell script
     exe = os.path.join(os.path.dirname(__file__), 'gencsr')
     csr = subprocess.check_output([exe, keyfilename] + domains)
     # Generating the CSR is done by a shell script
     exe = os.path.join(os.path.dirname(__file__), 'gencsr')
     csr = subprocess.check_output([exe, keyfilename] + domains)

-    assert not os.path.exists(csrfilename)
+    assert not os.path.exists(csrfilename), "The temporary CSR file {} still exists. It seems something went wrong on a previous request. You may want to remove the file manually.".format(csrfilename)

     with open(csrfilename, 'wb') as file:
         file.write(csr)
     with open(csrfilename, 'wb') as file:
         file.write(csr)

-    # call acme-tiny as a script
-    acme_tiny = os.path.join(config['acme']['acme-tiny'], 'acme_tiny.py')
-    signed_crt = subprocess.check_output(["python", acme_tiny, "--quiet", "--account-key", accountkey, "--csr", csrfilename, "--acme-dir", config['acme']['challenge-dir']])
-    # save new certificate
-    make_backup(certfilename)
-    with open(certfilename, 'wb') as f:
-        f.write(signed_crt)
-    # clean up
-    os.remove(csrfilename)
+    try:
+        # call acme-tiny as a script
+        acme_tiny = os.path.join(config['acme']['acme-tiny'], 'acme_tiny.py')
+        signed_crt = subprocess.check_output(["python", acme_tiny, "--quiet", "--account-key", accountkey, "--csr", csrfilename, "--acme-dir", config['acme']['challenge-dir']])
+        # save new certificate
+        make_backup(certfilename)
+        with open(certfilename, 'wb') as f:
+            f.write(signed_crt)
+    finally:
+        # clean up
+        os.remove(csrfilename)

 
 def openssl_genrsa(keyfilename):
     with subprocess.Popen(["openssl", "genrsa", str(int(config['DEFAULT']['key-length']))], stdout=subprocess.PIPE, stderr=subprocess.PIPE) as f:
 
 def openssl_genrsa(keyfilename):
     with subprocess.Popen(["openssl", "genrsa", str(int(config['DEFAULT']['key-length']))], stdout=subprocess.PIPE, stderr=subprocess.PIPE) as f:


@@ -92,6 +94,7 @@ def request_cert(name):
     acme(keyfile(name), certfile(name), domains)
 
 def generate_key(name):
     acme(keyfile(name), certfile(name), domains)
 
 def generate_key(name):

+    assert not os.path.exists(certfile(name)), "Don't make create a new key for an old cert"

     print("Generating new private key '{}'".format(name))
     openssl_genrsa(keyfile(name))
 
     print("Generating new private key '{}'".format(name))
     openssl_genrsa(keyfile(name))
 


@@ -202,6 +205,7 @@ if __name__ == "__main__":
         live = config['files']['live']
         if not os.path.exists(keyfile(live)):
             generate_key(live)
         live = config['files']['live']
         if not os.path.exists(keyfile(live)):
             generate_key(live)

+        if not os.path.exists(certfile(live)):

             request_cert(live)
             if args.hooks:
                 trigger_hook('post-certchange')
             request_cert(live)
             if args.hooks:
                 trigger_hook('post-certchange')