From a457463ba3d27b36cffb6a6e8d1cb63df2a40325 Mon Sep 17 00:00:00 2001 From: Mai Morag <81917647+maimorag@users.noreply.github.com> Date: Tue, 13 Jun 2023 14:46:29 +0300 Subject: [PATCH] Align credentials stores part 16 (#27367) --- Packs/FireEyeETP/.pack-ignore | 2 +- Packs/FireEyeETP/Integrations/FireEyeETP/FireEyeETP.py | 4 +++- .../FireEyeETP/Integrations/FireEyeETP/FireEyeETP.yml | 10 ++++++++-- Packs/FireEyeETP/ReleaseNotes/1_2_3.md | 6 ++++++ Packs/FireEyeETP/pack_metadata.json | 2 +- Packs/Zimperium/.pack-ignore | 2 +- Packs/Zimperium/Integrations/Zimperium/Zimperium.py | 4 +++- Packs/Zimperium/Integrations/Zimperium/Zimperium.yml | 10 ++++++++-- Packs/Zimperium/ReleaseNotes/1_1_9.md | 6 ++++++ Packs/Zimperium/pack_metadata.json | 2 +- 10 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 Packs/FireEyeETP/ReleaseNotes/1_2_3.md create mode 100644 Packs/Zimperium/ReleaseNotes/1_1_9.md diff --git a/Packs/FireEyeETP/.pack-ignore b/Packs/FireEyeETP/.pack-ignore index 95f3d91e2cb3..75ae7f5a1571 100644 --- a/Packs/FireEyeETP/.pack-ignore +++ b/Packs/FireEyeETP/.pack-ignore @@ -1,5 +1,5 @@ [file:FireEyeETP.yml] -ignore=IN126,IN145 +ignore=IN126 [file:README.md] ignore=RM102 diff --git a/Packs/FireEyeETP/Integrations/FireEyeETP/FireEyeETP.py b/Packs/FireEyeETP/Integrations/FireEyeETP/FireEyeETP.py index 0edfa18e8ae2..f96db7ba9305 100644 --- a/Packs/FireEyeETP/Integrations/FireEyeETP/FireEyeETP.py +++ b/Packs/FireEyeETP/Integrations/FireEyeETP/FireEyeETP.py @@ -20,7 +20,7 @@ GLOBAL VARS ''' -API_KEY = demisto.params().get('api_key') +API_KEY = demisto.params().get('credentials_api_key', {}).get('password') or demisto.params().get('api_key') BASE_PATH = '{}/api/v1'.format(demisto.params().get('server')) HTTP_HEADERS = { 'Content-Type': 'application/json' @@ -607,6 +607,8 @@ def fetch_incidents(): def main(): + if not API_KEY: + return_error('API key must be provided.') set_proxies() try: diff --git a/Packs/FireEyeETP/Integrations/FireEyeETP/FireEyeETP.yml b/Packs/FireEyeETP/Integrations/FireEyeETP/FireEyeETP.yml index 9a4856bf2508..4b9fbd81d97c 100644 --- a/Packs/FireEyeETP/Integrations/FireEyeETP/FireEyeETP.yml +++ b/Packs/FireEyeETP/Integrations/FireEyeETP/FireEyeETP.yml @@ -16,7 +16,13 @@ configuration: name: api_key defaultvalue: "" type: 4 - required: true + required: false + hidden: true +- displaypassword: API Key + name: credentials_api_key + required: false + hiddenusername: true + type: 9 - display: Trust any certificate (not secure) name: unsecure type: 8 @@ -297,7 +303,7 @@ script: isfetch: true runonce: false subtype: python3 - dockerimage: demisto/python3:3.10.10.48392 + dockerimage: demisto/python3:3.10.12.62631 tests: - No Test diff --git a/Packs/FireEyeETP/ReleaseNotes/1_2_3.md b/Packs/FireEyeETP/ReleaseNotes/1_2_3.md new file mode 100644 index 000000000000..f0ce94502487 --- /dev/null +++ b/Packs/FireEyeETP/ReleaseNotes/1_2_3.md @@ -0,0 +1,6 @@ + +#### Integrations + +##### FireEye ETP +- Added the *API Key* integration parameters to support credentials fetching object. +- Updated the Docker image to: *demisto/python3:3.10.12.62631*. diff --git a/Packs/FireEyeETP/pack_metadata.json b/Packs/FireEyeETP/pack_metadata.json index ddb13ff131a3..eec18a2665cc 100644 --- a/Packs/FireEyeETP/pack_metadata.json +++ b/Packs/FireEyeETP/pack_metadata.json @@ -2,7 +2,7 @@ "name": "FireEye ETP", "description": "FireEye Email Threat Prevention (ETP Cloud) is a cloud-based platform that protects against advanced email attacks.", "support": "xsoar", - "currentVersion": "1.2.2", + "currentVersion": "1.2.3", "author": "Cortex XSOAR", "url": "https://www.paloaltonetworks.com/cortex", "email": "", diff --git a/Packs/Zimperium/.pack-ignore b/Packs/Zimperium/.pack-ignore index 07558ff84951..ef1b5329d5ce 100644 --- a/Packs/Zimperium/.pack-ignore +++ b/Packs/Zimperium/.pack-ignore @@ -1,5 +1,5 @@ [file:Zimperium.yml] -ignore=IN126,IN145 +ignore=IN126 [file:README.md] ignore=RM104 diff --git a/Packs/Zimperium/Integrations/Zimperium/Zimperium.py b/Packs/Zimperium/Integrations/Zimperium/Zimperium.py index 97080b165643..dda40359e3e2 100644 --- a/Packs/Zimperium/Integrations/Zimperium/Zimperium.py +++ b/Packs/Zimperium/Integrations/Zimperium/Zimperium.py @@ -700,7 +700,9 @@ def main(): PARSE AND VALIDATE INTEGRATION PARAMS """ params = demisto.params() - api_key = params.get('api_key') + api_key = params.get('credentials_api_key', {}).get('password') or params.get('api_key') + if not api_key: + return_error('API key must be provided.') base_url = urljoin(params.get('url'), '/api/v1/') verify = not params.get('insecure', False) diff --git a/Packs/Zimperium/Integrations/Zimperium/Zimperium.yml b/Packs/Zimperium/Integrations/Zimperium/Zimperium.yml index 4c3b96dbcd26..027cd51c0410 100644 --- a/Packs/Zimperium/Integrations/Zimperium/Zimperium.yml +++ b/Packs/Zimperium/Integrations/Zimperium/Zimperium.yml @@ -10,8 +10,14 @@ configuration: type: 0 - display: API Key name: api_key - required: true + required: false type: 4 + hidden: true +- displaypassword: API Key + name: credentials_api_key + required: false + hiddenusername: true + type: 9 - display: Fetch incidents name: isFetch required: false @@ -1088,7 +1094,7 @@ script: description: Checks the reputation of an app in Zimperium. execution: false name: file - dockerimage: demisto/python3:3.10.11.61265 + dockerimage: demisto/python3:3.10.12.62631 feed: false isfetch: true longRunning: false diff --git a/Packs/Zimperium/ReleaseNotes/1_1_9.md b/Packs/Zimperium/ReleaseNotes/1_1_9.md new file mode 100644 index 000000000000..2487d0fea09e --- /dev/null +++ b/Packs/Zimperium/ReleaseNotes/1_1_9.md @@ -0,0 +1,6 @@ + +#### Integrations + +##### Zimperium +- Added the *API Key* integration parameters to support credentials fetching object. +- Updated the Docker image to: *demisto/python3:3.10.12.62631*. diff --git a/Packs/Zimperium/pack_metadata.json b/Packs/Zimperium/pack_metadata.json index ae55bb374122..209b1ce443ef 100644 --- a/Packs/Zimperium/pack_metadata.json +++ b/Packs/Zimperium/pack_metadata.json @@ -2,7 +2,7 @@ "name": "Zimperium", "description": "Streamline investigation and remediation of mobile alerts, generated alerts based on anomalous or unauthorized activities using the Zimperium pack.", "support": "xsoar", - "currentVersion": "1.1.8", + "currentVersion": "1.1.9", "author": "Cortex XSOAR", "url": "https://www.paloaltonetworks.com/cortex", "email": "",