cloudx-proxy 0.3.12__py3-none-any.whl → 0.3.14__py3-none-any.whl

cloudx_proxy/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.12'
-__version_tuple__ = version_tuple = (0, 3, 12)
+__version__ = version = '0.3.14'
+__version_tuple__ = version_tuple = (0, 3, 14)

cloudx_proxy/setup.py

@@ -68,6 +68,25 @@ class CloudXSetup:
         response = input(prompt_text)
         return response if response else default
 
+    def _set_directory_permissions(self, directory: Path) -> bool:
+        """Set proper permissions (700) on a directory for Unix-like systems.
+        
+        Args:
+            directory: Path to the directory
+            
+        Returns:
+            bool: True if permissions were set successfully
+        """
+        try:
+            if platform.system() != 'Windows':
+                import stat
+                directory.chmod(stat.S_IRWXU)  # 700 permissions (owner read/write/execute)
+                self.print_status(f"Set {directory} permissions to 700", True, 2)
+            return True
+        except Exception as e:
+            self.print_status(f"Error setting permissions: {str(e)}", False, 2)
+            return False
+
     def setup_aws_profile(self) -> bool:
         """Set up AWS profile using aws configure command.
         
@@ -138,10 +157,20 @@ class CloudXSetup:
             self.ssh_dir.mkdir(parents=True, exist_ok=True)
             self.print_status("SSH directory exists", True, 2)
             
+            # Set proper permissions on the vscode directory
+            if not self._set_directory_permissions(self.ssh_dir):
+                return False
+            
             key_exists = self.ssh_key_file.exists() and (self.ssh_key_file.with_suffix('.pub')).exists()
             
             if key_exists:
                 self.print_status(f"SSH key '{self.ssh_key}' exists", True, 2)
+                # Set proper permissions on existing key files
+                if platform.system() != 'Windows':
+                    import stat
+                    self.ssh_key_file.chmod(stat.S_IRUSR | stat.S_IWUSR)  # 600 permissions (owner read/write)
+                    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)
             else:
                 self.print_status(f"Generating new SSH key '{self.ssh_key}'...", None, 2)
                 subprocess.run([
@@ -152,6 +181,12 @@ class CloudXSetup:
                 ], check=True)
                 self.print_status("SSH key generated", True, 2)
                 
+                # Set proper permissions on newly generated key files
+                if platform.system() != 'Windows':
+                    import stat
+                    self.ssh_key_file.chmod(stat.S_IRUSR | stat.S_IWUSR)  # 600 permissions (owner read/write)
+                    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)
             
             return True
 
@@ -200,6 +235,13 @@ Host cloudx-{cloudx_env}-{hostname}
             with open(self.ssh_config_file, 'a') as f:
                 f.write(host_entry)
             self.print_status("Host entry added with settings", True, 2)
+            
+            # Set proper permissions on the config file
+            if platform.system() != 'Windows':
+                import stat
+                self.ssh_config_file.chmod(stat.S_IRUSR | stat.S_IWUSR)  # 600 permissions (owner read/write)
+                self.print_status("Set config file permissions to 600", True, 2)
+                
             return True
 
         except Exception as e:
@@ -210,6 +252,31 @@ Host cloudx-{cloudx_env}-{hostname}
                 return True
             return False
 
+    def _ensure_control_dir(self) -> bool:
+        """Create SSH control directory with proper permissions.
+        
+        Creates ~/.ssh/control directory with 700 permissions on Unix-like systems,
+        or appropriate permissions on Windows.
+        
+        Returns:
+            bool: True if directory was created or exists with proper permissions
+        """
+        try:
+            # Create control directory path
+            control_dir = Path(self.home_dir) / ".ssh" / "control"
+            
+            # Create directory if it doesn't exist
+            if not control_dir.exists():
+                control_dir.mkdir(parents=True, exist_ok=True)
+                self.print_status(f"Created control directory: {control_dir}", True, 2)
+            
+            # Set proper permissions
+            return self._set_directory_permissions(control_dir)
+            
+        except Exception as e:
+            self.print_status(f"Error creating control directory: {str(e)}", False, 2)
+            return False
+    
     def setup_ssh_config(self, cloudx_env: str, instance_id: str, hostname: str) -> bool:
         """Set up SSH config for the instance.
         
