Merge pull request #8 from vincowl/patch-1

Error generating certs with acme v2 and SANs
2025-09-18 21:24:31 +08:00 · 2018-06-20 15:54:18 +02:00 · 2018-06-20 12:16:19 +02:00 · 2018-06-06 12:56:30 +02:00 · 2018-06-06 12:56:08 +02:00 · 2018-05-22 02:56:26 +02:00
2 changed files with 30 additions and 11 deletions
--- a/2
+++ b/2
@@ -15,4 +15,4 @@ RUN pip3 install -r requirements.txt
 COPY . /app

 # Define entrypoint of the app
-ENTRYPOINT ["python3", "extractor.py"]
+ENTRYPOINT ["python3", "-u", "extractor.py"]
--- a/extractor.py
+++ b/extractor.py
@@ -21,19 +21,38 @@ class Handler(FileSystemEventHandler):

            # Read JSON file
            data = json.loads(open(event.src_path).read())
-            certs = data['DomainsCertificate']['Certs']
+
+            # Determine ACME version
+            acme_version = 2 if 'acme-v02' in data['Account']['Registration']['uri'] else 1
+
+            # Find certificates
+            if acme_version == 1:
+                certs = data['DomainsCertificate']['Certs']
+            elif acme_version == 2:
+                certs = data['Certificates']

            # Loop over all certificates
            for c in certs:
+                if acme_version == 1:
+                    name = c['Certificate']['Domain']
+                    privatekey = c['Certificate']['PrivateKey']
+                    fullchain = c['Certificate']['Certificate']
+                    sans = c['Domains']['SANs']
+                elif acme_version == 2:
+                    name = c['Domain']['Main']
+                    privatekey = c['Key']
+                    fullchain = c['Certificate']
+                    sans = c['Domain']['SANs']
+
                # Decode private key, certificate and chain
-                privatekey = b64decode(c['Certificate']['PrivateKey']).decode('utf-8')
-                fullchain = b64decode(c['Certificate']['Certificate']).decode('utf-8')
+                privatekey = b64decode(privatekey).decode('utf-8')
+                fullchain = b64decode(fullchain).decode('utf-8')
                start = fullchain.find('-----BEGIN CERTIFICATE-----', 1)
                cert = fullchain[0:start]
                chain = fullchain[start:]

                # Create domain directory if it doesn't exist
-                directory = 'certs/' + c['Certificate']['Domain'] + '/'
+                directory = 'certs/' + name + '/'
                try:
                    os.makedirs(directory)
                except OSError as error:
@@ -56,15 +75,15 @@ class Handler(FileSystemEventHandler):
                # Write private key, certificate and chain to flat files
                directory = 'certs_flat/'

-                with open(directory + c['Certificate']['Domain'] + '.key', 'w') as f:
+                with open(directory + name + '.key', 'w') as f:
                    f.write(privatekey)
-                with open(directory + c['Certificate']['Domain'] + '.crt', 'w') as f:
+                with open(directory + name + '.crt', 'w') as f:
                    f.write(fullchain)
-                with open(directory + c['Certificate']['Domain'] + '.chain.pem', 'w') as f:
+                with open(directory + name + '.chain.pem', 'w') as f:
                    f.write(chain)

-                if c['Domains']['SANs']:
-                    for name in c['Domains']['SANs']:
+                if sans:
+                    for name in sans:
                        with open(directory + name + '.key', 'w') as f:
                            f.write(privatekey)
                        with open(directory + name + '.crt', 'w') as f:
@@ -72,7 +91,7 @@ class Handler(FileSystemEventHandler):
                        with open(directory + name + '.chain.pem', 'w') as f:
                            f.write(chain)

-                print('Extracted certificate for: ' + c['Domains']['Main'] + (', ' + ', '.join(c['Domains']['SANs']) if c['Domains']['SANs'] else ''))
+                print('Extracted certificate for: ' + name + (', ' + ', '.join(sans) if sans else ''))

 if __name__ == "__main__":
    # Determine path to watch
Author	SHA1	Message	Date
Daniel Huisman	51dfc49499	Merge pull request #8 from vincowl/patch-1 Error generating certs with acme v2 and SANs	2018-06-20 15:54:18 +02:00
vincowl	f7f7af27b8	Error generating certs with acme v2 and SANs This error as raised while running : ```Exception in thread Thread-1: Traceback (most recent call last): File "/usr/local/lib/python3.6/threading.py", line 916, in _bootstrap_inner self.run() File "/usr/local/lib/python3.6/site-packages/watchdog/observers/api.py", line 199, in run self.dispatch_events(self.event_queue, self.timeout) File "/usr/local/lib/python3.6/site-packages/watchdog/observers/api.py", line 368, in dispatch_events handler.dispatch(event) File "/usr/local/lib/python3.6/site-packages/watchdog/events.py", line 330, in dispatch _method_map[event_type](event) File "extractor.py", line 13, in on_created self.handle(event) File "extractor.py", line 48, in handle sans = c['Domains']['SANs'] KeyError: 'Domains' ``` Acme.json's file syntax seems to have changed regarding my own traffic acme.json	2018-06-20 12:16:19 +02:00
Daniel Huisman	97e71b2b5c	Merge remote-tracking branch 'origin/feature-acme-v2'	2018-06-06 12:56:30 +02:00
Daniel Huisman	7842e09181	Improve the code I wrote when hungover, thanks to #7 , closes #6	2018-06-06 12:56:08 +02:00
Daniel Huisman	9701cb9219	Start implementing ACME v2 support	2018-05-22 02:56:26 +02:00
Daniel Huisman	d94604591e	Fix Docker logs, closes #5	2018-04-24 16:25:49 +02:00