From 4776d41dfe94d8554cbce6d94403c7fa5b883891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BB=D1=8C=D0=B5=D0=B2=20=D0=9D?= =?UTF-8?q?=D0=B8=D0=BA=D0=B8=D1=82=D0=B0?= Date: Mon, 16 Nov 2026 13:05:47 +0300 Subject: [PATCH] Reserve bounded upload buffers without starving readiness and enforce lease deadlines --- src/messenger/secrets_provider.py | 8 ++++++-- src/messenger/tls_gateway.py | 19 ++++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/messenger/secrets_provider.py b/src/messenger/secrets_provider.py index 616f519..7a65d62 100644 --- a/src/messenger/secrets_provider.py +++ b/src/messenger/secrets_provider.py @@ -41,14 +41,18 @@ def refresh(): raise Failure(503, "Сервис секретов временно недоступен") try: role = os.environ["BAO_ROLE"] + auth_started = time.monotonic() auth = request("auth/cert/login", data={"name": role})["auth"] + deadline = auth_started + min(float(auth["lease_duration"]), 30) - 1 values = request("secret/data/services/" + role, token=auth["client_token"])["data"][ "data" ] - # Never keep credentials usable beyond the auth token's short lease. + if time.monotonic() >= deadline: + raise ValueError("Service credential lease already expired") + # Deadline starts before auth, never after a slow KV read. _values = values _retry_after = 0.0 - _valid_until = time.monotonic() + min(float(auth["lease_duration"]), 30) - 1 + _valid_until = deadline except (OSError, ValueError, TypeError, KeyError, urllib.error.URLError): _values = {} _valid_until = 0 diff --git a/src/messenger/tls_gateway.py b/src/messenger/tls_gateway.py index 431f0db..3a80e6d 100644 --- a/src/messenger/tls_gateway.py +++ b/src/messenger/tls_gateway.py @@ -208,12 +208,19 @@ class HTTPHandler(BaseHTTPRequestHandler): if not permitted: self.send_error(403) return + has_body_slot = False + body = None try: length = int(self.headers.get("Content-Length", "0")) body_limit = MAX_BODY if cfg.get("s3") else 1024 * 1024 if length < 0 or length > body_limit or self.headers.get("Transfer-Encoding"): self.send_error(413) return + if length: + has_body_slot = self.server.body_slots.acquire(blocking=False) + if not has_body_slot: + self.send_error(503) + return if self.headers.get("Expect", "").lower() == "100-continue": self.wfile.write(b"HTTP/1.1 100 Continue\r\n\r\n") self.wfile.flush() @@ -242,18 +249,28 @@ class HTTPHandler(BaseHTTPRequestHandler): self.wfile.write(chunk) except (OSError, ValueError, http.client.HTTPException): self.close_connection = True + finally: + if has_body_slot: + body = None + self.server.body_slots.release() class HTTPServer(Boundary, ThreadingHTTPServer): daemon_threads = True + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + # Bound large request buffers, while HEAD/readiness and streamed GETs + # do not compete for the two upload-body slots. + self.body_slots = threading.BoundedSemaphore(2) + def serve(cfg): cls = HTTPServer if cfg.get("http") else TCPServer handler = HTTPHandler if cfg.get("http") else TCPHandler with cls(("0.0.0.0", cfg["port"]), handler) as server: server.cfg = cfg - server.slots = threading.BoundedSemaphore(2 if cfg.get("http") else 32) + server.slots = threading.BoundedSemaphore(16 if cfg.get("http") else 32) server.serve_forever(poll_interval=0.2)