devstack-cli 11.0.86__py3-none-any.whl → 11.0.88__py3-none-any.whl

cli.py

@@ -57,6 +57,30 @@ logger.addHandler(rich.logging.RichHandler())
 json_logger = logging.getLogger('cli-json')
 json_logger.addHandler(rich.logging.RichHandler(highlighter=rich.highlighter.JSONHighlighter()))
 
+def is_valid_username(username: str) -> bool:
+    return re.match(r'^[a-zA-Z0-9]+[a-zA-Z0-9_.-]*$', username) is not None
+
+def is_valid_hostname(hostname: str) -> bool:
+    return re.match(r'^([a-zA-Z0-9][a-zA-Z0-9-]*\.)*([a-zA-Z0-9][a-zA-Z0-9-]*)$', hostname) is not None
+
+def is_valid_path(path: str) -> bool:
+    return re.match(r'^[a-zA-Z0-9/_.,\-+ ]+$', path) is not None
+
+def ensure_valid_username(username: str) -> str:
+    if not is_valid_username(username):
+        raise ValueError(f'Invalid username: "{username}". Username must start with an alphanumeric character, and contain only alphanumeric characters, dots, underscores and hyphens.')
+    return username
+
+def ensure_valid_hostname(hostname: str) -> str:
+    if not is_valid_hostname(hostname):
+        raise ValueError(f'Invalid hostname: "{hostname}". Hostname must start with an alphanumeric character, and contain only alphanumeric characters, dots, and hyphens.')
+    return hostname
+
+def ensure_valid_path(path: str) -> str:
+    if not is_valid_path(path):
+        raise ValueError(f'Invalid path: "{path}". Path must start with an alphanumeric character, and contain only alphanumeric characters, slashes, dots, underscores, commas, pluses, hyphens, and spaces.')
+    return path
+
 class SubprocessError(Exception):
     """A subprocess call returned with non-zero."""
 
@@ -1223,12 +1247,8 @@ class Cli:
         self.port_forwarding_task = None
 
     async def _bg_port_forwarding(self: 'Cli') -> None:
-        remote_username = self.cde_type['value']['remote-username']
-        if re.match(r'[^a-zA-Z0-9]', remote_username):
-            raise Exception(f'Invalid remote username: "{remote_username}". Only alphanumeric characters are allowed.')
-        hostname = self.hostname
-        if re.match(r'[^a-zA-Z0-9]', hostname):
-            raise Exception(f'Invalid hostname: "{hostname}". Only alphanumeric characters are allowed.')
+        remote_username = ensure_valid_username(self.cde_type['value']['remote-username'])
+        hostname = ensure_valid_hostname(self.hostname)
         service_ports = self.cde_type['value'].get('service-ports')
         if service_ports is None:
             service_ports = [
@@ -1247,9 +1267,9 @@ class Cli:
         ]
         for port in service_ports:
             if port[0] < 1 or port[0] > 65535:
-                raise Exception(f'Invalid port: "{port[0]}". Only numbers between 1 and 65535 are allowed.')
+                raise ValueError(f'Invalid port: "{port[0]}". Only numbers between 1 and 65535 are allowed.')
             if port[1] < 1 or port[1] > 65535:
-                raise Exception(f'Invalid port: "{port[1]}". Only numbers between 1 and 65535 are allowed.')
+                raise ValueError(f'Invalid port: "{port[1]}". Only numbers between 1 and 65535 are allowed.')
         while True:
             logger.info('Starting port forwarding of %s', ', '.join(str(port[0]) for port in service_ports))
             try:
@@ -1439,15 +1459,9 @@ class Cli:
         return await self._process_remote_item_copy_file(file_info.filename)
 
     async def _process_remote_item_copy_dir(self: 'Cli', filename: str) -> str:
-        remote_username = self.cde_type['value']['remote-username']
-        if re.match(r'[^a-zA-Z0-9]', remote_username):
-            raise Exception(f'Invalid remote username: "{remote_username}". Only alphanumeric characters are allowed.')
-        hostname = self.hostname
-        if re.match(r'[^a-zA-Z0-9]', hostname):
-            raise Exception(f'Invalid hostname: "{hostname}". Only alphanumeric characters are allowed.')
-        remote_source_directory = self.cde_type['value']['remote-source-directory']
-        if re.match(r'[^a-zA-Z0-9/_.-]', remote_source_directory):
-            raise Exception(f'Invalid remote source directory: "{remote_source_directory}". Only alphanumeric characters, slashes, underscores, dots and hyphens are allowed.')
+        remote_username = ensure_valid_username(self.cde_type['value']['remote-username'])
+        hostname = ensure_valid_hostname(self.hostname)
+        remote_source_directory = ensure_valid_path(self.cde_type['value']['remote-source-directory'])
         await run_subprocess(
             'rsync',
             [
@@ -1462,9 +1476,7 @@ class Cli:
         return f'Copied directory "{filename}"'
 
     async def _process_remote_item_copy_file(self: 'Cli', filename: str) -> str:
-        remote_source_directory = self.cde_type['value']['remote-source-directory']
-        if re.match(r'[^a-zA-Z0-9/_.-]', remote_source_directory):
-            raise Exception(f'Invalid remote source directory: "{remote_source_directory}". Only alphanumeric characters, slashes, underscores, dots and hyphens are allowed.')
+        remote_source_directory = ensure_valid_path(self.cde_type['value']['remote-source-directory'])
         await self.loop.run_in_executor(
             executor=None,
             func=functools.partial(
@@ -1476,15 +1488,9 @@ class Cli:
         return f'Copied file "{filename}"'
 
     async def _process_remote_item_clone(self: 'Cli', filename: str) -> str:
-        remote_username = self.cde_type['value']['remote-username']
-        if re.match(r'[^a-zA-Z0-9]', remote_username):
-            raise Exception(f'Invalid remote username: "{remote_username}". Only alphanumeric characters are allowed.')
-        hostname = self.hostname
-        if re.match(r'[^a-zA-Z0-9]', hostname):
-            raise Exception(f'Invalid hostname: "{hostname}". Only alphanumeric characters are allowed.')
-        remote_source_directory = self.cde_type['value']['remote-source-directory']
-        if re.match(r'[^a-zA-Z0-9/_.-]', remote_source_directory):
-            raise Exception(f'Invalid remote source directory: "{remote_source_directory}". Only alphanumeric characters, slashes, underscores, dots and hyphens are allowed.')
+        remote_username = ensure_valid_username(self.cde_type['value']['remote-username'])
+        hostname = ensure_valid_hostname(self.hostname)
+        remote_source_directory = ensure_valid_path(self.cde_type['value']['remote-source-directory'])
         await run_subprocess(
             'git',
             [
@@ -1530,15 +1536,9 @@ class Cli:
         return f'Cloned repository "{filename}"'
 
     async def _background_sync(self: 'Cli') -> None:
-        remote_username = self.cde_type['value']['remote-username']
-        if re.match(r'[^a-zA-Z0-9]', remote_username):
-            raise Exception(f'Invalid remote username: "{remote_username}". Only alphanumeric characters are allowed.')
-        hostname = self.hostname
-        if re.match(r'[^a-zA-Z0-9]', hostname):
-            raise Exception(f'Invalid hostname: "{hostname}". Only alphanumeric characters are allowed.')
-        remote_source_directory = self.cde_type['value']['remote-source-directory']
-        if re.match(r'[^a-zA-Z0-9/_.-]', remote_source_directory):
-            raise Exception(f'Invalid remote source directory: "{remote_source_directory}". Only alphanumeric characters, slashes, underscores, dots and hyphens are allowed.')
+        remote_username = ensure_valid_username(self.cde_type['value']['remote-username'])
+        hostname = ensure_valid_hostname(self.hostname)
+        remote_source_directory = ensure_valid_path(self.cde_type['value']['remote-source-directory'])
         logger.debug('Starting background sync')
         self.local_source_directory.mkdir(parents=True, exist_ok=True)
         with contextlib.suppress(OSError):
@@ -1606,19 +1606,10 @@ class Cli:
             logger.info('Background sync done')
 
     async def _reverse_background_sync(self: 'Cli') -> None:
-        remote_username = self.cde_type['value']['remote-username']
-        if re.match(r'[^a-zA-Z0-9]', remote_username):
-            raise Exception(f'Invalid remote username: "{remote_username}". Only alphanumeric characters are allowed.')
-        hostname = self.hostname
-        if re.match(r'[^a-zA-Z0-9]', hostname):
-            raise Exception(f'Invalid hostname: "{hostname}". Only alphanumeric characters are allowed.')
-        remote_source_directory = self.cde_type['value']['remote-source-directory']
-        if re.match(r'[^a-zA-Z0-9/_.-]', remote_source_directory):
-            raise Exception(f'Invalid remote source directory: "{remote_source_directory}". Only alphanumeric characters, slashes, underscores, dots and hyphens are allowed.')
+        remote_username = ensure_valid_username(self.cde_type['value']['remote-username'])
+        hostname = ensure_valid_hostname(self.hostname)
+        remote_output_directory = ensure_valid_path(self.cde_type['value']['remote-output-directory'])
         logger.debug('Starting reverse background sync')
-        remote_output_directory = self.cde_type['value']['remote-output-directory']
-        if re.match(r'[^a-zA-Z0-9/_.-]', remote_output_directory):
-            raise Exception(f'Invalid remote output directory: "{remote_output_directory}". Only alphanumeric characters, slashes, underscores, dots and hyphens are allowed.')
         with contextlib.suppress(OSError):
             self.sftp_client.mkdir(remote_output_directory)
         self.local_output_directory.mkdir(parents=True, exist_ok=True)

{devstack_cli-11.0.86.dist-info → devstack_cli-11.0.88.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: devstack-cli
-Version: 11.0.86
+Version: 11.0.88
 Summary: Command-line access to Cloud Development Environments (CDEs) created by Cloudomation DevStack
 Author-email: Stefan Mückstein <stefan@cloudomation.com>
 Project-URL: Homepage, https://cloudomation.com/

devstack_cli-11.0.88.dist-info/RECORD

@@ -0,0 +1,9 @@
+__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cli.py,sha256=-KSbyW0gGMp18u3EkQ2J6H4tiVyyW__0zUDSiC1J75o,81433
+version.py,sha256=qza2HnAKjrjiL9HnU7qLhuqYTAtgntUo6i3QbWeRuDU,180
+devstack_cli-11.0.88.dist-info/LICENSE,sha256=OBXZbEUMtIHIzyISkJ9fJlf_imds3rcKqeQu9yiyUJI,1055
+devstack_cli-11.0.88.dist-info/METADATA,sha256=temVYDs588G-T9yMi7_P4q3tMObOMATNstdm6reeeFw,4287
+devstack_cli-11.0.88.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+devstack_cli-11.0.88.dist-info/entry_points.txt,sha256=f0xb4DIk0a7E5kyZ7YpoLhtjoagQj5VQpeBbW9a8A9Y,42
+devstack_cli-11.0.88.dist-info/top_level.txt,sha256=lP8zvU46Am_G0MPcNmCI6f0sMfwpDUWpTROaPs-IEPk,21
+devstack_cli-11.0.88.dist-info/RECORD,,

version.py

@@ -4,6 +4,6 @@ constants, set by build
 
 MAJOR = '11'
 BRANCH_NAME = 'release-11'
-BUILD_DATE = '2025-02-11-041730'
-SHORT_SHA = 'f9e1188'
-VERSION = '11+release-11.2025-02-11-041730.f9e1188'
+BUILD_DATE = '2025-02-14-040012'
+SHORT_SHA = '0dab1e2'
+VERSION = '11+release-11.2025-02-14-040012.0dab1e2'

devstack_cli-11.0.86.dist-info/RECORD

@@ -1,9 +0,0 @@
-__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cli.py,sha256=MB5BGbhMwEs1icEsDpheBQDrNk1ck9QeDV2vTzYU82s,83037
-version.py,sha256=sJpyKrc9U7z_DqGEbXgd2Wk7mEkpNR377tdh5lUi-hc,180
-devstack_cli-11.0.86.dist-info/LICENSE,sha256=OBXZbEUMtIHIzyISkJ9fJlf_imds3rcKqeQu9yiyUJI,1055
-devstack_cli-11.0.86.dist-info/METADATA,sha256=ms4yDvaRUZ9etdQhZfQ4bfF1H4fGoMRBQrwmfaCCUEw,4287
-devstack_cli-11.0.86.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-devstack_cli-11.0.86.dist-info/entry_points.txt,sha256=f0xb4DIk0a7E5kyZ7YpoLhtjoagQj5VQpeBbW9a8A9Y,42
-devstack_cli-11.0.86.dist-info/top_level.txt,sha256=lP8zvU46Am_G0MPcNmCI6f0sMfwpDUWpTROaPs-IEPk,21
-devstack_cli-11.0.86.dist-info/RECORD,,