@@ -219,6 +286,7 @@ Host cloudx-{cloudx_env}-{hostname}
            - User and key configuration
            - 1Password SSH agent integration if selected
            - ProxyCommand using uvx cloudx-proxy with proper parameters
+           - SSH multiplexing configuration (ControlMaster, ControlPath, ControlPersist)
         
         2. For an existing environment:
            - Skips creating duplicate environment config
@@ -232,6 +300,10 @@ Host cloudx-{cloudx_env}-{hostname}
             IdentityAgent ~/.1password/agent.sock  # If using 1Password
             IdentityFile ~/.ssh/vscode/key.pub    # .pub for 1Password, no .pub otherwise
             IdentitiesOnly yes                    # If using 1Password
+            TCPKeepAlive yes
+            ControlMaster auto
+            ControlPath ~/.ssh/control/%r@%h:%p
+            ControlPersist 4h
             ProxyCommand uvx cloudx-proxy connect %h %p --profile profile --aws-env env
         
         # Host entries (added for each instance)
@@ -258,8 +330,8 @@ Host cloudx-{cloudx_env}-{hostname}
                 if f"Host cloudx-{cloudx_env}-*" in current_config:
                     self.print_status(f"Found existing config for cloudx-{cloudx_env}-*", True, 2)
                     choice = self.prompt(
-                        "Would you like to (1) override the existing config or "
-                        "(2) add settings to the specific host entry?",
+                        "Would you like to \n  1: override the existing config\n "
+                        "  2: add settings to the specific host entry?\nSelect an option ",
                         "1"
                     )
                     if choice == "2":
@@ -294,6 +366,10 @@ Host cloudx-{cloudx_env}-{hostname}
             if self.ssh_key != "vscode":
                 proxy_command += f" --ssh-key {self.ssh_key}"
 
+            # Ensure control directory exists with proper permissions
+            if not self._ensure_control_dir():
+                return False
+            
             # Build base configuration
             base_config = f"""# cloudx-proxy SSH Configuration
 Host cloudx-{cloudx_env}-*
@@ -303,6 +379,18 @@ Host cloudx-{cloudx_env}-*
             base_config += f"""    IdentityFile {self.ssh_key_file}
     IdentitiesOnly yes
 
+"""
+            # Add SSH multiplexing configuration
+            control_path = "~/.ssh/control/%r@%h:%p"
+            if platform.system() == 'Windows':
+                # Use forward slashes for Windows as well, SSH client will handle conversion
+                control_path = "~/.ssh/control/%r@%h:%p"
+                
+            base_config += f"""    TCPKeepAlive yes
+    ControlMaster auto
+    ControlPath {control_path}
+    ControlPersist 4h
+
 """
             # Add ProxyCommand
             base_config += f"""    ProxyCommand {proxy_command}
@@ -315,6 +403,12 @@ Host cloudx-{cloudx_env}-*
             else:
                 self.ssh_config_file.write_text(base_config)
             self.print_status("Base configuration created", True, 2)
+            
+            # Set proper permissions on the config file
+            if platform.system() != 'Windows':
+                import stat
+                self.ssh_config_file.chmod(stat.S_IRUSR | stat.S_IWUSR)  # 600 permissions (owner read/write)
+                self.print_status("Set config file permissions to 600", True, 2)
 
             # Add specific host entry
             self.print_status(f"Adding host entry for cloudx-{cloudx_env}-{hostname}", None, 2)
@@ -327,6 +421,13 @@ Host cloudx-{cloudx_env}-{hostname}
             self.print_status("Host entry added", True, 2)
 
             # Ensure main SSH config includes our config
+            # Ensure ~/.ssh directory has proper permissions
+            ssh_parent_dir = Path(self.home_dir) / ".ssh"
+            if not ssh_parent_dir.exists():
+                ssh_parent_dir.mkdir(parents=True, exist_ok=True)
+                self.print_status(f"Created SSH directory: {ssh_parent_dir}", True, 2)
+            self._set_directory_permissions(ssh_parent_dir)
+            
             main_config = Path(self.home_dir) / ".ssh" / "config"
             include_line = f"Include {self.ssh_config_file}\n"
             
