Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'christina23/master'

Browse source 
* christina23/master:
  Added unit tests for regex fix
  Improved regex for SMTP parsing
This commit is contained in:
Tim Wojtulewicz 2020-11-17 15:01:04 -07:00
commit a56fbe408f
5 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,3 +1,8 @@
3.3.0-dev.551 | 2020-11-17 15:01:04 -0700
* Added unit tests for regex fix (christina23)
* Improved regex for SMTP parsing (christina23)
3.3.0-dev.548 | 2020-11-17 13:32:57 -0800 3.3.0-dev.548 | 2020-11-17 13:32:57 -0800

2
VERSION
View file

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

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

@ -59,7 +59,7 @@ 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)];

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

@ -19,3 +19,9 @@ three@example.com,
one@example.com, one@example.com,
two@example.com two@example.com
} }
john.smith@email.com
[john.smith@email.com, jane.doe@email.com]
{
john.smith@email.com
jane.doe@email.com
}

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

@ -15,3 +15,7 @@ s = "ieje one@example.com, eifj two@example.com, asdf three@example.com, one@exa
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);