Small fixes

kshcherban · Jul 28, 2018 · 2e50141 · 2e50141
1 parent 520d8e8
commit 2e50141
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/acme_nginx/Acme.py b/acme_nginx/Acme.py
@@ -262,15 +262,15 @@ def _verify_challenge(self, url, domain):
             sys.exit(1)
 
     @staticmethod
-    def _get_challenge(auth, challenge_type):
+    def _get_challenge(challenges, challenge_type):
         """
         Return challenge from dict
         Params:
-            auth, dict, auth data structure from acme api
+            challenge, dict, challenge data structure from acme api
             challenge_type, str, challenge type
         Return:
             challenge key
         """
-        for c in auth['challenges']:
-            if c['type'] == challenge_type:
-                return c
+        for challenge in challenges:
+            if challenge['type'] == challenge_type:
+                return challenge
diff --git a/acme_nginx/AcmeV1.py b/acme_nginx/AcmeV1.py
@@ -60,7 +60,7 @@ def get_certificate(self):
             if code != 201:
                 self.log.error('error requesting challenges: {0} {1}'.format(code, result))
                 sys.exit(1)
-            challenge = self._get_challenge(json.loads(result), "http-01")
+            challenge = self._get_challenge(json.loads(result)['challenges'], "http-01")
             token = re.sub(r"[^A-Za-z0-9_\-]", "_", challenge['token'])
             thumbprint = self._thumbprint()
             self.log.info('adding nginx virtual host and completing challenge')

diff --git a/acme_nginx/AcmeV2.py b/acme_nginx/AcmeV2.py
@@ -97,7 +97,7 @@ def solve_http_challenge(self, directory):
             self.log.debug(json.dumps(auth))
             domain = auth['identifier']['value']
             self.log.info('verifying domain {0}'.format(domain))
-            challenge = self._get_challenge(auth, "http-01")
+            challenge = self._get_challenge(auth['challenges'], "http-01")
             token = re.sub(r"[^A-Za-z0-9_\-]", "_", challenge['token'])
             thumbprint = self._thumbprint()
             self.log.info('adding nginx virtual host and completing challenge')
@@ -142,7 +142,7 @@ def solve_dns_challenge(self, directory, client):
             self.log.debug(json.dumps(auth))
             domain = auth['identifier']['value']
             self.log.info('verifying domain {0}'.format(domain))
-            challenge = self._get_challenge(auth, "dns-01")
+            challenge = self._get_challenge(auth['challenges'], "dns-01")
             token = re.sub(r"[^A-Za-z0-9_\-]", "_", challenge['token'])
             thumbprint = self._thumbprint()
             keyauthorization = "{0}.{1}".format(token, thumbprint)