api apt/versions: add some missing packages

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

diff --git a/PMG/SMTP.pm b/PMG/SMTP.pm
index 6cac972c9ef9fc9c2a046eb1b151aed0b4db6895..a2a6c480251cab43e28bfeb9cf6460bc6f2cfe01 100644 (file)
--- a/PMG/SMTP.pm
+++ b/PMG/SMTP.pm
@@ -2,8 +2,8 @@ package PMG::SMTP;
 
 use strict;
 use warnings;
-use Carp;
 use IO::Socket;
+use Encode;
 
 use PVE::SafeSyslog;
 
@@ -14,7 +14,7 @@ sub new {
 
     my $class = ref($this) || $this;
 
-    croak("undefined socket: ERROR") if !defined($sock);
+    die("undefined socket: ERROR") if !defined($sock);
 
     my $self = {};
     $self->{sock} = $sock;
@@ -33,6 +33,7 @@ sub reset {
     $self->{from} = undef;
     $self->{to} = [];
     $self->{queue} = undef;
+    delete $self->{smtputf8};
     delete $self->{xforward};
     delete $self->{status};
 }
@@ -73,6 +74,7 @@ sub loop {
            $self->reply ("250-PIPELINING");
            $self->reply ("250-ENHANCEDSTATUSCODES");
            $self->reply ("250-8BITMIME");
+           $self->reply ("250-SMTPUTF8");
            $self->reply ("250-XFORWARD NAME ADDR PROTO HELO");
            $self->reply ("250 OK.");
            $self->{lmtp} = 1 if ($cmd eq 'lhlo');
@@ -96,9 +98,14 @@ sub loop {
            $self->reply ("250 2.5.0 OK");
            next;
        } elsif ($cmd eq 'mail') {
-           if ($args =~ m/^from:\s*<(\S*)>/i) {
+           if ($args =~ m/^from:\s*<([^\s\>]*)>([^>]*)$/i) {
                delete $self->{to};
-               $self->{from} = $1;
+               my ($from, $opts) = ($1, $2);
+               if ($opts =~ m/\sSMTPUTF8/) {
+                   $self->{smtputf8} = 1;
+                   $from = decode('UTF-8', $from);
+               }
+               $self->{from} = $from;
                $self->reply ('250 2.5.0 OK');
                next;
            } else {
@@ -106,20 +113,21 @@ sub loop {
                next;
            }
        } elsif ($cmd eq 'rcpt') {
-           if ($args =~ m/^to:\s*<(\S+)>/i) {
-               push @{$self->{to}} , $1;
+           if ($args =~ m/^to:\s*<([^\s\>]+)>[^>]*$/i) {
+               my $to = $self->{smtputf8} ? decode('UTF-8', $1) : $1;
+               push @{$self->{to}} , $to;
                $self->reply ('250 2.5.0 OK');
                next;
            } else {
-               $self->reply ("501 5.5.2 Syntax: MAIL FROM: <address>");
+               $self->reply ("501 5.5.2 Syntax: RCPT TO: <address>");
                next;
            }
        } elsif ($cmd eq 'data') {
            if ($self->save_data ()) {
                eval { &$func ($data, $self); };
-               if ($@) {
+               if (my $err = $@) {
                    $data->{errors} = 1;
-                   syslog ('err', $@);
+                   syslog ('err', $err);
                }
 
                if ($self->{lmtp}) {
@@ -212,10 +220,9 @@ sub save_data {
 
        $self->{queue} = $queue;
     };
-
-    if($@) {
-       syslog ('err', $@);
-       $self->reply ("451 4.5.0 Local delivery failed: $@");
+    if (my $err = $@) {
+       syslog ('err', $err);
+       $self->reply ("451 4.5.0 Local delivery failed: $err");
        return 0;
     }
     if(!defined($done)) {