1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
Description: Add Postfix long, non-repeating, queue ID support.
The long queue IDs are encoded in a 52-character alphabet that contains:
- digits (0-9)
- upper-case letters (B-Z) w/o AEIOU
- lower-case letters (b-z) w/o aeiou
Additionally it corrects the regular expression for the short queue IDs.
The short queue IDs are encoded in hexadecimal alphabet that contains:
- digits (0-9)
- upper-case letters (A-F)
Author: Pascal Volk <user@localhost.localdomain.org>
--- a/mailgraph.pl
+++ b/mailgraph.pl
@@ -620,7 +620,7 @@
}
}
elsif($prog eq 'smtpd') {
- if($text =~ /^[0-9A-Z]+: client=(\S+)/) {
+ if($text =~ /^(?:[\dA-F]+|[\dB-DF-HJ-NP-TV-Zb-df-hj-np-tv-z]+): client=(\S+)/) {
my $client = $1;
return if $opt{'ignore-localhost'} and
$client =~ /\[127\.0\.0\.1\]$/;
@@ -628,19 +628,19 @@
$client =~ /$opt{'ignore-host'}/oi;
event($time, 'received');
}
- elsif($opt{'virbl-is-virus'} and $text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using virbl.dnsbl.bit.nl/) {
+ elsif($opt{'virbl-is-virus'} and $text =~ /^(?:[\dA-F]+: |[\dB-DF-HJ-NP-TV-Zb-df-hj-np-tv-z]+: |NOQUEUE: )?reject: .*: 554.* blocked using virbl.dnsbl.bit.nl/) {
event($time, 'virus');
}
- elsif($opt{'rbl-is-spam'} and $text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using/) {
+ elsif($opt{'rbl-is-spam'} and $text =~ /^(?:[\dA-F]+: |[\dB-DF-HJ-NP-TV-Zb-df-hj-np-tv-z]+: |NOQUEUE: )?reject: .*: 554.* blocked using/) {
event($time, 'spam');
}
elsif($text =~ /Greylisted/) {
event($time, 'greylisted');
}
- elsif($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: /) {
+ elsif($text =~ /^(?:[\dA-F]+: |[\dB-DF-HJ-NP-TV-Zb-df-hj-np-tv-z]+: |NOQUEUE: )?reject: /) {
event($time, 'rejected');
}
- elsif($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?milter-reject: /) {
+ elsif($text =~ /^(?:[\dA-F]+: |[\dB-DF-HJ-NP-TV-Zb-df-hj-np-tv-z]+: |NOQUEUE: )?milter-reject: /) {
if($text =~ /Blocked by SpamAssassin/) {
event($time, 'spam');
}
@@ -655,7 +655,7 @@
}
}
elsif($prog eq 'cleanup') {
- if($text =~ /^[0-9A-Z]+: (?:reject|discard): /) {
+ if($text =~ /(?:[\dA-F]+|[\dB-DF-HJ-NP-TV-Zb-df-hj-np-tv-z]+): (?:reject|discard): /) {
event($time, 'rejected');
}
}
|
