send SIGHUP at end of lease

Author: evakhoni

packages/jumpstarter-cli/jumpstarter_cli/shell.py

@@ -20,7 +20,8 @@ def _run_shell_with_lease(lease, exporter_logs, config, command):
     def launch_remote_shell(path: str) -> int:
         return launch_shell(
             path, lease.exporter_name, config.drivers.allow, config.drivers.unsafe,
-            config.shell.use_profiles, command=command
+            config.shell.use_profiles, command=command,
+            process_callback=lambda proc: setattr(lease, 'shell_process', proc)
         )
 
     with lease.serve_unix() as path:

packages/jumpstarter/jumpstarter/client/lease.py

@@ -53,6 +53,7 @@ class Lease(ContextManagerMixin, AsyncContextManagerMixin):
     grpc_options: dict[str, Any] = field(default_factory=dict)
     acquisition_timeout: int = field(default=7200)  # Timeout in seconds for lease acquisition, polled in 5s intervals
     exporter_name: str = field(default="remote", init=False)  # Populated during acquisition
+    shell_process: Any = field(default=None, init=False)  # Shell process to terminate on expiry
 
     def __post_init__(self):
         if hasattr(super(), "__post_init__"):
@@ -262,6 +263,9 @@ async def _monitor():
                     if remain < timedelta(0):
                         # lease already expired, stopping monitor
                         logger.info("Lease {} ended at {}".format(self.name, end_time))
+                        if self.shell_process is not None:
+                            import signal
+                            self.shell_process.send_signal(signal.SIGHUP)
                         break
                     # Log once when entering the threshold window
                     if threshold - timedelta(seconds=check_interval) <= remain < threshold:

packages/jumpstarter/jumpstarter/common/utils.py

@@ -54,6 +54,7 @@ def launch_shell(
     use_profiles: bool,
     *,
     command: tuple[str, ...] | None = None,
+    process_callback=None,
 ) -> int:
     """Launch a shell with a custom prompt indicating the exporter type.
 
@@ -62,6 +63,7 @@ def launch_shell(
         context: The context of the shell (e.g. "local" or exporter name)
         allow: List of allowed drivers
         unsafe: Whether to allow drivers outside of the allow list
+        process_callback: Optional callback to receive the process object before waiting
     """
 
     shell = os.environ.get("SHELL", "bash")
@@ -74,6 +76,8 @@ def launch_shell(
 
     if command:
         process = Popen(command, stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr, env=common_env)
+        if process_callback:
+            process_callback(process)
         return process.wait()
 
     if shell_name.endswith("bash"):
@@ -85,6 +89,8 @@ def launch_shell(
         if not use_profiles:
             cmd.extend(["--norc", "--noprofile"])
         process = Popen(cmd, stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr, env=env)
+        if process_callback:
+            process_callback(process)
         return process.wait()
 
     elif shell_name == "fish":
@@ -103,6 +109,8 @@ def launch_shell(
         )
         cmd = [shell, "--init-command", fish_fn]
         process = Popen(cmd, stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr, env=common_env)
+        if process_callback:
+            process_callback(process)
         return process.wait()
 
     elif shell_name == "zsh":
@@ -120,8 +128,12 @@ def launch_shell(
         cmd.extend(["-o", "inc_append_history", "-o", "share_history"])
 
         process = Popen(cmd, stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr, env=env)
+        if process_callback:
+            process_callback(process)
         return process.wait()
 
     else:
         process = Popen([shell], stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr, env=common_env)
+        if process_callback:
+            process_callback(process)
         return process.wait()