fix: don't reload cert manager, use only sni callback

src/cert_manager.py

@@ -183,44 +183,23 @@ class CertManager:
             return False
         return self.__exists_certbot(host)
 
-    def get_https_context(self, default_host: str) -> ssl.SSLContext | None:
-        if not self.exists(default_host):
-            self.logger.warning("Cannot create HTTPS context for %s", default_host)
-            return None
-        self.logger.debug("Creating HTTP context...")
-        cert_file = self.get_cert(default_host)
-        key_file = self.get_key(default_host)
-        self.last_file_change = cert_file.stat().st_mtime
-        context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
-        context.load_cert_chain(
-            cert_file,
-            key_file,
-        )
-        context.sni_callback = self.__sni_callback
-        return context
-
-    def detect_default_cert_change(self, default_host: str) -> bool:
-        cert_file = self.get_cert(default_host)
-        if cert_file.exists() and cert_file.stat().st_mtime != self.last_file_change:
-            self.logger.debug("Detected change: %s", cert_file)
-            self.last_file_change = cert_file.stat().st_mtime
-            return True
-        return False
-
-    def __sni_callback(
+    def sni_callback(
         self, socket: ssl.SSLObject, host: str | None, _: ssl.SSLContext, /
     ) -> None | int:
         if host is None:
             return None
         if not self.exists(host) and not self.create_or_update(host):
-            msg = "Could not get certificate for %s"
-            raise CertManagerError(msg, host)
-        new_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
+            return None
         cert_file = self.get_cert(host)
         key_file = self.get_key(host)
-        new_context.load_cert_chain(
-            cert_file,
-            key_file,
-        )
-        socket.context = new_context
+        try:
+            new_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
+            new_context.load_cert_chain(
+                cert_file,
+                key_file,
+            )
+            socket.context = new_context
+        except Exception:
+            self.logger.exception("Could not create HTTPS context for %s", host)
+            return None
         return None

src/server.py

@@ -1,6 +1,7 @@
 import contextlib
 import http.server
 import logging
+import ssl
 import threading
 import time
 import typing
@@ -42,7 +43,6 @@ class StaplerServer:
         self.data_dir: DataDir = DataDir(params.data_dir)
         self.default_host: str = params.host.split(":", maxsplit=2)[0]
         self.server: http.server.ThreadingHTTPServer | None = None
-        self.https = params.https
 
     def __get_all_hosts(self) -> list[str]:
         return [self.default_host, *self.registry.get_hosts()]
@@ -66,13 +66,8 @@ class StaplerServer:
             token_manager=self.token_manager,
         )
 
-    def __create_base_server(self) -> tuple[http.server.ThreadingHTTPServer, bool]:
-        context = (
-            self.cert_manager.get_https_context(self.default_host)
-            if self.params.https
-            else None
-        )
-        if context is not None:
+    def __create_base_server(self) -> http.server.ThreadingHTTPServer:
+        if self.params.https:
             server = http.server.ThreadingHTTPServer(
                 (
                     self.params.bind,
@@ -80,7 +75,9 @@ class StaplerServer:
                 ),
                 self.__request_handler,
             )
+            context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
             server.socket = context.wrap_socket(server.socket, server_side=True)
+            context.sni_callback = self.cert_manager.sni_callback
         else:
             server = http.server.ThreadingHTTPServer(
                 (
@@ -94,7 +91,7 @@ class StaplerServer:
             server.server_address[0],
             server.server_port,
         )
-        return server, context is not None
+        return server
 
     def __upgrade_handler(
         self, *args: typing.Any
@@ -127,37 +124,19 @@ class StaplerServer:
                     self.token_manager.init()
                 time.sleep(1)
 
-    def __cert_manager_background(self) -> None:
-        with contextlib.suppress(KeyboardInterrupt):
-            while True:
-                if (
-                    self.server is not None
-                    and self.cert_manager.detect_default_cert_change(self.default_host)
-                    and (
-                        context := self.cert_manager.get_https_context(
-                            self.default_host
-                        )
-                    )
-                    is not None
-                ):
-                    self.server.socket = context.wrap_socket(self.server.socket)
-                time.sleep(1)
-
     def __start_background_tasks(self) -> None:
         threading.Thread(target=self.__token_manager_background, daemon=True).start()
-        if self.https:
-            threading.Thread(target=self.__cert_manager_background, daemon=True).start()
 
     def run(self) -> int:
         self.logger.info("Version %s", project.get_version())
         for line in STAPLER_ASCII.split("\n"):
             self.logger.debug(line.ljust(36))
         self.__startup()
-        self.server, self.https = self.__create_base_server()
-        upgrade_server = self.__start_upgrade_server() if self.https else None
+        self.server = self.__create_base_server()
+        upgrade_server = self.__start_upgrade_server() if self.params.https else None
         self.logger.info(
             "Server up and ready on %s://%s",
-            "https" if self.https else "http",
+            "https" if self.params.https else "http",
             self.params.host,
         )
         self.__start_background_tasks()