From c92bf0b1ab5b00d3c0764f76cdc578b0a944b552 Mon Sep 17 00:00:00 2001
From: Mai Morag <81917647+maimorag@users.noreply.github.com>
Date: Sun, 25 Jun 2023 15:21:50 +0300
Subject: [PATCH] Align credentials stores - part 22 (#27683)

* Align credentials stores - part 22

* fix

* fix

* cr note
---
 Packs/CarbonBlackEnterpriseEDR/.pack-ignore      |  2 +-
 .../CarbonBlackEnterpriseEDR.py                  |  6 ++++--
 .../CarbonBlackEnterpriseEDR.yml                 | 16 ++++++++++++----
 .../ReleaseNotes/1_1_29.md                       |  6 ++++++
 .../CarbonBlackEnterpriseEDR/pack_metadata.json  |  2 +-
 .../Carbonblackliveresponse.js                   | 12 +++++++-----
 .../Carbonblackliveresponse.yml                  | 12 ++++++++++++
 .../ReleaseNotes/1_1_5.md                        |  5 +++++
 .../pack_metadata.json                           |  2 +-
 Packs/DuoAdminApi/.pack-ignore                   |  3 ---
 .../Integrations/DuoAdminApi/DuoAdminApi.py      |  6 ++++--
 .../Integrations/DuoAdminApi/DuoAdminApi.yml     | 13 ++++++++++---
 Packs/DuoAdminApi/ReleaseNotes/4_0_3.md          |  6 ++++++
 Packs/DuoAdminApi/pack_metadata.json             |  2 +-
 14 files changed, 70 insertions(+), 23 deletions(-)
 create mode 100644 Packs/CarbonBlackEnterpriseEDR/ReleaseNotes/1_1_29.md
 create mode 100644 Packs/Carbon_Black_Enterprise_Live_Response/ReleaseNotes/1_1_5.md
 create mode 100644 Packs/DuoAdminApi/ReleaseNotes/4_0_3.md

diff --git a/Packs/CarbonBlackEnterpriseEDR/.pack-ignore b/Packs/CarbonBlackEnterpriseEDR/.pack-ignore
index 80578647a66f..58901c06d78c 100644
--- a/Packs/CarbonBlackEnterpriseEDR/.pack-ignore
+++ b/Packs/CarbonBlackEnterpriseEDR/.pack-ignore
@@ -1,5 +1,5 @@
 [file:CarbonBlackEnterpriseEDR.yml]
-ignore=IN126,IN145
+ignore=IN126
 
 [file:README.md]
 ignore=RM104
diff --git a/Packs/CarbonBlackEnterpriseEDR/Integrations/CarbonBlackEnterpriseEDR/CarbonBlackEnterpriseEDR.py b/Packs/CarbonBlackEnterpriseEDR/Integrations/CarbonBlackEnterpriseEDR/CarbonBlackEnterpriseEDR.py
index a95506c39252..8fecc20f278e 100644
--- a/Packs/CarbonBlackEnterpriseEDR/Integrations/CarbonBlackEnterpriseEDR/CarbonBlackEnterpriseEDR.py
+++ b/Packs/CarbonBlackEnterpriseEDR/Integrations/CarbonBlackEnterpriseEDR/CarbonBlackEnterpriseEDR.py
@@ -1295,8 +1295,10 @@ def main():
     """
         PARSE AND VALIDATE INTEGRATION PARAMS
     """
-    cb_custom_key = demisto.params().get('custom_key')
-    cb_custom_id = demisto.params().get('custom_id')
+    cb_custom_key = demisto.params().get('credentials_custom', {}).get('password') or demisto.params().get('custom_key')
+    cb_custom_id = demisto.params().get('credentials_custom', {}).get('identifier') or demisto.params().get('custom_id')
+    if not (cb_custom_key and cb_custom_id):
+        raise DemistoException('Custom ID and Custom key must be provided.')
     cb_org_key = demisto.params().get('organization_key')
     token = f'{cb_custom_key}/{cb_custom_id}'
     # get the service API url
diff --git a/Packs/CarbonBlackEnterpriseEDR/Integrations/CarbonBlackEnterpriseEDR/CarbonBlackEnterpriseEDR.yml b/Packs/CarbonBlackEnterpriseEDR/Integrations/CarbonBlackEnterpriseEDR/CarbonBlackEnterpriseEDR.yml
index 975664e48479..8be7d867a397 100644
--- a/Packs/CarbonBlackEnterpriseEDR/Integrations/CarbonBlackEnterpriseEDR/CarbonBlackEnterpriseEDR.yml
+++ b/Packs/CarbonBlackEnterpriseEDR/Integrations/CarbonBlackEnterpriseEDR/CarbonBlackEnterpriseEDR.yml
@@ -18,14 +18,22 @@ configuration:
   section: Connect
 - display: Custom Key
   name: custom_key
-  required: true
+  required: false
   type: 4
   section: Connect
+  hidden: true
 - display: Custom ID
   name: custom_id
-  required: true
+  required: false
   type: 0
   section: Connect
+  hidden: true
+- display: Custom ID
+  name: credentials_custom
+  required: false
+  type: 9
+  displaypassword: Custom Key
+  section: Connect
 - display: Fetch incidents
   name: isFetch
   required: false
@@ -48,7 +56,7 @@ configuration:
   type: 8
   section: Connect
   advanced: true
-- defaultvalue: 3 days
+- defaultvalue: '3 days'
   display: First fetch timestamp (<number> <time unit>, e.g., 12 hours, 7 days, 3 months, 1 year)
   name: fetch_time
   required: false
@@ -1793,7 +1801,7 @@ script:
     - contextPath: CarbonBlackEEDR.SearchProcess.results.scriptload_count
       description: The cumulative count of loaded scripts since process tracking started.
       type: Number
-  dockerimage: demisto/python3:3.10.11.54132
+  dockerimage: demisto/python3:3.10.12.63474
   feed: false
   isfetch: true
   longRunning: false
diff --git a/Packs/CarbonBlackEnterpriseEDR/ReleaseNotes/1_1_29.md b/Packs/CarbonBlackEnterpriseEDR/ReleaseNotes/1_1_29.md
new file mode 100644
index 000000000000..5cb621a8c54d
--- /dev/null
+++ b/Packs/CarbonBlackEnterpriseEDR/ReleaseNotes/1_1_29.md
@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### VMware Carbon Black Enterprise EDR
+- Added the *Custom ID* and *Custom Key* integration parameters to support credentials fetching object.
+- Updated the Docker image to: *demisto/python3:3.10.12.63474*.
diff --git a/Packs/CarbonBlackEnterpriseEDR/pack_metadata.json b/Packs/CarbonBlackEnterpriseEDR/pack_metadata.json
index 3b50de42157b..bf899639edd2 100644
--- a/Packs/CarbonBlackEnterpriseEDR/pack_metadata.json
+++ b/Packs/CarbonBlackEnterpriseEDR/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Carbon Black Cloud Enterprise EDR",
     "description": "Advanced threat hunting and incident response solution.",
     "support": "xsoar",
-    "currentVersion": "1.1.28",
+    "currentVersion": "1.1.29",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/Carbon_Black_Enterprise_Live_Response/Integrations/Carbonblackliveresponse/Carbonblackliveresponse.js b/Packs/Carbon_Black_Enterprise_Live_Response/Integrations/Carbonblackliveresponse/Carbonblackliveresponse.js
index 6afd1e4137c1..12e3ca273a27 100644
--- a/Packs/Carbon_Black_Enterprise_Live_Response/Integrations/Carbonblackliveresponse/Carbonblackliveresponse.js
+++ b/Packs/Carbon_Black_Enterprise_Live_Response/Integrations/Carbonblackliveresponse/Carbonblackliveresponse.js
@@ -9,14 +9,16 @@ let SLEEP_BETWEEN_RETRIES = 1000 * 5;
 let DEFAULT_WAIT_TIMEOUT = 1000 * 60 * 2;
 let ERROR_MESSAGE = 'Use Live Response for Cb Defense or Cb Response.\nFor Cb Defense: Provide \'Live Response\' API key and connector.\nFor Cb Response: Provide API Token.';
 //validate the credentials are provided to match only one of the products
-if (params.apitoken && (params.apikey || params.connector) ) {
+let API_TOKEN = (params.credentials_api_token)? params.credentials_api_token.password : params.apitoken;
+let API_KEY = (params.credentials_api_key)? params.credentials_api_key.password : params.apikey;
+if (API_TOKEN && (API_KEY || params.connector) ) {
     throw ERROR_MESSAGE;
 }
 //determain Cb product
-if (params.apitoken) {
+if (API_TOKEN) {
     CB_PRODUCT = 'Response';
     BASE_URL = `${params.serverurl}/api/v1/cblr`;
-    AUTH = params.apitoken;
+    AUTH = API_TOKEN;
     COMMAND_DATA = [
         {to: 'CbSensorID', from: 'sensor_id'},
         {to: 'CbSessionID', from: 'session_id'},
@@ -30,10 +32,10 @@ if (params.apitoken) {
         {to: 'Result.Type', from: 'result_type'},
         {to: 'Result.Code', from: 'result_code'}
     ];
-} else if (params.apikey && params.connector){
+} else if (API_KEY && params.connector){
     CB_PRODUCT = 'Defense';
     BASE_URL = `${params.serverurl}/integrationServices/v3/cblr`
-    AUTH = params.apikey + '/' + params.connector;
+    AUTH = API_KEY + '/' + params.connector;
     COMMAND_DATA = [
         {to: 'CbSensorID', from: 'sensor_id'},
         {to: 'CbSessionID', from: 'session_id'},
diff --git a/Packs/Carbon_Black_Enterprise_Live_Response/Integrations/Carbonblackliveresponse/Carbonblackliveresponse.yml b/Packs/Carbon_Black_Enterprise_Live_Response/Integrations/Carbonblackliveresponse/Carbonblackliveresponse.yml
index 4eb868d2f648..9d9c9ffed658 100644
--- a/Packs/Carbon_Black_Enterprise_Live_Response/Integrations/Carbonblackliveresponse/Carbonblackliveresponse.yml
+++ b/Packs/Carbon_Black_Enterprise_Live_Response/Integrations/Carbonblackliveresponse/Carbonblackliveresponse.yml
@@ -18,11 +18,23 @@ configuration:
   defaultvalue: ""
   type: 4
   required: false
+  hidden: true
+- displaypassword: API Token (CB Response)
+  name:  credentials_api_token
+  required: false
+  hiddenusername: true
+  type: 9
 - display: API Key (CB Defense)
   name: apikey
   defaultvalue: ""
   type: 4
   required: false
+  hidden: true
+- displaypassword: API Key (CB Defense)
+  name:  credentials_api_key
+  required: false
+  hiddenusername: true
+  type: 9
 - display: Connector ID (CB Defense)
   name: connector
   defaultvalue: ""
diff --git a/Packs/Carbon_Black_Enterprise_Live_Response/ReleaseNotes/1_1_5.md b/Packs/Carbon_Black_Enterprise_Live_Response/ReleaseNotes/1_1_5.md
new file mode 100644
index 000000000000..17d409670ea8
--- /dev/null
+++ b/Packs/Carbon_Black_Enterprise_Live_Response/ReleaseNotes/1_1_5.md
@@ -0,0 +1,5 @@
+
+#### Integrations
+
+##### VMware Carbon Black EDR (Live Response API)
+- Added the *API Key* and the *API Token* integration parameters to support credentials fetching object.
diff --git a/Packs/Carbon_Black_Enterprise_Live_Response/pack_metadata.json b/Packs/Carbon_Black_Enterprise_Live_Response/pack_metadata.json
index 537c87260026..4116b4e9adb0 100644
--- a/Packs/Carbon_Black_Enterprise_Live_Response/pack_metadata.json
+++ b/Packs/Carbon_Black_Enterprise_Live_Response/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Carbon Black Enterprise Live Response",
     "description": "Collect information and take action on remote endpoints in real time with Carbon Black Enterprise Live Response.",
     "support": "xsoar",
-    "currentVersion": "1.1.4",
+    "currentVersion": "1.1.5",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/DuoAdminApi/.pack-ignore b/Packs/DuoAdminApi/.pack-ignore
index 66a819091f02..fb4491931487 100644
--- a/Packs/DuoAdminApi/.pack-ignore
+++ b/Packs/DuoAdminApi/.pack-ignore
@@ -1,6 +1,3 @@
-[file:DuoAdminApi.yml]
-ignore=IN145
-
 [file:DuoAdminApi_image.png]
 ignore=IM111
 
diff --git a/Packs/DuoAdminApi/Integrations/DuoAdminApi/DuoAdminApi.py b/Packs/DuoAdminApi/Integrations/DuoAdminApi/DuoAdminApi.py
index 9b64c3c91247..57fd2a37de1b 100644
--- a/Packs/DuoAdminApi/Integrations/DuoAdminApi/DuoAdminApi.py
+++ b/Packs/DuoAdminApi/Integrations/DuoAdminApi/DuoAdminApi.py
@@ -7,8 +7,8 @@
 # Setup
 
 HOST = demisto.getParam('hostname')
-INTEGRATION_KEY = demisto.getParam('integration_key')
-SECRET_KEY = demisto.getParam('secret_key')
+INTEGRATION_KEY = demisto.params().get('credentials_key', {}).get('identifier') or demisto.getParam('integration_key')
+SECRET_KEY = demisto.params().get('credentials_key', {}).get('password') or demisto.getParam('secret_key')
 USE_SSL = not demisto.params().get('insecure', False)
 USE_PROXY = demisto.params().get('proxy', False)
 
@@ -397,6 +397,8 @@ def main() -> None:  # pragma: no cover
     args = demisto.args()
     command = demisto.command()
     demisto.debug(f'Command being called is {command}')
+    if not (SECRET_KEY and INTEGRATION_KEY):
+        raise DemistoException('Secret Key and Integration Key must be provided.')
     try:
         admin_api = create_api_call()
         set_proxy(admin_api)
diff --git a/Packs/DuoAdminApi/Integrations/DuoAdminApi/DuoAdminApi.yml b/Packs/DuoAdminApi/Integrations/DuoAdminApi/DuoAdminApi.yml
index 6fa03ada97bf..ea7e27927929 100644
--- a/Packs/DuoAdminApi/Integrations/DuoAdminApi/DuoAdminApi.yml
+++ b/Packs/DuoAdminApi/Integrations/DuoAdminApi/DuoAdminApi.yml
@@ -9,12 +9,19 @@ configuration:
   type: 0
 - display: Integration Key
   name: integration_key
-  required: true
+  required: false
   type: 0
+  hidden: true
 - display: Secret Key
   name: secret_key
-  required: true
+  required: false
   type: 4
+  hidden: true
+- displaypassword: Secret Key
+  name:  credentials_key
+  required: false
+  display: Integration Key
+  type: 9
 - display: Trust any certificate (not secure)
   name: insecure
   required: false
@@ -333,7 +340,7 @@ script:
     outputs: []
     description: Modify the user account.
     name: duoadmin-modify-user
-  dockerimage: demisto/duoadmin3:1.0.0.61875
+  dockerimage: demisto/duoadmin3:1.0.0.63681
   runonce: false
   script: ''
   type: python
diff --git a/Packs/DuoAdminApi/ReleaseNotes/4_0_3.md b/Packs/DuoAdminApi/ReleaseNotes/4_0_3.md
new file mode 100644
index 000000000000..911c3b310362
--- /dev/null
+++ b/Packs/DuoAdminApi/ReleaseNotes/4_0_3.md
@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### DUO Admin
+- Updated the Docker image to: *demisto/duoadmin3:1.0.0.63681*.
+- Added the *Secret Key* and *Integration Key* integration parameters to support credentials fetching object.
diff --git a/Packs/DuoAdminApi/pack_metadata.json b/Packs/DuoAdminApi/pack_metadata.json
index 247300606454..8d2a8f59f2d0 100644
--- a/Packs/DuoAdminApi/pack_metadata.json
+++ b/Packs/DuoAdminApi/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "DUO Admin",
     "description": "DUO for admins.\nMust have access to the admin api in order to use this",
     "support": "xsoar",
-    "currentVersion": "4.0.2",
+    "currentVersion": "4.0.3",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",