nullgate 1.2.1__tar.gz → 1.2.2__tar.gz

{nullgate-1.2.1/src/nullgate.egg-info → nullgate-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nullgate
-Version: 1.2.1
+Version: 1.2.2
 Summary: Disposable SSH gateway into confined directory workspaces
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

nullgate-1.2.2/src/nullgate/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.2.2"

{nullgate-1.2.1 → nullgate-1.2.2}/src/nullgate/gateway.py

@@ -11,9 +11,11 @@ import asyncio
 import contextlib
 import fcntl
 import hmac
+import json
 import os
 import pty
 import pwd
+import secrets
 import signal
 import stat
 import struct
@@ -21,6 +23,8 @@ import subprocess
 import sys
 import tempfile
 import termios
+import time
+import traceback
 from dataclasses import dataclass
 from pathlib import Path
 
@@ -278,9 +282,14 @@ def available_locales() -> dict[str, str]:
     """Map normalized locale names to their canonical form from ``locale -a``."""
     try:
         completed = subprocess.run(
-            ["locale", "-a"], capture_output=True, text=True, timeout=5
+            ["locale", "-a"],
+            capture_output=True,
+            text=True,
+            encoding="utf-8",
+            errors="replace",
+            timeout=5,
         )
-    except (OSError, subprocess.SubprocessError):
+    except (OSError, subprocess.SubprocessError, UnicodeError):
         return {}
     result: dict[str, str] = {}
     for line in completed.stdout.splitlines():
@@ -296,7 +305,7 @@ def sanitize_locale_environment(environment: dict[str, str]) -> None:
     Container images often bake in LANG/LC_* values (e.g. en_US.UTF-8) without
     generating the matching locale, so every child shell emits "setlocale:
     cannot change locale" warnings. Fall back to an available UTF-8 locale, or C
-    as a last resort, whenever the requested one is missing dustbin.
+    as a last resort whenever the requested one is missing.
     """
     requested = {
         var: environment[var] for var in _LOCALE_ENV_VARS if environment.get(var)
@@ -590,6 +599,53 @@ async def handle_process(process: asyncssh.SSHServerProcess, config: Config) ->
         process.exit(returncode if returncode >= 0 else 128 - returncode)
 
 
+async def handle_process_logged(
+    process: asyncssh.SSHServerProcess, config: Config
+) -> None:
+    """Record session lifecycle and make process-factory failures visible."""
+    session_id = "ngp-" + secrets.token_hex(4)
+    started = time.monotonic()
+    mode = "shell" if not process.command else "exec"
+
+    def log(event: str, **fields: object) -> None:
+        print(
+            json.dumps(
+                {
+                    "event": event,
+                    "session_id": session_id,
+                    "mode": mode,
+                    "pty": process.term_type is not None,
+                    **fields,
+                },
+                sort_keys=True,
+            ),
+            file=sys.stderr,
+            flush=True,
+        )
+
+    log("session.start")
+    try:
+        await handle_process(process, config)
+    except Exception as error:
+        log(
+            "session.error",
+            duration_ms=round((time.monotonic() - started) * 1000),
+            error=type(error).__name__,
+            message=str(error),
+        )
+        traceback.print_exc(file=sys.stderr)
+        with contextlib.suppress(ConnectionError, BrokenPipeError):
+            process.stderr.write(b"nullgate: session failed; see gateway log\n")
+            await process.stderr.drain()
+        with contextlib.suppress(Exception):
+            process.exit(255)
+        return
+    log(
+        "session.ok",
+        duration_ms=round((time.monotonic() - started) * 1000),
+    )
+
+
 class HostSFTPServer(asyncssh.SFTPServer):
     """SFTP mapping that mirrors shell visibility for Nullgate workspaces.
 
@@ -732,7 +788,7 @@ async def create_acceptor(config: Config) -> asyncssh.SSHAcceptor:
         config.host,
         config.port,
         server_host_keys=[str(config.host_key)],
-        process_factory=lambda process: handle_process(process, config),
+        process_factory=lambda process: handle_process_logged(process, config),
         sftp_factory=sftp_factory,
         allow_scp=True,
         encoding=None,

{nullgate-1.2.1 → nullgate-1.2.2/src/nullgate.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nullgate
-Version: 1.2.1
+Version: 1.2.2
 Summary: Disposable SSH gateway into confined directory workspaces
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{nullgate-1.2.1 → nullgate-1.2.2}/tests/test_gateway.py

@@ -1,5 +1,6 @@
 import asyncio
 import contextlib
+import io
 import os
 import shutil
 import tempfile
@@ -16,11 +17,13 @@ from nullgate.gateway import (
     SERVER_KEEPALIVE_COUNT_MAX,
     SERVER_KEEPALIVE_INTERVAL,
     TokenSSHServer,
+    available_locales,
     build_child_argv,
     build_child_environment,
     build_config,
     create_acceptor,
     ensure_host_key,
+    handle_process_logged,
     parse_args,
     sanitize_locale_environment,
 )
@@ -218,6 +221,29 @@ class NullgateSSHTests(unittest.IsolatedAsyncioTestCase):
             acceptor.close()
             await acceptor.wait_closed()
 
+    async def test_process_factory_errors_are_logged_and_reported(self):
+        process = mock.Mock(command=b"printf ok", term_type=None)
+        process.stderr.drain = mock.AsyncMock()
+        log = io.StringIO()
+        with (
+            mock.patch(
+                "nullgate.gateway.handle_process", side_effect=OSError("spawn denied")
+            ),
+            mock.patch("sys.stderr", log),
+        ):
+            await handle_process_logged(process, self.config)
+
+        output = log.getvalue()
+        self.assertIn('"event": "session.start"', output)
+        self.assertIn('"event": "session.error"', output)
+        self.assertIn('"error": "OSError"', output)
+        self.assertIn("spawn denied", output)
+        process.stderr.write.assert_called_once_with(
+            b"nullgate: session failed; see gateway log\n"
+        )
+        process.stderr.drain.assert_awaited_once()
+        process.exit.assert_called_once_with(255)
+
     async def test_tcp_forwarding_respects_flag(self):
         async def echo_handler(reader, writer):
             try:
@@ -721,6 +747,18 @@ class LocaleSanitizerTests(unittest.TestCase):
             sanitize_locale_environment(environment)
         return environment
 
+    def test_locale_listing_tolerates_invalid_utf8(self):
+        invalid_output = b"C\nC.utf8\nbroken-\xe5\n"
+
+        def fake_run(*args, encoding=None, errors=None, **kwargs):
+            return mock.Mock(stdout=invalid_output.decode(encoding, errors))
+
+        with mock.patch("nullgate.gateway.subprocess.run", side_effect=fake_run):
+            locales = available_locales()
+
+        self.assertEqual(locales["c"], "C")
+        self.assertEqual(locales["c.utf8"], "C.utf8")
+
     def test_missing_locale_falls_back_to_available_utf8(self):
         environment = {"LANG": "en_US.UTF-8", "LC_ALL": "en_US.UTF-8", "PATH": "/bin"}
         self.sanitize(environment, self.UTF8_HOST)

nullgate-1.2.1/src/nullgate/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.2.1"