do not keep CSRs

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

diff --git a/letsencrypt-tiny b/letsencrypt-tiny
index eb9d17150f9ecc99650db4de46fc1f3918a4bd8c..3b89db7b9d2dcec7d7d1230ced46727a0e942a39 100755 (executable)
--- a/letsencrypt-tiny
+++ b/letsencrypt-tiny
@@ -11,9 +11,9 @@ def readConfig(fname, defSection = 'DEFAULT'):
         config.read_file(stream)
     return config
 
         config.read_file(stream)
     return config
 

-def certfile(name, suff = None):
+def certfile(name):

     global config
     global config

-    return os.path.join(config['dirs']['certs'], name + ".crt" + ('' if suff is None else '+'+suff) )
+    return os.path.join(config['dirs']['certs'], name + ".crt" )

 
 def keyfile(name):
     global config
 
 def keyfile(name):
     global config


@@ -21,7 +21,7 @@ def keyfile(name):
 
 def csrfile(name):
     global config
 
 def csrfile(name):
     global config

-    return os.path.join(config['dirs']['csrs'], name + ".csr")
+    return os.path.join(config['dirs']['keys'], name + ".csr.tmp")

 
 def make_backup(fname):
     if os.path.exists(fname):
 
 def make_backup(fname):
     if os.path.exists(fname):


@@ -30,7 +30,7 @@ def make_backup(fname):
         while True:
             backupfile = os.path.join(config['dirs']['backups'], backupname + "." + str(i))
             if not os.path.exists(backupfile):
         while True:
             backupfile = os.path.join(config['dirs']['backups'], backupname + "." + str(i))
             if not os.path.exists(backupfile):

-                os.rename(src = fname, dst = backupfile)
+                os.rename(fname, backupfile)

                 break
             elif i >= 100:
                 print("Somehow it's really hard to find a name for the backup file...")
                 break
             elif i >= 100:
                 print("Somehow it's really hard to find a name for the backup file...")


@@ -60,26 +60,20 @@ def acme(name, domains):
         file.write(csr)
     # call acme-tiny as a script
     acme_tiny = os.path.join(config['acme']['acme-tiny'], 'acme_tiny.py')
         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([acme_tiny, "--quiet", "--account-key", config['acme']['account-key'], "--csr", csrfile(name), "--acme-dir", config['acme']['challenge-dir']])
+    signed_crt = subprocess.check_output(["python", acme_tiny, "--quiet", "--account-key", config['acme']['account-key'], "--csr", csrfile(name), "--acme-dir", config['acme']['challenge-dir']])

     # save new certificate
     make_backup(certfile(name))
     with open(certfile(name), 'wb') as f:
         f.write(signed_crt)
     # save new certificate
     make_backup(certfile(name))
     with open(certfile(name), 'wb') as f:
         f.write(signed_crt)

-    # append DH params
-    dhfile = config['DEFAULT']['dh-params']
-    if dhfile is not None:
-        with open(dhfile, 'rb') as f:
-            dh = f.read()
-        with open(certfile(name, 'dh'), 'wb') as f:
-            f.write(signed_crt)
-            f.write(dh)
+    # clean up
+    os.remove(csrfile(name))

 
 def request_cert(name):
     global config
     if not os.path.exists(keyfile(name)):
         raise Exception("No such key: {}".format(name))
     domains = config['DEFAULT']['domains'].split()
 
 def request_cert(name):
     global config
     if not os.path.exists(keyfile(name)):
         raise Exception("No such key: {}".format(name))
     domains = config['DEFAULT']['domains'].split()

-    print("Obtaining certificate '{}' for domains {}".format(name, ' '.join(domains)))
+    print("Obtaining certificate '{}' for domains: {}".format(name, ' '.join(domains)))

     acme(name, domains)
 
 def generate_key(name):
     acme(name, domains)
 
 def generate_key(name):


@@ -97,9 +91,10 @@ def generate_key(name):
 def check_staging():
     '''Returns 0 if nothing was done, 1 if a stage key is present but has to be kept, 2 is a stage key was unstaged.'''
     live = config['files']['live']
 def check_staging():
     '''Returns 0 if nothing was done, 1 if a stage key is present but has to be kept, 2 is a stage key was unstaged.'''
     live = config['files']['live']

-    staging = config['files']['staging']
+    staging = config['files'].get('staging')

     if staging is None or not os.path.exists(keyfile(staging)):
         return 0
     if staging is None or not os.path.exists(keyfile(staging)):
         return 0

+    

     staging_time = datetime.timedelta(hours = int(config['timing']['staging-hours']))
     key_age = datetime.datetime.now() - key_mtime(staging)
     if key_age < staging_time:
     staging_time = datetime.timedelta(hours = int(config['timing']['staging-hours']))
     key_age = datetime.datetime.now() - key_mtime(staging)
     if key_age < staging_time:


@@ -107,19 +102,15 @@ def check_staging():
     print("Unstaging '{}' to '{}'".format(staging, live))
     # unstage the key!
     make_backup(keyfile(live))
     print("Unstaging '{}' to '{}'".format(staging, live))
     # unstage the key!
     make_backup(keyfile(live))

-    os.rename(src = keyfile(staging), dst = keyfile(live))
+    os.rename(keyfile(staging), keyfile(live))

     make_backup(certfile(live))
     make_backup(certfile(live))

-    os.rename(src = certfile(staging), dst = certfile(live))
-    try:
-        os.rename(src = certfile(staging, 'dh'), dst = certfile(live, 'dh'))
-    except FileNotFoundError:
-        pass
+    os.rename(certfile(staging), certfile(live))

     return 2
 
 def auto_renewal():
     '''Returns 0 if nothing was done, 1 if only certs were changed, 2 if certs and keys were changed.'''
     live = config['files']['live']
     return 2
 
 def auto_renewal():
     '''Returns 0 if nothing was done, 1 if only certs were changed, 2 if certs and keys were changed.'''
     live = config['files']['live']

-    staging = config['files']['staging']
+    staging = config['files'].get('staging')

     
     max_key_age = datetime.timedelta(days = int(config['timing']['max-key-age-days']))
     renew_cert_time = datetime.timedelta(days = int(config['timing']['renew-cert-before-expiry-days']))
     
     max_key_age = datetime.timedelta(days = int(config['timing']['max-key-age-days']))
     renew_cert_time = datetime.timedelta(days = int(config['timing']['renew-cert-before-expiry-days']))


@@ -168,7 +159,7 @@ if __name__ == "__main__":
     
     if args.action[0] == 'renew':
         live = config['files']['live']
     
     if args.action[0] == 'renew':
         live = config['files']['live']

-        staging = config['files']['staging']
+        staging = config['files'].get('staging')

         
         request_cert(live)
         if staging is not None and os.path.exists(keyfile(staging)):
         
         request_cert(live)
         if staging is not None and os.path.exists(keyfile(staging)):