wsbuilder 1.0.2__tar.gz → 1.0.3__tar.gz

{wsbuilder-1.0.2/src/wsbuilder.egg-info → wsbuilder-1.0.3}/PKG-INFO

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

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/pyproject.toml

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

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/src/wsbuilder/__init__.py

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

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/src/wsbuilder/app.py

@@ -455,7 +455,7 @@ class App:
         thread_id = parts[0]
         try:
             normalized = str(uuid.UUID(thread_id))
-        except Exception:
+        except ValueError:
             return ""
 
         issued_text, sig = parts[1], parts[2]

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/src/wsbuilder/cache.py

@@ -16,14 +16,14 @@ DEFAULT_CLEANUP_INTERVAL_SECONDS = 30.0
 def _safe_float(value, default):
     try:
         return float(value)
-    except Exception:
+    except (TypeError, ValueError, OverflowError):
         return default
 
 
 def _safe_int(value, default):
     try:
         return int(value)
-    except Exception:
+    except (TypeError, ValueError, OverflowError):
         return default
 
 

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/src/wsbuilder/caches.py

@@ -39,14 +39,14 @@ _DROP_HEADERS = {
 def _safe_float(value, default):
     try:
         return float(value)
-    except Exception:
+    except (TypeError, ValueError, OverflowError):
         return default
 
 
 def _safe_int(value, default):
     try:
         return int(value)
-    except Exception:
+    except (TypeError, ValueError, OverflowError):
         return default
 
 

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/src/wsbuilder/http.py

@@ -59,7 +59,7 @@ class Request:
     def json(self):
         try:
             return json.loads(self.text())
-        except Exception:
+        except (ValueError, RecursionError):
             return None
 
 

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/src/wsbuilder/metrics.py

@@ -19,14 +19,14 @@ def _iso_utc(ts):
 def _safe_int(value, default):
     try:
         return int(value)
-    except Exception:
+    except (TypeError, ValueError, OverflowError):
         return default
 
 
 def _safe_float(value, default):
     try:
         return float(value)
-    except Exception:
+    except (TypeError, ValueError, OverflowError):
         return default
 
 

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/src/wsbuilder/proxyi.py

@@ -99,14 +99,14 @@ _REDACTED_HEADER_VALUE = "[REDACTED]"
 def _safe_int(value, default):
     try:
         return int(value)
-    except Exception:
+    except (TypeError, ValueError, OverflowError):
         return default
 
 
 def _safe_float(value, default):
     try:
         return float(value)
-    except Exception:
+    except (TypeError, ValueError, OverflowError):
         return default
 
 

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/src/wsbuilder/security.py

@@ -29,14 +29,14 @@ DEFAULT_MAX_TEMPORARY_BLOCKS = 20000
 def _safe_int(value, default):
     try:
         return int(value)
-    except Exception:
+    except (TypeError, ValueError, OverflowError):
         return default
 
 
 def _safe_float(value, default):
     try:
         return float(value)
-    except Exception:
+    except (TypeError, ValueError, OverflowError):
         return default
 
 
@@ -46,7 +46,7 @@ def _to_ip(value):
         return None
     try:
         return ipaddress.ip_address(text)
-    except Exception:
+    except ValueError:
         return None
 
 
@@ -56,7 +56,7 @@ def _to_network(value):
         return None
     try:
         return ipaddress.ip_network(text, strict=False)
-    except Exception:
+    except ValueError:
         ip_obj = _to_ip(text)
         if ip_obj is None:
             return None

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/src/wsbuilder/server.py

@@ -105,7 +105,7 @@ class HTTPServer:
                 if not acquired:
                     try:
                         conn.close()
-                    except Exception:
+                    except OSError:
                         pass
                     continue
                 t = threading.Thread(
@@ -172,7 +172,7 @@ class HTTPServer:
                 metrics.error("tls_context", e)
             try:
                 conn.close()
-            except Exception:
+            except OSError:
                 pass
             return
         tls_meta = {
@@ -192,14 +192,14 @@ class HTTPServer:
                 print(f"[tls] handshake error from {addr}: {e}")
                 try:
                     conn.close()
-                except Exception:
+                except OSError:
                     pass
                 return
             except Exception as e:
                 print(f"[tls] wrap error from {addr}: {e}")
                 try:
                     conn.close()
-                except Exception:
+                except OSError:
                     pass
                 return
         with conn:
@@ -214,7 +214,7 @@ class HTTPServer:
                     # first read, so a reused connection waits less.
                     try:
                         conn.settimeout(self.KEEPALIVE_TIMEOUT_SECONDS)
-                    except Exception:
+                    except OSError:
                         pass
                 try:
                     keep_alive = self._serve_one_request(reader, conn, addr, tls_meta)
@@ -274,7 +274,7 @@ class HTTPServer:
         security = getattr(self.app, "security", None)
         try:
             conn.settimeout(self.REQUEST_READ_TIMEOUT_SECONDS)
-        except Exception:
+        except OSError:
             pass
         try:
             req = parse_http_request(

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/src/wsbuilder/ws.py

@@ -69,7 +69,7 @@ def _is_valid_websocket_key(value):
         return False
     try:
         decoded = base64.b64decode(raw.encode("ascii"), validate=True)
-    except Exception:
+    except ValueError:
         return False
     return len(decoded) == 16
 

{wsbuilder-1.0.2 → wsbuilder-1.0.3/src/wsbuilder.egg-info}/PKG-INFO

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

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/tests/test_http.py

@@ -21,6 +21,23 @@ class BufferSocket:
 
 
 class TestHTTPCore(unittest.TestCase):
+    def test_request_json_returns_none_for_unparseable_bodies(self):
+        def request(body):
+            return Request(
+                method="POST",
+                path="/",
+                query_string="",
+                headers={},
+                body=body,
+                client=("127.0.0.1", 1234),
+                tls={},
+            )
+
+        self.assertEqual(request(b'{"ok": true}').json(), {"ok": True})
+        for body in (b"", b"{not json", b"[" * 100_000):
+            with self.subTest(body=body[:16]):
+                self.assertIsNone(request(body).json())
+
     def test_query_string_decodes_standard_url_encoding(self):
         parsed = parse_query_string(
             "name=Ana+Mar%C3%ADa&empty=&flag&name=final"

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/tests/test_security.py

@@ -2,6 +2,7 @@ import json
 import unittest
 
 from wsbuilder import App, Request, SecurityPolicy
+from wsbuilder.security import _safe_float, _safe_int, _to_ip, _to_network
 
 
 def _req(method, path, query_string="", client=("127.0.0.1", 1234), headers=None, tls=None):
@@ -152,6 +153,23 @@ if __name__ == "__main__":
     unittest.main()
 
 
+class TestSecurityParsing(unittest.TestCase):
+    def test_numeric_helpers_fall_back_on_unconvertible_values(self):
+        for value in (None, "", "abc", float("inf"), float("nan"), object()):
+            with self.subTest(value=value):
+                self.assertEqual(_safe_int(value, 7), 7)
+        self.assertEqual(_safe_int("12", 7), 12)
+        self.assertEqual(_safe_float(None, 1.5), 1.5)
+        self.assertEqual(_safe_float(10**400, 1.5), 1.5)
+        self.assertEqual(_safe_float("2.5", 1.5), 2.5)
+
+    def test_address_helpers_return_none_for_invalid_text(self):
+        self.assertIsNone(_to_ip("999.1.1.1"))
+        self.assertIsNone(_to_network("not-a-network"))
+        self.assertEqual(str(_to_network("10.0.0.0/8")), "10.0.0.0/8")
+        self.assertEqual(str(_to_ip("::1")), "::1")
+
+
 class TestSecurityTrackingLimits(unittest.TestCase):
     def test_client_tracking_maps_stop_growing_at_the_configured_ceiling(self):
         policy = SecurityPolicy(max_tracked_clients=16)

{wsbuilder-1.0.2 → wsbuilder-1.0.3}/tests/test_ws.py

@@ -8,6 +8,7 @@ from wsbuilder.ws import (
     WebSocketFrame,
     WebSocketProtocolError,
     WebSocketReadTimeoutError,
+    _is_valid_websocket_key,
     base64_encode,
     handshake_websocket_with_options,
     make_ws_frame_bytes,
@@ -332,6 +333,12 @@ if __name__ == "__main__":
 
 
 class TestWebSocketPrimitives(unittest.TestCase):
+    def test_websocket_key_must_be_sixteen_base64_octets(self):
+        self.assertTrue(_is_valid_websocket_key("dGhlIHNhbXBsZSBub25jZQ=="))
+        for key in (None, "", "not base64!", "ñandú", "dGhlIHNhbXBsZQ=="):
+            with self.subTest(key=key):
+                self.assertFalse(_is_valid_websocket_key(key))
+
     def test_unmask_payload_matches_the_per_byte_definition(self):
         mask = b"\x37\xfa\x21\x3d"
         for size in (0, 1, 2, 3, 4, 5, 7, 8, 1023, 4096):