cloudx-proxy 0.4.0__py3-none-any.whl → 0.4.2__py3-none-any.whl

cloudx_proxy/_1password.py

@@ -0,0 +1,208 @@
+import os
+import json
+import subprocess
+from pathlib import Path
+
+def check_1password_cli() -> tuple:
+    """Check if 1Password CLI is installed and authenticated.
+    
+    Returns:
+        tuple: (installed: bool, authenticated: bool, version: str)
+    """
+    try:
+        # Check if 1Password CLI is installed
+        result = subprocess.run(
+            ['op', '--version'],
+            capture_output=True,
+            text=True,
+            check=False
+        )
+        
+        if result.returncode != 0:
+            return False, False, ""
+            
+        version = result.stdout.strip()
+        
+        # Check if 1Password CLI is authenticated
+        result = subprocess.run(
+            ['op', 'account', 'list'],
+            capture_output=True,
+            text=True,
+            check=False
+        )
+        
+        if result.returncode != 0:
+            return True, False, version
+            
+        return True, True, version
+        
+    except FileNotFoundError:
+        return False, False, ""
+    except Exception:
+        return False, False, ""
+
+def check_ssh_agent(agent_sock_path: str) -> bool:
+    """Check if 1Password SSH agent is running.
+    
+    Args:
+        agent_sock_path: Path to the SSH agent socket
+        
+    Returns:
+        bool: True if agent is running
+    """
+    try:
+        # Check if the socket file exists
+        if not os.path.exists(agent_sock_path):
+            return False
+            
+        # Check if agent is active
+        env = os.environ.copy()
+        env['SSH_AUTH_SOCK'] = agent_sock_path
+        
+        result = subprocess.run(
+            ['ssh-add', '-l'],
+            env=env,
+            capture_output=True,
+            text=True,
+            check=False
+        )
+        
+        if "Could not open a connection to your authentication agent" in result.stderr:
+            return False
+            
+        return True
+        
+    except Exception:
+        return False
+
+def list_ssh_keys() -> list:
+    """List SSH keys stored in 1Password.
+    
+    Returns:
+        list: List of SSH key items
+    """
+    try:
+        # List SSH keys in 1Password using the correct command - confusingly, the category is "SSH Key" where the OUTPUT show "SSH_KEY"
+        result = subprocess.run(
+            ['op', 'item', 'list', '--categories', 'SSH Key', '--format=json'],
+            capture_output=True,
+            text=True,
+            check=False
+        )
+        
+        if result.returncode != 0:
+            return []
+            
+        items = json.loads(result.stdout)
+        return items
+        
+    except Exception:
+        return []
+
+def create_ssh_key(title: str, vault: str) -> tuple:
+    """Create a new SSH key in 1Password.
+    
+    Args:
+        title: Title for the SSH key
+        vault: Vault ID to store the key in
+        
+    Returns:
+        tuple: (success: bool, public_key: str, item_id: str)
+    """
+    try:
+        # Create a new SSH key in 1Password
+        result = subprocess.run(
+            [
+                'op', 'item', 'create',
+                '--category=ssh-key', # and yet a different way to specify the category
+                f'--title={title}',
+                f'--vault={vault}'
+            ],
+            capture_output=True,
+            text=True,
+            check=False
+        )
+        
+        if result.returncode != 0:
+            return False, "", ""
+            
+        # Parse the output to extract the public key and item ID
+        output_lines = result.stdout.strip().split('\n')
+        item_id = ""
+        public_key = ""
+        
+        for idx, line in enumerate(output_lines):
+            if line.startswith("ID:"):
+                item_id = line.split(":", 1)[1].strip()
+            
+            # Check for "public key:" in the line
+            if "public key:" in line.lower():
+                public_key = line.split(":", 1)[1].strip()
+                
+        # If we got the item ID but not the public key, try to get it separately
+        if item_id and not public_key:
+            result = subprocess.run(
+                ['op', 'item', 'get', item_id, '--fields', 'public key'],
+                capture_output=True,
+                text=True,
+                check=False
+            )
+            
+            if result.returncode == 0:
+                public_key = result.stdout.strip()
+        
+        return item_id and public_key, public_key, item_id
+        
+    except Exception:
+        return False, "", ""
+
+def get_vaults() -> list:
+    """Get list of available 1Password vaults.
+    
+    Returns:
+        list: List of vault objects with 'id' and 'name' keys
+    """
+    try:
+        result = subprocess.run(
+            ['op', 'vault', 'list', '--format=json'],
+            capture_output=True,
+            text=True,
+            check=False
+        )
+        
+        if result.returncode != 0:
+            return []
+            
+        vaults = json.loads(result.stdout)
+        return vaults
+        
+    except Exception:
+        return []
+
+def save_public_key(public_key: str, key_path: str) -> bool:
+    """Save the public key to a file with proper permissions.
+    
+    Args:
+        public_key: The public key content
+        key_path: Path to save the public key
+        
+    Returns:
+        bool: True if successful
+    """
+    try:
+        # Create parent directories if needed
+        os.makedirs(os.path.dirname(key_path), exist_ok=True)
+        
+        # Write the public key
+        with open(key_path, 'w') as f:
+            f.write(public_key)
+            
+        # Set permissions (644) on Unix-like systems
+        if os.name != 'nt':  # Not Windows
+            import stat
+            os.chmod(key_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IROTH | stat.S_IRGRP)
+            
+        return True
+        
+    except Exception:
+        return False

