python4cpm 1.1.4__tar.gz → 1.1.5__tar.gz

{python4cpm-1.1.4/src/python4cpm.egg-info → python4cpm-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python4cpm
-Version: 1.1.4
+Version: 1.1.5
 Summary: Python for CPM
 Author-email: Gonzalo Atienza Rela <gonatienza@gmail.com>
 License-Expression: MIT
@@ -71,8 +71,6 @@ class CredManager(Python4CPMHandler):
     """
     Properties:
         target_account (TargetAccount): Account being managed.
-            .policy_id (str): Platform name.
-            .object_name (str): Account name.
             .username (str): Account username.
             .address (str): Target address.
             .port (str): Target port.
@@ -145,7 +143,7 @@ When doing `verify`, `change` or `reconcile` from Privilege Cloud/PVWA:
 6. If a reconcile account is not linked, `reconcile_account` will return `None`.
 7. Always use the `close_success` or `close_fail` methods to signal the proper termination for all actions.
     - If any action is not terminated with a termination method, CPM/SRS will see this as a `close_fail(unrecoverable=True)`, even if no exceptions are raised.
-8. The python `Logger` places its logs in the `Logs/ThirdParty` directory.  The filename will be based on `target_account.policy_id` and `target_account.object_name`.
+8. The python `Logger` places its logs in the `Logs/ThirdParty` directory.
 
 
 ### Installing dependencies in python venv
@@ -159,22 +157,23 @@ As with any python venv, you can install dependencies in your venv.
 
 ## Dev Helper:
 
-For dev purposes, `NETHelper` is a companion helper to test your scripts without CPM/SRS.  It simplifies the instantiation of the `Python4CPM` or `Python4CPMHandler` objects by simulating how the plugin creates the environment context for the python module.
+For dev purposes, `DevHelper` is a companion helper to test your scripts without CPM/SRS.  It simplifies the instantiation of the `Python4CPM` or `Python4CPMHandler` objects by simulating how the plugin creates the environment context for the python module.
 
-**Note**: As CPM and the SRS management agent run in Windows, the plugin was built to encrypt secrets using DPAPI (a windows only library).  For dev purposes in Linux/Mac dev workstations, those secrets put in the environment context by `NETHelper` will be in plaintext.  In windows dev workstations, `NETHelper` encrypts the secrets as the .NET plugin does.  This is informational only, **the module will use its encryption/decryption capabilities automatically based on the platform** it is running on and you do not have to do anything specific to enable it.
+**Note**: As CPM and the SRS management agent run in Windows, the plugin was built to encrypt secrets using DPAPI (a windows only library).  For dev purposes in Linux/Mac dev workstations, those secrets put in the environment context by `DevHelper` will be in plaintext.  In windows dev workstations, `DevHelper` encrypts the secrets as the .NET plugin does.  This is informational only, **the module will use its encryption/decryption capabilities automatically based on the platform** it is running on and you do not have to do anything specific to enable it.
 
 ### Example:
 
 #### Set your arguments and secrets:
 
 ```python
-from python4cpm import NETHelper, Python4CPM, Python4CPMHandler
+from python4cpm import DevHelper, Python4CPM, Python4CPMHandler
 
-NETHelper.set(
+DevHelper.set(
     action=Python4CPM.ACTION_CHANGE, # use actions from Python4CPM.ACTION_*
     logging_level="debug",
-    target_policy_id="NETHelper",
-    target_object_name="Objectname",
+    target_policy_id="DevHelper", # name of platform
+    target_safe_name="Safename", # name of safe
+    target_object_name="Objectname", # name of account
     target_username="jdoe",
     target_address="myapp.corp.local",
     target_port="8443",
@@ -212,5 +211,5 @@ CredManager().run()
 
 #### Remember for your final script:
 
-- Remove the import of `NETHelper`.
-- Remove the `NETHelper.set()` call.
+- Remove the import of `DevHelper`.
+- Remove the `DevHelper.set()` call.

{python4cpm-1.1.4 → python4cpm-1.1.5}/README.md

@@ -60,8 +60,6 @@ class CredManager(Python4CPMHandler):
     """
     Properties:
         target_account (TargetAccount): Account being managed.
-            .policy_id (str): Platform name.
-            .object_name (str): Account name.
             .username (str): Account username.
             .address (str): Target address.
             .port (str): Target port.
@@ -134,7 +132,7 @@ When doing `verify`, `change` or `reconcile` from Privilege Cloud/PVWA:
 6. If a reconcile account is not linked, `reconcile_account` will return `None`.
 7. Always use the `close_success` or `close_fail` methods to signal the proper termination for all actions.
     - If any action is not terminated with a termination method, CPM/SRS will see this as a `close_fail(unrecoverable=True)`, even if no exceptions are raised.
-8. The python `Logger` places its logs in the `Logs/ThirdParty` directory.  The filename will be based on `target_account.policy_id` and `target_account.object_name`.
+8. The python `Logger` places its logs in the `Logs/ThirdParty` directory.
 
 
 ### Installing dependencies in python venv
@@ -148,22 +146,23 @@ As with any python venv, you can install dependencies in your venv.
 
 ## Dev Helper:
 
-For dev purposes, `NETHelper` is a companion helper to test your scripts without CPM/SRS.  It simplifies the instantiation of the `Python4CPM` or `Python4CPMHandler` objects by simulating how the plugin creates the environment context for the python module.
+For dev purposes, `DevHelper` is a companion helper to test your scripts without CPM/SRS.  It simplifies the instantiation of the `Python4CPM` or `Python4CPMHandler` objects by simulating how the plugin creates the environment context for the python module.
 
-**Note**: As CPM and the SRS management agent run in Windows, the plugin was built to encrypt secrets using DPAPI (a windows only library).  For dev purposes in Linux/Mac dev workstations, those secrets put in the environment context by `NETHelper` will be in plaintext.  In windows dev workstations, `NETHelper` encrypts the secrets as the .NET plugin does.  This is informational only, **the module will use its encryption/decryption capabilities automatically based on the platform** it is running on and you do not have to do anything specific to enable it.
+**Note**: As CPM and the SRS management agent run in Windows, the plugin was built to encrypt secrets using DPAPI (a windows only library).  For dev purposes in Linux/Mac dev workstations, those secrets put in the environment context by `DevHelper` will be in plaintext.  In windows dev workstations, `DevHelper` encrypts the secrets as the .NET plugin does.  This is informational only, **the module will use its encryption/decryption capabilities automatically based on the platform** it is running on and you do not have to do anything specific to enable it.
 
 ### Example:
 
 #### Set your arguments and secrets:
 
 ```python
-from python4cpm import NETHelper, Python4CPM, Python4CPMHandler
+from python4cpm import DevHelper, Python4CPM, Python4CPMHandler
 
-NETHelper.set(
+DevHelper.set(
     action=Python4CPM.ACTION_CHANGE, # use actions from Python4CPM.ACTION_*
     logging_level="debug",
-    target_policy_id="NETHelper",
-    target_object_name="Objectname",
+    target_policy_id="DevHelper", # name of platform
+    target_safe_name="Safename", # name of safe
+    target_object_name="Objectname", # name of account
     target_username="jdoe",
     target_address="myapp.corp.local",
     target_port="8443",
@@ -201,5 +200,5 @@ CredManager().run()
 
 #### Remember for your final script:
 
-- Remove the import of `NETHelper`.
-- Remove the `NETHelper.set()` call.
+- Remove the import of `DevHelper`.
+- Remove the `DevHelper.set()` call.

{python4cpm-1.1.4 → python4cpm-1.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python4cpm"
-version = "1.1.4"
+version = "1.1.5"
 description = "Python for CPM"
 authors = [
   { name = "Gonzalo Atienza Rela", email = "gonatienza@gmail.com" }

{python4cpm-1.1.4 → python4cpm-1.1.5}/src/python4cpm/__init__.py

@@ -1,6 +1,6 @@
 from python4cpm.python4cpm import Python4CPM
 from python4cpm.python4cpmhandler import Python4CPMHandler
-from python4cpm.nethelper import NETHelper
+from python4cpm.devhelper import DevHelper
 from importlib.metadata import version as __version
 
 __version__ = __version(__name__)
@@ -8,5 +8,5 @@ __version__ = __version(__name__)
 __all__ = [
     Python4CPM,
     Python4CPMHandler,
-    NETHelper
+    DevHelper
 ]

{python4cpm-1.1.4 → python4cpm-1.1.5}/src/python4cpm/accounts.py

@@ -33,6 +33,7 @@ class TargetAccount(BaseAccount):
     OBJ_PREFIX = "target_"
     PROPS = Props(
         "policy_id",
+        "safe_name",
         "object_name",
         "username",
         "password",
@@ -44,6 +45,7 @@ class TargetAccount(BaseAccount):
     def __init__(
         self,
         policy_id: str | None,
+        safe_name: str | None,
         object_name: str | None,
         username: str | None,
         password: str | None,
@@ -56,6 +58,7 @@ class TargetAccount(BaseAccount):
             password
         )
         self._policy_id = policy_id
+        self._safe_name = safe_name
         self._object_name = object_name
         self._address = address
         self._port = port
@@ -65,6 +68,10 @@ class TargetAccount(BaseAccount):
     def policy_id(self) -> str | None:
         return self._policy_id
 
+    @property
+    def safe_name(self) -> str | None:
+        return self._safe_name
+
     @property
     def object_name(self) -> str | None:
         return self._object_name

python4cpm-1.1.4/src/python4cpm/nethelper.py → python4cpm-1.1.5/src/python4cpm/devhelper.py

@@ -1,17 +1,17 @@
-from python4cpm.python4cpm import Python4CPM
 from python4cpm.args import Args
 from python4cpm.accounts import TargetAccount, LogonAccount, ReconcileAccount
 from python4cpm.crypto import Crypto
 import os
 
 
-class NETHelper:
+class DevHelper:
     @classmethod
     def set(
         cls,
         action: str | None = None,
         logging_level: str | None = None,
         target_policy_id: str | None = None,
+        target_safe_name: str | None = None,
         target_object_name: str | None = None,
         target_username: str | None = None,
         target_address: str | None = None,
@@ -32,6 +32,7 @@ class NETHelper:
             Args.get_key(Args.PROPS.action),
             Args.get_key(Args.PROPS.logging_level),
             TargetAccount.get_key(TargetAccount.PROPS.policy_id),
+            TargetAccount.get_key(TargetAccount.PROPS.safe_name),
             TargetAccount.get_key(TargetAccount.PROPS.object_name),
             TargetAccount.get_key(TargetAccount.PROPS.username),
             TargetAccount.get_key(TargetAccount.PROPS.address),
@@ -47,6 +48,7 @@ class NETHelper:
             action,
             logging_level,
             target_policy_id,
+            target_safe_name,
             target_object_name,
             target_username,
             target_address,
@@ -61,7 +63,3 @@ class NETHelper:
         for i, key in enumerate(keys):
             if values[i] is not None:
                 os.environ.update({key: values[i]})
-
-    @classmethod
-    def get(cls) -> Python4CPM:
-        return Python4CPM()

{python4cpm-1.1.4 → python4cpm-1.1.5}/src/python4cpm/logger.py

@@ -23,11 +23,11 @@ class Logger:
         os.makedirs(cls._LOGS_DIR, exist_ok=True)
         uid = os.urandom(4).hex()
         logger = logging.getLogger(uid)
-        _logging_level = logging_level.lower()
+        _logging_level = (logging_level or cls._DEFAULT_LEVEL).lower()
         if _logging_level not in cls._LOGGING_LEVELS:
             _logging_level = cls._DEFAULT_LEVEL
         logger.setLevel(cls._LOGGING_LEVELS[_logging_level])
-        file_name = f"{__name__}_{_logging_level}_{name}.log"
+        file_name = f"{__name__}_{_logging_level}_{name}_{uid}.log"
         logs_file = os.path.join(cls._LOGS_DIR, file_name)
         handler = RotatingFileHandler(
             filename=logs_file,
@@ -35,7 +35,7 @@ class Logger:
             backupCount=1
         )
         fmt = (
-            "%(asctime)s.%(msecs)03d | %(levelname)s | %(name)s | "
+            "%(asctime)s.%(msecs)03d | %(levelname)s | "
             "%(module)s | %(funcName)s | %(message)s"
         )
         datefmt = "%Y-%m-%d %H:%M:%S"

{python4cpm-1.1.4 → python4cpm-1.1.5}/src/python4cpm/python4cpm.py

@@ -29,10 +29,7 @@ class Python4CPM:
         self._target_account = TargetAccount.get()
         self._logon_account = LogonAccount.get()
         self._reconcile_account = ReconcileAccount.get()
-        self._logger = Logger.get_logger(
-            f"{self._target_account.policy_id}-{self._target_account.object_name}",
-            self._args.logging_level
-        )
+        self._logger = self._get_logger()
         self._logger.debug("Initiating...")
         self._log_obj(self._args)
         self._verify_action()
@@ -62,6 +59,15 @@ class Python4CPM:
     def reconcile_account(self) -> ReconcileAccount:
         return self._reconcile_account
 
+    def _get_logger(self) -> logging.Logger:
+        name_parts = (
+            self._target_account.policy_id,
+            self._target_account.safe_name,
+            self._target_account.object_name
+        )
+        name = "-".join(name_parts)
+        return Logger.get_logger(name, self._args.logging_level)
+
     def _verify_action(self) -> None:
         if self._args.action not in self._VALID_ACTIONS:
             self._logger.warning(f"Unkonwn action -> '{self._args.action}'")

{python4cpm-1.1.4 → python4cpm-1.1.5/src/python4cpm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python4cpm
-Version: 1.1.4
+Version: 1.1.5
 Summary: Python for CPM
 Author-email: Gonzalo Atienza Rela <gonatienza@gmail.com>
 License-Expression: MIT
@@ -71,8 +71,6 @@ class CredManager(Python4CPMHandler):
     """
     Properties:
         target_account (TargetAccount): Account being managed.
-            .policy_id (str): Platform name.
-            .object_name (str): Account name.
             .username (str): Account username.
             .address (str): Target address.
             .port (str): Target port.
@@ -145,7 +143,7 @@ When doing `verify`, `change` or `reconcile` from Privilege Cloud/PVWA:
 6. If a reconcile account is not linked, `reconcile_account` will return `None`.
 7. Always use the `close_success` or `close_fail` methods to signal the proper termination for all actions.
     - If any action is not terminated with a termination method, CPM/SRS will see this as a `close_fail(unrecoverable=True)`, even if no exceptions are raised.
-8. The python `Logger` places its logs in the `Logs/ThirdParty` directory.  The filename will be based on `target_account.policy_id` and `target_account.object_name`.
+8. The python `Logger` places its logs in the `Logs/ThirdParty` directory.
 
 
 ### Installing dependencies in python venv
@@ -159,22 +157,23 @@ As with any python venv, you can install dependencies in your venv.
 
 ## Dev Helper:
 
-For dev purposes, `NETHelper` is a companion helper to test your scripts without CPM/SRS.  It simplifies the instantiation of the `Python4CPM` or `Python4CPMHandler` objects by simulating how the plugin creates the environment context for the python module.
+For dev purposes, `DevHelper` is a companion helper to test your scripts without CPM/SRS.  It simplifies the instantiation of the `Python4CPM` or `Python4CPMHandler` objects by simulating how the plugin creates the environment context for the python module.
 
-**Note**: As CPM and the SRS management agent run in Windows, the plugin was built to encrypt secrets using DPAPI (a windows only library).  For dev purposes in Linux/Mac dev workstations, those secrets put in the environment context by `NETHelper` will be in plaintext.  In windows dev workstations, `NETHelper` encrypts the secrets as the .NET plugin does.  This is informational only, **the module will use its encryption/decryption capabilities automatically based on the platform** it is running on and you do not have to do anything specific to enable it.
+**Note**: As CPM and the SRS management agent run in Windows, the plugin was built to encrypt secrets using DPAPI (a windows only library).  For dev purposes in Linux/Mac dev workstations, those secrets put in the environment context by `DevHelper` will be in plaintext.  In windows dev workstations, `DevHelper` encrypts the secrets as the .NET plugin does.  This is informational only, **the module will use its encryption/decryption capabilities automatically based on the platform** it is running on and you do not have to do anything specific to enable it.
 
 ### Example:
 
 #### Set your arguments and secrets:
 
 ```python
-from python4cpm import NETHelper, Python4CPM, Python4CPMHandler
+from python4cpm import DevHelper, Python4CPM, Python4CPMHandler
 
-NETHelper.set(
+DevHelper.set(
     action=Python4CPM.ACTION_CHANGE, # use actions from Python4CPM.ACTION_*
     logging_level="debug",
-    target_policy_id="NETHelper",
-    target_object_name="Objectname",
+    target_policy_id="DevHelper", # name of platform
+    target_safe_name="Safename", # name of safe
+    target_object_name="Objectname", # name of account
     target_username="jdoe",
     target_address="myapp.corp.local",
     target_port="8443",
@@ -212,5 +211,5 @@ CredManager().run()
 
 #### Remember for your final script:
 
-- Remove the import of `NETHelper`.
-- Remove the `NETHelper.set()` call.
+- Remove the import of `DevHelper`.
+- Remove the `DevHelper.set()` call.

{python4cpm-1.1.4 → python4cpm-1.1.5}/src/python4cpm.egg-info/SOURCES.txt

@@ -5,9 +5,9 @@ src/python4cpm/__init__.py
 src/python4cpm/accounts.py
 src/python4cpm/args.py
 src/python4cpm/crypto.py
+src/python4cpm/devhelper.py
 src/python4cpm/envhandler.py
 src/python4cpm/logger.py
-src/python4cpm/nethelper.py
 src/python4cpm/python4cpm.py
 src/python4cpm/python4cpmhandler.py
 src/python4cpm/secret.py