machineconfig 5.78__py3-none-any.whl → 5.81__py3-none-any.whl

machineconfig/scripts/python/devops_helpers/cli_nw.py

@@ -18,17 +18,18 @@ def install_ssh_server():
     from machineconfig.utils.code import run_shell_script
     run_shell_script(script=SSH_SERVER.read_text(encoding="utf-8"))
 
+
 def add_ssh_key(path: Optional[str] = typer.Option(None, help="Path to the public key file"),
          choose: bool = typer.Option(False, "--choose", "-c", help="Choose from available public keys in ~/.ssh/*.pub"),
          value: bool = typer.Option(False, "--value", "-v", help="Paste the public key content manually"),
          github: Optional[str] = typer.Option(None, "--github", "-g", help="Fetch public keys from a GitHub username")
 ):
     """🔑 SSH add pub key to this machine so its accessible by owner of corresponding private key."""
-    import machineconfig.scripts.python.devops_helpers.devops_add_ssh_key as helper
+    import machineconfig.scripts.python.nw.devops_add_ssh_key as helper
     helper.main(pub_path=path, pub_choose=choose, pub_val=value, from_github=github)
 def add_ssh_identity():
     """🗝️ SSH add identity (private key) to this machine"""
-    import machineconfig.scripts.python.devops_helpers.devops_add_identity as helper
+    import machineconfig.scripts.python.nw.devops_add_identity as helper
     helper.main()
 
 
@@ -41,6 +42,16 @@ def show_address():
     print(f"This computer is @ {local_ip_v4}")
 
 
+def debug_ssh():
+    """🐛 SSH debug"""
+    from platform import system
+    if system() == "Linux" or system() == "Darwin":
+        import machineconfig.scripts.python.nw.ssh_debug_linux as helper
+        helper.ssh_debug_linux()
+    elif system() == "Windows":
+        raise NotImplementedError("SSH debug for Windows is not implemented yet.")
+    else:
+        raise NotImplementedError(f"Platform {system()} is not supported.")
 
 def get_app():
     nw_apps = typer.Typer(help="🔐 [n] Network subcommands", no_args_is_help=True)
@@ -56,4 +67,6 @@ def get_app():
     nw_apps.command(name="a", help="Add SSH identity (private key) to this machine", hidden=True)(add_ssh_identity)
     nw_apps.command(name="show-address", help="[A] Show this computer addresses on network")(show_address)
     nw_apps.command(name="a", help="Show this computer addresses on network", hidden=True)(show_address)
+    nw_apps.command(name="debug-ssh", help="🐛  [d] Debug SSH connection")(debug_ssh)
+    nw_apps.command(name="d", help="Debug SSH connection", hidden=True)(debug_ssh)
     return nw_apps

machineconfig/scripts/python/{devops_helpers → nw}/devops_add_ssh_key.py

@@ -5,25 +5,13 @@ from machineconfig.utils.source_of_truth import LIBRARY_ROOT
 from machineconfig.utils.path_extended import PathExtended
 from rich.console import Console
 from rich.panel import Panel
-from rich import box  # Import box
+from rich import box
 from typing import Optional
 import typer
 
 
 console = Console()
 
-"""
-if (!$pubkey_string) {
-    $pubkey_url = 'https://github.com/thisismygitrepo.keys'  # (CHANGE APPROPRIATELY)
-    $pubkey_string = (Invoke-WebRequest $pubkey_url).Content
-} else {
-    Write-Output "pubkey_string is already defined."
-}
-echo $null >> $HOME/.ssh/authorized_keys  # powershell way of touching a file if it doesn't exist
-echo $pubkey_string >> $HOME/.ssh/authorized_keys
-echo $pubkey_string > $HOME/.ssh/pubkey.pub
-"""
-
 
 def get_add_ssh_key_script(path_to_key: PathExtended):
     console.print(Panel("🔑 SSH KEY CONFIGURATION", title="[bold blue]SSH Setup[/bold blue]"))

machineconfig/scripts/python/nw/ssh_debug_linux.py

