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 21 #27565

Merged
merged 11 commits into from Jun 22, 2023
2 changes: 1 addition & 1 deletion Packs/MicrosoftGraphCalendar/.pack-ignore
Expand Up @@ -2,4 +2,4 @@
ignore=auto-test

[file:MicrosoftGraphCalendar.yml]
ignore=DS107,IN145
ignore=DS107,IN124
Expand Up @@ -512,13 +512,14 @@ def module_test_function_command(client: MsGraphClient, args: Dict) -> Tuple[str
def main():
params: dict = demisto.params()
url = params.get('url', '').rstrip('/') + '/v1.0/'
tenant = params.get('tenant_id')
auth_and_token_url = params.get('auth_id', '')
enc_key = params.get('enc_key')
tenant = params.get('credentials_tenant_id', {}).get('password') or params.get('tenant_id')
auth_and_token_url = params.get('credentials_auth_id', {}).get('password') or params.get('auth_id', '')
enc_key = params.get('credentials_enc_key', {}).get('password') or params.get('enc_key')
verify = not params.get('insecure', False)
proxy = params.get('proxy', False)
default_user = params.get('default_user')
certificate_thumbprint = params.get('certificate_thumbprint')
certificate_thumbprint = params.get('credentials_certificate_thumbprint', {}).get(
'password') or params.get('certificate_thumbprint')
private_key = params.get('private_key')
managed_identities_client_id = get_azure_managed_identities_client_id(params)
self_deployed: bool = params.get('self_deployed', False) or managed_identities_client_id is not None
Expand Down
Expand Up @@ -12,20 +12,45 @@ configuration:
name: auth_id
required: false
type: 4
hidden: true
- displaypassword: ID (received from the admin consent - see Detailed Instructions (?)
name: credentials_auth_id
required: false
hiddenusername: true
type: 9
- display: Token (received from the admin consent - see Detailed Instructions (?)
section)
name: tenant_id
required: false
type: 4
hidden: true
- displaypassword: Token (received from the admin consent - see Detailed Instructions (?)
name: credentials_tenant_id
required: false
hiddenusername: true
type: 9
- display: Key (received from the admin consent - see Detailed Instructions (?)
name: enc_key
required: false
type: 4
hidden: true
- displaypassword: Key (received from the admin consent - see Detailed Instructions (?)
name: credentials_enc_key
required: false
hiddenusername: true
type: 9
- additionalinfo: Used for certificate authentication. As appears in the "Certificates & secrets" page of the app.
display: Certificate Thumbprint
name: certificate_thumbprint
required: false
type: 4
hidden: true
- additionalinfo: Used for certificate authentication. As appears in the "Certificates & secrets" page of the app.
displaypassword: Certificate Thumbprint
name: credentials_certificate_thumbprint
required: false
hiddenusername: true
type: 9
- additionalinfo: Used for certificate authentication. The private key of the registered certificate.
display: Private Key
name: private_key
Expand Down Expand Up @@ -824,7 +849,7 @@ script:
description: "A URL for an online meeting, used only when an organizer specifies\
\ an event as an online meeting, such as a Skype meeting. Read-only."
type: Unknown
dockerimage: demisto/crypto:1.0.0.52480
dockerimage: demisto/crypto:1.0.0.63672
isfetch: false
longRunning: false
longRunningPort: false
Expand Down
10 changes: 10 additions & 0 deletions Packs/MicrosoftGraphCalendar/ReleaseNotes/1_1_12.md
@@ -0,0 +1,10 @@

#### Integrations

##### O365 Outlook Calendar
- Added the following integration parameters to support credentials fetching object:
- *ID*.
- *Token*.
- *Key*.
- *Certificate Thumbprint*.
- Updated the Docker image to: *demisto/crypto:1.0.0.63672*.
2 changes: 1 addition & 1 deletion Packs/MicrosoftGraphCalendar/pack_metadata.json
@@ -1,7 +1,7 @@
{
"name": "Microsoft Graph Calendar",
"description": "Microsoft Graph Calendar enables you to create and manage different calendars and events\n according to your requirements.",
"currentVersion": "1.1.11",
"currentVersion": "1.1.12",
"support": "xsoar",
"author": "Cortex XSOAR",
"url": "https://www.paloaltonetworks.com/cortex",
Expand Down
3 changes: 0 additions & 3 deletions Packs/nessus/.pack-ignore
@@ -1,5 +1,2 @@
[file:Nessus.yml]
ignore=IN145

[file:Nessus_image.png]
ignore=IM111
8 changes: 7 additions & 1 deletion Packs/nessus/Integrations/Nessus/Nessus.js
Expand Up @@ -113,13 +113,19 @@ var jsonToEntity = function(origObj, newKeys){
}
};


var login = function() {
let username = params.credentials ? params.credentials.identifier : params.username;
let password = params.credentials ? params.credentials.password : params.password;
if (!(username&&password)){
throw 'Username and Password must be provided';
}
var result = http(
getReadyURL()+'session',
{
Headers: {'Content-Type': ['application/json']},
Method: 'POST',
Body: JSON.stringify({'username':params.username,'password':params.password}),
Body: JSON.stringify({'username':username,'password':password}),
},
params.insecure
);
Expand Down
12 changes: 10 additions & 2 deletions Packs/nessus/Integrations/Nessus/Nessus.yml
Expand Up @@ -16,12 +16,20 @@ configuration:
name: username
defaultvalue: ""
type: 0
required: true
required: false
hidden: true
- display: Password
name: password
defaultvalue: ""
type: 4
required: true
required: false
hidden: true
- display: Username
name: credentials
required: false
type: 9
displaypassword: Password
section: Connect
- display: Trust any certificate (not secure)
name: insecure
type: 8
Expand Down