fix: handle all errors

stapler/cert_manager.py

@@ -122,7 +122,9 @@ class CertManager:
             )
             self.logger.info("Created self-signed certificate for %s", host)
         except CertManagerError:
-            self.logger.exception("Could not create certbot certificate for %s\n%s")
+            self.logger.exception(
+                "Could not create self-signed certificate for %s", host
+            )
             return False
         except subprocess.CalledProcessError as e:
             self.logger.exception(
@@ -172,7 +174,7 @@ class CertManager:
             )
             self.logger.info("Created certbot certificate for %s", host)
         except CertManagerError:
-            self.logger.exception("Could not create certbot certificate for %s\n%s")
+            self.logger.exception("Could not create certbot certificate for %s", host)
             return False
         except subprocess.CalledProcessError as e:
             self.logger.exception(

stapler/handlers.py

@@ -1,4 +1,5 @@
 import abc
+import contextlib
 import http
 import http.cookiejar
 import http.server
@@ -223,6 +224,14 @@ class BaseHandler(abc.ABC, http.server.BaseHTTPRequestHandler):
     def server_signature(self) -> str:
         return self.server_version + "\n\n" + STAPLER_ASCII + "\n"
 
+    @contextlib.contextmanager
+    def handle_errors(self) -> typing.Iterator[None]:
+        try:
+            yield
+        except Exception as e:
+            self.send_error(http.HTTPStatus.INTERNAL_SERVER_ERROR, str(e))
+            self.logger.exception("Internal Server Error")
+
 
 class RequestHandler(http.server.SimpleHTTPRequestHandler, BaseHandler):
     protocol_version = "HTTP/1.1"
@@ -335,12 +344,14 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler, BaseHandler):
 
     @typing.override
     def do_HEAD(self) -> None:
+        with self.handle_errors():
             self._pre_log_request()
             if not self._proxy_or_redirect():
                 super().do_HEAD()
 
     @typing.override
     def do_GET(self) -> None:
+        with self.handle_errors():
             self._pre_log_request()
             if self._proxy_or_redirect():
                 return None
@@ -349,6 +360,7 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler, BaseHandler):
             return super().do_GET()
 
     def do_PUT(self) -> None:
+        with self.handle_errors():
             self._pre_log_request()
             if self._proxy_or_redirect():
                 return
@@ -379,6 +391,7 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler, BaseHandler):
         self.do_PUT()  # be gentle on them
 
     def do_DELETE(self) -> None:
+        with self.handle_errors():
             self._pre_log_request()
             if self._proxy_or_redirect():
                 return
@@ -392,16 +405,19 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler, BaseHandler):
             return
 
     def do_CONNECT(self) -> None:
+        with self.handle_errors():
             self._pre_log_request()
             if not self._proxy_or_redirect():
                 self.send_error(http.HTTPStatus.METHOD_NOT_ALLOWED)
 
     def do_OPTIONS(self) -> None:
+        with self.handle_errors():
             self._pre_log_request()
             if not self._proxy_or_redirect():
                 self.send_error(http.HTTPStatus.METHOD_NOT_ALLOWED)
 
     def do_TRACE(self) -> None:
+        with self.handle_errors():
             self._pre_log_request()
             if not self._proxy_or_redirect():
                 self.send_error(http.HTTPStatus.METHOD_NOT_ALLOWED)
@@ -422,9 +438,6 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler, BaseHandler):
         except tarfile.TarError:
             self.send_error(http.HTTPStatus.BAD_REQUEST, "Invalid tar archive")
             return False
-        except Exception as e:
-            self.send_error(http.HTTPStatus.INTERNAL_SERVER_ERROR, str(e))
-            return False
         self.registry.add(path)
         self.token_manager.set_token(path, self.token)
         if self.has_target_spa:
@@ -457,11 +470,7 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler, BaseHandler):
         if not self.data_dir.exists(path):
             self.send_error(http.HTTPStatus.NOT_FOUND, "Not found")
             return False
-        try:
         self.data_dir.remove(path)
-        except Exception as e:
-            self.send_error(http.HTTPStatus.INTERNAL_SERVER_ERROR, str(e))
-            return False
         self.registry.remove(path)
         return True
 
@@ -578,10 +587,12 @@ class UpgradeHandler(RequestHandler):
     server_version = "StaplerUpgradeServer/" + PKG_VERSION
 
     def do_HEAD(self) -> None:
+        with self.handle_errors():
             self._pre_log_request()
             self.send_redirect(f"https://{self.host}{self.path}")
 
     def do_GET(self) -> None:
+        with self.handle_errors():
             if self.path.startswith(self.CERTBOT_CHALLENGE_PATH):
                 super().do_GET()
             else: