Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 21:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/timw/fix-email-regex'

Browse source 
* origin/topic/timw/fix-email-regex:
  Reverts the regex change in dead3226a5.
This commit is contained in:
Jon Siwek 2020-11-19 18:09:01 -08:00
commit 8d0f2f9ab7
5 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -1,3 +1,11 @@
3.3.0-dev.554 | 2020-11-19 18:09:01 -0800
* Reverts the SMTP regex change in dead3226a545e264072ced40284f86ac41528ba8. (Tim Wojtulewicz, Corelight)
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.
3.3.0-dev.551 | 2020-11-17 15:01:04 -0700 3.3.0-dev.551 | 2020-11-17 15:01:04 -0700
* Added unit tests for regex fix (christina23) * Added unit tests for regex fix (christina23)

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.551 3.3.0-dev.554

3
scripts/base/utils/email.zeek
View file

@ -58,8 +58,7 @@ function extract_first_email_addr(str: string): string
function split_mime_email_addresses(line: string): set[string] function split_mime_email_addresses(line: string): set[string]
{ {
local output = string_set(); local output = string_set();
local addrs = find_all(line, /(\"[^"]*\")?[^,]+/);
local addrs = find_all(line, /(\"[^"]*\")?[^,]+@[^,]+/);
for ( part in addrs ) for ( part in addrs )
{ {
add output[strip(part)]; add output[strip(part)];

9
testing/btest/Baseline/scripts.base.utils.email/output
View file

@ -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
[one@example.com, two@example.com, three@example.com, 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
[john.smith@email.com, jane.doe@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 jane.doe@email.com
} }

4
testing/btest/scripts/base/utils/email.zeek
View file

@ -19,3 +19,7 @@ s = "\"Smith, John\" <john.smith@email.com>, \"Doe, Jane\" <jane.doe@email.com>"
print extract_first_email_addr(s); print extract_first_email_addr(s);
print extract_email_addrs_vec(s); print extract_email_addrs_vec(s);
print extract_email_addrs_set(s); print extract_email_addrs_set(s);
s = "\"Smith, John\" <john.smith@email.com>,\"Doe, Jane\" <jane.doe@email.com>";
print extract_first_email_addr(s);
print extract_email_addrs_vec(s);
print extract_email_addrs_set(s);