Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align credentials stores part 26 #27718

Merged
merged 15 commits into from Jul 3, 2023
2 changes: 1 addition & 1 deletion Packs/CheckPhish/.pack-ignore
@@ -1,2 +1,2 @@
[file:CheckPhish.yml]
ignore=IN135,IN145
ignore=IN135
6 changes: 4 additions & 2 deletions Packs/CheckPhish/Integrations/CheckPhish/CheckPhish.py
Expand Up @@ -226,7 +226,9 @@ def main():
good_disp = argToList(demisto_params.get('good_disp'))
susp_disp = argToList(demisto_params.get('susp_disp'))
bad_disp = argToList(demisto_params.get('bad_disp'))

api_key = demisto_params.get('credentials_api_token', {}).get('password') or demisto_params.get('token')
if not api_key:
raise DemistoException('API token must be provided.')
unite_dispositions(good_disp, susp_disp, bad_disp)

reliability = demisto_params.get('integrationReliability')
Expand All @@ -239,7 +241,7 @@ def main():

params = {
'base_url': demisto_params['url'],
'api_key': demisto_params.get('token'),
'api_key': api_key,
'use_ssl': not demisto_params.get('insecure', False),
'reliability': reliability
}
Expand Down
10 changes: 8 additions & 2 deletions Packs/CheckPhish/Integrations/CheckPhish/CheckPhish.yml
Expand Up @@ -10,8 +10,14 @@ configuration:
type: 0
- display: API Token
name: token
required: true
required: false
type: 4
hidden: true
- displaypassword: API Token
name: credentials_api_token
required: false
hiddenusername: true
type: 9
- display: 'Good Dispositions (CheckPhish labels for non-phishing URLs. Default is "clean")'
name: good_disp
options:
Expand Down Expand Up @@ -206,5 +212,5 @@ script:
script: '-'
type: python
subtype: python3
dockerimage: demisto/python3:3.10.11.54132
dockerimage: demisto/python3:3.10.12.63474
fromversion: 5.0.0
6 changes: 6 additions & 0 deletions Packs/CheckPhish/ReleaseNotes/1_0_18.md
@@ -0,0 +1,6 @@

#### Integrations

##### CheckPhish
- Added the *API Token* integration parameters to support credentials fetching object.
maimorag marked this conversation as resolved.
Show resolved Hide resolved
- Updated the Docker image to: *demisto/python3:3.10.12.63474*.
2 changes: 1 addition & 1 deletion Packs/CheckPhish/pack_metadata.json
Expand Up @@ -2,7 +2,7 @@
"name": "CheckPhish",
"description": "Check any URL to detect supsicious behavior.",
"support": "xsoar",
"currentVersion": "1.0.17",
"currentVersion": "1.0.18",
"author": "Cortex XSOAR",
"url": "https://www.paloaltonetworks.com/cortex",
"email": "",
Expand Down
2 changes: 1 addition & 1 deletion Packs/isight/.pack-ignore
@@ -1,2 +1,2 @@
[file:FireEyeISIGHT.yml]
ignore=IN144,IN145,IN107
ignore=IN144,IN107
5 changes: 4 additions & 1 deletion Packs/isight/Integrations/FireEyeISIGHT/FireEyeISIGHT.js
@@ -1,7 +1,7 @@

var baseUrl = 'https://api.isightpartners.com'; // iSight base url
var publicKey = params.publicKey;
var privateKey = params.privateKey;
var privateKey = params.credentials_private_key? params.credentials_private_key.password : params.privateKey;
var acceptVersion = params.version;
var insecure = params.insecure;
var proxy = params.proxy;
Expand Down Expand Up @@ -45,6 +45,9 @@ var getHeaders = function(query) {
} else if (timestamp.indexOf('-') > 0) {
timestamp = timestamp.substring(0,timestamp.indexOf('-'));
}
if (!privateKey){
throw('Private Key must be provided.')
}
message = query + acceptVersion + 'application/json' + timestamp;
hashed = HMAC_SHA256_MAC(privateKey, message);

Expand Down
8 changes: 7 additions & 1 deletion Packs/isight/Integrations/FireEyeISIGHT/FireEyeISIGHT.yml
Expand Up @@ -15,7 +15,13 @@ configuration:
name: privateKey
defaultvalue: ""
type: 4
required: true
required: false
hidden: true
- displaypassword: Private Key
name: credentials_private_key
required: false
hiddenusername: true
type: 9
- display: Version
name: version
defaultvalue: "2.5"
Expand Down
5 changes: 5 additions & 0 deletions Packs/isight/ReleaseNotes/1_0_3.md
@@ -0,0 +1,5 @@

#### Integrations

##### FireEye iSIGHT
Added the *Private Key* integration parameters to support credentials fetching object.
maimorag marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion Packs/isight/pack_metadata.json
Expand Up @@ -2,7 +2,7 @@
"name": "FireEye iSIGHT",
"description": "FireEye cyber threat intelligence",
"support": "xsoar",
"currentVersion": "1.0.2",
"currentVersion": "1.0.3",
"author": "Cortex XSOAR",
"url": "https://www.paloaltonetworks.com/cortex",
"email": "",
Expand Down