@@ -0,0 +1,299 @@
+
+
+from platform import system
+from machineconfig.utils.path_extended import PathExtended
+from rich.console import Console
+from rich.panel import Panel
+from rich import box
+import subprocess
+import os
+
+console = Console()
+
+
+def ssh_debug_linux() -> dict[str, dict[str, str | bool]]:
+    """
+    Comprehensive SSH debugging function that checks for common pitfalls on Linux systems.
+    
+    Returns a dictionary with diagnostic results for each check performed.
+    """
+    if system() != "Linux":
+        console.print(Panel("❌ This function is only supported on Linux systems", title="[bold red]Error[/bold red]", border_style="red"))
+        raise NotImplementedError("ssh_debug_linux is only supported on Linux")
+    
+    console.print(Panel("🔍 SSH DEBUG - COMPREHENSIVE DIAGNOSTICS", box=box.DOUBLE_EDGE, title_align="left"))
+    
+    results: dict[str, dict[str, str | bool]] = {}
+    issues_found: list[str] = []
+    
+    ssh_dir = PathExtended.home().joinpath(".ssh")
+    authorized_keys = ssh_dir.joinpath("authorized_keys")
+    
+    console.print(Panel("🔐 Checking SSH directory and authorized_keys...", title="[bold blue]File Permissions[/bold blue]", border_style="blue"))
+    
+    if not ssh_dir.exists():
+        results["ssh_directory"] = {"status": "error", "message": "~/.ssh directory does not exist", "action": "Create with: mkdir -p ~/.ssh && chmod 700 ~/.ssh"}
+        issues_found.append("SSH directory missing")
+        console.print(Panel("❌ ~/.ssh directory does not exist\n💡 Run: mkdir -p ~/.ssh && chmod 700 ~/.ssh", title="[bold red]Critical Issue[/bold red]", border_style="red"))
+    else:
+        ssh_dir_stat = os.stat(ssh_dir)
+        ssh_dir_perms = oct(ssh_dir_stat.st_mode)[-3:]
+        if ssh_dir_perms != "700":
+            results["ssh_directory"] = {"status": "warning", "message": f"~/.ssh has incorrect permissions: {ssh_dir_perms} (should be 700)", "action": "Fix with: chmod 700 ~/.ssh"}
+            issues_found.append(f"SSH directory permissions incorrect: {ssh_dir_perms}")
+            console.print(Panel(f"⚠️  ~/.ssh permissions: {ssh_dir_perms} (should be 700)\n💡 Fix: chmod 700 ~/.ssh", title="[bold yellow]Permission Issue[/bold yellow]", border_style="yellow"))
+        else:
+            results["ssh_directory"] = {"status": "ok", "message": "~/.ssh directory permissions correct (700)", "action": ""}
+            console.print(Panel("✅ ~/.ssh directory permissions correct (700)", title="[bold green]OK[/bold green]", border_style="green"))
+    
+    if not authorized_keys.exists():
+        results["authorized_keys"] = {"status": "warning", "message": "authorized_keys file does not exist", "action": "Create authorized_keys file and add public keys"}
+        issues_found.append("authorized_keys missing")
+        console.print(Panel("⚠️  authorized_keys file does not exist\n💡 Add your public key to ~/.ssh/authorized_keys", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+    else:
+        ak_stat = os.stat(authorized_keys)
+        ak_perms = oct(ak_stat.st_mode)[-3:]
+        if ak_perms not in ["600", "644"]:
+            results["authorized_keys"] = {"status": "warning", "message": f"authorized_keys has incorrect permissions: {ak_perms} (should be 600 or 644)", "action": "Fix with: chmod 644 ~/.ssh/authorized_keys"}
+            issues_found.append(f"authorized_keys permissions incorrect: {ak_perms}")
+            console.print(Panel(f"⚠️  authorized_keys permissions: {ak_perms} (should be 600 or 644)\n💡 Fix: chmod 644 ~/.ssh/authorized_keys", title="[bold yellow]Permission Issue[/bold yellow]", border_style="yellow"))
+        else:
+            key_count = len([line for line in authorized_keys.read_text(encoding="utf-8").split("\n") if line.strip()])
+            results["authorized_keys"] = {"status": "ok", "message": f"authorized_keys permissions correct ({ak_perms}), contains {key_count} key(s)", "action": ""}
+            console.print(Panel(f"✅ authorized_keys permissions correct ({ak_perms})\n🔑 Contains {key_count} authorized key(s)", title="[bold green]OK[/bold green]", border_style="green"))
+    
+    console.print(Panel("🔧 Checking SSH service status...", title="[bold blue]Service Status[/bold blue]", border_style="blue"))
+    
+    try:
+        ssh_service_check = subprocess.run(["systemctl", "is-active", "ssh"], capture_output=True, text=True, check=False)
+        sshd_service_check = subprocess.run(["systemctl", "is-active", "sshd"], capture_output=True, text=True, check=False)
+        
+        ssh_active = ssh_service_check.returncode == 0
+        sshd_active = sshd_service_check.returncode == 0
+        
+        if not ssh_active and not sshd_active:
+            results["ssh_service"] = {"status": "error", "message": "SSH service is not running (checked both 'ssh' and 'sshd')", "action": "Start with: sudo systemctl start ssh (or sshd)"}
+            issues_found.append("SSH service not running")
+            console.print(Panel("❌ SSH service is not running\n💡 Start: sudo systemctl start ssh (or sshd)\n💡 Enable on boot: sudo systemctl enable ssh", title="[bold red]Critical Issue[/bold red]", border_style="red"))
+        elif ssh_active or sshd_active:
+            service_name = "ssh" if ssh_active else "sshd"
+            results["ssh_service"] = {"status": "ok", "message": f"SSH service is running ({service_name})", "action": ""}
+            console.print(Panel(f"✅ SSH service is running ({service_name})", title="[bold green]OK[/bold green]", border_style="green"))
+    except FileNotFoundError:
+        results["ssh_service"] = {"status": "warning", "message": "systemctl not found, cannot check service status", "action": "Check SSH service manually"}
+        console.print(Panel("⚠️  systemctl not found\n💡 Check SSH service status manually", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+    
+    console.print(Panel("🔌 Checking SSH port and listening status...", title="[bold blue]Network Status[/bold blue]", border_style="blue"))
+    
+    sshd_config_paths = [PathExtended("/etc/ssh/sshd_config"), PathExtended("/etc/sshd_config")]
+    sshd_config = None
+    for config_path in sshd_config_paths:
+        if config_path.exists():
+            sshd_config = config_path
+            break
+    
+    if sshd_config:
+        config_text = sshd_config.read_text(encoding="utf-8")
+        port_lines = [line for line in config_text.split("\n") if line.strip().startswith("Port") and not line.strip().startswith("#")]
+        if port_lines:
+            ssh_port = port_lines[0].split()[1]
+        else:
+            ssh_port = "22"
+        
+        results["sshd_config"] = {"status": "ok", "message": f"SSH configured to listen on port {ssh_port}", "action": ""}
+        console.print(Panel(f"✅ SSH configured to listen on port {ssh_port}", title="[bold green]Config[/bold green]", border_style="green"))
+        
+        password_auth_lines = [line for line in config_text.split("\n") if "PasswordAuthentication" in line and not line.strip().startswith("#")]
+        if password_auth_lines:
+            password_auth_enabled = "yes" in password_auth_lines[-1].lower()
+            if not password_auth_enabled:
+                console.print(Panel("ℹ️  Password authentication is disabled\n💡 Only SSH keys will work", title="[bold blue]Info[/bold blue]", border_style="blue"))
+        
+        pubkey_auth_lines = [line for line in config_text.split("\n") if "PubkeyAuthentication" in line and not line.strip().startswith("#")]
+        if pubkey_auth_lines:
+            pubkey_auth_enabled = "yes" in pubkey_auth_lines[-1].lower()
+            if not pubkey_auth_enabled:
+                results["pubkey_auth"] = {"status": "error", "message": "PubkeyAuthentication is disabled in sshd_config", "action": "Enable with: PubkeyAuthentication yes in sshd_config"}
+                issues_found.append("PubkeyAuthentication disabled")
+                console.print(Panel("❌ PubkeyAuthentication is DISABLED\n💡 Edit /etc/ssh/sshd_config and set: PubkeyAuthentication yes\n💡 Then restart: sudo systemctl restart ssh", title="[bold red]Critical Issue[/bold red]", border_style="red"))
+            else:
+                results["pubkey_auth"] = {"status": "ok", "message": "PubkeyAuthentication is enabled", "action": ""}
+                console.print(Panel("✅ PubkeyAuthentication is enabled", title="[bold green]OK[/bold green]", border_style="green"))
+    else:
+        results["sshd_config"] = {"status": "warning", "message": "sshd_config not found", "action": "Check SSH configuration manually"}
+        ssh_port = "22"
+        console.print(Panel("⚠️  sshd_config not found\n💡 Assuming default port 22", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+    
+    try:
+        listening_check = subprocess.run(["ss", "-tlnp"], capture_output=True, text=True, check=False)
+        if listening_check.returncode == 0:
+            listening_output = listening_check.stdout
+            if f":{ssh_port}" in listening_output:
+                results["ssh_listening"] = {"status": "ok", "message": f"SSH is listening on port {ssh_port}", "action": ""}
+                console.print(Panel(f"✅ SSH is listening on port {ssh_port}", title="[bold green]OK[/bold green]", border_style="green"))
+            else:
+                results["ssh_listening"] = {"status": "error", "message": f"SSH is NOT listening on port {ssh_port}", "action": "Check if SSH service is running and configured correctly"}
+                issues_found.append(f"SSH not listening on port {ssh_port}")
+                console.print(Panel(f"❌ SSH is NOT listening on port {ssh_port}\n💡 Check: sudo ss -tlnp | grep {ssh_port}\n💡 Restart: sudo systemctl restart ssh", title="[bold red]Critical Issue[/bold red]", border_style="red"))
+        else:
+            results["ssh_listening"] = {"status": "warning", "message": "Could not check listening status", "action": "Check manually with: ss -tlnp"}
+            console.print(Panel("⚠️  Could not check listening status\n💡 Check manually: ss -tlnp | grep ssh", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+    except FileNotFoundError:
+        results["ssh_listening"] = {"status": "warning", "message": "ss command not found", "action": "Install net-tools or check manually"}
+        console.print(Panel("⚠️  'ss' command not found\n💡 Try: netstat -tlnp | grep ssh", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+    
+    console.print(Panel("🧱 Checking firewall status...", title="[bold blue]Firewall[/bold blue]", border_style="blue"))
+    
+    firewall_checked = False
+    
+    try:
+        ufw_status = subprocess.run(["ufw", "status"], capture_output=True, text=True, check=False)
+        if ufw_status.returncode == 0:
+            firewall_checked = True
+            ufw_output = ufw_status.stdout
+            if "Status: active" in ufw_output:
+                if f"{ssh_port}/tcp" in ufw_output.lower() or f"{ssh_port}" in ufw_output.lower() or "ssh" in ufw_output.lower():
+                    results["firewall_ufw"] = {"status": "ok", "message": f"UFW is active and SSH port {ssh_port} is allowed", "action": ""}
+                    console.print(Panel(f"✅ UFW is active and SSH port {ssh_port} is allowed", title="[bold green]OK[/bold green]", border_style="green"))
+                else:
+                    results["firewall_ufw"] = {"status": "error", "message": f"UFW is active but SSH port {ssh_port} is NOT allowed", "action": f"Allow with: sudo ufw allow {ssh_port}/tcp"}
+                    issues_found.append(f"UFW blocking port {ssh_port}")
+                    console.print(Panel(f"❌ UFW is active but SSH port {ssh_port} is NOT allowed\n💡 Fix: sudo ufw allow {ssh_port}/tcp", title="[bold red]Critical Issue[/bold red]", border_style="red"))
+            else:
+                results["firewall_ufw"] = {"status": "ok", "message": "UFW is inactive", "action": ""}
+                console.print(Panel("ℹ️  UFW is inactive (no firewall blocking)", title="[bold blue]Info[/bold blue]", border_style="blue"))
+    except FileNotFoundError:
+        pass
+    
+    if not firewall_checked:
+        try:
+            firewalld_status = subprocess.run(["firewall-cmd", "--state"], capture_output=True, text=True, check=False)
+            if firewalld_status.returncode == 0 and "running" in firewalld_status.stdout.lower():
+                firewall_checked = True
+                firewalld_check = subprocess.run(["firewall-cmd", "--list-services"], capture_output=True, text=True, check=False)
+                if firewalld_check.returncode == 0:
+                    if "ssh" in firewalld_check.stdout.lower():
+                        results["firewall_firewalld"] = {"status": "ok", "message": "firewalld is active and SSH service is allowed", "action": ""}
+                        console.print(Panel("✅ firewalld is active and SSH service is allowed", title="[bold green]OK[/bold green]", border_style="green"))
+                    else:
+                        results["firewall_firewalld"] = {"status": "error", "message": "firewalld is active but SSH service is NOT allowed", "action": "Allow with: sudo firewall-cmd --permanent --add-service=ssh && sudo firewall-cmd --reload"}
+                        issues_found.append("firewalld blocking SSH")
+                        console.print(Panel("❌ firewalld is active but SSH is NOT allowed\n💡 Fix: sudo firewall-cmd --permanent --add-service=ssh\n💡 Then: sudo firewall-cmd --reload", title="[bold red]Critical Issue[/bold red]", border_style="red"))
+        except FileNotFoundError:
+            pass
+    
+    if not firewall_checked:
+        try:
+            iptables_check = subprocess.run(["iptables", "-L", "-n"], capture_output=True, text=True, check=False)
+            if iptables_check.returncode == 0:
+                firewall_checked = True
+                iptables_output = iptables_check.stdout
+                if f"dpt:{ssh_port}" in iptables_output or "ACCEPT" in iptables_output.split("\n")[0]:
+                    results["firewall_iptables"] = {"status": "ok", "message": f"iptables appears to allow SSH traffic on port {ssh_port}", "action": ""}
+                    console.print(Panel(f"ℹ️  iptables detected - appears to allow SSH on port {ssh_port}", title="[bold blue]Info[/bold blue]", border_style="blue"))
+                else:
+                    results["firewall_iptables"] = {"status": "warning", "message": f"iptables may be blocking SSH traffic on port {ssh_port}", "action": "Check rules manually: sudo iptables -L -n"}
+                    console.print(Panel(f"⚠️  iptables detected - may be blocking SSH\n💡 Check: sudo iptables -L -n\n💡 Allow: sudo iptables -A INPUT -p tcp --dport {ssh_port} -j ACCEPT", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+        except FileNotFoundError:
+            pass
+    
+    if not firewall_checked:
+        results["firewall"] = {"status": "ok", "message": "No firewall detected or firewall commands not available", "action": ""}
+        console.print(Panel("ℹ️  No firewall detected", title="[bold blue]Info[/bold blue]", border_style="blue"))
+    
+    console.print(Panel("🗂️  Checking for problematic files in /etc/...", title="[bold blue]System Files[/bold blue]", border_style="blue"))
+    
+    hosts_deny = PathExtended("/etc/hosts.deny")
+    if hosts_deny.exists():
+        hosts_deny_content = hosts_deny.read_text(encoding="utf-8")
+        if "sshd" in hosts_deny_content.lower() or "all" in hosts_deny_content.lower():
+            results["hosts_deny"] = {"status": "error", "message": "/etc/hosts.deny may be blocking SSH connections", "action": "Review /etc/hosts.deny and remove SSH blocks"}
+            issues_found.append("/etc/hosts.deny blocking SSH")
+            console.print(Panel("❌ /etc/hosts.deny may be blocking SSH\n💡 Check: cat /etc/hosts.deny\n💡 Remove any lines blocking 'sshd' or 'ALL'", title="[bold red]Critical Issue[/bold red]", border_style="red"))
+        else:
+            results["hosts_deny"] = {"status": "ok", "message": "/etc/hosts.deny exists but doesn't appear to block SSH", "action": ""}
+            console.print(Panel("✅ /etc/hosts.deny doesn't block SSH", title="[bold green]OK[/bold green]", border_style="green"))
+    else:
+        results["hosts_deny"] = {"status": "ok", "message": "/etc/hosts.deny does not exist", "action": ""}
+        console.print(Panel("✅ /etc/hosts.deny not present", title="[bold green]OK[/bold green]", border_style="green"))
+    
+    hosts_allow = PathExtended("/etc/hosts.allow")
+    if hosts_allow.exists():
+        results["hosts_allow"] = {"status": "ok", "message": "/etc/hosts.allow exists (check if needed)", "action": ""}
+        console.print(Panel("ℹ️  /etc/hosts.allow exists\n💡 Ensure it allows SSH if using TCP wrappers", title="[bold blue]Info[/bold blue]", border_style="blue"))
+    
+    console.print(Panel("👤 Checking home directory permissions...", title="[bold blue]User Permissions[/bold blue]", border_style="blue"))
+    
+    home_dir = PathExtended.home()
+    home_stat = os.stat(home_dir)
+    home_perms = oct(home_stat.st_mode)[-3:]
+    
+    if home_perms[2] in ["7", "6"]:
+        results["home_directory"] = {"status": "error", "message": f"Home directory has world-writable permissions: {home_perms} (SSH may refuse to work)", "action": f"Fix with: chmod 755 {home_dir}"}
+        issues_found.append(f"Home directory world-writable: {home_perms}")
+        console.print(Panel(f"❌ Home directory is world-writable ({home_perms})\n💡 SSH may refuse connections for security\n💡 Fix: chmod 755 {home_dir}", title="[bold red]Critical Issue[/bold red]", border_style="red"))
+    else:
+        results["home_directory"] = {"status": "ok", "message": f"Home directory permissions OK: {home_perms}", "action": ""}
+        console.print(Panel(f"✅ Home directory permissions OK: {home_perms}", title="[bold green]OK[/bold green]", border_style="green"))
+    
+    console.print(Panel("🔍 Checking SELinux status...", title="[bold blue]SELinux[/bold blue]", border_style="blue"))
+    
+    try:
+        selinux_check = subprocess.run(["getenforce"], capture_output=True, text=True, check=False)
+        if selinux_check.returncode == 0:
+            selinux_status = selinux_check.stdout.strip()
+            if selinux_status == "Enforcing":
+                restorecon_check = subprocess.run(["restorecon", "-Rv", str(ssh_dir)], capture_output=True, text=True, check=False)
+                if restorecon_check.returncode == 0:
+                    results["selinux"] = {"status": "ok", "message": f"SELinux is {selinux_status}, SSH contexts restored", "action": ""}
+                    console.print(Panel(f"✅ SELinux is {selinux_status}\n✅ SSH contexts restored", title="[bold green]OK[/bold green]", border_style="green"))
+                else:
+                    results["selinux"] = {"status": "warning", "message": f"SELinux is {selinux_status}, may need context restoration", "action": f"Run: sudo restorecon -Rv {ssh_dir}"}
+                    console.print(Panel(f"⚠️  SELinux is {selinux_status}\n💡 Fix contexts: sudo restorecon -Rv {ssh_dir}", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+            else:
+                results["selinux"] = {"status": "ok", "message": f"SELinux is {selinux_status}", "action": ""}
+                console.print(Panel(f"ℹ️  SELinux is {selinux_status}", title="[bold blue]Info[/bold blue]", border_style="blue"))
+    except FileNotFoundError:
+        results["selinux"] = {"status": "ok", "message": "SELinux not installed", "action": ""}
+        console.print(Panel("ℹ️  SELinux not installed", title="[bold blue]Info[/bold blue]", border_style="blue"))
+    
+    console.print(Panel("📋 Checking SSH logs for errors...", title="[bold blue]Logs[/bold blue]", border_style="blue"))
+    
+    log_files = [PathExtended("/var/log/auth.log"), PathExtended("/var/log/secure")]
+    log_found = False
+    for log_file in log_files:
+        if log_file.exists():
+            log_found = True
+            try:
+                tail_check = subprocess.run(["tail", "-n", "50", str(log_file)], capture_output=True, text=True, check=False)
+                if tail_check.returncode == 0:
+                    log_content = tail_check.stdout
+                    error_keywords = ["error", "failed", "refused", "denied", "invalid"]
+                    ssh_errors = [line for line in log_content.split("\n") if any(keyword in line.lower() for keyword in error_keywords) and "ssh" in line.lower()]
+                    if ssh_errors:
+                        results["ssh_logs"] = {"status": "warning", "message": f"Found {len(ssh_errors)} potential SSH errors in {log_file}", "action": f"Review: sudo tail -f {log_file}"}
+                        console.print(Panel(f"⚠️  Found {len(ssh_errors)} potential SSH errors in {log_file}\n💡 Review: sudo tail -f {log_file}\n\nRecent errors:\n" + "\n".join(ssh_errors[-3:]), title="[bold yellow]Log Errors[/bold yellow]", border_style="yellow"))
+                    else:
+                        results["ssh_logs"] = {"status": "ok", "message": f"No recent SSH errors in {log_file}", "action": ""}
+                        console.print(Panel(f"✅ No recent SSH errors in {log_file}", title="[bold green]OK[/bold green]", border_style="green"))
+            except Exception:
+                results["ssh_logs"] = {"status": "warning", "message": f"Could not read {log_file}", "action": f"Check manually: sudo tail {log_file}"}
+                console.print(Panel(f"⚠️  Could not read {log_file}\n💡 Check: sudo tail {log_file}", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+            break
+    
+    if not log_found:
+        results["ssh_logs"] = {"status": "warning", "message": "SSH log files not found", "action": "Check journalctl: sudo journalctl -u ssh"}
+        console.print(Panel("⚠️  SSH log files not found\n💡 Check: sudo journalctl -u ssh -n 50", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+    
+    console.print(Panel("📊 DIAGNOSTIC SUMMARY", box=box.DOUBLE_EDGE, title_align="left"))
+    
+    if issues_found:
+        console.print(Panel(f"⚠️  Found {len(issues_found)} issue(s):\n\n" + "\n".join([f"• {issue}" for issue in issues_found]), title="[bold yellow]Issues Found[/bold yellow]", border_style="yellow"))
+    else:
+        console.print(Panel("✅ No critical issues detected\n\nIf you still cannot connect:\n• Check client-side configuration\n• Verify network connectivity\n• Ensure correct username and hostname\n• Check if public key is correctly added to authorized_keys", title="[bold green]All Checks Passed[/bold green]", border_style="green"))
+    
+    return results
+
+
+if __name__ == "__main__":
+    ssh_debug_linux()

{machineconfig-5.78.dist-info → machineconfig-5.81.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.78
+Version: 5.81
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-5.78.dist-info → machineconfig-5.81.dist-info}/RECORD

@@ -177,13 +177,11 @@ machineconfig/scripts/python/devops_helpers/__init__.py,sha256=47DEQpj8HBSa-_TIm
 machineconfig/scripts/python/devops_helpers/cli_config.py,sha256=wnQyhN-LbuIpVKvZhOxv8_UR7cwFTlKpZMqL3Ydi3Zo,5332
 machineconfig/scripts/python/devops_helpers/cli_config_dotfile.py,sha256=rjTys4FNf9_feP9flWM7Zvq17dxWmetSiGaHPxp25nk,2737
 machineconfig/scripts/python/devops_helpers/cli_data.py,sha256=kvJ7g2CccjjXIhCwdu_Vlif8JHC0qUoLjuGcTSqT-IU,514
-machineconfig/scripts/python/devops_helpers/cli_nw.py,sha256=pMypnNF7Ffp__Ic9D0R386juwhbbQ21TAdYyZRwmCy0,3442
+machineconfig/scripts/python/devops_helpers/cli_nw.py,sha256=3KyzyoEyiLFrKxB5abkUq8UI3PoHWcI9PyczHf0YcSY,4023
 machineconfig/scripts/python/devops_helpers/cli_repos.py,sha256=HJH5ZBob_Uzhc3fDgG9riOeW6YEJt88xTjQYcEUPmUY,12015
 machineconfig/scripts/python/devops_helpers/cli_self.py,sha256=9ie3qtEKcUSDwi7rkwBbWCXZoYsk6wpYXEVIC4wlBIg,4531
 machineconfig/scripts/python/devops_helpers/cli_share_server.py,sha256=285OzxttCx7YsrpOkaapMKP1eVGHmG5TkkaSQnY7i3c,3976
 machineconfig/scripts/python/devops_helpers/cli_terminal.py,sha256=k_PzXaiGyE0vXr0Ii1XcJz2A7UvyPJrR31TRWt4RKRI,6019
-machineconfig/scripts/python/devops_helpers/devops_add_identity.py,sha256=wvjNgqsLmqD2SxbNCW_usqfp0LI-TDvcJJKGOWt2oFw,3775
-machineconfig/scripts/python/devops_helpers/devops_add_ssh_key.py,sha256=4Vn93ecTy62rIc8uLM90YsR3l0-0AiiqumMlI9Axk9A,9296
 machineconfig/scripts/python/devops_helpers/devops_backup_retrieve.py,sha256=nK47Rc7gQuDCnkk6_sW1y82gBnDJ9TdHU8XwMPFBK9c,5591
 machineconfig/scripts/python/devops_helpers/devops_status.py,sha256=PJVPhfhXq8der6Xd-_fjZfnizfM-RGfJApkRGhGBmNo,20525
 machineconfig/scripts/python/devops_helpers/devops_update_repos.py,sha256=qYS3vT-VECxXI4MXgmRMHAqbVX19aj0U_zobhyM_nGI,10130
@@ -227,6 +225,7 @@ machineconfig/scripts/python/helpers_repos/secure_repo.py,sha256=g0o3SHBwicro1K5
 machineconfig/scripts/python/nw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/scripts/python/nw/add_ssh_key.py,sha256=dYOK9vCB6I9YSeCLO7Hid1IaFjiEs9n_gugDSddtGU8,9298
 machineconfig/scripts/python/nw/devops_add_identity.py,sha256=aPjcHbTLhxYwWYcandyAHdwuO15ZBu3fB82u6bI0tMQ,3773
+machineconfig/scripts/python/nw/devops_add_ssh_key.py,sha256=EyLs2kc1A0Z-JncjDSleiBokgBzEaxlS-C024K4WuZQ,8847
 machineconfig/scripts/python/nw/mount_drive,sha256=zemKofv7hOmRN_V3qK0q580GkfWw3VdikyVVQyiu8j8,3514
 machineconfig/scripts/python/nw/mount_nfs,sha256=DdJqswbKLu8zqlVR3X6Js30D4myJFPVzHHNkWTJqDUQ,1855
 machineconfig/scripts/python/nw/mount_nfs.py,sha256=lOMDY4RS7tx8gsCazVR5tNNwFbaRyO2PJlnwBCDQgCM,3573
@@ -235,6 +234,7 @@ machineconfig/scripts/python/nw/mount_nw_drive.py,sha256=iru6AtnTyvyuk6WxlK5R4lD
 machineconfig/scripts/python/nw/mount_smb,sha256=7UN5EP1kuxYL_-CnyaH4f9Wuu2CgALDZpJ0mPcdvCiY,94
 machineconfig/scripts/python/nw/mount_ssh.py,sha256=qt0P4T4pheszexBxaDeLVrGdLIVRoOc-UdfYv5r0OLY,2587
 machineconfig/scripts/python/nw/onetimeshare.py,sha256=xRd8by6qUm-od2Umty2MYsXyJwzXw-CBTd7VellNaKY,2498
+machineconfig/scripts/python/nw/ssh_debug_linux.py,sha256=LAKWq8rMWauvVk4_ap38SjZCIqPFaREjheJ84424Ss0,23012
 machineconfig/scripts/python/nw/wifi_conn.py,sha256=4GdLhgma9GRmZ6OFg3oxOX-qY3sr45njPckozlpM_A0,15566
 machineconfig/scripts/python/nw/wsl_windows_transfer.py,sha256=1ab9l-8MtAxofW5nGH9G2-BjlszaiLETu6WBECcNNhA,3546
 machineconfig/scripts/python/repos_helpers/action.py,sha256=t6x9K43Uy7r5aRpdODfsN-5UoMrYXEG2cVw-Y8l9prw,14847
@@ -420,8 +420,8 @@ machineconfig/utils/schemas/installer/installer_types.py,sha256=QClRY61QaduBPJoS
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=TcqlZdGVoH8htG5fHn1KWXhRdPueAcoyApppZsPAPto,2020
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
 machineconfig/utils/ssh_utils/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig-5.78.dist-info/METADATA,sha256=i9g-av8M1QLZxEzuHg-_KcwvgukX_qg_ioP95H3oniY,3013
-machineconfig-5.78.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-5.78.dist-info/entry_points.txt,sha256=M0jwN_brZdXWhmNVeXLvdKxfkv8WhhXFZYcuKBA9qnk,418
-machineconfig-5.78.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-5.78.dist-info/RECORD,,
+machineconfig-5.81.dist-info/METADATA,sha256=6QMAVt6LlV-kLzc9UcRMh75QCdIk0DZbIPrYMYYMS20,3013
+machineconfig-5.81.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-5.81.dist-info/entry_points.txt,sha256=M0jwN_brZdXWhmNVeXLvdKxfkv8WhhXFZYcuKBA9qnk,418
+machineconfig-5.81.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-5.81.dist-info/RECORD,,

machineconfig/scripts/python/devops_helpers/devops_add_identity.py

@@ -1,84 +0,0 @@
-"""ID"""
-
-# from platform import system
-from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.options import choose_from_options
-from rich.panel import Panel
-from rich.text import Text
-
-BOX_WIDTH = 150  # width for box drawing
-
-
-def main() -> None:
-    title = "🔑 SSH IDENTITY MANAGEMENT"
-    print(Panel(Text(title, justify="center"), expand=False))
-
-    print(Panel("🔍 Searching for existing SSH keys...", expand=False))
-
-    private_keys = [x.with_name(x.stem) for x in PathExtended.home().joinpath(".ssh").search("*.pub")]
-    private_keys = [x for x in private_keys if x.exists()]
-    if private_keys:
-        print(Panel(f"✅ Found {len(private_keys)} SSH private key(s)", expand=False))
-    else:
-        print(Panel("⚠️  No SSH private keys found", expand=False))
-
-    choice = choose_from_options(msg="Path to private key to be used when ssh'ing: ", options=[str(x) for x in private_keys] + ["I have the path to the key file", "I want to paste the key itself"], multi=False)
-
-    if choice == "I have the path to the key file":
-        print(Panel("📄 Please enter the path to your private key file", expand=False))
-        path_to_key = PathExtended(input("📋 Input path here: ")).expanduser().absolute()
-        print(Panel(f"📂 Using key from custom path: {path_to_key}", expand=False))
-
-    elif choice == "I want to paste the key itself":
-        print(Panel("📋 Please provide a filename and paste the private key content", expand=False))
-        key_filename = input("📝 File name (default: my_pasted_key): ") or "my_pasted_key"
-        path_to_key = PathExtended.home().joinpath(f".ssh/{key_filename}")
-        path_to_key.parent.mkdir(parents=True, exist_ok=True)
-        path_to_key.write_text(input("🔑 Paste the private key here: "), encoding="utf-8")
-        print(Panel(f"💾 Key saved to: {path_to_key}", expand=False))
-
-    else:
-        path_to_key = PathExtended(choice)
-        print(Panel(f"🔑 Using selected key: {path_to_key.name}", expand=False))
-
-    txt = f"IdentityFile {path_to_key.collapseuser().as_posix()}"  # adds this id for all connections, no host specified.
-    config_path = PathExtended.home().joinpath(".ssh/config")
-
-    print(Panel("📝 Updating SSH configuration...", expand=False))
-
-    # Inline the previous modify_text behavior (now deprecated):
-    # - If file doesn't exist, seed content with txt_search
-    # - Otherwise, replace a matching line or append if not found
-    if config_path.exists():
-        current = config_path.read_text(encoding="utf-8")
-        print(Panel("✏️  Updated existing SSH config file", expand=False))
-    else:
-        current = txt
-        print(Panel("📄 Created new SSH config file", expand=False))
-    lines = current.split("\n")
-    found = False
-    for i, line in enumerate(lines):
-        if txt in line:
-            lines[i] = txt
-            found = True
-    if not found:
-        lines.insert(0, txt)
-    new_content = "\n".join(lines)
-    config_path.write_text(new_content, encoding="utf-8")
-
-    panel_complete = Panel(Text("✅ SSH IDENTITY CONFIGURATION COMPLETE\nIdentity added to SSH config file\nConsider reloading the SSH config to apply changes", justify="center"), expand=False, border_style="green")
-    program = f"echo '{panel_complete}'"
-
-    success_message = f"🎉 CONFIGURATION SUCCESSFUL\nIdentity added: {path_to_key.name}\nConfig file: {config_path}"
-    print(Panel(Text(success_message, justify="center"), expand=False, border_style="green"))
-
-    import subprocess
-
-    # run program
-    subprocess.run(program, shell=True, check=True, text=True)
-    print(Panel("🔐 Identity added to SSH agent", expand=False, border_style="green"))
-    return None
-
-
-if __name__ == "__main__":
-    pass