sshler 0.7.2__tar.gz → 0.7.4__tar.gz

{sshler-0.7.2/sshler.egg-info → sshler-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sshler
-Version: 0.7.2
+Version: 0.7.4
 Summary: A local FastAPI-powered SSH multiplexer for tmux-in-browser — from your laptop only.
 Author-email: Gabu <gabu@gabu.quest>
 License-Expression: MIT

{sshler-0.7.2 → sshler-0.7.4}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sshler"
-version = "0.7.2"
+version = "0.7.4"
 description = "A local FastAPI-powered SSH multiplexer for tmux-in-browser — from your laptop only."
 readme = "README.md"
 requires-python = ">=3.12"

{sshler-0.7.2 → sshler-0.7.4}/sshler/cli.py

@@ -358,8 +358,16 @@ def serve(
         指定したホストとポートでリクエスト受付を開始します。
     """
 
+    # Auto-add the actual listening address to allowed origins
+    # so origin checks pass regardless of custom port
+    auto_origins = list(allow_origins or [])
+    listen_origins = {f"http://{host}:{port}", f"http://localhost:{port}", f"http://127.0.0.1:{port}"}
+    for o in listen_origins:
+        if o not in auto_origins:
+            auto_origins.append(o)
+
     settings = ServerSettings(
-        allow_origins=allow_origins or [],
+        allow_origins=auto_origins,
         csrf_token=token or secrets.token_urlsafe(32),
         max_upload_bytes=max_upload_mb * 1024 * 1024,
         allow_ssh_alias=allow_ssh_alias,

{sshler-0.7.2 → sshler-0.7.4}/sshler/settings.py

@@ -27,8 +27,8 @@ class SshlerSettings(BaseSettings):
     host: str = Field(default="127.0.0.1", description="Host to bind to")
     port: int = Field(default=8822, description="Port to bind to")
     public_url: str = Field(
-        default="http://localhost:8822",
-        description="Public URL where sshler is accessible (used for CORS/origin checks)",
+        default="",
+        description="Public URL where sshler is accessible (used for CORS/origin checks). Auto-derived from host:port if empty.",
     )
 
     # Session/Cookie settings

{sshler-0.7.2 → sshler-0.7.4}/sshler/webapp.py

@@ -756,18 +756,17 @@ def make_app(settings: ServerSettings | None = None) -> FastAPI:
                 parsed_origin = urlparse(origin)
                 origin_base = f"{parsed_origin.scheme}://{parsed_origin.netloc}"
 
-                # Parse expected origin from public_url
-                parsed_public = urlparse(app_settings.public_url)
-                expected_origin = f"{parsed_public.scheme}://{parsed_public.netloc}"
-
                 # Check if origin matches public_url or is in allowed_origins
                 # Include both env-based origins (SshlerSettings) and CLI-based origins (ServerSettings)
                 cli_settings: ServerSettings = request.app.state.settings
-                allowed_origins = (
-                    [expected_origin]
-                    + app_settings.allowed_origins_list
-                    + cli_settings.allow_origins
-                )
+                allowed_origins = list(cli_settings.allow_origins) + app_settings.allowed_origins_list
+
+                # Add public_url-derived origin if set
+                if app_settings.public_url:
+                    parsed_public = urlparse(app_settings.public_url)
+                    expected_origin = f"{parsed_public.scheme}://{parsed_public.netloc}"
+                    if expected_origin not in allowed_origins:
+                        allowed_origins.append(expected_origin)
 
                 if origin_base not in allowed_origins:
                     logging.warning(

{sshler-0.7.2 → sshler-0.7.4/sshler.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sshler
-Version: 0.7.2
+Version: 0.7.4
 Summary: A local FastAPI-powered SSH multiplexer for tmux-in-browser — from your laptop only.
 Author-email: Gabu <gabu@gabu.quest>
 License-Expression: MIT