cloudx-proxy 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

cloudx_proxy/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.4'
-__version_tuple__ = version_tuple = (0, 3, 4)
+__version__ = version = '0.3.6'
+__version_tuple__ = version_tuple = (0, 3, 6)

cloudx_proxy/setup.py

@@ -2,6 +2,7 @@ import os
 import time
 import json
 import subprocess
+import platform
 from pathlib import Path
 from typing import Optional, Tuple
 import boto3
@@ -142,16 +143,17 @@ class CloudXSetup:
             
             if key_exists:
                 self.print_status(f"SSH key '{self.ssh_key}' exists", True, 2)
-                self.using_1password = self.prompt("Would you like to use 1Password SSH agent?", "N").lower() == 'y'
-                if self.using_1password:
-                    self.print_status("Using 1Password SSH agent", True, 2)
-                else:
-                    store_in_1password = self.prompt("Would you like to store the private key in 1Password?", "N").lower() == 'y'
-                    if store_in_1password:
-                        if self._store_key_in_1password():
-                            self.print_status("Private key stored in 1Password", True, 2)
-                        else:
-                            self.print_status("Failed to store private key in 1Password", False, 2)
+                if platform.system() != 'Windows':
+                    self.using_1password = self.prompt("Would you like to use 1Password SSH agent?", "N").lower() == 'y'
+                    if self.using_1password:
+                        self.print_status("Using 1Password SSH agent", True, 2)
+                    else:
+                        store_in_1password = self.prompt("Would you like to store the private key in 1Password?", "N").lower() == 'y'
+                        if store_in_1password:
+                            if self._store_key_in_1password():
+                                self.print_status("Private key stored in 1Password", True, 2)
+                            else:
+                                self.print_status("Failed to store private key in 1Password", False, 2)
             else:
                 self.print_status(f"Generating new SSH key '{self.ssh_key}'...", None, 2)
                 subprocess.run([
@@ -162,16 +164,17 @@ class CloudXSetup:
                 ], check=True)
                 self.print_status("SSH key generated", True, 2)
                 
-                self.using_1password = self.prompt("Would you like to use 1Password SSH agent?", "N").lower() == 'y'
-                if self.using_1password:
-                    self.print_status("Using 1Password SSH agent", True, 2)
-                else:
-                    store_in_1password = self.prompt("Would you like to store the private key in 1Password?", "N").lower() == 'y'
-                    if store_in_1password:
-                        if self._store_key_in_1password():
-                            self.print_status("Private key stored in 1Password", True, 2)
-                        else:
-                            self.print_status("Failed to store private key in 1Password", False, 2)
+                if platform.system() != 'Windows':
+                    self.using_1password = self.prompt("Would you like to use 1Password SSH agent?", "N").lower() == 'y'
+                    if self.using_1password:
+                        self.print_status("Using 1Password SSH agent", True, 2)
+                    else:
+                        store_in_1password = self.prompt("Would you like to store the private key in 1Password?", "N").lower() == 'y'
+                        if store_in_1password:
+                            if self._store_key_in_1password():
+                                self.print_status("Private key stored in 1Password", True, 2)
+                            else:
+                                self.print_status("Failed to store private key in 1Password", False, 2)
             
             return True
 
@@ -190,13 +193,32 @@ class CloudXSetup:
             bool: True if key was stored successfully
         """
         try:
+            # Check if 1Password CLI is available
             subprocess.run(['op', '--version'], check=True, capture_output=True)
-            print("Storing private key in 1Password...")
+            
+            # Check if 1Password SSH agent is running
+            agent_sock = Path.home() / ".1password" / "agent.sock"
+            if platform.system() == 'Darwin':
+                agent_sock = Path.home() / "Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
+            
+            if not agent_sock.exists():
+                self.print_status("1Password SSH agent not running. Please enable it in 1Password settings.", False, 2)
+                return False
+            
+            # Read private key content
+            with open(self.ssh_key_file, 'r') as f:
+                private_key = f.read()
+            
+            # Store private key in 1Password as document
             subprocess.run([
                 'op', 'document', 'create',
-                str(self.ssh_key_file),
-                '--title', f'cloudx-proxy SSH Key - {self.ssh_key}'
-            ], check=True)
+                '--title', f'cloudx-proxy SSH Key - {self.ssh_key}',
+            ], input=private_key.encode(), check=True)
+            
+            # Remove private key file but keep public key
+            os.remove(self.ssh_key_file)
+            self.print_status("Private key stored in 1Password and removed from disk", True, 2)
+            self.print_status("Please import the key into 1Password SSH agent through the desktop app", True, 2)
             return True
         except subprocess.CalledProcessError:
             print("Error: 1Password CLI not installed or not signed in.")
@@ -229,13 +251,19 @@ Host cloudx-{cloudx_env}-{hostname}
     HostName {instance_id}
     User ec2-user
 """
