nullgate 1.2.7__tar.gz → 1.2.8__tar.gz

{nullgate-1.2.7/src/nullgate.egg-info → nullgate-1.2.8}/PKG-INFO

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

nullgate-1.2.8/src/nullgate/__init__.py

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

{nullgate-1.2.7 → nullgate-1.2.8}/src/nullgate/runtime.py

@@ -78,6 +78,17 @@ def _identity_of(pid_file: Path) -> str | None:
     return None
 
 
+def _process_state(pid: int) -> str | None:
+    """Return the Linux process state letter, when procfs exposes it."""
+    proc_stat = Path("/proc") / str(pid) / "stat"
+    try:
+        if proc_stat.is_file():
+            return proc_stat.read_text().rsplit(")", 1)[1].split()[0]
+    except (OSError, IndexError):
+        pass
+    return None
+
+
 def is_running(pid_file: Path) -> bool:
     """True when the recorded pid is alive and still matches its identity."""
     pid = read_pid(pid_file)
@@ -87,10 +98,20 @@ def is_running(pid_file: Path) -> bool:
         os.kill(pid, 0)
     except OSError:
         return False
+    if _process_state(pid) == "Z":
+        return False
     identity = process_identity(pid)
     return identity is not None and identity == _identity_of(pid_file)
 
 
+def reap_child(pid: int | None) -> None:
+    """Reap a dead direct child without blocking; ignore unrelated processes."""
+    if pid is None:
+        return
+    with contextlib.suppress(ChildProcessError, OSError):
+        os.waitpid(pid, os.WNOHANG)
+
+
 def write_pid(pid_file: Path, pid: int) -> bool:
     """Record ``pid IDENTITY``; fails rather than track an unidentifiable pid."""
     identity = process_identity(pid)

{nullgate-1.2.7 → nullgate-1.2.8}/src/nullgate/session.py

@@ -534,6 +534,8 @@ def _supervise_tick(
         pid_file, child = transport_pid_file, "transport"
     if child is None:
         return "none"
+    old_pid = st.read_pid(pid_file)
+    st.reap_child(old_pid)
     pid_file.unlink(missing_ok=True)
     recent = [
         stamp

{nullgate-1.2.7 → nullgate-1.2.8}/src/nullgate/transports.py

@@ -120,6 +120,9 @@ def _spawn(command: list[str], environment: dict[str, str], log: Path) -> subpro
             stdout=output,
             stderr=subprocess.STDOUT,
             stdin=subprocess.DEVNULL,
+            # Background services must outlive the shell or SSH exec channel
+            # which invoked `nullgate start`.
+            start_new_session=True,
         )
 
 
@@ -257,11 +260,10 @@ def launch_gateway(
 def launch_transport_srvus(
     port: int, slot: int, state: Path, identity_seed: str = ""
 ) -> subprocess.Popen:
-    ssh_dir = Path(os.path.expanduser("~/.ssh"))
-    if not prepare_ssh_dir(ssh_dir):
-        st.stop_one(state / "gateway.pid")
-        raise SystemExit(f"Failed to initialize SSH directory: {ssh_dir}")
-    key = Path(os.path.expanduser("~/.ssh/id_ed25519"))
+    # The tunnel identity belongs to this Nullgate state, not to the host's
+    # SSH configuration. ingress.ensure_key() creates it atomically in pure
+    # Python, including deterministic creation when an identity seed is set.
+    key = state / "srvus-id_ed25519"
     st.repair_key_permissions(key)
     host = os.environ.get("NULLGATE_TUNNEL_HOST", "srv.us")
     try:

{nullgate-1.2.7 → nullgate-1.2.8/src/nullgate.egg-info}/PKG-INFO

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

{nullgate-1.2.7 → nullgate-1.2.8}/tests/test_commands.py

@@ -540,9 +540,11 @@ class CLILifecycleTests(unittest.TestCase):
                     [line for line in lines if not line.startswith(("ssh ", "password: "))],
                     [],
                 )
-                self.assertIn("Fixed permissions on", err)
-                self.assertIn("(was 660, now 600)", err)
-                self.assertEqual(key.stat().st_mode & 0o777, 0o600)
+                self.assertNotIn("Fixed permissions on", err)
+                self.assertEqual(key.stat().st_mode & 0o777, 0o660)
+                tunnel_key = state / "srvus-id_ed25519"
+                self.assertTrue(tunnel_key.is_file())
+                self.assertEqual(tunnel_key.stat().st_mode & 0o777, 0o600)
 
                 code, out, err = run_cli(["status"], env=env)
                 self.assertEqual(code, 0)
@@ -1893,7 +1895,7 @@ class CLILifecycleTests(unittest.TestCase):
             home.mkdir()
             state = temp / "state"
             state.mkdir()
-            key_path = home / ".ssh" / "id_ed25519"
+            key_path = state / "srvus-id_ed25519"
             with mock.patch.dict(os.environ, {"HOME": str(home)}):
                 with mock.patch.object(transports, "_spawn", side_effect=fake_spawn):
                     transports.launch_transport_srvus(4822, 1, state, "child-seed")
@@ -1901,7 +1903,7 @@ class CLILifecycleTests(unittest.TestCase):
                 spawned[-1]["environment"].get("NULLGATE_IDENTITY_SEED"), "child-seed"
             )
             self.assertIn(str(key_path), spawned[-1]["command"])
