ssh-handler 1.0.6__tar.gz → 1.0.8__tar.gz

{ssh_handler-1.0.6/ssh_handler.egg-info → ssh_handler-1.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssh-handler
-Version: 1.0.6
+Version: 1.0.8
 Summary: Extensive SSH/SFTP/SCP/FTP handler built on Paramiko, for test automation, CLIs and PyQt5 tools.
 Author: ssh-handler contributors
 License-Expression: MIT
@@ -226,14 +226,18 @@ administrator** on the target. If SSH already works, this code path never runs.
 
 ### Set up OpenSSH Server on a machine (bundled installer)
 
-Installing the package also gives you a one-command setup for the *local* Windows
-machine — it ships inside the wheel, self-elevates to Administrator, installs &
-starts OpenSSH Server, and opens the firewall:
+Installing the package also gives you a one-command, **fully offline** setup for
+the local Windows machine. The OpenSSH ZIPs (ARM64 / Win64 / Win32) ship *inside*
+the wheel, so the installer needs **no internet and no Windows Update** — it picks
+the ZIP matching the CPU architecture, self-elevates to Administrator, installs &
+starts OpenSSH Server, and opens the firewall. (This avoids the
+`Add-WindowsCapability` hang common on locked-down corporate networks.)
 
 ```powershell
 pip install ssh-handler
-ssh-handler-setup                 # install + start sshd + firewall (self-elevates)
+ssh-handler-setup                 # offline install + start sshd + firewall (self-elevates)
 ssh-handler-setup --install-pip   # also (re)install the package as admin
+ssh-handler-setup --force         # reinstall even if sshd already exists
 # equivalent: python -m ssh_handler setup-server
 ```
 

{ssh_handler-1.0.6 → ssh_handler-1.0.8}/README.md

@@ -195,14 +195,18 @@ administrator** on the target. If SSH already works, this code path never runs.
 
 ### Set up OpenSSH Server on a machine (bundled installer)
 
-Installing the package also gives you a one-command setup for the *local* Windows
-machine — it ships inside the wheel, self-elevates to Administrator, installs &
-starts OpenSSH Server, and opens the firewall:
+Installing the package also gives you a one-command, **fully offline** setup for
+the local Windows machine. The OpenSSH ZIPs (ARM64 / Win64 / Win32) ship *inside*
+the wheel, so the installer needs **no internet and no Windows Update** — it picks
+the ZIP matching the CPU architecture, self-elevates to Administrator, installs &
+starts OpenSSH Server, and opens the firewall. (This avoids the
+`Add-WindowsCapability` hang common on locked-down corporate networks.)
 
 ```powershell
 pip install ssh-handler
-ssh-handler-setup                 # install + start sshd + firewall (self-elevates)
+ssh-handler-setup                 # offline install + start sshd + firewall (self-elevates)
 ssh-handler-setup --install-pip   # also (re)install the package as admin
+ssh-handler-setup --force         # reinstall even if sshd already exists
 # equivalent: python -m ssh_handler setup-server
 ```
 

{ssh_handler-1.0.6 → ssh_handler-1.0.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ssh-handler"
-version = "1.0.6"
+version = "1.0.8"
 description = "Extensive SSH/SFTP/SCP/FTP handler built on Paramiko, for test automation, CLIs and PyQt5 tools."
 readme = "README.md"
 requires-python = ">=3.8"
@@ -38,4 +38,4 @@ ssh-handler-setup = "ssh_handler.cli:setup_server_main"
 packages = ["ssh_handler"]
 
 [tool.setuptools.package-data]
-ssh_handler = ["*.ps1"]
+ssh_handler = ["*.ps1", "openssh/*.zip"]

{ssh_handler-1.0.6 → ssh_handler-1.0.8}/ssh_handler/__init__.py

@@ -22,7 +22,7 @@ dependencies (PyQt5 / scp) don't break the core package.
 
 from __future__ import annotations
 
-__version__ = "1.0.6"
+__version__ = "1.0.8"
 
 from .config import SSHConfig, FTPConfig
 from .core import SSHHandler, ShellSession

ssh_handler-1.0.8/ssh_handler/setup_openssh_server.ps1

@@ -0,0 +1,189 @@
+<#
+.SYNOPSIS
+    One-shot OpenSSH Server setup for a Windows machine, fully OFFLINE.
+    Installs from the OpenSSH ZIP bundled with the ssh-handler package
+    (chosen by CPU architecture), starts sshd, opens the firewall, and
+    optionally pip-installs the package. Self-elevates to Administrator.
+
+.DESCRIPTION
+    No Windows Update / Features-on-Demand and no internet required - this
+    avoids the Add-WindowsCapability hang on locked-down corporate networks.
+    The matching ZIP (ARM64 / Win64 / Win32) ships inside the package under
+    .\openssh\ next to this script.
+
+.PARAMETER InstallPip
+    Also run `pip install -U "ssh-handler[winrm]"` (needs Python+pip on PATH).
+
+.PARAMETER Port
+    SSH port to open in the firewall (default 22).
+
+.PARAMETER ZipPath
+    Use a specific OpenSSH ZIP instead of the bundled one (override).
+
+.PARAMETER Force
+    Reinstall even if sshd already exists.
+
+.EXAMPLE
+    powershell -ExecutionPolicy Bypass -File .\setup_openssh_server.ps1
+.EXAMPLE
+    ssh-handler-setup --install-pip
+#>
+
+param(
+    [switch]$InstallPip,
+    [int]$Port = 22,
+    [string]$ZipPath,
+    [switch]$Force
+)
+
+$ErrorActionPreference = 'Stop'
+$ProgressPreference = 'SilentlyContinue'
+
+# --- 1. Self-elevate to Administrator -------------------------------------- #
+$isAdmin = ([Security.Principal.WindowsPrincipal]`
+    [Security.Principal.WindowsIdentity]::GetCurrent()`
+    ).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
+
+if (-not $isAdmin) {
+    Write-Host "Elevating to Administrator..." -ForegroundColor Yellow
+    $argList = "-NoProfile -ExecutionPolicy Bypass -File `"$PSCommandPath`" -Port $Port"
+    if ($InstallPip) { $argList += " -InstallPip" }
+    if ($Force)      { $argList += " -Force" }
+    if ($ZipPath)    { $argList += " -ZipPath `"$ZipPath`"" }
+    Start-Process powershell -Verb RunAs -ArgumentList $argList
+    exit
+}
+
+Write-Host "=== OpenSSH Server setup (Administrator, offline) ===" -ForegroundColor Cyan
+
+function Test-SshdPresent {
+    return [bool](Get-Service -Name sshd -ErrorAction SilentlyContinue)
+}
+
+# --- 2. Pick the right bundled ZIP by CPU architecture --------------------- #
+function Get-OSArch {
+    try {
+        $a = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString()
+        if ($a) { return $a }
+    } catch {}
+    $p = $env:PROCESSOR_ARCHITEW6432
+    if (-not $p) { $p = $env:PROCESSOR_ARCHITECTURE }
+    switch ($p) {
+        'AMD64' { 'X64' } 'ARM64' { 'Arm64' } 'x86' { 'X86' } default { $p }
+    }
+}
+
+function Resolve-BundledZip {
+    $arch = Get-OSArch
+    switch -Regex ($arch) {
+        'Arm64' { $name = 'OpenSSH-ARM64.zip' }
+        'X64'   { $name = 'OpenSSH-Win64.zip' }
+        'X86'   { $name = 'OpenSSH-Win32.zip' }
+        default { throw "Unsupported architecture: $arch" }
+    }
+    Write-Host ("  Detected architecture: {0} -> {1}" -f $arch, $name)
+    return (Join-Path $PSScriptRoot ("openssh\" + $name))
+}
+
+# --- 3. Install OpenSSH Server from the ZIP -------------------------------- #
+if ((Test-SshdPresent) -and -not $Force) {
+    Write-Host "OpenSSH Server already present (use -Force to reinstall)." -ForegroundColor Green
+}
+else {
+    $zip = if ($ZipPath) { $ZipPath } else { Resolve-BundledZip }
+    if (-not (Test-Path $zip)) {
+        throw "OpenSSH ZIP not found: $zip"
+    }
+    Write-Host "Installing OpenSSH Server from: $zip"
+
+    $dest = Join-Path $env:ProgramFiles 'OpenSSH'
+    $tmp  = Join-Path $env:TEMP ("openssh_" + [guid]::NewGuid().ToString('N'))
+    try {
+        Expand-Archive -Path $zip -DestinationPath $tmp -Force
+        # the archive nests a single OpenSSH-XXX folder
+        $srcDir = Get-ChildItem $tmp -Directory | Select-Object -First 1
+        if (-not $srcDir) { $srcDir = Get-Item $tmp }
+
+        if (-not (Test-Path $dest)) {
+            New-Item -ItemType Directory -Path $dest | Out-Null
+        }
+        Copy-Item (Join-Path $srcDir.FullName '*') $dest -Recurse -Force
+        Write-Host "  Files copied to $dest"
+
+        $installer = Join-Path $dest 'install-sshd.ps1'
+        if (-not (Test-Path $installer)) { throw "install-sshd.ps1 missing in $dest" }
+        & powershell -NoProfile -ExecutionPolicy Bypass -File $installer | Out-Null
+        Write-Host "  OpenSSH Server installed." -ForegroundColor Green
+
+        # Generate host keys and fix their ACLs. Without this, ZIP installs often
+        # accept the TCP connection but fail the handshake -> clients see
+        # "Error reading SSH protocol banner".
+        $keygen = Join-Path $dest 'ssh-keygen.exe'
+        if (Test-Path $keygen) {
+            & $keygen -A | Out-Null
+            Write-Host "  Host keys generated." -ForegroundColor Green
+        }
+        $fixPerms = Join-Path $dest 'FixHostFilePermissions.ps1'
+        if (Test-Path $fixPerms) {
+            & powershell -NoProfile -ExecutionPolicy Bypass -File $fixPerms `
+                -Confirm:$false | Out-Null
+            Write-Host "  Host key permissions fixed." -ForegroundColor Green
+        }
+    }
+    finally {
+        if (Test-Path $tmp) { Remove-Item $tmp -Recurse -Force -ErrorAction SilentlyContinue }
+    }
+
+    # add the install dir to the machine PATH so ssh/sshd are callable
+    $machinePath = [Environment]::GetEnvironmentVariable('Path', 'Machine')
+    if ($machinePath -notlike "*$dest*") {
+        [Environment]::SetEnvironmentVariable('Path', "$machinePath;$dest", 'Machine')
+    }
+}
+
+# --- 4. Service + firewall -------------------------------------------------- #
+Write-Host "Configuring sshd service and firewall..."
+Set-Service -Name sshd -StartupType Automatic
+if ((Get-Service sshd).Status -eq 'Running') {
+    Restart-Service sshd      # pick up freshly generated host keys
+} else {
+    Start-Service sshd
+}
+
+$ruleName = "OpenSSH-Server-In-TCP"
+if (-not (Get-NetFirewallRule -Name $ruleName -ErrorAction SilentlyContinue)) {
+    New-NetFirewallRule -Name $ruleName -DisplayName 'OpenSSH Server (sshd)' `
+        -Enabled True -Direction Inbound -Protocol TCP -Action Allow `
+        -LocalPort $Port | Out-Null
+    Write-Host "  Firewall rule added for TCP $Port." -ForegroundColor Green
+}
+else {
+    Write-Host "  Firewall rule already present." -ForegroundColor Green
+}
+
+# --- 5. Optional: pip install the package ---------------------------------- #
+if ($InstallPip) {
+    Write-Host "Installing ssh-handler (pip)..."
+    try {
+        python -m pip install --upgrade pip | Out-Null
+        python -m pip install -U "ssh-handler[winrm]"
+        Write-Host "  ssh-handler installed." -ForegroundColor Green
+    }
+    catch {
+        Write-Warning "pip install failed: $($_.Exception.Message)"
+    }
+}
+
+# --- 6. Verify -------------------------------------------------------------- #
+Write-Host "`n=== Verification ===" -ForegroundColor Cyan
+$svc = Get-Service sshd
+Write-Host ("sshd status : {0}" -f $svc.Status)
+$test = Test-NetConnection localhost -Port $Port -WarningAction SilentlyContinue
+Write-Host ("port {0} open : {1}" -f $Port, $test.TcpTestSucceeded)
+
+if ($svc.Status -eq 'Running' -and $test.TcpTestSucceeded) {
+    Write-Host "`nDone. This machine now accepts SSH on port $Port." -ForegroundColor Green
+}
+else {
+    Write-Warning "Setup finished but sshd is not listening yet - check the messages above."
+}

{ssh_handler-1.0.6 → ssh_handler-1.0.8/ssh_handler.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssh-handler
-Version: 1.0.6
+Version: 1.0.8
 Summary: Extensive SSH/SFTP/SCP/FTP handler built on Paramiko, for test automation, CLIs and PyQt5 tools.
 Author: ssh-handler contributors
 License-Expression: MIT
@@ -226,14 +226,18 @@ administrator** on the target. If SSH already works, this code path never runs.
 
 ### Set up OpenSSH Server on a machine (bundled installer)
 
-Installing the package also gives you a one-command setup for the *local* Windows
-machine — it ships inside the wheel, self-elevates to Administrator, installs &
-starts OpenSSH Server, and opens the firewall:
+Installing the package also gives you a one-command, **fully offline** setup for
+the local Windows machine. The OpenSSH ZIPs (ARM64 / Win64 / Win32) ship *inside*
+the wheel, so the installer needs **no internet and no Windows Update** — it picks
+the ZIP matching the CPU architecture, self-elevates to Administrator, installs &
+starts OpenSSH Server, and opens the firewall. (This avoids the
+`Add-WindowsCapability` hang common on locked-down corporate networks.)
 
 ```powershell
 pip install ssh-handler
-ssh-handler-setup                 # install + start sshd + firewall (self-elevates)
+ssh-handler-setup                 # offline install + start sshd + firewall (self-elevates)
 ssh-handler-setup --install-pip   # also (re)install the package as admin
+ssh-handler-setup --force         # reinstall even if sshd already exists
 # equivalent: python -m ssh_handler setup-server
 ```
 

{ssh_handler-1.0.6 → ssh_handler-1.0.8}/ssh_handler.egg-info/SOURCES.txt

@@ -20,4 +20,7 @@ ssh_handler.egg-info/dependency_links.txt
 ssh_handler.egg-info/entry_points.txt
 ssh_handler.egg-info/requires.txt
 ssh_handler.egg-info/top_level.txt
+ssh_handler/openssh/OpenSSH-ARM64.zip
+ssh_handler/openssh/OpenSSH-Win32.zip
+ssh_handler/openssh/OpenSSH-Win64.zip
 tests/test_offline.py

ssh_handler-1.0.6/ssh_handler/setup_openssh_server.ps1

@@ -1,150 +0,0 @@
-<#
-.SYNOPSIS
-    One-shot setup for an SSH target / RDP jump machine:
-    installs & starts OpenSSH Server, opens the firewall, and (optionally)
-    pip-installs the ssh-handler package. Self-elevates to Administrator.
-
-.DESCRIPTION
-    Run this once on a Windows machine that you want to reach over SSH (e.g. the
-    RDP box you tunnel through). It:
-      1. Re-launches itself elevated if not already running as Administrator.
-      2. Installs OpenSSH Server (Windows capability -> winget fallback).
-      3. Starts sshd, sets it to start automatically, opens TCP 22.
-      4. Optionally runs `pip install -U "ssh-handler[winrm]"`.
-      5. Verifies sshd is running and listening.
-
-.PARAMETER InstallPip
-    Also install/upgrade the ssh-handler Python package (needs Python+pip on PATH).
-
-.PARAMETER Port
-    SSH port to open in the firewall (default 22).
-
-.EXAMPLE
-    powershell -ExecutionPolicy Bypass -File .\setup_openssh_server.ps1
-
-.EXAMPLE
-    powershell -ExecutionPolicy Bypass -File .\setup_openssh_server.ps1 -InstallPip
-#>
-
-param(
-    [switch]$InstallPip,
-    [int]$Port = 22
-)
-
-$ErrorActionPreference = 'Stop'
-$ProgressPreference = 'SilentlyContinue'
-
-# --- 1. Self-elevate to Administrator -------------------------------------- #
-$isAdmin = ([Security.Principal.WindowsPrincipal]`
-    [Security.Principal.WindowsIdentity]::GetCurrent()`
-    ).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
-
-if (-not $isAdmin) {
-    Write-Host "Elevating to Administrator..." -ForegroundColor Yellow
-    $argList = "-NoProfile -ExecutionPolicy Bypass -File `"$PSCommandPath`""
-    if ($InstallPip) { $argList += " -InstallPip" }
-    $argList += " -Port $Port"
-    Start-Process powershell -Verb RunAs -ArgumentList $argList
-    exit
-}
-
-Write-Host "=== OpenSSH Server setup (running as Administrator) ===" -ForegroundColor Cyan
-
-# --- 2. Install OpenSSH Server --------------------------------------------- #
-function Test-SshdPresent {
-    return [bool](Get-Service -Name sshd -ErrorAction SilentlyContinue)
-}
-
-if (Test-SshdPresent) {
-    Write-Host "OpenSSH Server already present." -ForegroundColor Green
-}
-else {
-    Write-Host "Installing OpenSSH Server..."
-    $installed = $false
-
-    # 2a. Windows capability (Features-on-Demand). May be slow on corporate nets.
-    try {
-        $cap = Get-WindowsCapability -Online -Name 'OpenSSH.Server*' |
-               Select-Object -First 1
-        if ($cap -and $cap.State -ne 'Installed') {
-            Write-Host "  Trying Add-WindowsCapability (can take a few minutes)..."
-            Add-WindowsCapability -Online -Name $cap.Name | Out-Null
-        }
-        if (Test-SshdPresent) { $installed = $true }
-    }
-    catch {
-        Write-Host "  Windows capability install failed: $($_.Exception.Message)" `
-            -ForegroundColor DarkYellow
-    }
-
-    # 2b. winget fallback
-    if (-not $installed) {
-        try {
-            Write-Host "  Trying winget (Microsoft.OpenSSH.Beta)..."
-            winget install --id Microsoft.OpenSSH.Beta -e --silent `
-                --accept-source-agreements --accept-package-agreements | Out-Null
-            if (Test-SshdPresent) { $installed = $true }
-        }
-        catch {
-            Write-Host "  winget not available or failed." -ForegroundColor DarkYellow
-        }
-    }
-
-    if (-not $installed -and -not (Test-SshdPresent)) {
-        Write-Warning @"
-Could not auto-install OpenSSH Server (Windows Update / winget likely blocked).
-Manual fallback:
-  1. On a machine with internet, download OpenSSH-Win64.zip from
-     https://github.com/PowerShell/Win32-OpenSSH/releases/latest
-  2. Copy it here, extract to 'C:\Program Files\OpenSSH'
-  3. Run:  powershell -ExecutionPolicy Bypass -File 'C:\Program Files\OpenSSH\install-sshd.ps1'
-Then re-run this script to finish service + firewall setup.
-"@
-        exit 1
-    }
-    Write-Host "OpenSSH Server installed." -ForegroundColor Green
-}
-
-# --- 3. Service + firewall -------------------------------------------------- #
-Write-Host "Configuring sshd service and firewall..."
-Set-Service -Name sshd -StartupType Automatic
-Start-Service sshd
-
-$ruleName = "OpenSSH-Server-In-TCP"
-if (-not (Get-NetFirewallRule -Name $ruleName -ErrorAction SilentlyContinue)) {
-    New-NetFirewallRule -Name $ruleName -DisplayName 'OpenSSH Server (sshd)' `
-        -Enabled True -Direction Inbound -Protocol TCP -Action Allow `
-        -LocalPort $Port | Out-Null
-    Write-Host "  Firewall rule added for TCP $Port." -ForegroundColor Green
-}
-else {
-    Write-Host "  Firewall rule already present." -ForegroundColor Green
-}
-
-# --- 4. Optional: pip install the package ---------------------------------- #
-if ($InstallPip) {
-    Write-Host "Installing ssh-handler (pip)..."
-    try {
-        python -m pip install --upgrade pip | Out-Null
-        python -m pip install -U "ssh-handler[winrm]"
-        Write-Host "  ssh-handler installed." -ForegroundColor Green
-    }
-    catch {
-        Write-Warning "pip install failed: $($_.Exception.Message)"
-        Write-Host "  Ensure Python and pip are on PATH, then run: pip install -U ssh-handler"
-    }
-}
-
-# --- 5. Verify -------------------------------------------------------------- #
-Write-Host "`n=== Verification ===" -ForegroundColor Cyan
-$svc = Get-Service sshd
-Write-Host ("sshd status : {0}" -f $svc.Status)
-$test = Test-NetConnection localhost -Port $Port -WarningAction SilentlyContinue
-Write-Host ("port {0} open : {1}" -f $Port, $test.TcpTestSucceeded)
-
-if ($svc.Status -eq 'Running' -and $test.TcpTestSucceeded) {
-    Write-Host "`nDone. This machine now accepts SSH on port $Port." -ForegroundColor Green
-}
-else {
-    Write-Warning "Setup finished but sshd is not listening yet - check the messages above."
-}