Merge pull request #10 from cs-sameer-pathan/develop

updated description and doc link
fortinet-fortisoar · Mar 31, 2023 · 62befff · 62befff
2 parents 52e6305 + 5875df9
commit 62befff
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git 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": {
@@ -1578,8 +1578,8 @@
           "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.",
-          "description": "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,
           "editable": true,
@@ -1594,7 +1594,8 @@
           "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.",
+          "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,
           "editable": true,

diff --git 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/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,
@@ -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",

diff --git 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.