github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Verify emails when creating an email connector, even if allowedDomains is not provided. (#133859)

Browse source
This commit is contained in:
Ersin Erdal 2022-06-28 13:46:33 +02:00 • committed by GitHub
parent d6f2dc1042
commit 2b6fc197cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
x-pack/plugins/actions/common/validate_email_addresses.test.ts
View file

@ -182,11 +182,13 @@ describe('validate_email_address', () => {
},
Object {
"address": "totally invalid",
"valid": true,
"reason": "invalid",
"valid": false,
},
Object {
"address": "{{sneaky}}",
"valid": true,
"reason": "invalid",
"valid": false,
},
]
`);
@ -226,7 +228,8 @@ describe('validate_email_address', () => {
},
Object {
"address": "totally invalid",
"valid": true,
"reason": "invalid",
"valid": false,
},
Object {
"address": "{{sneaky}}",

40
x-pack/plugins/actions/common/validate_email_addresses.ts
View file

@ -27,13 +27,6 @@ export function validateEmailAddresses(
addresses: string[],
options: ValidateEmailAddressesOptions = {}
): ValidatedEmail[] {
// note: this is the legacy default, which would in theory allow
// mustache strings, so options.allowMustache is ignored in this
// case - everything is valid!
if (allowedDomains == null) {
return validateEmailAddressesAsAlwaysValid(addresses);
}
return addresses.map((address) => validateEmailAddress(allowedDomains, address, options));
}
@ -60,7 +53,7 @@ export function invalidEmailsAsMessage(validatedEmails: ValidatedEmail[]): strin
// in case the npm email-addresses returns unexpected things ...
function validateEmailAddress(
allowedDomains: string[],
allowedDomains: string[] | null,
address: string,
options: ValidateEmailAddressesOptions
): ValidatedEmail {
@ -80,32 +73,33 @@ function validateEmailAddress(
}
}
function validateEmailAddress_(allowedDomains: string[], address: string): ValidatedEmail {
function validateEmailAddress_(allowedDomains: string[] | null, address: string): ValidatedEmail {
const emailAddresses = parseAddressList(address);
if (emailAddresses == null) {
return { address, valid: false, reason: InvalidEmailReason.invalid };
}
const allowedDomainsSet = new Set(allowedDomains);
if (allowedDomains !== null) {
const allowedDomainsSet = new Set(allowedDomains);
for (const emailAddress of emailAddresses) {
let domains: string[] = [];
for (const emailAddress of emailAddresses) {
let domains: string[] = [];
if (emailAddress.type === 'group') {
domains = emailAddress.addresses.map((groupAddress) => groupAddress.domain);
} else if (emailAddress.type === 'mailbox') {
domains = [emailAddress.domain];
} else {
return { address, valid: false, reason: InvalidEmailReason.invalid };
}
if (emailAddress.type === 'group') {
domains = emailAddress.addresses.map((groupAddress) => groupAddress.domain);
} else if (emailAddress.type === 'mailbox') {
domains = [emailAddress.domain];
} else {
return { address, valid: false, reason: InvalidEmailReason.invalid };
}
for (const domain of domains) {
if (!allowedDomainsSet.has(domain)) {
return { address, valid: false, reason: InvalidEmailReason.notAllowed };
for (const domain of domains) {
if (!allowedDomainsSet.has(domain)) {
return { address, valid: false, reason: InvalidEmailReason.notAllowed };
}
}
}
}
return { address, valid: true };
}

5
x-pack/plugins/actions/public/plugin.test.ts
View file

@ -12,7 +12,7 @@ describe('Actions Plugin', () => {
describe('setup()', () => {
const emails = ['bob@elastic.co', 'jim@somewhere.org', 'not an email'];
it('should allow all emails when not using email allowlist config', async () => {
it('should allow all the valid emails when not using email allowlist config', async () => {
const context = coreMock.createPluginInitializerContext({});
const plugin = new Plugin(context);
const pluginSetup = plugin.setup();
@ -29,7 +29,8 @@ describe('Actions Plugin', () => {
},
Object {
"address": "not an email",
"valid": true,
"reason": "invalid",
"valid": false,
},
]
`);