fix bug #1643: add port and protocol to spamquarantine config

[pmg-api.git] / PMG / Utils.pm

diff --git a/PMG/Utils.pm b/PMG/Utils.pm
index bb389cadb399e877c440699bd6f4a68fd9d039c3..a78728e559a116a18ee01f06ce1665b0deee0e24 100644 (file)
--- a/PMG/Utils.pm
+++ b/PMG/Utils.pm
@@ -471,7 +471,7 @@ __EOD__
 }
 
 sub find_local_network_for_ip {
-    my ($ip) = @_;
+    my ($ip, $noerr) = @_;
 
     my $testip = Net::IP->new($ip);
 
@@ -499,6 +499,8 @@ sub find_local_network_for_ip {
        }
     }
 
+    return undef if $noerr;
+
     die "unable to detect local network for ip '$ip'\n";
 }
 
@@ -531,6 +533,9 @@ sub get_full_service_state {
     return $res;
 }
 
+our $db_service_list = [
+    'pmgpolicy', 'pmgmirror', 'pmgtunnel', 'pmg-smtp-filter' ];
+
 sub service_wait_stopped {
     my ($timeout, $service_list) = @_;
 
@@ -567,14 +572,14 @@ sub service_cmd {
     my ($service, $cmd) = @_;
 
     die "unknown service command '$cmd'\n"
-       if $cmd !~ m/^(start|stop|restart|reload)$/;
+       if $cmd !~ m/^(start|stop|restart|reload|reload-or-restart)$/;
 
     if ($service eq 'pmgdaemon' || $service eq 'pmgproxy') {
-       if ($cmd eq 'restart') {
-           # OK
-       } else {
-           die "invalid service cmd '$service $cmd': ERROR";
-       }
+       die "invalid service cmd '$service $cmd': ERROR" if $cmd eq 'stop';
+    } elsif ($service eq 'fetchmail') {
+       # use restart instead of start - else it does not start 'exited' unit
+       # after setting START_DAEMON=yes in /etc/default/fetchmail
+       $cmd = 'restart' if $cmd eq 'start';
     }
 
     $service = $service_aliases->{$service} // $service;
@@ -613,11 +618,13 @@ sub run_postmap {
     # make sure the file exists (else postmap fails)
     IO::File->new($filename, 'a', 0644);
 
-    my $age_src = -M $filename // 0;
-    my $age_dst = -M "$filename.db" // 10000000000;
+    my $mtime_src = (CORE::stat($filename))[9] //
+       die "unbale to read mtime of $filename\n";
+
+    my $mtime_dst = (CORE::stat("$filename.db"))[9] // 0;
 
     # if not changed, do nothing
-    return if $age_src > $age_dst;
+    return if $mtime_src <= $mtime_dst;
 
     eval {
        PVE::Tools::run_command(
@@ -787,7 +794,7 @@ sub update_node_status_rrd {
     my $netin = 0;
     my $netout = 0;
     foreach my $dev (keys %$netdev) {
-       next if $dev !~ m/^eth\d+$/;
+       next if $dev !~ m/^$PVE::Network::PHYSICAL_NIC_RE$/;
        $netin += $netdev->{$dev}->{receive};
        $netout += $netdev->{$dev}->{transmit};
     }
@@ -963,10 +970,13 @@ sub bencode_header {
 }
 
 sub load_sa_descriptions {
+    my ($additional_dirs) = @_;
 
     my @dirs = ('/usr/share/spamassassin',
                '/usr/share/spamassassin-extra');
 
+    push @dirs, @$additional_dirs if @$additional_dirs;
+
     my $res = {};
 
     my $parse_sa_file = sub {
@@ -994,6 +1004,8 @@ sub load_sa_descriptions {
        }
     }
 
+    $res->{'ClamAVHeuristics'}->{desc} = "ClamAV heuristic tests";
+
     return $res;
 }
 
@@ -1083,9 +1095,13 @@ sub scan_journal_for_rbl_rejects {
     # example postscreen log entry for RBL rejects
     # Aug 29 08:00:36 proxmox postfix/postscreen[11266]: NOQUEUE: reject: RCPT from [x.x.x.x]:1234: 550 5.7.1 Service unavailable; client [x.x.x.x] blocked using zen.spamhaus.org; from=<xxxx>, to=<yyyy>, proto=ESMTP, helo=<zzz>
 
+    # example for PREGREET reject
+    # Dec  7 06:57:11 proxmox postfix/postscreen[32084]: PREGREET 14 after 0.23 from [x.x.x.x]:63492: EHLO yyyyy\r\n
+
     my $identifier = 'postfix/postscreen';
 
-    my $count = 0;
+    my $rbl_count = 0;
+    my $pregreet_count = 0;
 
     my $parser = sub {
        my $line = shift;
@@ -1095,8 +1111,11 @@ sub scan_journal_for_rbl_rejects {
            return;
        }
 
-       return if $line !~ m/\s$identifier\[\d+\]:\sNOQUEUE:\sreject:.*550 5.7.1 Service unavailable;/;
-       $count++;
+       if ($line =~ m/\s$identifier\[\d+\]:\sNOQUEUE:\sreject:.*550 5.7.1 Service unavailable;/) {
+           $rbl_count++;
+       } elsif ($line =~ m/\s$identifier\[\d+\]:\sPREGREET\s\d+\safter\s/) {
+           $pregreet_count++;
+       }
     };
 
     # limit to last 5000 lines to avoid long delays
@@ -1111,7 +1130,7 @@ sub scan_journal_for_rbl_rejects {
 
     PVE::Tools::run_command($cmd, outfunc => $parser);
 
-    return $count;
+    return ($rbl_count, $pregreet_count);
 }
 
 my $hwaddress;
@@ -1127,4 +1146,40 @@ sub get_hwaddress {
     return $hwaddress;
 }
 
+my $default_locale = "en_US.UTF-8 UTF-8";
+
+sub cond_add_default_locale {
+
+    my $filename = "/etc/locale.gen";
+
+    open(my $infh, "<", $filename) || return;
+
+    while (defined(my $line = <$infh>)) {
+       if ($line =~ m/^\Q${default_locale}\E/) {
+           # already configured
+           return;
+       }
+    }
+
+    seek($infh, 0, 0) // return; # seek failed
+
+    open(my $outfh, ">", "$filename.tmp") || return;
+
+    my $done;
+    while (defined(my $line = <$infh>)) {
+       if ($line =~ m/^#\s*\Q${default_locale}\E.*/) {
+           print $outfh "${default_locale}\n" if !$done;
+           $done = 1;
+       } else {
+           print $outfh $line;
+       }
+    }
+
+    print STDERR "generation pmg default locale\n";
+
+    rename("$filename.tmp", $filename) || return; # rename failed
+
+    system("dpkg-reconfigure locales -f noninteractive");
+}
+
 1;