illumio-pylo 0.3.5__tar.gz → 0.3.7__tar.gz

{illumio_pylo-0.3.5/illumio_pylo.egg-info → illumio_pylo-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: illumio_pylo
-Version: 0.3.5
+Version: 0.3.7
 Summary: A set of tools and library for working with Illumio PCE
 Home-page: https://github.com/cpainchaud/pylo
 Author: Christophe Painchaud

{illumio_pylo-0.3.5 → illumio_pylo-0.3.7}/illumio_pylo/API/APIConnector.py

@@ -649,6 +649,9 @@ class APIConnector:
         if filter_by_name is not None:
             data['name'] = filter_by_name
 
+        if representation is not None:
+            data['representation'] = representation
+
         if max_results is not None:
             data['max_results'] = max_results
 

{illumio_pylo-0.3.5 → illumio_pylo-0.3.7}/illumio_pylo/API/CredentialsManager.py

@@ -46,7 +46,6 @@ class CredentialProfile:
 
         self.raw_json: Optional[CredentialFileEntry] = None
 
-
     @staticmethod
     def from_credentials_file_entry(credential_file_entry: CredentialFileEntry, originating_file: Optional[str] = None):
         return CredentialProfile(credential_file_entry['name'],
@@ -303,3 +302,25 @@ def find_ssh_key_from_fingerprint(fingerprint: bytes) -> Optional[paramiko.Agent
         if key.get_fingerprint() == fingerprint:
             return key
     return None
+
+
+def get_supported_keys_from_ssh_agent() -> list[paramiko.AgentKey]:
+    keys = paramiko.Agent().get_keys()
+    # filter out ECDSA NISTPXXX and sk-ssh-ed25519
+    # RSA and ED25519 keys are reported to be working
+    return [key for key in keys if not (key.get_name().startswith("ecdsa-sha2-nistp") or
+                                        key.get_name().startswith("sk-ssh-ed25519"))]
+
+
+def is_encryption_available() -> bool:
+    if paramiko is None:
+        return False
+
+    # does paramiko have an agent module and does it have any supported key?
+    if hasattr(paramiko, 'Agent'):
+        keys = get_supported_keys_from_ssh_agent()
+        return len(keys) > 0
+
+    return False
+
+

{illumio_pylo-0.3.5 → illumio_pylo-0.3.7}/illumio_pylo/Helpers/exports.py

@@ -436,7 +436,7 @@ class CsvExcelToObject:
                     for col_index in range(1, source_worksheet.max_column+1):
                         item = source_worksheet.cell(row_count, col_index).value
                         if item is None or len(item) < 1:
-                            raise pylo.PyloEx('Excel headers has blank fields, this is not supported')
+                            raise pylo.PyloEx('Excel headers has blank field at column #{}'.format(col_index))
                         self._detected_headers.append(item.lower())
                         if strict_headers and item.lower() not in mandatory_headers_dict:
                             raise pylo.PyloEx("CSV/Excel headers have an unexpected header named '{}'".format(item))

{illumio_pylo-0.3.5 → illumio_pylo-0.3.7}/illumio_pylo/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.5"
+__version__ = "0.3.7"
 
 from typing import Callable
 

{illumio_pylo-0.3.5 → illumio_pylo-0.3.7}/illumio_pylo/cli/__init__.py

@@ -151,7 +151,7 @@ def run(forced_command_name: Optional[str] = None):
     print("**** END OF {} UTILITY ****".format(selected_command.name.upper()))
     print("Command Specific Execution time: {:.2f} seconds".format(time.perf_counter() - command_execution_time_start))
     print("CLI started at {} and finished at {}".format(cli_start_time, cli_end_time))
-    print("CLI Total Execution time: {}".format(cli_end_time - cli_start_time))
+    print("CLI Total Execution time: {}".format((cli_end_time - cli_start_time)))
     print()
 
 

{illumio_pylo-0.3.5 → illumio_pylo-0.3.7}/illumio_pylo/cli/commands/credential_manager.py

@@ -9,9 +9,9 @@ import paramiko
 import illumio_pylo as pylo
 import click
 from illumio_pylo.API.CredentialsManager import get_all_credentials, create_credential_in_file, CredentialFileEntry, \
-    create_credential_in_default_file,  \
+    create_credential_in_default_file, \
     get_credentials_from_file, encrypt_api_key_with_paramiko_ssh_key_chacha20poly1305, \
-    decrypt_api_key_with_paramiko_ssh_key_chacha20poly1305, decrypt_api_key_with_paramiko_ssh_key_fernet
+    decrypt_api_key_with_paramiko_ssh_key_chacha20poly1305, get_supported_keys_from_ssh_agent, is_encryption_available
 
 from illumio_pylo import log
 from . import Command
@@ -117,32 +117,33 @@ def __main(args, **kwargs):
             "api_key": api_key
         }
 
-        encrypt_api_key = click.prompt('> Encrypt API (requires an SSH agent running and an RSA or Ed25519 key) ? Y/N', type=bool)
-        if encrypt_api_key:
-            print("Available keys (ECDSA NISTPXXX keys and a few others are not supported and will be filtered out):")
-            ssh_keys = paramiko.Agent().get_keys()
-            # filter out ECDSA NISTPXXX and sk-ssh-ed25519@openssh.com
-            ssh_keys = get_supported_keys_from_ssh_agent()
-
-            # display a table of keys
-            print_keys(keys=ssh_keys, display_index=True)
-            print()
-
-            index_of_selected_key = click.prompt('> Select key by ID#', type=click.IntRange(0, len(ssh_keys)-1))
-            selected_ssh_key = ssh_keys[index_of_selected_key]
-            print("Selected key: {} | {} | {}".format(selected_ssh_key.get_name(),
-                                                      selected_ssh_key.get_fingerprint().hex(),
-                                                      selected_ssh_key.comment))
-            print(" * encrypting API key with selected key (you may be prompted by your SSH agent for confirmation or PIN code) ...", flush=True, end="")
-            # encrypted_api_key = encrypt_api_key_with_paramiko_ssh_key_fernet(ssh_key=selected_ssh_key, api_key=api_key)
-            encrypted_api_key = encrypt_api_key_with_paramiko_ssh_key_chacha20poly1305(ssh_key=selected_ssh_key, api_key=api_key)
-            print("OK!")
-            print(" * trying to decrypt the encrypted API key...", flush=True, end="")
-            decrypted_api_key = decrypt_api_key_with_paramiko_ssh_key_chacha20poly1305(encrypted_api_key_payload=encrypted_api_key)
-            if decrypted_api_key != api_key:
-                raise pylo.PyloEx("Decrypted API key does not match original API key")
-            print("OK!")
-            credentials_data["api_key"] = encrypted_api_key
+        if is_encryption_available():
+            encrypt_api_key = click.prompt('> Encrypt API (requires an SSH agent running and an RSA or Ed25519 key added to them) ? Y/N', type=bool)
+            if encrypt_api_key:
+                print("Available keys (ECDSA NISTPXXX keys and a few others are not supported and will be filtered out):")
+                ssh_keys = get_supported_keys_from_ssh_agent()
+
+                # display a table of keys
+                print_keys(keys=ssh_keys, display_index=True)
+                print()
+
+                index_of_selected_key = click.prompt('> Select key by ID#', type=click.IntRange(0, len(ssh_keys)-1))
+                selected_ssh_key = ssh_keys[index_of_selected_key]
+                print("Selected key: {} | {} | {}".format(selected_ssh_key.get_name(),
+                                                          selected_ssh_key.get_fingerprint().hex(),
+                                                          selected_ssh_key.comment))
+                print(" * encrypting API key with selected key (you may be prompted by your SSH agent for confirmation or PIN code) ...", flush=True, end="")
+                # encrypted_api_key = encrypt_api_key_with_paramiko_ssh_key_fernet(ssh_key=selected_ssh_key, api_key=api_key)
+                encrypted_api_key = encrypt_api_key_with_paramiko_ssh_key_chacha20poly1305(ssh_key=selected_ssh_key, api_key=api_key)
+                print("OK!")
+                print(" * trying to decrypt the encrypted API key...", flush=True, end="")
+                decrypted_api_key = decrypt_api_key_with_paramiko_ssh_key_chacha20poly1305(encrypted_api_key_payload=encrypted_api_key)
+                if decrypted_api_key != api_key:
+                    raise pylo.PyloEx("Decrypted API key does not match original API key")
+                print("OK!")
+                credentials_data["api_key"] = encrypted_api_key
+        else:
+            print(" * encryption is not available (no SSH agent or compatible key found), storing API key in plain text...")
 
 
         cwd = os.getcwd()
@@ -187,15 +188,9 @@ def __main(args, **kwargs):
     else:
         raise pylo.PyloEx("Unknown sub-command '{}'".format(args['sub_command']))
 
-command_object = Command(command_name, __main, fill_parser, credentials_manager_mode=True)
 
+command_object = Command(command_name, __main, fill_parser, credentials_manager_mode=True)
 
-def get_supported_keys_from_ssh_agent() -> list[paramiko.AgentKey]:
-    keys = paramiko.Agent().get_keys()
-    # filter out ECDSA NISTPXXX and sk-ssh-ed25519
-    # RSA and ED25519 keys are reported to be working
-    return [key for key in keys if not (key.get_name().startswith("ecdsa-sha2-nistp") or
-                                        key.get_name().startswith("sk-ssh-ed25519"))]
 
 def print_keys(keys: list[paramiko.AgentKey], display_index = True) -> None:
 

{illumio_pylo-0.3.5 → illumio_pylo-0.3.7}/illumio_pylo/cli/commands/ruleset_export.py

@@ -25,7 +25,6 @@ def fill_parser(parser: argparse.ArgumentParser):
                         "Public_NATed")
 
 
-
 def __main(args: Dict, org: pylo.Organization, **kwargs):
 
     setting_prefix_objects_with_type: bool|str = args['prefix_objects_with_type']
@@ -33,13 +32,11 @@ def __main(args: Dict, org: pylo.Organization, **kwargs):
     settings_output_file_format = args['format']
     settings_output_dir = args['output_dir']
 
-
     if setting_prefix_objects_with_type is False:
         print(" * Prefix for object types are disabled")
     else:
         print(" * Prefix for object types are enabled")
 
-
     if setting_object_types_as_section is False:
         print(" * Object types as section are disabled")
     else:

{illumio_pylo-0.3.5 → illumio_pylo-0.3.7}/illumio_pylo/cli/commands/ven_duplicate_remover.py

@@ -288,6 +288,7 @@ def __main(args, org: pylo.Organization, pce_cache_was_used: bool, **kwargs):
 # make this command available to the CLI system
 command_object = Command(command_name, __main, fill_parser, objects_load_filter)
 
+
 class DuplicateRecordManager:
     class DuplicatedRecord:
         def __init__(self, pce_offline_timer_override: Optional[int] = None):

{illumio_pylo-0.3.5 → illumio_pylo-0.3.7}/illumio_pylo/cli/commands/workload_import.py

@@ -283,8 +283,8 @@ def detect_workloads_name_collisions(csv_data, org: pylo.Organization, ignore_al
         if csv_object['hostname'] is not None and len(csv_object['hostname']) > 0:
             lower_hostname = csv_object['hostname'].lower()
             if lower_name != lower_hostname:
-                if csv_object['hostname'] not in name_cache:
-                    name_cache[csv_object['hostname']] = WorkloadCollisionItem(from_pce=False, csv_object=csv_object,
+                if lower_hostname not in name_cache:
+                    name_cache[lower_hostname] = WorkloadCollisionItem(from_pce=False, csv_object=csv_object,
                                                                                managed=False)
                 else:
                     if not name_cache[lower_hostname].from_pce:

{illumio_pylo-0.3.5 → illumio_pylo-0.3.7}/illumio_pylo/cli/commands/workload_update.py

@@ -128,6 +128,7 @@ def __main(args, org: pylo.Organization, **kwargs):
 
     print('OK')
     print("   - CSV has {} columns and {} lines (headers don't count)".format(csv_input_object.count_columns(), csv_input_object.count_lines()))
+    context.csv_data = csv_input_object.objects()
     # </editor-fold desc="CSV input file data extraction">
 
 
@@ -307,7 +308,7 @@ def check_and_sanitize_csv_input_data(context, input_match_on_hostname, input_ma
     if input_match_on_hostname:
         for csv_data in context.csv_data:
             name = csv_data['hostname']
-            name = pylo.Workload.static_name_stripped_fqdn(name)
+            name = pylo.Workload.static_name_stripped_fqdn(name).lower()
             if name is None or len(name) < 1:
                 print("   - ERROR: CSV line #{} has invalid hostname defined: '{}'".format(csv_data['*line*'],
                                                                                            csv_data['hostname']),
@@ -332,7 +333,7 @@ def check_and_sanitize_csv_input_data(context, input_match_on_hostname, input_ma
                 continue
 
             if href not in context.csv_href_index:
-                context.csv_name_index[href] = csv_data
+                context.csv_href_index[href] = csv_data
                 continue
 
             print("   - ERROR: CSV line #{} has duplicate href defined from a previous line: '{}'".format(
@@ -343,6 +344,7 @@ def check_and_sanitize_csv_input_data(context, input_match_on_hostname, input_ma
             "ERROR! Several ({}) inconsistencies were found in the CSV, please fix them before you continue!".format(
                 csv_check_failed_count))
         sys.exit(1)
+
     print("   * Done")
 
 

{illumio_pylo-0.3.5 → illumio_pylo-0.3.7/illumio_pylo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: illumio_pylo
-Version: 0.3.5
+Version: 0.3.7
 Summary: A set of tools and library for working with Illumio PCE
 Home-page: https://github.com/cpainchaud/pylo
 Author: Christophe Painchaud