texas2step 2.2.2__tar.gz → 2.2.3__tar.gz

{texas2step-2.2.2 → texas2step-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: texas2step
-Version: 2.2.2
+Version: 2.2.3
 Summary: Web-centric throughput, latency, jitter and packet-loss measurement between endpoints.
 Project-URL: Homepage, https://github.com/robert-patrick-texas/texas2step
 Project-URL: Documentation, https://robert-patrick-texas.github.io/texas2step/

{texas2step-2.2.2 → texas2step-2.2.3}/docs/access.md

@@ -49,10 +49,14 @@ networks, as addresses or CIDR blocks. Include the corporate addresses the desk'
 browsers reach the servers from.
 
 ```bash
-sudo texas2step config set access_code=daily internal_networks=10.0.0.0/8,198.51.100.0/24 --write
+sudo texas2step config set access_code=daily internal_networks=10.0.0.0/8,2001:db8::/32,198.51.100.0/24 --write
 sudo systemctl restart texas2step
 ```
 
+On the command line, separate the networks with commas. In `config.toml` they are a list
+of quoted strings: `internal_networks = ["10.0.0.0/8", "2001:db8::/32", "198.51.100.0/24"]`.
+One string of networks separated by spaces is refused.
+
 **3. Check** that the servers agree. On each:
 
 ```bash
@@ -87,7 +91,7 @@ To turn codes off again: `sudo texas2step config set access_code=off --write`, t
 | `access_pass_hours` | `12` | How long an entered code lets a browser keep testing |
 | `access_key_file` | `/etc/texas2step/access.key` | The key |
 | `access_phrases_file` | `/etc/texas2step/access-phrases.toml` | [Standing phrases](#standing-phrases), if the file exists |
-| `internal_networks` | `[]` | Your own networks: no code, and the desk's tools |
+| `internal_networks` | `[]` | Your own networks: no code, and the desk's tools. A list of IPv4 and IPv6 addresses and networks in CIDR form, mixed freely: `["192.168.0.0/16", "2001:db8::/32", "203.0.113.7"]`. An address alone is a single host. Bits past the prefix are ignored, so `10.2.1.30/24` means all of `10.2.1.0/24`. Give the addresses as the server sees them: staff who come in through your firewall's NAT arrive from its public address. |
 
 **Built-in words.** A code is two words and the digits: `maple.river.42`. The words come
 from the EFF's short word list of easily spelled words (credited in the package's

{texas2step-2.2.2 → texas2step-2.2.3}/docs/configuration.md

@@ -7,8 +7,9 @@ Settings come from, in increasing priority:
 3. environment variables `TEXAS2STEP_<SETTING>` (upper case).
 
 Lists in environment variables are comma separated. Booleans accept `1/0`,
-`true/false`, `yes/no` and `on/off`. Unknown keys in the TOML file are an error, so
-typos don't fail silently. The package installs a fully commented file listing every
+`true/false`, `yes/no` and `on/off`. Spaces around any value, or around each item of a
+list, are ignored, wherever the setting comes from. Unknown keys in the TOML file are an
+error, so typos don't fail silently. The package installs a fully commented file listing every
 setting and its default as `/etc/texas2step/config.toml` (source:
 [`src/texas2step/config_template.toml`](../src/texas2step/config_template.toml)); restart
 the service after editing it. After an upgrade, `texas2step config merge` brings your

{texas2step-2.2.2 → texas2step-2.2.3}/docs/roadmap.md

@@ -116,6 +116,11 @@ links and footer credit. Three places still say texas2step:
 
 Newest first. Each release's notes have the details and its upgrade steps.
 
+### [2.2.3](https://github.com/robert-patrick-texas/texas2step/releases/tag/v2.2.3) (2026-10-24)
+
+- [x] Spaces around any setting or typed value are ignored; a stray one in
+  `internal_networks` no longer breaks every request.
+
 ### [2.2.2](https://github.com/robert-patrick-texas/texas2step/releases/tag/v2.2.2) (2026-10-24)
 
 - [x] UDP works in Firefox: Monitor, Diag and the Test page's packet loss no longer fall

{texas2step-2.2.2 → texas2step-2.2.3}/src/texas2step/__init__.py

@@ -1,3 +1,3 @@
 """texas2step: web-centric throughput, latency, jitter and packet-loss measurement."""
 
-__version__ = "2.2.2"
+__version__ = "2.2.3"

{texas2step-2.2.2 → texas2step-2.2.3}/src/texas2step/api/access.py

@@ -9,7 +9,7 @@ from datetime import UTC, datetime
 from typing import Any, Literal
 
 from fastapi import APIRouter, HTTPException, Query, Request, Response
-from pydantic import BaseModel, Field, ValidationError
+from pydantic import BaseModel, ConfigDict, Field, ValidationError
 
 from .. import cluster
 from ..access import Codes, is_internal
@@ -24,10 +24,12 @@ PASS_COOKIE = "texas2step_pass"  # the pass again, for loading this server's own
 
 
 class CodeIn(BaseModel):
+    model_config = ConfigDict(str_strip_whitespace=True)  # as typed or pasted
     code: str = Field(max_length=200, description="The code, with any case and separators")
 
 
 class BlockIn(BaseModel):
+    model_config = ConfigDict(str_strip_whitespace=True)
     network: str = Field(
         max_length=64,
         description="An address or network outside internal_networks, e.g. 203.0.113.0/24",
@@ -261,6 +263,7 @@ async def unblock(
     ),
 ) -> dict[str, Any]:
     ip = _desk_client(request)
+    network = network.strip()
     try:
         target = None if network == "all" else str(parse_network(network))
     except ValueError as exc:

{texas2step-2.2.2 → texas2step-2.2.3}/src/texas2step/api/measure.py

@@ -15,7 +15,7 @@ from typing import Any
 
 import httpx
 from fastapi import APIRouter, HTTPException, Request
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 from .. import engine
 from ..store import TRANSFERS
@@ -27,6 +27,7 @@ _slots = asyncio.Semaphore(2)
 
 
 class Target(BaseModel):
+    model_config = ConfigDict(str_strip_whitespace=True)
     target: str = Field(description="Base URL of a texas2step server, e.g. https://peer.example")
 
 

{texas2step-2.2.2 → texas2step-2.2.3}/src/texas2step/api/results.py

@@ -50,7 +50,7 @@ async def recent(
 
 @router.get("/{rid}", summary="A saved result, in full")
 async def one(rid: str, request: Request) -> dict[str, Any]:
-    result = await run_in_threadpool(_store(request).get, rid)
+    result = await run_in_threadpool(_store(request).get, rid.strip())
     if result is None:
         raise HTTPException(404, "no such result")
     return result

{texas2step-2.2.2 → texas2step-2.2.3}/src/texas2step/cli.py

@@ -1361,6 +1361,17 @@ def build_parser() -> argparse.ArgumentParser:
     return parser
 
 
+def trimmed(args: argparse.Namespace) -> argparse.Namespace:
+    """The arguments without spaces around their text: pasted values often bring them, with
+    an address, a URL or a network."""
+    for name, value in vars(args).items():
+        if isinstance(value, str):
+            setattr(args, name, value.strip())
+        elif isinstance(value, list):
+            setattr(args, name, [v.strip() if isinstance(v, str) else v for v in value])
+    return args
+
+
 def main(argv: list[str] | None = None) -> None:
-    args = build_parser().parse_args(argv)
+    args = trimmed(build_parser().parse_args(argv))
     args.func(args)

{texas2step-2.2.2 → texas2step-2.2.3}/src/texas2step/config.py

@@ -190,6 +190,11 @@ class Settings:
     brand_credit: str = "link"
 
     def __post_init__(self) -> None:
+        # However a setting was given (file, environment, `config set`), spaces around its
+        # text are no part of it: a stray space inside quotes would otherwise pass here and
+        # fail later, as in an address network that every request is checked against.
+        for f in dataclasses.fields(self):
+            setattr(self, f.name, _trimmed(getattr(self, f.name)))
         ports = (self.rtc_port_min, self.rtc_port_max)
         if ports != (0, 0) and not 1 <= ports[0] <= ports[1] <= 65535:
             raise ValueError(
@@ -317,6 +322,19 @@ class Settings:
         )
 
 
+def _trimmed(value: Any) -> Any:
+    """A setting with the whitespace around each piece of its text taken off: in lists, and
+    in the fields of [[locations]] and links too."""
+    if isinstance(value, str):
+        return value.strip()
+    if isinstance(value, list):
+        return [_trimmed(v) for v in value]
+    if dataclasses.is_dataclass(value) and not isinstance(value, type):
+        fields = {f.name: _trimmed(getattr(value, f.name)) for f in dataclasses.fields(value)}
+        return dataclasses.replace(value, **fields)
+    return value
+
+
 def _coerce(raw: Any, hint: Any, name: str) -> Any:
     origin = typing.get_origin(hint)
     if origin in (typing.Union, types.UnionType):
@@ -336,7 +354,7 @@ def _coerce(raw: Any, hint: Any, name: str) -> Any:
     if hint is float:
         return float(raw)
     if hint is str:
-        return str(raw)
+        return str(raw).strip()
     if origin is list:
         (item,) = typing.get_args(hint)
         if isinstance(raw, str):