@@ -338,11 +439,23 @@ Host cloudx-{cloudx_env}-{hostname}
                     self.print_status("Added include line to main SSH config", True, 2)
                 else:
                     self.print_status("Main SSH config already includes our config", True, 2)
+                
+                # Set correct permissions on main config file
+                if platform.system() != 'Windows':
+                    import stat
+                    main_config.chmod(stat.S_IRUSR | stat.S_IWUSR)  # 600 permissions
+                    self.print_status("Set main config file permissions to 600", True, 2)
             else:
                 main_config.write_text(include_line)
                 self.print_status("Created main SSH config with include line", True, 2)
+                
+                # Set correct permissions on newly created main config file
+                if platform.system() != 'Windows':
+                    import stat
+                    main_config.chmod(stat.S_IRUSR | stat.S_IWUSR)  # 600 permissions
+                    self.print_status("Set main config file permissions to 600", True, 2)
 
-            self.print_status("\nSSH configuration summary:", None)
+            self.print_status("SSH configuration summary:", None)
             self.print_status(f"Main config: {main_config}", None, 2)
             self.print_status(f"cloudx-proxy config: {self.ssh_config_file}", None, 2)
             self.print_status(f"Connect using: ssh cloudx-{cloudx_env}-{hostname}", None, 2)

{cloudx_proxy-0.3.12.dist-info → cloudx_proxy-0.3.14.dist-info}/METADATA

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

@@ -0,0 +1,11 @@
+cloudx_proxy/__init__.py,sha256=ZZ2O_m9OFJm18AxMSuYJt4UjSuSqyJlYRaZMoets498,61
+cloudx_proxy/_version.py,sha256=dAYECGus8vEags4_X66QYJmiBFCY-yJJXDyexsFv72w,513
+cloudx_proxy/cli.py,sha256=7wi00p5CUl0Dt8huMEkP85SWgA_vzcoCzch0wctvqHk,3488
+cloudx_proxy/core.py,sha256=XQbVlPaqQQ352Ao_JJlN-PpqIdQtSBec0lNRB1s0JSk,7288
+cloudx_proxy/setup.py,sha256=Ing3UnTG_zeMZAcNI3SQbmTJzrY1UWUHUbu6UT14lao,24178
+cloudx_proxy-0.3.14.dist-info/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
+cloudx_proxy-0.3.14.dist-info/METADATA,sha256=qvR4_o1puGZ2WNjb0Y5GLW8Ff2aX_IH7k8YPZx9-ORM,14038
+cloudx_proxy-0.3.14.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+cloudx_proxy-0.3.14.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
+cloudx_proxy-0.3.14.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
+cloudx_proxy-0.3.14.dist-info/RECORD,,

{cloudx_proxy-0.3.12.dist-info → cloudx_proxy-0.3.14.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

cloudx_proxy-0.3.12.dist-info/RECORD

@@ -1,11 +0,0 @@
-cloudx_proxy/__init__.py,sha256=ZZ2O_m9OFJm18AxMSuYJt4UjSuSqyJlYRaZMoets498,61
-cloudx_proxy/_version.py,sha256=KKAn9DIKrkf9v6mAp59Mf9qI6ZEjCmBhMjuc_1u5SFI,413
-cloudx_proxy/cli.py,sha256=7wi00p5CUl0Dt8huMEkP85SWgA_vzcoCzch0wctvqHk,3488
-cloudx_proxy/core.py,sha256=XQbVlPaqQQ352Ao_JJlN-PpqIdQtSBec0lNRB1s0JSk,7288
-cloudx_proxy/setup.py,sha256=GNgZcUnnJG7q7npUl4QW_4mWfJT0gKZ_i1fwmxj3pmI,18672
-cloudx_proxy-0.3.12.dist-info/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
-cloudx_proxy-0.3.12.dist-info/METADATA,sha256=_RhoHyOJKYPCixp2of61kt5qaYRCebFaQB89L2hlZ00,14038
-cloudx_proxy-0.3.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-cloudx_proxy-0.3.12.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
-cloudx_proxy-0.3.12.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
-cloudx_proxy-0.3.12.dist-info/RECORD,,