X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=perlmail-accept;h=75dfa4acfa93aecd56b1ff897a236ffea7054b05;hp=7eb3f75ddc0c5f349d34d75d1b2467a6944afe2c;hb=c3e8f93bdd428b21be0af55eed08f47cf14874b8;hpb=130d4621a51128a582392422074bb8954a78c254

diff --git a/perlmail-accept b/perlmail-accept
index 7eb3f75..75dfa4a 100755
--- a/perlmail-accept
+++ b/perlmail-accept
@@ -69,6 +69,8 @@ require HTTP::Request;
 require LWP::UserAgent;
 use URI::Escape 'uri_escape';
 require WWW::SMS;
+require Authen::SASL;	# Sanity check for &Net::SMTP::auth
+use MIME::Base64;
 
 
 our($Message,@AuditStored,$DoBell);
@@ -492,7 +494,7 @@ sub spamassassin
 {
 my($cmd)=@_;
 
-	$cmd||="spamassassin --exit-code";
+	$cmd||="$HOME/bin/spamassassin --exit-code";
 	# spamassassin has exit code 1 if IS spam, code 0 if NOT spam
 	local *CHILD;
 	local $SIG{"PIPE"}=sub { warn "spamassassin gave me SIGPIPE: broken pipe"; };
@@ -656,6 +658,63 @@ my($header,$map)=@_;
 	$Audit->replace_header($header,$text);
 }
 
+# LMTP engine:
+use Net::Cmd qw(CMD_OK CMD_MORE);
+{
+	package My::Net::SMTP::LMTP;
+	require Net::SMTP;
+	our @ISA=qw(Net::SMTP);
+	use Net::SMTP;
+	use Net::Cmd qw(CMD_OK);
+	use Carp qw(confess cluck);
+
+	# Do not: sub _HELO
+	# as it would not set {'net_smtp_esmtp'}
+	sub _EHLO { shift->command("LHLO", @_)->response()  == CMD_OK }
+
+	sub clucked
+	{
+	my($self,$func,@args)=@_;
+
+		do { return $_ if defined $_; } for $self->$func(@args);
+		cluck $func;
+		return;
+	}
+}
+
+
+sub lmtp_deliver
+{
+my($admin_user,$admin_pwd,$user_from,$user_to)=@_;
+
+	my $lmtp=My::Net::SMTP::LMTP->clucked("new","localhost","Port"=>"lmtp",
+#			"Debug"=>1,
+			) or return;
+	bless $lmtp,"My::Net::SMTP::LMTP";
+# Prevent:
+# due to:
+#	$lmtp->auth(Authen::SASL->new(
+#			"mechanism"=>"PLAIN",
+#			"callback"=>{
+#					"user"=>$admin_user,
+#					"pass"=>$admin_pwd,
+#					# Prevent: "authname"=>$admin_user
+#					# as it causes: DIE: Unknown callback: 'authname'. (user|auth|language|pass)
+#					}));
+	# FIXME: Authentication hack:
+	$lmtp->command("AUTH PLAIN")->response()==CMD_MORE
+			or do { cluck "auth announce"; return; };
+	$lmtp->clucked("command",encode_base64($user_from."\x00".$admin_user."\x00".$admin_pwd)) or return;
+	$lmtp->clucked("mail",$user_from) or return;
+	$lmtp->clucked("to",$user_to) or return;
+	$lmtp->clucked("data");	# Do not: or return;
+	# Prevent: 554 5.6.0 Message contains invalid header
+	(my $data=$Message)=~s/\AFrom .*\r?\n//;
+	$lmtp->clucked("datasend",$data) or return;
+	$lmtp->clucked("dataend") or return;
+	$lmtp->clucked("quit") or return;
+}
+
 
 # MAIN