-            self.assertTrue((home / ".ssh").is_dir())
+            self.assertFalse((home / ".ssh").exists())
             with mock.patch.dict(
                 os.environ,
                 {"HOME": str(home), "NULLGATE_IDENTITY_SEED": "leaked"},
@@ -2387,6 +2389,22 @@ class CLILifecycleTests(unittest.TestCase):
 
 
 class TransportProbeTests(unittest.TestCase):
+    def test_spawn_detaches_background_service_from_launching_session(self):
+        with tempfile.TemporaryDirectory() as temp:
+            log = Path(temp) / "child.log"
+            process = mock.Mock(pid=1234)
+            with mock.patch.object(
+                transports.subprocess, "Popen", return_value=process
+            ) as popen:
+                self.assertIs(
+                    transports._spawn(["child"], {"EXAMPLE": "1"}, log),
+                    process,
+                )
+            kwargs = popen.call_args.kwargs
+            self.assertTrue(kwargs["start_new_session"])
+            self.assertIs(kwargs["stdin"], subprocess.DEVNULL)
+            self.assertIs(kwargs["stderr"], subprocess.STDOUT)
+
     def test_tls_probe_uses_sni_verification_context_and_requires_ssh_banner(self):
         raw = mock.MagicMock()
         raw.__enter__.return_value = raw
@@ -2469,6 +2487,22 @@ class ClientConfigTests(unittest.TestCase):
 
 
 class RuntimeUnitTests(unittest.TestCase):
+    def test_is_running_rejects_zombie(self):
+        with tempfile.TemporaryDirectory() as temp:
+            pid_file = Path(temp) / "child.pid"
+            pid_file.write_text("12345 identity\n")
+            with mock.patch.object(runtime_mod.os, "kill"), mock.patch.object(
+                runtime_mod, "_process_state", return_value="Z"
+            ), mock.patch.object(
+                runtime_mod, "process_identity", return_value="identity"
+            ):
+                self.assertFalse(runtime_mod.is_running(pid_file))
+
+    def test_reap_child_is_nonblocking_and_tolerates_non_child(self):
+        with mock.patch.object(runtime_mod.os, "waitpid", return_value=(0, 0)) as waitpid:
+            runtime_mod.reap_child(12345)
+        waitpid.assert_called_once_with(12345, os.WNOHANG)
+
     def test_repair_key_permissions(self):
         with tempfile.TemporaryDirectory() as temp:
             key = Path(temp) / "id_ed25519"

nullgate-1.2.7/src/nullgate/__init__.py

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