lager-cli 0.31.0__tar.gz → 0.31.2__tar.gz

{lager_cli-0.31.0/lager_cli.egg-info → lager_cli-0.31.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: lager-cli
-Version: 0.31.0
+Version: 0.31.2
 Summary: Lager CLI - Box and Docker connectivity
 Home-page: https://github.com/lagerdata/lager
 Author: Lager Data

{lager_cli-0.31.0 → lager_cli-0.31.2}/__init__.py

@@ -7,4 +7,4 @@ Lager CLI
 A Command Line Interface for Lager Data
 """
 
-__version__ = '0.31.0'
+__version__ = '0.31.2'

{lager_cli-0.31.0 → lager_cli-0.31.2}/commands/box/_ssh.py

@@ -14,6 +14,7 @@ fixes don't have to be made three times.
 from __future__ import annotations
 
 import os
+import shutil
 import subprocess
 from typing import Callable, Optional, Tuple
 
@@ -52,11 +53,20 @@ def ensure_lager_box_keypair(key_path: str = _LAGER_BOX_KEY) -> bool:
     if os.path.exists(key_path):
         return False
     os.makedirs(os.path.dirname(key_path), mode=0o700, exist_ok=True)
-    proc = subprocess.run(
-        ["ssh-keygen", "-t", "ed25519", "-f", key_path, "-N", "", "-C", "lager-box-access"],
-        capture_output=True,
-        text=True,
-    )
+    keygen_exe = shutil.which("ssh-keygen")
+    if keygen_exe is None:
+        raise LagerError(
+            "ssh-keygen not found — install the OpenSSH client.",
+            fixes=["Windows: Settings → System → Optional Features → 'OpenSSH Client'"],
+        )
+    try:
+        proc = subprocess.run(
+            [keygen_exe, "-t", "ed25519", "-f", key_path, "-N", "", "-C", "lager-box-access"],
+            capture_output=True,
+            text=True,
+        )
+    except OSError as exc:
+        raise LagerError("ssh-keygen failed to launch.", cause=str(exc), raw=exc) from exc
     if proc.returncode != 0:
         raise LagerError(
             "Could not generate the SSH key.",
@@ -85,17 +95,22 @@ def key_auth_works(
     "key not authorized", which makes `lager update` spuriously re-prompt
     "SSH key not configured" on every run for a box that is in fact set up.
     """
-    proc = subprocess.run(
-        [
-            "ssh", "-i", key_path,
-            "-o", "BatchMode=yes",
-            "-o", "StrictHostKeyChecking=accept-new",
-            "-o", f"ConnectTimeout={connect_timeout}",
-            dest, "true",
-        ],
-        capture_output=True,
-        text=True,
-    )
+    if shutil.which("ssh") is None:
+        return False
+    try:
+        proc = subprocess.run(
+            [
+                "ssh", "-i", key_path,
+                "-o", "BatchMode=yes",
+                "-o", "StrictHostKeyChecking=accept-new",
+                "-o", f"ConnectTimeout={connect_timeout}",
+                dest, "true",
+            ],
+            capture_output=True,
+            text=True,
+        )
+    except OSError:
+        return False
     return proc.returncode == 0
 
 

{lager_cli-0.31.0 → lager_cli-0.31.2}/commands/utility/update.py

@@ -11,6 +11,7 @@
 import click
 import requests
 import re
+import shlex
 import shutil
 import subprocess
 import threading
@@ -536,22 +537,48 @@ def _update_logic(ctx, *, box, yes, version, verbose, check, force=False):
         except LagerError:
             log_error('Error: Failed to create SSH key')
             return False
+        except FileNotFoundError:
+            click.secho('ssh-keygen not found. Install OpenSSH client tools.', fg='red')
+            click.echo('  Windows: Settings → System → Optional Features → "OpenSSH Client"')
+            return False
 
-        # Copy key to box
+        # Copy key to box using ssh directly — ssh-copy-id is a POSIX shell
+        # script not available on Windows, even when Git for Windows is installed.
         click.echo()
         click.echo('Copying SSH key to box (enter password when prompted):')
-        copy_result = subprocess.run(
-            [
-                'ssh-copy-id',
-                '-o', 'StrictHostKeyChecking=accept-new',
-                '-o', 'ConnectTimeout=30',
-                '-i', key_file,
-                ssh_host,
-            ],
-            timeout=300  # 5 minutes - allow time for user to enter password
+        try:
+            pub_key = open(f'{key_file}.pub').read().strip()
+        except OSError as e:
+            click.secho(f'Could not read public key {key_file}.pub: {e}', fg='red')
+            return False
+
+        remote_cmd = (
+            f'mkdir -p ~/.ssh && echo {shlex.quote(pub_key)} >> ~/.ssh/authorized_keys'
+            ' && chmod 600 ~/.ssh/authorized_keys'
         )
+        try:
+            copy_result = subprocess.run(
+                [
+                    'ssh',
+                    '-o', 'StrictHostKeyChecking=accept-new',
+                    '-o', 'ConnectTimeout=30',
+                    ssh_host,
+                    remote_cmd,
+                ],
+                timeout=300,  # 5 minutes — allow time for user to enter password
+            )
+        except (FileNotFoundError, OSError):
+            click.echo()
+            click.secho('ssh not found on this system.', fg='red')
+            click.echo('Install the OpenSSH client:')
+            click.echo('  Windows: Settings → System → Optional Features → "OpenSSH Client"')
+            return False
 
-        if copy_result.returncode == 0 and key_auth_works(ssh_host):
+        try:
+            _key_works = copy_result.returncode == 0 and key_auth_works(ssh_host)
+        except OSError:
+            _key_works = False
+        if _key_works:
             click.echo()
             click.secho('SSH key installed successfully!', fg='green')
             click.echo('Future connections will not require a password.')
@@ -578,6 +605,10 @@ def _update_logic(ctx, *, box, yes, version, verbose, check, force=False):
             click.secho('SSH key not configured for this box', fg='yellow')
             click.echo()
 
+            if check:
+                click.secho("Run 'lager update --box ...' (without --check) to set up the SSH key first.", fg='yellow')
+                ctx.exit(2)
+
             if yes or click.confirm('Set up SSH key for this box? (requires password once, then never again)'):
                 if setup_ssh_key():
                     # Key setup successful, reinitialize progress bar
@@ -611,8 +642,14 @@ def _update_logic(ctx, *, box, yes, version, verbose, check, force=False):
         log_error(f'Error: Connection to {ssh_host} timed out')
         ctx.exit(1)
     except Exception as e:
-        if progress:
-            progress.finish(success=False)
+        import traceback as _tb
+        tb_str = _tb.format_exc()
+        try:
+            if progress:
+                progress.finish(success=False)
+        except Exception:
+            pass
+        click.echo(tb_str)
         log_error(f'Error: {str(e)}')
         ctx.exit(1)
 
@@ -630,15 +667,26 @@ def _update_logic(ctx, *, box, yes, version, verbose, check, force=False):
     # (e.g. a devenv where it's a single-file bind mount and ssh's atomic replace
     # errors with "Invalid cross-device link"): accept-new lets the connection
     # proceed despite the write failure.
-    _ssh_mux_opts = [
-        '-o', 'StrictHostKeyChecking=accept-new',
-        '-o', 'ConnectTimeout=30',
-        '-o', 'ControlMaster=auto',
-        '-o', f'ControlPath={_ssh_control_path}',
-        '-o', 'ControlPersist=10m',
-        '-o', 'ServerAliveInterval=30',
-        '-o', 'ServerAliveCountMax=3',
-    ]
+    if sys.platform == 'win32':
+        # ControlPath is a Unix-domain socket — Windows OpenSSH treats any ControlPath
+        # value as a literal filename and then fails at getsockname() with
+        # "Not a socket". ServerAliveInterval also triggers getsockname on some
+        # Windows builds when stdout/stderr are piped. Use the minimal safe set.
+        _ssh_mux_opts = [
+            '-o', 'ControlMaster=no',
+            '-o', 'StrictHostKeyChecking=accept-new',
+            '-o', 'ConnectTimeout=10',
+        ]
+    else:
+        _ssh_mux_opts = [
+            '-o', 'StrictHostKeyChecking=accept-new',
+            '-o', 'ConnectTimeout=30',
+            '-o', 'ControlMaster=auto',
+            '-o', f'ControlPath={_ssh_control_path}',
+            '-o', 'ControlPersist=10m',
+            '-o', 'ServerAliveInterval=30',
+            '-o', 'ServerAliveCountMax=3',
+        ]
 
     # Tear down any leftover control master for this host before the first
     # probe. A socket orphaned by an earlier interrupted/failed run (or one
@@ -647,18 +695,19 @@ def _update_logic(ctx, *, box, yes, version, verbose, check, force=False):
     # confusing "Permission denied (publickey,password)" on the probe even
     # though the key authenticates fine on a fresh connection. Ask the master
     # to exit, then unlink the socket if it lingers; both are best-effort.
-    try:
-        subprocess.run(
-            ['ssh', '-o', f'ControlPath={_ssh_control_path}', '-O', 'exit', ssh_host],
-            capture_output=True, timeout=10,
-        )
-    except (subprocess.SubprocessError, OSError):
-        pass
-    try:
-        if os.path.exists(_ssh_control_path):
-            os.remove(_ssh_control_path)
-    except OSError:
-        pass
+    if sys.platform != 'win32':
+        try:
+            subprocess.run(
+                ['ssh', '-o', f'ControlPath={_ssh_control_path}', '-O', 'exit', ssh_host],
+                capture_output=True, timeout=10,
+            )
+        except (subprocess.SubprocessError, OSError):
+            pass
+        try:
+            if os.path.exists(_ssh_control_path):
+                os.remove(_ssh_control_path)
+        except OSError:
+            pass
 
     # Helper function to run SSH commands
     def run_ssh_command_with_output(cmd, timeout_secs=120):
@@ -671,7 +720,7 @@ def _update_logic(ctx, *, box, yes, version, verbose, check, force=False):
         ssh_cmd.extend(_ssh_mux_opts)
         ssh_cmd.append(ssh_host)
         ssh_cmd.append(cmd)
-        return subprocess.run(ssh_cmd, capture_output=True, text=True, timeout=timeout_secs)
+        return subprocess.run(ssh_cmd, capture_output=True, text=True, encoding='utf-8', errors='replace', timeout=timeout_secs)
 
     def run_ssh_command_interactive(cmd, timeout_secs=300, allow_sudo_prompt=False):
         """Run an SSH command that may require sudo password input.
@@ -1705,6 +1754,8 @@ def _update_logic(ctx, *, box, yes, version, verbose, check, force=False):
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             text=True,
+            encoding='utf-8',
+            errors='replace',
             bufsize=1
         )
         if process.stdout:
@@ -1718,7 +1769,9 @@ def _update_logic(ctx, *, box, yes, version, verbose, check, force=False):
             ssh_cmd,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
-            text=True
+            text=True,
+            encoding='utf-8',
+            errors='replace',
         )
         # Read and store output for potential error reporting
         if process.stdout:
@@ -1962,7 +2015,17 @@ def _update_logic(ctx, *, box, yes, version, verbose, check, force=False):
     if container_lines:
         log_status('OK', 'green')
     else:
-        log_status('WARNING (lager container not detected)', 'yellow')
+        if progress:
+            progress.finish(success=False)
+        log_status('FAILED', 'red')
+        log_error('Error: lager container is not running after startup')
+        click.secho(
+            'The container may have crashed immediately after starting. Check logs on the box:',
+            fg='yellow', err=True
+        )
+        click.echo(f'  ssh {ssh_host} "docker logs lager --tail 50"', err=True)
+        click.echo(f'  ssh {ssh_host} "docker ps -a | grep lager"', err=True)
+        ctx.exit(1)
 
     if verbose and container_lines:
         click.echo()

{lager_cli-0.31.0 → lager_cli-0.31.2/lager_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: lager-cli
-Version: 0.31.0
+Version: 0.31.2
 Summary: Lager CLI - Box and Docker connectivity
 Home-page: https://github.com/lagerdata/lager
 Author: Lager Data