@@ -10,31 +10,64 @@ source: |
1010 and (
1111 any(headers.reply_to,
1212 any($org_vips,
13- strings.contains(.display_name, ..display_name)
14- or strings.contains(strings.concat(.first_name, " ", .last_name),
15- ..display_name
13+ (
14+ ..display_name != ""
15+ and strings.contains(.display_name, ..display_name)
1616 )
17- or strings.contains(strings.concat(.last_name, ", ", .first_name),
18- ..display_name
17+ or (
18+ .first_name != ""
19+ and .last_name != ""
20+ and strings.contains(strings.concat(.first_name, " ", .last_name),
21+ ..display_name
22+ )
23+ )
24+ or (
25+ .first_name != ""
26+ and .last_name != ""
27+ and strings.contains(strings.concat(.last_name, ", ", .first_name),
28+ ..display_name
29+ )
1930 )
2031 )
2132 )
2233 or any($org_vips,
23- strings.contains(subject.subject, .display_name)
24- or strings.contains(subject.subject,
25- strings.concat(.first_name, " ", .last_name )
34+ (
35+ .display_name != ""
36+ and strings.contains(subject.subject, .display_name )
2637 )
27- or strings.contains(subject.subject,
28- strings.concat(.last_name, ", ", .first_name)
38+ or (
39+ .first_name != ""
40+ and .last_name != ""
41+ and strings.contains(subject.subject,
42+ strings.concat(.first_name, " ", .last_name)
43+ )
44+ )
45+ or (
46+ .first_name != ""
47+ and .last_name != ""
48+ and strings.contains(subject.subject,
49+ strings.concat(.last_name, ", ", .first_name)
50+ )
2951 )
3052 )
3153 or any($org_vips,
32- strings.contains(sender.display_name, .display_name)
33- or strings.contains(sender.display_name,
34- strings.concat(.first_name, " ", .last_name)
54+ (
55+ .display_name != ""
56+ and strings.contains(sender.display_name, .display_name)
57+ )
58+ or (
59+ .first_name != ""
60+ and .last_name != ""
61+ and strings.contains(sender.display_name,
62+ strings.concat(.first_name, " ", .last_name)
63+ )
3564 )
36- or strings.contains(sender.display_name,
37- strings.concat(.last_name, ", ", .first_name)
65+ or (
66+ .first_name != ""
67+ and .last_name != ""
68+ and strings.contains(sender.display_name,
69+ strings.concat(.last_name, ", ", .first_name)
70+ )
3871 )
3972 )
4073 )
@@ -104,4 +137,4 @@ detection_methods:
104137id : " 674a5349-ceb9-5831-af1c-175d9fa6dbd7"
105138og_id : " 57f9cd3b-ddac-5ef5-96dd-374dbd03f5cd"
106139testing_pr : 4515
107- testing_sha : c9ede5003470372be79cb7ad142656d7202a6329
140+ testing_sha : 2ec75286147bba6ef91add1a4e30fd5b4114e410
0 commit comments