diff --git a/Packs/CarbonBlackDefense/.pack-ignore b/Packs/CarbonBlackDefense/.pack-ignore index 434d563754f0..a74a0458de90 100644 --- a/Packs/CarbonBlackDefense/.pack-ignore +++ b/Packs/CarbonBlackDefense/.pack-ignore @@ -12,6 +12,3 @@ ignore=IF100 [file:incidentfield-CarbonBlackES_Last_Event_Time.json] ignore=IF100 - -[file:CarbonBlackLiveResponseCloud.yml] -ignore=IN145 \ No newline at end of file diff --git a/Packs/CarbonBlackDefense/Integrations/CarbonBlackLiveResponseCloud/CarbonBlackLiveResponseCloud.py b/Packs/CarbonBlackDefense/Integrations/CarbonBlackLiveResponseCloud/CarbonBlackLiveResponseCloud.py index 9f03f3a48531..3d89518fe49c 100644 --- a/Packs/CarbonBlackDefense/Integrations/CarbonBlackLiveResponseCloud/CarbonBlackLiveResponseCloud.py +++ b/Packs/CarbonBlackDefense/Integrations/CarbonBlackLiveResponseCloud/CarbonBlackLiveResponseCloud.py @@ -332,9 +332,11 @@ def main(): params = demisto.params() url = params.get('url') - cb_custom_key = params.get('custom_key') - cb_custom_id = params.get('custom_id') - cb_org_key = params.get('org_key') + cb_custom_key = params.get('credentials_api_token_custom_key', {}).get('password') or params.get('custom_key') + cb_custom_id = params.get('credentials_api_token_custom_id', {}).get('password') or params.get('custom_id') + cb_org_key = params.get('credentials_api_token_org_key', {}).get('password') or params.get('org_key') + if not(cb_custom_key and cb_custom_id and cb_org_key): + raise DemistoException('Custom Key, Custom ID and Organization Key must be provided.') verify_certificate = not params.get('insecure', True) handle_proxy() diff --git a/Packs/CarbonBlackDefense/Integrations/CarbonBlackLiveResponseCloud/CarbonBlackLiveResponseCloud.yml b/Packs/CarbonBlackDefense/Integrations/CarbonBlackLiveResponseCloud/CarbonBlackLiveResponseCloud.yml index ae73bdb66f9d..9ae9816ce0da 100644 --- a/Packs/CarbonBlackDefense/Integrations/CarbonBlackLiveResponseCloud/CarbonBlackLiveResponseCloud.yml +++ b/Packs/CarbonBlackDefense/Integrations/CarbonBlackLiveResponseCloud/CarbonBlackLiveResponseCloud.yml @@ -11,22 +11,43 @@ configuration: - display: Server URL name: url type: 0 - required: true + required: false additionalinfo: The URL used to access the Carbon Black Cloud. - display: Custom Key name: custom_key type: 4 - required: true + required: false + hidden: true + additionalinfo: The custom key to use for the connection. +- displaypassword: Custom Key + name: credentials_custom_key + required: false + hiddenusername: true + type: 9 additionalinfo: The custom key to use for the connection. - display: Custom ID name: custom_id type: 4 - required: true + required: false + hidden: true + additionalinfo: The custom ID to use for the connection. +- displaypassword: Custom ID + name: credentials_custom_id + required: false + hiddenusername: true + type: 9 additionalinfo: The custom ID to use for the connection. - display: Organization Key name: org_key type: 4 - required: true + required: false + hidden: true + additionalinfo: The organization key to use for the connection. +- displaypassword: Organization Key + name: credentials_org_key + required: false + hiddenusername: true + type: 9 additionalinfo: The organization key to use for the connection. - display: Trust any certificate (not secure) name: insecure @@ -295,6 +316,6 @@ script: description: Performs a memory dump operation on the remote machine. execution: true outputs: [] - dockerimage: demisto/carbon-black-cloud:1.0.0.61452 + dockerimage: demisto/carbon-black-cloud:1.0.0.63664 runonce: false subtype: python3 diff --git a/Packs/CarbonBlackDefense/Integrations/CarbonBlackLiveResponseCloud/CarbonBlackLiveResponseCloud_test.py b/Packs/CarbonBlackDefense/Integrations/CarbonBlackLiveResponseCloud/CarbonBlackLiveResponseCloud_test.py index a557fef3468a..e634b52aa134 100644 --- a/Packs/CarbonBlackDefense/Integrations/CarbonBlackLiveResponseCloud/CarbonBlackLiveResponseCloud_test.py +++ b/Packs/CarbonBlackDefense/Integrations/CarbonBlackLiveResponseCloud/CarbonBlackLiveResponseCloud_test.py @@ -427,7 +427,9 @@ def test_not_implemented_command(self, mocker): # prepare not_implemented_command = 'not_implemented' mocker.patch.object(demisto, 'command', return_value=not_implemented_command) - + mocker.patch.object(demisto, 'params', return_value={'custom_key': 'unit test', + 'custom_id': 'unit test', + 'org_key': 'unit test'}) # run with pytest.raises(NotImplementedError) as exc_info: main() diff --git a/Packs/CarbonBlackDefense/ReleaseNotes/3_0_28.md b/Packs/CarbonBlackDefense/ReleaseNotes/3_0_28.md new file mode 100644 index 000000000000..c9cc840fb73a --- /dev/null +++ b/Packs/CarbonBlackDefense/ReleaseNotes/3_0_28.md @@ -0,0 +1,9 @@ + +#### Integrations + +##### Carbon Black Live Response Cloud +- Updated the Docker image to: *demisto/carbon-black-cloud:1.0.0.63664*. +- Added the following integration parameters to support credentials fetching object: + - *Custom Key*. + - *Custom ID*. + - *Organization Key*. diff --git a/Packs/CarbonBlackDefense/pack_metadata.json b/Packs/CarbonBlackDefense/pack_metadata.json index e9b072071784..3f16d748c31c 100644 --- a/Packs/CarbonBlackDefense/pack_metadata.json +++ b/Packs/CarbonBlackDefense/pack_metadata.json @@ -2,7 +2,7 @@ "name": "Carbon Black Endpoint Standard", "description": "Next-generation antivirus + EDR in one cloud-delivered platform that stops commodity malware, advanced malware, non-malware attacks and ransomware.", "support": "xsoar", - "currentVersion": "3.0.27", + "currentVersion": "3.0.28", "author": "Cortex XSOAR", "url": "https://www.paloaltonetworks.com/cortex", "email": "", diff --git a/Packs/HashiCorp-Vault/.pack-ignore b/Packs/HashiCorp-Vault/.pack-ignore index de73b189a812..e768ca89fd97 100644 --- a/Packs/HashiCorp-Vault/.pack-ignore +++ b/Packs/HashiCorp-Vault/.pack-ignore @@ -1,5 +1,5 @@ [file:HashiCorpVault.yml] -ignore=IN145,CJ105 +ignore=CJ105 [known_words] HashiCorp diff --git a/Packs/HashiCorp-Vault/Integrations/HashiCorpVault/HashiCorpVault.py b/Packs/HashiCorp-Vault/Integrations/HashiCorpVault/HashiCorpVault.py index 134532f4ce8d..8dfddc50cb3a 100644 --- a/Packs/HashiCorp-Vault/Integrations/HashiCorpVault/HashiCorpVault.py +++ b/Packs/HashiCorp-Vault/Integrations/HashiCorpVault/HashiCorpVault.py @@ -13,7 +13,7 @@ USERNAME = CREDENTIALS.get('identifier') PASSWORD = CREDENTIALS.get('password') VERIFY_SSL = not demisto.params().get('unsecure', False) -TOKEN = demisto.params().get('token') +TOKEN = demisto.params().get("credentials_token", {}).get('password') or demisto.params().get('token') NAMESPACE = demisto.params().get('namespace') USE_APPROLE_AUTH_METHOD = argToBoolean(demisto.params().get('use_approle', 'false') or 'false') BASE_URL = demisto.params().get('server', '') diff --git a/Packs/HashiCorp-Vault/Integrations/HashiCorpVault/HashiCorpVault.yml b/Packs/HashiCorp-Vault/Integrations/HashiCorpVault/HashiCorpVault.yml index 44e57963acfa..4186107e8de5 100644 --- a/Packs/HashiCorp-Vault/Integrations/HashiCorpVault/HashiCorpVault.yml +++ b/Packs/HashiCorp-Vault/Integrations/HashiCorpVault/HashiCorpVault.yml @@ -26,6 +26,12 @@ configuration: defaultvalue: "" type: 4 required: false + hidden: true +- displaypassword: Authentication token + name: credentials_token + required: false + hiddenusername: true + type: 9 - display: Vault enterprise namespace name: namespace defaultvalue: "" diff --git a/Packs/HashiCorp-Vault/ReleaseNotes/1_1_12.md b/Packs/HashiCorp-Vault/ReleaseNotes/1_1_12.md new file mode 100644 index 000000000000..0dd50bab6e58 --- /dev/null +++ b/Packs/HashiCorp-Vault/ReleaseNotes/1_1_12.md @@ -0,0 +1,5 @@ + +#### Integrations + +##### HashiCorp Vault +Added the *Authentication token* integration parameters to support credentials fetching object. diff --git a/Packs/HashiCorp-Vault/pack_metadata.json b/Packs/HashiCorp-Vault/pack_metadata.json index e985ca185c45..e797a35523e0 100644 --- a/Packs/HashiCorp-Vault/pack_metadata.json +++ b/Packs/HashiCorp-Vault/pack_metadata.json @@ -2,7 +2,7 @@ "name": "HashiCorp Vault", "description": "Manage Secrets and Protect Sensitive Data through HashiCorp Vault", "support": "xsoar", - "currentVersion": "1.1.11", + "currentVersion": "1.1.12", "author": "Cortex XSOAR", "url": "https://www.paloaltonetworks.com/cortex", "email": "",