Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f77e826490 | |||
| fec5857995 | |||
| b1ef00b437 | |||
| 09ea29d6af | |||
| 8855fd0b01 | |||
| 8854cb393c | |||
| 5e5147251f | |||
| 3fe33cb348 |
+1
-1
@@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "stapler"
|
||||
version = "1.2.3"
|
||||
version = "1.2.5"
|
||||
description = "Static pages as simple as a gzip file"
|
||||
requires-python = ">=3.14"
|
||||
dependencies = [
|
||||
|
||||
+22
-3
@@ -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(
|
||||
@@ -75,7 +80,7 @@ class BaseHandler(abc.ABC, http.server.BaseHTTPRequestHandler):
|
||||
|
||||
@typing.override
|
||||
def address_string(self) -> str: # pragma: no cover
|
||||
return re.sub(r"[^\x00-\x7F]+", "", super().address_string())
|
||||
return self.SANITIZE_REGEX.sub("?", super().address_string())
|
||||
|
||||
@typing.override
|
||||
def log_message(self, format: str, *args: typing.Any) -> None: # pragma: no cover
|
||||
@@ -102,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)
|
||||
@@ -121,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
|
||||
@@ -135,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()
|
||||
@@ -183,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)
|
||||
@@ -223,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)
|
||||
|
||||
@@ -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"))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user