From 01ec5ebdcdb18bea847a42a901551b266817213d Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Wed, 18 Nov 2020 15:32:45 -0700 Subject: [PATCH] Reverts the regex change in dead3226a545e264072ced40284f86ac41528ba8. The regex change broke some of the external tests. I added some more cases to the regular email btest to hopefully cover all of the cases better. --- scripts/base/utils/email.zeek | 5 ++--- testing/btest/Baseline/scripts.base.utils.email/output | 9 ++++++++- testing/btest/scripts/base/utils/email.zeek | 4 ++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/scripts/base/utils/email.zeek b/scripts/base/utils/email.zeek index 903048eafd..b647149bdc 100644 --- a/scripts/base/utils/email.zeek +++ b/scripts/base/utils/email.zeek @@ -19,7 +19,7 @@ function extract_email_addrs_vec(str: string): string_vec ## ## str: A string potentially containing email addresses. ## -## Returns: A set of extracted email addresses. An empty set is returned +## Returns: A set of extracted email addresses. An empty set is returned ## if no email addresses are discovered. function extract_email_addrs_set(str: string): set[string] { @@ -58,8 +58,7 @@ function extract_first_email_addr(str: string): string function split_mime_email_addresses(line: string): set[string] { local output = string_set(); - - local addrs = find_all(line, /(\"[^"]*\")?[^,]+@[^,]+/); + local addrs = find_all(line, /(\"[^"]*\")?[^,]+/); for ( part in addrs ) { add output[strip(part)]; diff --git a/testing/btest/Baseline/scripts.base.utils.email/output b/testing/btest/Baseline/scripts.base.utils.email/output index 6955547403..dc0958ff64 100644 --- a/testing/btest/Baseline/scripts.base.utils.email/output +++ b/testing/btest/Baseline/scripts.base.utils.email/output @@ -1,3 +1,4 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. one@example.com [one@example.com, two@example.com, three@example.com, one@example.com] { @@ -22,6 +23,12 @@ two@example.com john.smith@email.com [john.smith@email.com, jane.doe@email.com] { -john.smith@email.com +john.smith@email.com, +jane.doe@email.com +} +john.smith@email.com +[john.smith@email.com, jane.doe@email.com] +{ +john.smith@email.com, jane.doe@email.com } diff --git a/testing/btest/scripts/base/utils/email.zeek b/testing/btest/scripts/base/utils/email.zeek index 5177ce8cb2..6d4838765f 100644 --- a/testing/btest/scripts/base/utils/email.zeek +++ b/testing/btest/scripts/base/utils/email.zeek @@ -19,3 +19,7 @@ s = "\"Smith, John\" , \"Doe, Jane\" " print extract_first_email_addr(s); print extract_email_addrs_vec(s); print extract_email_addrs_set(s); +s = "\"Smith, John\" ,\"Doe, Jane\" "; +print extract_first_email_addr(s); +print extract_email_addrs_vec(s); +print extract_email_addrs_set(s);