wsbuilder 1.2.5__tar.gz → 1.2.7__tar.gz

{wsbuilder-1.2.5/src/wsbuilder.egg-info → wsbuilder-1.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wsbuilder
-Version: 1.2.5
+Version: 1.2.7
 Summary: Lightweight HTTP + WebSocket framework for Python.
 Author: wsbuilder Authors
 License-Expression: MIT

{wsbuilder-1.2.5 → wsbuilder-1.2.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wsbuilder"
-version = "1.2.5"
+version = "1.2.7"
 description = "Lightweight HTTP + WebSocket framework for Python."
 readme = "README.md"
 requires-python = ">=3.11"

{wsbuilder-1.2.5 → wsbuilder-1.2.7}/src/wsbuilder/__init__.py

@@ -126,7 +126,7 @@ def __getattr__(name):
 def __dir__():
     return sorted(set(globals()) | _PKI_EXPORTS)
 
-__version__ = "1.2.5"
+__version__ = "1.2.7"
 
 __all__ = [
     "App",

{wsbuilder-1.2.5 → wsbuilder-1.2.7}/src/wsbuilder/proxyi.py

@@ -869,7 +869,9 @@ class ProxyRule:
     def choose_target(self, request, *, proxy=None):
         targets = self.enabled_targets()
         if not targets:
-            return None
+            # Every upstream of this rule is disabled: the proxy's default
+            # rule, when there is one, still answers the request.
+            return proxy._fallback_target(request) if proxy is not None else None
         mode = normalize_balance_mode(self.balance or BALANCING_ROUND_ROBIN)
         if mode == BALANCING_ROUND_ROBIN:
             target = self._round_robin(targets)

{wsbuilder-1.2.5 → wsbuilder-1.2.7}/src/wsbuilder/server.py

@@ -276,6 +276,12 @@ class HTTPServer:
             except OSError:
                 pass
             return
+        # Accepted sockets block forever by default; bound the handshake and
+        # the HTTP/2 preface sniff the same way as the first request read.
+        try:
+            conn.settimeout(self.REQUEST_READ_TIMEOUT_SECONDS)
+        except OSError:
+            pass
         tls_meta = {
             "enabled": context is not None,
             "peer_cert": None,

{wsbuilder-1.2.5 → wsbuilder-1.2.7/src/wsbuilder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wsbuilder
-Version: 1.2.5
+Version: 1.2.7
 Summary: Lightweight HTTP + WebSocket framework for Python.
 Author: wsbuilder Authors
 License-Expression: MIT

{wsbuilder-1.2.5 → wsbuilder-1.2.7}/tests/test_proxyi.py

@@ -204,6 +204,22 @@ class TestProxyI(unittest.TestCase):
         self.assertIsNone(rule.choose_target(request))
         self.assertEqual(proxy.dispatch(request).status, 502)
 
+    def test_a_rule_with_only_disabled_targets_falls_back_to_the_default_rule(self):
+        proxy = ProxyI(name="edge")
+        proxy.default({"url": f"http://127.0.0.1:{self.backend_port}", "name": "fallback"})
+        rule = (
+            proxy.route(name="api", path_prefix="/api")
+            .upstream("http://127.0.0.1:9001", enabled=False)
+            .build()
+        )
+        request = self._request(path="/api/users")
+
+        self.assertEqual(rule.choose_target(request, proxy=proxy).name, "fallback")
+        self.assertIsNone(rule.choose_target(request))
+        response = proxy.dispatch(request)
+        self.assertEqual(response.status, 200)
+        self.assertEqual(response.headers["X-ProxyI-Target"], "fallback")
+
     def test_snapshot_does_not_advance_round_robin(self):
         proxy = ProxyI(name="edge")
         rule = (

{wsbuilder-1.2.5 → wsbuilder-1.2.7}/tests/test_server.py

@@ -2,6 +2,7 @@ import io
 import os
 import signal
 import socket
+import ssl
 import threading
 import unittest
 from unittest.mock import patch
@@ -512,6 +513,42 @@ class TestHTTPServerLifecycle(unittest.TestCase):
         self.assertFalse(thread.is_alive())
 
 
+    def test_silent_client_is_dropped_after_the_read_timeout(self):
+        server = HTTPServer("127.0.0.1", 0, self._ping_app(), request_read_timeout=0.2)
+        self._serve(server)
+
+        for opening in (b"", b"P"):
+            with self.subTest(opening=opening):
+                with socket.create_connection(server.server_address, timeout=5.0) as sock:
+                    if opening:
+                        sock.sendall(opening)
+                    received = b""
+                    while True:
+                        chunk = sock.recv(4096)
+                        if not chunk:
+                            break
+                        received += chunk
+                self.assertNotIn(b"200 OK", received)
+
+    def test_tls_handshake_runs_under_the_read_timeout(self):
+        seen = []
+
+        class RecordingContext:
+            def wrap_socket(self, conn, server_side):
+                seen.append(conn.gettimeout())
+                raise ssl.SSLError("stop after recording")
+
+        server = HTTPServer(
+            "127.0.0.1", 0, self._ping_app(), ssl_context=RecordingContext(), request_read_timeout=0.2
+        )
+        left, right = socket.socketpair()
+        self.addCleanup(right.close)
+        left.setblocking(True)
+        server.handle_conn(left, ("127.0.0.1", 0))
+
+        self.assertEqual(seen, [0.2])
+
+
 class TestHTTPServerLimits(unittest.TestCase):
     def test_constructor_limits_override_only_this_instance(self):
         server = HTTPServer(