cloudx_proxy/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.4.0'
-__version_tuple__ = version_tuple = (0, 4, 0)
+__version__ = version = '0.4.2'
+__version_tuple__ = version_tuple = (0, 4, 2)

cloudx_proxy/setup.py

@@ -7,6 +7,7 @@ from pathlib import Path
 from typing import Optional, Tuple
 import boto3
 from botocore.exceptions import ClientError
+from ._1password import check_1password_cli, check_ssh_agent, list_ssh_keys, create_ssh_key, get_vaults, save_public_key
 
 class CloudXSetup:
     def __init__(self, profile: str = "vscode", ssh_key: str = "vscode", ssh_config: str = None, 
@@ -166,107 +167,51 @@ class CloudXSetup:
             
         self.print_status("Checking 1Password availability...")
         
-        # Check if 1Password CLI is installed
-        try:
-            result = subprocess.run(
-                ['op', '--version'],
-                capture_output=True,
-                text=True,
-                check=False
-            )
-            if result.returncode != 0:
-                self.print_status("1Password CLI not found. Please install it from https://1password.com/downloads/command-line/", False, 2)
-                return False
-            
-            self.print_status(f"1Password CLI {result.stdout.strip()} installed", True, 2)
-            
-            # Check if 1Password SSH agent is running
-            agent_sock_exists = self.onepassword_agent_sock.exists()
-            if not agent_sock_exists:
-                self.print_status("1Password SSH agent socket not found at ~/.1password/agent.sock", False, 2)
-                self.print_status("Please ensure 1Password SSH agent is enabled in 1Password settings", None, 2)
-                return False
-                
-            self.print_status("1Password SSH agent socket found", True, 2)
-            
-            # Check if agent is active by trying to list identities
-            result = subprocess.run(
-                ['ssh-add', '-l'],
-                env={**os.environ, 'SSH_AUTH_SOCK': str(self.onepassword_agent_sock)},
-                capture_output=True,
-                text=True,
-                check=False
-            )
-            
-            if "Could not open a connection to your authentication agent" in result.stderr:
-                self.print_status("1Password SSH agent is not running", False, 2)
-                return False
-                
-            self.print_status("1Password SSH agent is running", True, 2)
-            
-            # Check if 1Password CLI is authenticated
-            result = subprocess.run(
-                ['op', 'account', 'list'],
-                capture_output=True,
-                text=True,
-                check=False
-            )
-            
-            if result.returncode != 0:
-                self.print_status("1Password CLI is not authenticated. Run 'op signin' first.", False, 2)
-                return False
-                
-            self.print_status("1Password CLI is authenticated", True, 2)
-            return True
-            
-        except FileNotFoundError:
+        # Use our helper function to check 1Password CLI
+        installed, authenticated, version = check_1password_cli()
+        
+        if not installed:
             self.print_status("1Password CLI not found. Please install it from https://1password.com/downloads/command-line/", False, 2)
             return False
-        except Exception as e:
-            self.print_status(f"Error checking 1Password: {str(e)}", False, 2)
+        
+        self.print_status(f"1Password CLI {version} installed", True, 2)
+        
+        if not authenticated:
+            self.print_status("1Password CLI is not authenticated. Run 'op signin' first.", False, 2)
             return False
+        
+        self.print_status("1Password CLI is authenticated", True, 2)
+        
+        # Check if 1Password SSH agent is running
+        agent_running = check_ssh_agent(str(self.onepassword_agent_sock))
+        
+        if not agent_running:
+            self.print_status("1Password SSH agent is not running", False, 2)
+            self.print_status("Please ensure 1Password SSH agent is enabled in 1Password settings", None, 2)
+            return False
+        
+        self.print_status("1Password SSH agent is running", True, 2)
+        return True
 
-    def _store_key_in_1password(self) -> bool:
-        """Store the SSH key in 1Password and offer to remove it from the filesystem.
+    def _create_1password_key(self) -> bool:
+        """Create a new SSH key in 1Password.
         
         Returns:
             bool: True if successful
         """
         try:
-            # If key exists on filesystem, offer to store it in 1Password
-            key_exists = self.ssh_key_file.exists() and (self.ssh_key_file.with_suffix('.pub')).exists()
-            
-            if not key_exists:
-                self.print_status("No SSH key found to store in 1Password", False, 2)
-                return False
-                
-            # Ask if user wants to store the key in 1Password
-            store_in_1password = self.prompt("Would you like to store this SSH key in 1Password?", "Y").lower() == "y"
-            if not store_in_1password:
-                return True
-                
-            # Get vault to store the key in
-            result = subprocess.run(
-                ['op', 'vault', 'list', '--format=json'],
-                capture_output=True,
-                text=True,
-                check=True
-            )
-            
-            if result.returncode != 0:
-                self.print_status("Error listing 1Password vaults", False, 2)
-                return False
-                
-            vaults = json.loads(result.stdout)
+            # Get vaults to determine where to store the key
+            vaults = get_vaults()
             if not vaults:
                 self.print_status("No 1Password vaults found", False, 2)
                 return False
-                
+            
             # Display available vaults
+            self.print_status("Creating a new SSH key in 1Password", None, 2)
             print("\n\033[96mAvailable 1Password vaults:\033[0m")
             for i, vault in enumerate(vaults):
                 print(f"  {i+1}. {vault['name']}")
-                
+            
             # Let user select vault
             vault_num = self.prompt("Select vault number to store SSH key", "1")
             try:
@@ -278,46 +223,55 @@ class CloudXSetup:
             except ValueError:
                 self.print_status("Invalid input", False, 2)
                 return False
-                
-            # Read private key
-            private_key = self.ssh_key_file.read_text()
             
             # Create a title for the 1Password item
             ssh_key_title = f"cloudX SSH Key - {self.ssh_key}"
             
-            # Create item in 1Password
-            # Format: op item create --category=sshkey --title="..." --vault="..." "privateKey=<private key>"
-            result = subprocess.run(
-                [
-                    'op', 'item', 'create',
-                    '--category=sshkey',
-                    f'--title={ssh_key_title}',
-                    f'--vault={selected_vault}',
-                    f'privateKey={private_key}'
-                ],
-                capture_output=True,
-                text=True,
-                check=False
-            )
-            
-            if result.returncode != 0:
-                self.print_status(f"Error storing SSH key in 1Password: {result.stderr}", False, 2)
-                return False
+            # Check if a key with this title already exists in 1Password
+            ssh_keys = list_ssh_keys()
+            existing_key = next((key for key in ssh_keys if key['title'] == ssh_key_title), None)
+            
+            if existing_key:
+                self.print_status(f"SSH key '{ssh_key_title}' already exists in 1Password", True, 2)
+                # Get the public key
+                result = subprocess.run(
+                    ['op', 'item', 'get', existing_key['id'], '--fields', 'public key'],
+                    capture_output=True,
+                    text=True,
+                    check=False
+                )
+                
+                if result.returncode == 0:
+                    public_key = result.stdout.strip()
+                    # Save it to the expected location
+                    if save_public_key(public_key, f"{self.ssh_key_file}.pub"):
+                        self.print_status(f"Saved existing public key to {self.ssh_key_file}.pub", True, 2)
+                        return True
+            else:
+                # Create a new SSH key in 1Password
+                self.print_status(f"Creating new SSH key '{ssh_key_title}' in 1Password...", None, 2)
+                success, public_key, item_id = create_ssh_key(ssh_key_title, selected_vault)
                 
-            self.print_status("SSH key stored in 1Password successfully", True, 2)
-            
-            # Ask if user wants to remove private key from filesystem
-            remove_private_key = self.prompt("Would you like to remove the private key from the filesystem? (for security)", "Y").lower() == "y"
-            if remove_private_key:
-                # We should only remove the private key, keep the public key
-                self.ssh_key_file.unlink()
-                self.print_status("Private key removed from filesystem", True, 2)
-                self.print_status("\033[93mImportant: If you need to recover this key, it's now only available in 1Password\033[0m", None, 2)
+                if not success:
+                    self.print_status("Failed to create SSH key in 1Password", False, 2)
+                    return False
                 
+                self.print_status("SSH key created successfully in 1Password", True, 2)
+                
+                # Save the public key to the expected location
+                if save_public_key(public_key, f"{self.ssh_key_file}.pub"):
+                    self.print_status(f"Saved public key to {self.ssh_key_file}.pub", True, 2)
+                    return True
+                else:
+                    self.print_status(f"Failed to save public key to {self.ssh_key_file}.pub", False, 2)
+                    return False
+            
+            # Remind user to enable the key in 1Password SSH agent
+            self.print_status("\033[93mImportant: Make sure the key is enabled in 1Password's SSH agent settings\033[0m", None, 2)
             return True
             
         except Exception as e:
-            self.print_status(f"Error storing key in 1Password: {str(e)}", False, 2)
+            self.print_status(f"Error creating key in 1Password: {str(e)}", False, 2)
             return False
 
     def setup_ssh_key(self) -> bool:
@@ -334,21 +288,8 @@ class CloudXSetup:
             if op_available:
                 self.print_status("Using 1Password SSH agent for authentication", True, 2)
                 
-                # Generate a key if it doesn't exist
-                key_exists = self.ssh_key_file.exists() and (self.ssh_key_file.with_suffix('.pub')).exists()
-                if not key_exists:
-                    self.print_status(f"No SSH key found for '{self.ssh_key}'", None, 2)
-                    create_key = self.prompt("Would you like to create a new SSH key?", "Y").lower() == "y"
-                    if create_key:
-                        # We'll continue to the standard key creation flow
-                        pass
-                    else:
-                        # User doesn't want a key, so we'll skip and just rely on 1Password
-                        return True
-                else:
-                    # Key exists, offer to store it in 1Password
-                    self._store_key_in_1password()
-                    return True
+                # Always prefer to create keys in 1Password
+                return self._create_1password_key()
             else:
                 proceed = self.prompt("1Password integration not available. Continue with standard SSH key setup?", "Y").lower() != "n"
                 if not proceed:
@@ -393,14 +334,8 @@ class CloudXSetup:
                     self.ssh_key_file.with_suffix('.pub').chmod(stat.S_IRUSR | stat.S_IWUSR | stat.S_IROTH | stat.S_IRGRP)  # 644 permissions
                     self.print_status("Set key file permissions", True, 2)
             
-            # For both standard setup and 1Password when a key needs to be created,
-            # we'll use the same code to generate the key
+            # Standard key generation successful
             self.print_status("Key generated successfully", True, 2)
-            
-            # If using 1Password, offer to store the key there
-            if self.use_1password:
-                self._store_key_in_1password()
-                
             return True
 
         except Exception as e:

{cloudx_proxy-0.4.0.dist-info → cloudx_proxy-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudx-proxy
-Version: 0.4.0
+Version: 0.4.2
 Summary: SSH proxy command to connect VSCode with Cloud9/CloudX instance using AWS Systems Manager
 Author-email: easytocloud <info@easytocloud.com>
 License: MIT License

cloudx_proxy-0.4.2.dist-info/RECORD

@@ -0,0 +1,12 @@
+cloudx_proxy/_1password.py,sha256=uxyCfVvO1eQrOfYRojst_LN2DV4fIwxM5moaQTn3wQY,5853
+cloudx_proxy/__init__.py,sha256=ZZ2O_m9OFJm18AxMSuYJt4UjSuSqyJlYRaZMoets498,61
+cloudx_proxy/_version.py,sha256=_F8vLxUxrAtC2alXNPGVa9l3P6_vLpQAzemS6QlnPGQ,511
+cloudx_proxy/cli.py,sha256=kdrZydxL94BJrv6NnjIcceRqhoonBzMIx4vfm1Wl7qc,4104
+cloudx_proxy/core.py,sha256=RF3bX5MQiokRKjYEPnfWdKywGdtoVUvV2xZqm9uOl1g,8135
+cloudx_proxy/setup.py,sha256=jvv7ibJQ8svyjYYeVKwGa70L7RV2W7yS7JXEvKed3wI,33339
+cloudx_proxy-0.4.2.dist-info/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
+cloudx_proxy-0.4.2.dist-info/METADATA,sha256=YAHtMfsqZ1aDk1FryZhgV-Q_vr4GcdBO_mzs-gbEpK8,14037
+cloudx_proxy-0.4.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+cloudx_proxy-0.4.2.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
+cloudx_proxy-0.4.2.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
+cloudx_proxy-0.4.2.dist-info/RECORD,,

cloudx_proxy-0.4.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-cloudx_proxy/__init__.py,sha256=ZZ2O_m9OFJm18AxMSuYJt4UjSuSqyJlYRaZMoets498,61
-cloudx_proxy/_version.py,sha256=l5eo51MdCumDFCp44TFT1JH8yCDo1krag-GJubLxnVo,511
-cloudx_proxy/cli.py,sha256=kdrZydxL94BJrv6NnjIcceRqhoonBzMIx4vfm1Wl7qc,4104
-cloudx_proxy/core.py,sha256=RF3bX5MQiokRKjYEPnfWdKywGdtoVUvV2xZqm9uOl1g,8135
-cloudx_proxy/setup.py,sha256=OGJszBaTzw94pB5B61h2i3fWath44DBRshfKYvlLu6U,36024
-cloudx_proxy-0.4.0.dist-info/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
-cloudx_proxy-0.4.0.dist-info/METADATA,sha256=XC0WQBkIzpUuMnb_sJkQgqT7RKPJnHHYq9XFwB1a2U8,14037
-cloudx_proxy-0.4.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-cloudx_proxy-0.4.0.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
-cloudx_proxy-0.4.0.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
-cloudx_proxy-0.4.0.dist-info/RECORD,,