From e56240498bca39d586f066fbe0ad1b27f6d4dfbd Mon Sep 17 00:00:00 2001 From: spathan Date: Fri, 31 Mar 2023 10:28:10 +0530 Subject: [PATCH 1/3] updated description and doc link --- activedirectory/info.json | 8 ++++---- activedirectory/playbooks/playbooks.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/activedirectory/info.json b/activedirectory/info.json index 4ad6214..d7aabd1 100644 --- a/activedirectory/info.json +++ b/activedirectory/info.json @@ -13,7 +13,7 @@ "Enrichment", "User_Enrichment" ], - "help_online": "", + "help_online": "https://docs.fortinet.com/document/fortisoar/2.3.0/active-directory/547/active-directory-v2-3-0", "configuration": { "fields": [ { @@ -1562,7 +1562,7 @@ { "title": "Force password reset on next logon", "operation": "force_password_reset_next_logon", - "description": "Force password reset on next logon for a specific AD user based on the SamAccount Name or the Email, or the Distinguished Name (DN) of the user.", + "description": "Forces specific Active Directory users to reset their password when they next log on to Active Directory. You can specify the user who requires to reset their password based on the SamAccount Name, Email, or Distinguished Name (DN) of the user.", "category": "containment", "annotation": "force_password_reset_next_logon", "output_schema": { @@ -1579,7 +1579,7 @@ "title": "Attributes Type", "type": "select", "tooltip": "The attribute, either the SamAccount Name, Distinguished Name, or the Email of the user, whose password you want to reset in AD.", - "description": "The attribute, either the SamAccount Name, Distinguished Name, or the Email of the user, whose password you want to reset in AD.", + "description": "The attribute, either the Distinguished Name (DN), email address, or SamAccount Name of the user who requires to reset their password when they next log on to Active Directory.", "visible": true, "required": true, "editable": true, @@ -1594,7 +1594,7 @@ "title": "Attributes Value", "name": "search_attr_value", "type": "text", - "description": "The value of the SamAccount Name, the Distinguished Name, or the Email of the user, whose password you want to reset in AD.", + "description": "The value of the Distinguished Name (DN), email address, or SamAccount Name of the user who requires to reset their password when they next log on to Active Directory.", "visible": true, "required": true, "editable": true, diff --git a/activedirectory/playbooks/playbooks.json b/activedirectory/playbooks/playbooks.json index 6984484..630f815 100644 --- a/activedirectory/playbooks/playbooks.json +++ b/activedirectory/playbooks/playbooks.json @@ -3282,7 +3282,7 @@ "name": "Force Password Reset For Next Login", "aliasName": null, "tag": "#Active Directory", - "description": "Resets the password for a specific AD user based on the SamAccount Name or the Email, or the Distinguished Name (DN) of the user.", + "description": "Forces specific Active Directory users to reset their password when they next log on to Active Directory. You can specify the user who requires to reset their password based on the SamAccount Name, Email, or Distinguished Name (DN) of the user.", "isActive": false, "debug": false, "singleRecordExecution": false, From db6aad181f4cfffe11efadb000d34687cd1ed773 Mon Sep 17 00:00:00 2001 From: spathan Date: Fri, 31 Mar 2023 10:41:48 +0530 Subject: [PATCH 2/3] added tooltips --- activedirectory/info.json | 3 ++- activedirectory/playbooks/playbooks.json | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/activedirectory/info.json b/activedirectory/info.json index d7aabd1..ccefce7 100644 --- a/activedirectory/info.json +++ b/activedirectory/info.json @@ -1578,7 +1578,7 @@ "name": "search_attr_name", "title": "Attributes Type", "type": "select", - "tooltip": "The attribute, either the SamAccount Name, Distinguished Name, or the Email of the user, whose password you want to reset in AD.", + "tooltip": "The attribute, either the Distinguished Name (DN), email address, or SamAccount Name of the user who requires to reset their password when they next log on to Active Directory.", "description": "The attribute, either the Distinguished Name (DN), email address, or SamAccount Name of the user who requires to reset their password when they next log on to Active Directory.", "visible": true, "required": true, @@ -1594,6 +1594,7 @@ "title": "Attributes Value", "name": "search_attr_value", "type": "text", + "tooltip": "The value of the Distinguished Name (DN), email address, or SamAccount Name of the user who requires to reset their password when they next log on to Active Directory.", "description": "The value of the Distinguished Name (DN), email address, or SamAccount Name of the user who requires to reset their password when they next log on to Active Directory.", "visible": true, "required": true, diff --git a/activedirectory/playbooks/playbooks.json b/activedirectory/playbooks/playbooks.json index 630f815..b8a8ab9 100644 --- a/activedirectory/playbooks/playbooks.json +++ b/activedirectory/playbooks/playbooks.json @@ -3329,8 +3329,8 @@ "name": "Active Directory", "config": "''", "params": { - "search_attr_name": "SamAccount Name", - "search_attr_value": "jdoe" + "search_attr_name": "", + "search_attr_value": "" }, "version": "2.3.0", "connector": "activedirectory", From 5875df93333598d52c3aed43ffdbe91374cb2cb2 Mon Sep 17 00:00:00 2001 From: spathan Date: Fri, 31 Mar 2023 11:04:56 +0530 Subject: [PATCH 3/3] Allowing '\' with the escape sequence character in the Distinguished Name (DN) field. --- activedirectory/operations.py | 3 --- activedirectory/release_notes.md | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/activedirectory/operations.py b/activedirectory/operations.py index 478447b..0f6f9cf 100644 --- a/activedirectory/operations.py +++ b/activedirectory/operations.py @@ -257,7 +257,6 @@ def formatting_data(json_data): for each_dict in entries: attributes = each_dict['attributes'] - each_dict['dn'] = (each_dict['dn']).replace('\\', '') for key, val in attributes.items(): if key == 'userAccountControl': attributes[key] = get_user_account_control_detail(val) @@ -268,8 +267,6 @@ def formatting_data(json_data): attributes[key] = convert_ad_timestamp(val) if key in ip_details: attributes[key] = str(decimal_to_ip_address(int(val))) - if key in 'distinguishedName': - attributes[key] = val.replace('\\', '') if key == 'groupType': try: attributes[key] = list(GROUP_TYPE.keys())[list(GROUP_TYPE.values()).index(val)] diff --git a/activedirectory/release_notes.md b/activedirectory/release_notes.md index 0c43439..1e1b6af 100644 --- a/activedirectory/release_notes.md +++ b/activedirectory/release_notes.md @@ -1,3 +1,3 @@ #### What's Improved - Added new Action and playbook "Force Password Reset on Next Login" - +- Allowing '\\' with the escape sequence character in the Distinguished Name (DN) field. \ No newline at end of file