-            if self.using_1password:
-                host_entry += f"""    IdentityAgent ~/.1password/agent.sock
+            if self.using_1password and platform.system() != 'Windows':
+                # Use platform-specific agent socket path
+                if platform.system() == 'Darwin':  # macOS
+                    agent_sock = "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
+                else:  # Linux
+                    agent_sock = "~/.1password/agent.sock"
+                host_entry += f"""    IdentityAgent {agent_sock}
     IdentityFile {self.ssh_key_file}.pub
     IdentitiesOnly yes
 """
             else:
                 host_entry += f"""    IdentityFile {self.ssh_key_file}
+    IdentitiesOnly yes
 """
             host_entry += f"""    ProxyCommand {proxy_command}
 """
@@ -343,14 +371,22 @@ Host cloudx-{cloudx_env}-{hostname}
 Host cloudx-{cloudx_env}-*
     User ec2-user
 """
-            # Add 1Password or standard key configuration
-            if self.using_1password:
-                base_config += f"""    IdentityAgent ~/.1password/agent.sock
+            # Add key configuration
+            if self.using_1password and platform.system() != 'Windows':
+                # Use platform-specific agent socket path
+                if platform.system() == 'Darwin':  # macOS
+                    agent_sock = "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
+                else:  # Linux
+                    agent_sock = "~/.1password/agent.sock"
+                base_config += f"""    IdentityAgent {agent_sock}
     IdentityFile {self.ssh_key_file}.pub
     IdentitiesOnly yes
+
 """
             else:
                 base_config += f"""    IdentityFile {self.ssh_key_file}
+    IdentitiesOnly yes
+
 """
             # Add ProxyCommand
             base_config += f"""    ProxyCommand {proxy_command}

{cloudx_proxy-0.3.4.dist-info → cloudx_proxy-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudx-proxy
-Version: 0.3.4
+Version: 0.3.6
 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.3.6.dist-info/RECORD

@@ -0,0 +1,11 @@
+cloudx_proxy/__init__.py,sha256=ZZ2O_m9OFJm18AxMSuYJt4UjSuSqyJlYRaZMoets498,61
+cloudx_proxy/_version.py,sha256=IKAQ4gPrCQ2FWMXOFRqouULC2EQI1zCb4iXHsnfbmTQ,411
+cloudx_proxy/cli.py,sha256=Ph-m8lDsdU2zZab9Y6YgBBzd_UDouBnfNrYFFx0bI_E,3426
+cloudx_proxy/core.py,sha256=WjKoqMmmnt6e_4JMeq4gTka75JAvQcMUs9r9XUBLmFE,7289
+cloudx_proxy/setup.py,sha256=3Kz-VWid0EL4rIEyf30UuLEe3Rvo1Mn8rKIa5WnysFE,24378
+cloudx_proxy-0.3.6.dist-info/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
+cloudx_proxy-0.3.6.dist-info/METADATA,sha256=KwikAp1MVPQDaSABlt8esDM9448EIRgMitb394SH4JM,14037
+cloudx_proxy-0.3.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+cloudx_proxy-0.3.6.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
+cloudx_proxy-0.3.6.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
+cloudx_proxy-0.3.6.dist-info/RECORD,,

cloudx_proxy-0.3.4.dist-info/RECORD

@@ -1,11 +0,0 @@
-cloudx_proxy/__init__.py,sha256=ZZ2O_m9OFJm18AxMSuYJt4UjSuSqyJlYRaZMoets498,61
-cloudx_proxy/_version.py,sha256=gK2CDe_mbvAwKw5ZjOIg75LuB0kCZ4LyDYjtXPapvJw,411
-cloudx_proxy/cli.py,sha256=Ph-m8lDsdU2zZab9Y6YgBBzd_UDouBnfNrYFFx0bI_E,3426
-cloudx_proxy/core.py,sha256=WjKoqMmmnt6e_4JMeq4gTka75JAvQcMUs9r9XUBLmFE,7289
-cloudx_proxy/setup.py,sha256=Y8YYMJ47fb57FAr6llQaFGuVOQ-fstYEg_Pdv5uCd-A,22486
-cloudx_proxy-0.3.4.dist-info/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
-cloudx_proxy-0.3.4.dist-info/METADATA,sha256=WAcs0mWx3clQqk-1oNNk9Jqu2hBrlbWG6Ujr5n5lDhU,14037
-cloudx_proxy-0.3.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-cloudx_proxy-0.3.4.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
-cloudx_proxy-0.3.4.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
-cloudx_proxy-0.3.4.dist-info/RECORD,,