Skip to content

Commit

Permalink
Align credentials stores part 16 (#27367)
Browse files Browse the repository at this point in the history
  • Loading branch information
maimorag authored Jun 13, 2023
1 parent 225c878 commit a457463
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Packs/FireEyeETP/.pack-ignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[file:FireEyeETP.yml]
ignore=IN126,IN145
ignore=IN126

[file:README.md]
ignore=RM102
Expand Down
4 changes: 3 additions & 1 deletion Packs/FireEyeETP/Integrations/FireEyeETP/FireEyeETP.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -607,6 +607,8 @@ def fetch_incidents():


def main():
if not API_KEY:
return_error('API key must be provided.')
set_proxies()

try:
Expand Down
10 changes: 8 additions & 2 deletions Packs/FireEyeETP/Integrations/FireEyeETP/FireEyeETP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions Packs/FireEyeETP/ReleaseNotes/1_2_3.md
Original file line number Diff line number Diff line change
@@ -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*.
2 changes: 1 addition & 1 deletion Packs/FireEyeETP/pack_metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
2 changes: 1 addition & 1 deletion Packs/Zimperium/.pack-ignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[file:Zimperium.yml]
ignore=IN126,IN145
ignore=IN126

[file:README.md]
ignore=RM104
Expand Down
4 changes: 3 additions & 1 deletion Packs/Zimperium/Integrations/Zimperium/Zimperium.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
10 changes: 8 additions & 2 deletions Packs/Zimperium/Integrations/Zimperium/Zimperium.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions Packs/Zimperium/ReleaseNotes/1_1_9.md
Original file line number Diff line number Diff line change
@@ -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*.
2 changes: 1 addition & 1 deletion Packs/Zimperium/pack_metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down

0 comments on commit a457463

Please sign in to comment.