chore: release 1.2.6

crontab.example

@@ -1,3 +1,3 @@
 # do daily/weekly/monthly maintenance
 # min   hour    day     month   weekday command
-0       3       *       *       1       /app/main.py renew
+0       3       *       *       1       stapler renew

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "stapler"
-version = "1.2.2"
+version = "1.2.6"
 description = "Static pages as simple as a gzip file"
 requires-python = ">=3.14"
 dependencies = [
@@ -28,7 +28,7 @@ dev = [
 
 [tool.ruff.lint]
 select = ["ALL"]
-ignore = ["D", "E501", "S104", "PLR2004", "ANN401", "BLE001", "COM812", "S603", "PLR0911", "S101", "PT"]
+ignore = ["D", "E501", "S104", "PLR2004", "ANN401", "BLE001", "COM812", "S603", "PLR0911", "S101", "PT", "E722"]
 
 [tool.coverage.run]
 source = ["stapler"]

stapler/handlers.py

@@ -25,6 +25,9 @@ if typing.TYPE_CHECKING:
 
 
 class BaseHandler(abc.ABC, http.server.BaseHTTPRequestHandler):
+    SANITIZE_REGEX = re.compile(r"[^\x20-\x7F]+")
+    timeout = 10
+
     @typing.override
     def __init__(
         self,
@@ -39,6 +42,8 @@ class BaseHandler(abc.ABC, http.server.BaseHTTPRequestHandler):
         self.__in_size: int | None = None
         self.https: bool = params.https
         super().__init__(*args, **kwargs)
+        with contextlib.suppress(Exception):
+            self.connection.close()
 
     @typing.override
     def send_error(
@@ -73,6 +78,10 @@ class BaseHandler(abc.ABC, http.server.BaseHTTPRequestHandler):
         else:
             self.send_status_only(code, message)
 
+    @typing.override
+    def address_string(self) -> str:  # pragma: no cover
+        return self.SANITIZE_REGEX.sub("?", super().address_string())
+
     @typing.override
     def log_message(self, format: str, *args: typing.Any) -> None:  # pragma: no cover
         fmt = "%s - " + format
@@ -98,7 +107,12 @@ class BaseHandler(abc.ABC, http.server.BaseHTTPRequestHandler):
             code = color + str(code.value) + logs.TermColor.RESET
         if size == "" and self.out_size > 0:
             size = str(self.out_size)
-        args = (code, self.address_string(), self.host, self.requestline)
+        args = (
+            code,
+            self.address_string(),
+            self.host,
+            self.SANITIZE_REGEX.sub("?", self.requestline),
+        )
         fmt = "→ %s - %s - %s - %s"
         if size != "":
             args = (*args, size)
@@ -117,6 +131,7 @@ class BaseHandler(abc.ABC, http.server.BaseHTTPRequestHandler):
         self.send_response(code, message)
         self.send_header("Content-Type", f"{content_type}; charset=UTF-8")
         self.send_header("Content-Length", str(len(encoded)))
+        self.send_header("Connection", "close")
         self.end_headers()
         self.wfile.write(encoded)
         self.close_connection = True
@@ -131,6 +146,7 @@ class BaseHandler(abc.ABC, http.server.BaseHTTPRequestHandler):
             headers = {}
         self.send_response(code, message)
         self.send_header("Content-Length", "0")
+        self.send_header("Connection", "close")
         for header, value in headers.items():
             self.send_header(header, value)
         self.end_headers()
@@ -179,9 +195,11 @@ class BaseHandler(abc.ABC, http.server.BaseHTTPRequestHandler):
                 "transfer-encoding",
                 "server",
                 "date",
+                "connection",
             ]:
                 self.send_header(header, value.replace(target_host, self.host))
         self.send_header("Content-Length", str(out_size := len(response.content)))
+        self.send_header("Connection", "close")
         self.end_headers()
         if out_size > 0:
             self.wfile.write(response.content)
@@ -219,7 +237,12 @@ class BaseHandler(abc.ABC, http.server.BaseHTTPRequestHandler):
         )
 
     def _pre_log_request(self) -> None:  # pragma: no cover
-        args = ("...", self.address_string(), self.host, self.requestline)
+        args = (
+            "...",
+            self.address_string(),
+            self.host,
+            self.SANITIZE_REGEX.sub("?", self.requestline),
+        )
         fmt = "← %s - %s - %s - %s"
         if self.in_size > 0:
             args = (*args, self.in_size)
@@ -275,7 +298,12 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler, BaseHandler):
         self.__target_redirect: str | None = None
         self.__target_proxy: str | None = None
         self.__target_spa: str | None = None
-        super().__init__(*args, directory=params.data_dir, **kwargs, params=params)  # ty:ignore[unknown-argument]
+        try:
+            super().__init__(*args, directory=params.data_dir, **kwargs, params=params)  # ty:ignore[unknown-argument]
+        except (BrokenPipeError, ConnectionResetError) as e:
+            self.logger.error("Connection lost: %s", str(e))  # noqa: TRY400
+        except:
+            self.logger.exception("Could not handle request")
 
     @property
     def token(self) -> str:

tests/test_data_dir.py

@@ -59,10 +59,6 @@ class TestDataDir(BaseTestCase):
         self.__create_path("test_1")
         self.assertIsNone(self.data_dir.get_file("test_1", ".value"))
 
-    def test_get_file_cannot_read(self) -> None:
-        self.__create_path("test_1", {".value/.value": "value"})
-        self.assertIsNone(self.data_dir.get_file("test_1", ".value"))
-
     def test_get_file_invalid_path(self) -> None:
         self.assertIsNone(self.data_dir.get_file("test_1", ".value"))
 

tests/test_handlers.py

@@ -162,6 +162,36 @@ class TestRequestHandler(BaseHandlerTestCase):
             handler.data_dir = self.data_dir
             return handler
 
+    def test_handle_errors_silently(self) -> None:
+        with self.patch("http.server.BaseHTTPRequestHandler.__init__") as mock:
+            mock.side_effect = Exception
+            logging.basicConfig(level=logging.CRITICAL)
+            RequestHandler(
+                unittest.mock.MagicMock(),
+                "127.0.0.1",
+                unittest.mock.MagicMock(),
+                params=Parameters(
+                    data_dir=self.get_tmp_dir(), certbot_www=str(self.certbot_www)
+                ),
+                registry=self.registry,
+                token_manager=self.token_manager,
+            )
+
+    def test_handle_disconnect_silently(self) -> None:
+        with self.patch("http.server.BaseHTTPRequestHandler.__init__") as mock:
+            mock.side_effect = BrokenPipeError
+            logging.basicConfig(level=logging.CRITICAL)
+            RequestHandler(
+                unittest.mock.MagicMock(),
+                "127.0.0.1",
+                unittest.mock.MagicMock(),
+                params=Parameters(
+                    data_dir=self.get_tmp_dir(), certbot_www=str(self.certbot_www)
+                ),
+                registry=self.registry,
+                token_manager=self.token_manager,
+            )
+
     def test_do_head_forward(self) -> None:
         handler = self._get_handler()
         with (
@@ -1253,6 +1283,7 @@ class TestUpgradeHandler(BaseHandlerTestCase):
             handler.headers = collections.defaultdict(lambda: None, headers)  # ty:ignore[invalid-assignment]
             handler.rfile = rfile if rfile is not None else io.BytesIO()
             handler.wfile = io.BytesIO()
+            handler.client_address = ("127.0.0.1", 12345)
             handler.logger = unittest.mock.Mock(logging.Logger)
             handler.data_dir = self.data_dir
             return handler

uv.lock

@@ -203,7 +203,7 @@ wheels = [
 
 [[package]]
 name = "stapler"
-version = "1.2.2"
+version = "1.2.6"
 source = { editable = "." }
 dependencies = [
     { name = "requests" },