@@ -11,31 +11,37 @@ source: |
1111 any(headers.reply_to,
1212 any($org_vips,
1313 strings.contains(.display_name, ..display_name)
14- or strings.contains(strings.concat(.first_name, " ", .last_name),
15- ..display_name
16- )
1714 or strings.contains(strings.concat(.last_name, ", ", .first_name),
1815 ..display_name
1916 )
17+ or any(regex.extract(.display_name,
18+ '\A(?P<name>.+?)\s*[\((][^))]*[))]\s*\z'
19+ ),
20+ strings.contains(.named_groups["name"], ...display_name)
21+ )
2022 )
2123 )
2224 or any($org_vips,
2325 strings.contains(subject.subject, .display_name)
24- or strings.contains(subject.subject,
25- strings.concat(.first_name, " ", .last_name)
26- )
2726 or strings.contains(subject.subject,
2827 strings.concat(.last_name, ", ", .first_name)
2928 )
29+ or any(regex.extract(.display_name,
30+ '\A(?P<name>.+?)\s*[\((][^))]*[))]\s*\z'
31+ ),
32+ strings.contains(subject.subject, .named_groups["name"])
33+ )
3034 )
3135 or any($org_vips,
3236 strings.contains(sender.display_name, .display_name)
33- or strings.contains(sender.display_name,
34- strings.concat(.first_name, " ", .last_name)
35- )
3637 or strings.contains(sender.display_name,
3738 strings.concat(.last_name, ", ", .first_name)
3839 )
40+ or any(regex.extract(.display_name,
41+ '\A(?P<name>.+?)\s*[\((][^))]*[))]\s*\z'
42+ ),
43+ strings.contains(sender.display_name, .named_groups["name"])
44+ )
3945 )
4046 )
4147 and any(headers.hops,
@@ -104,4 +110,4 @@ detection_methods:
104110id : " 674a5349-ceb9-5831-af1c-175d9fa6dbd7"
105111og_id : " 57f9cd3b-ddac-5ef5-96dd-374dbd03f5cd"
106112testing_pr : 4515
107- testing_sha : 1658ad9fc984cdf4e2a8a85f6af83206ffd6dde1
113+ testing_sha : 3c7644f9963fb214445fd5add76ce8f949a4acf0
0 commit comments