moepman/acertmgr
1
0
Fork 0
mirror of https://github.com/moepman/acertmgr.git synced 2024-12-29 11:31:49 +01:00
Code Releases Activity

standalone: Fix multiple challange handlers on same port

Browse Source 
If you define challenge handlers on a per-domain basis multiple will be
created. This would cause the standalone handler to potientially try
to bind the same port (when configured) multiple times, which would only
work on the first try. Subsequent tries would fail with "Address already
in use". To fix this only bind the server between start and stop of the
challenge and cleanup afterwards.
This commit is contained in:
Kishi85 2021-03-23 09:22:03 +01:00 committed by Markus Hauschild
parent 7a5d35f29b
commit 9953cb4527
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
acertmgr/modes/standalone.py
View File

@ -28,10 +28,20 @@ class HTTPServer6(HTTPServer):
class ChallengeHandler(HTTPChallengeHandler): class ChallengeHandler(HTTPChallengeHandler):
def __init__(self, config): def __init__(self, config):
HTTPChallengeHandler.__init__(self, config) HTTPChallengeHandler.__init__(self, config)
bind_address = config.get("bind_address", "") self.bind_address = config.get("bind_address", "")
port = int(config.get("port", 80)) self.port = int(config.get("port", 80))
self.challenges = {} # Initialize the challenge data dict self.challenges = {} # Initialize the challenge data dict
self.server_thread = None
self.server = None
def create_challenge(self, domain, thumbprint, token):
self.challenges[token] = "{0}.{1}".format(token, thumbprint)
def destroy_challenge(self, domain, thumbprint, token):
del self.challenges[token]
def start_challenge(self, domain, thumbprint, token):
_self = self _self = self
# Custom HTTP request handler # Custom HTTP request handler
@ -54,19 +64,11 @@ class ChallengeHandler(HTTPChallengeHandler):
self.end_headers() self.end_headers()
self.wfile.write(value) self.wfile.write(value)
self.server_thread = None
try: try:
self.server = HTTPServer6((bind_address, port), _HTTPRequestHandler) self.server = HTTPServer6((self.bind_address, self.port), _HTTPRequestHandler)
except socket.gaierror: except socket.gaierror:
self.server = HTTPServer((bind_address, port), _HTTPRequestHandler) self.server = HTTPServer((self.bind_address, self.port), _HTTPRequestHandler)
def create_challenge(self, domain, thumbprint, token):
self.challenges[token] = "{0}.{1}".format(token, thumbprint)
def destroy_challenge(self, domain, thumbprint, token):
del self.challenges[token]
def start_challenge(self, domain, thumbprint, token):
def _serve(): def _serve():
self.server.serve_forever() self.server.serve_forever()
@ -78,3 +80,6 @@ class ChallengeHandler(HTTPChallengeHandler):
if self.server_thread.is_alive(): if self.server_thread.is_alive():
self.server.shutdown() self.server.shutdown()
self.server_thread.join() self.server_thread.join()
self.server.server_close()
self.server = None
self.server_thread = None