Fix cyberark-pas-account-add (cyberark) (#30294)

* commit

* add UT and RN

* corrections

* Fix DS108 and update Docker

* correction comments

Packs/CyberArkPAS/Integrations/CyberArkPAS/CyberArkPAS.py

@@ -69,6 +69,23 @@ def incident_priority_to_dbot_score(score: float) -> int:
     return 0
 
 
+def order_properties_to_dict(properties: str | dict) -> dict:
+    """
+    ordering the properties so that they are valid json for the api
+    """
+    if not properties:
+        return {}
+    if isinstance(properties, dict):
+        return properties
+    elif isinstance(properties, str):
+        try:
+            return json.loads(properties.replace("'", '"'))
+        except json.decoder.JSONDecodeError:
+            raise ValueError(f"Properties ({properties}) are not valid JSON")
+    else:
+        raise ValueError(f"Properties must be a JSON string or dictionary (got {properties})")
+
+
 def filter_by_score(events_data: list, score: int) -> list:
     if score == 0:
         return events_data
@@ -361,7 +378,7 @@ def add_account(self,
                     safe_name: str,
                     password: str,
                     secret_type: str,
-                    properties: str,
+                    properties: dict,
                     automatic_management_enabled: str,
                     manual_management_reason: str,
                     remote_machines: str,
@@ -995,7 +1012,7 @@ def add_account_command(
         safe_name: str = "",
         password: str = "",
         secret_type: str = "password",
-        properties: str = "",
+        properties: dict | str = "",
         automatic_management_enabled: str = "true",
         manual_management_reason: str = "",
         remote_machines: str = "",
@@ -1018,9 +1035,20 @@ def add_account_command(
     :param access_restricted_to_remote_machines: Whether or not to restrict access only to specified remote machines.
     :return: CommandResults
     """
-    response = client.add_account(account_name, address, username, platform_id, safe_name, password, secret_type,
-                                  properties, automatic_management_enabled, manual_management_reason, remote_machines,
-                                  access_restricted_to_remote_machines)
+    response = client.add_account(
+        account_name,
+        address,
+        username,
+        platform_id,
+        safe_name,
+        password,
+        secret_type,
+        order_properties_to_dict(properties),
+        automatic_management_enabled,
+        manual_management_reason,
+        remote_machines,
+        access_restricted_to_remote_machines,
+    )
     results = CommandResults(
         raw_response=response,
         outputs_prefix='CyberArkPAS.Accounts',

Packs/CyberArkPAS/Integrations/CyberArkPAS/CyberArkPAS.yml

@@ -68,7 +68,7 @@ script:
       required: true
     - description: The user type according to the license.
       name: user_type
-    - description: The CyberArkPAS interfaces that this user is not authorized to use, e.g., - "PSM", "PSMP"
+    - description: The CyberArkPAS interfaces that this user is not authorized to use, e.g., - "PSM", "PSMP".
       isArray: true
       name: non_authorized_interfaces
     - description: The location in the vault where the user will be created. Must begin with "\\".  If just "\\", the vault is in the root.
@@ -93,7 +93,7 @@ script:
       predefined:
       - 'true'
       - 'false'
-    - description: 'A comma-separated list of user permissions. Valid values are: AuditUsers, AddUpdateUsers, ResetUsersPasswords, ActivateUsers, AddNetworkAreas, ManageDirectoryMapping, ManageServerFileCategories, BackupAllSafes, RestoreAllSafes e.g., AddSafes,AuditUsers'
+    - description: 'A comma-separated list of user permissions. Valid values are: AuditUsers, AddUpdateUsers, ResetUsersPasswords, ActivateUsers, AddNetworkAreas, ManageDirectoryMapping, ManageServerFileCategories, BackupAllSafes, RestoreAllSafes e.g., AddSafes,AuditUsers.'
       isArray: true
       name: vault_authorization
     - description: Notes and comments.
@@ -165,7 +165,7 @@ script:
       name: username
     - description: User type according to the license.
       name: user_type
-    - description: The CyberArkPAS interfaces that this user is not authorized to use, e.g., "PSM", "PSMP"
+    - description: The CyberArkPAS interfaces that this user is not authorized to use, e.g., "PSM", "PSMP".
       isArray: true
       name: non_authorized_interfaces
     - description: The location in the vault where the user will be created. Must begin with "\\". If just "\\", the vault is in the root.
@@ -186,7 +186,7 @@ script:
       predefined:
       - 'true'
       - 'false'
-    - description: 'A comma-separated list of user permissions. Valid values are: AddSafes, AuditUsers, AddUpdateUsers, ResetUsersPasswords, ActivateUsers, AddNetworkAreas, ManageDirectoryMapping, ManageServerFileCategories, BackupAllSafes, RestoreAllSafes e.g., AddSafes,AuditUsers'
+    - description: 'A comma-separated list of user permissions. Valid values are: AddSafes, AuditUsers, AddUpdateUsers, ResetUsersPasswords, ActivateUsers, AddNetworkAreas, ManageDirectoryMapping, ManageServerFileCategories, BackupAllSafes, RestoreAllSafes e.g., AddSafes,AuditUsers.'
       isArray: true
       name: vault_authorization
     - description: Notes and comments.
@@ -510,7 +510,7 @@ script:
     - description: |-
         The user’s permissions in the safe.
         Valid values: UseAccounts, RetrieveAccounts, ListAccounts, AddAccounts, UpdateAccountContent, UpdateAccountProperties, InitiateCPMAccountManagementOperations, InitiateCPMAccountManagementOperations, SpecifyNextAccountContent, RenameAccounts, DeleteAccounts, UnlockAccounts, ManageSafe, ManageSafeMembers, BackupSafe, ViewAuditLog, ViewAuditLog, ViewSafeMembers, AccessWithoutConfirmation, CreateFolders, DeleteFolders, MoveAccountsAndFolders
-        e.g., UseAccounts,RetrieveAccounts
+        e.g., UseAccounts,RetrieveAccounts.
       isArray: true
       name: permissions
     - description: The name of the safe to add a member to.
@@ -554,7 +554,7 @@ script:
         The user’s permissions in the safe.
         Valid values are:
         UseAccounts, RetrieveAccounts, ListAccounts, AddAccounts, UpdateAccountContent, UpdateAccountProperties, InitiateCPMAccountManagementOperations, InitiateCPMAccountManagementOperations, SpecifyNextAccountContent, RenameAccounts, DeleteAccounts, UnlockAccounts, ManageSafe, ManageSafeMembers, BackupSafe, ViewAuditLog, ViewAuditLog, ViewSafeMembers, RequestsAuthorizationLevel, AccessWithoutConfirmation, CreateFolders, DeleteFolders, MoveAccountsAndFolders
-        e.g., UseAccounts,RetrieveAccounts
+        e.g., UseAccounts,RetrieveAccounts.
       isArray: true
       name: permissions
     - description: The name of the safe to which the safe member belongs.
@@ -631,7 +631,7 @@ script:
       secret: true
     - description: |-
         Object containing key-value pairs to associate with the account, as defined by the account platform.
-        e.g., {"Location": "IT", "OwnerName": "MSSPAdmin"}
+        e.g., {"Location": "IT", "OwnerName": "MSSPAdmin"}.
       name: properties
     - auto: PREDEFINED
       defaultValue: 'true'
@@ -745,12 +745,12 @@ script:
   - arguments:
     - description: |-
         List of keywords to search for in the accounts.
-        Separated with a space, e.g,. Windows admin
+        Separated with a space, e.g,. Windows admin.
       name: search
     - description: |-
         Property or properties by which to sort the returned accounts.
         The properties are followed by a comma and then 'asc' (default) or 'desc' to control the sort direction,
-        e.g., Windows,asc
+        e.g., Windows,asc.
       name: sort
     - defaultValue: '0'
       description: The offset of the first account that is returned in the collection of results. Default is '0'.
@@ -932,7 +932,7 @@ script:
     - contextPath: CyberArkPAS.SecurityEvents.type
       description: The type of the security events.
       type: String
-  dockerimage: demisto/python3:3.10.12.63474
+  dockerimage: demisto/python3:3.10.13.77674
   isfetch: true
   runonce: false
   script: '-'

Packs/CyberArkPAS/Integrations/CyberArkPAS/CyberArkPAS_test.py

@@ -4,7 +4,7 @@
     update_user_command, add_safe_command, update_safe_command, get_list_safes_command, get_safe_by_name_command, \
     add_safe_member_command, update_safe_member_command, list_safe_members_command, add_account_command, \
     update_account_command, get_list_accounts_command, get_list_account_activity_command, fetch_incidents, \
-    get_account_details_command
+    get_account_details_command, order_properties_to_dict
 from test_data.context import ADD_USER_CONTEXT, GET_USERS_CONTEXT, \
     UPDATE_USER_CONTEXT, UPDATE_SAFE_CONTEXT, GET_LIST_SAFES_CONTEXT, GET_SAFE_BY_NAME_CONTEXT, ADD_SAFE_CONTEXT, \
     ADD_SAFE_MEMBER_CONTEXT, UPDATE_SAFE_MEMBER_CONTEXT, LIST_SAFE_MEMBER_CONTEXT, ADD_ACCOUNT_CONTEXT, \
@@ -487,3 +487,39 @@ def test_pas_safe_members_list(mocker, response: dict, count_or_total: str, expe
     results = list_safe_members_command(client=client, safe_name="Test")
     assert count_or_total in results.readable_output
     assert results.outputs == expected_output
+
+
+@pytest.mark.parametrize("properties,expected", [
+    ({}, {}),
+    ({"a": 1}, {"a": 1}),
+    ({'a': 1}, {"a": 1}),
+    ("{'a': 1}", {"a": 1}),
+    ('{"a": 1}', {"a": 1}),
+    ("", {})
+])
+def test_order_properties_to_dict(properties, expected):
+    """
+    Given:
+        - properties as input
+    When:
+        - order_properties_to_dict is called on properties
+    Then:
+        - it returns the expected output
+    """
+    assert order_properties_to_dict(properties) == expected
+
+
+@pytest.mark.parametrize("properties,expected", [
+    ("not json", ValueError),
+])
+def test_order_properties_to_dict_failure(properties, expected):
+    """
+    Given:
+        - Invalid properties as input
+    When:
+        - order_properties_to_dict is called on properties
+    Then:
+        - An error is raised
+    """
+    with pytest.raises(expected):
+        order_properties_to_dict(properties)

Packs/CyberArkPAS/ReleaseNotes/1_0_14.md

@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### CyberArk PAS
+- Updated the Docker image to: *demisto/python3:3.10.13.77674*.
+- Fixed an issue where the ***cyberark-pas-account-add*** command failed when run with *properties* argument.

Packs/CyberArkPAS/pack_metadata.json

@@ -2,7 +2,7 @@
     "name": "CyberArk",
     "description": "Provides a Safe Haven, where all your administrative passwords can be securely archived, transferred and shared by authorized users.",
     "support": "xsoar",
-    "currentVersion": "1.0.13",
+    "currentVersion": "1.0.14",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",