byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for AUTH PLAIN from Michael Holzt <kju@fqdn.org>

Browse Source 
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@280 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Matt Sergeant 2004-07-29 14:40:32 +00:00
parent 2ab4613567
commit a204827d0c
1 changed files with 37 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
lib/Qpsmtpd/Auth.pm
View File

@ -214,6 +214,14 @@ package Qpsmtpd::Auth;
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
use MIME::Base64; use MIME::Base64;
sub e64
{
my ($arg) = @_;
my $res = encode_base64($arg);
chomp($res);
return($res);
}
sub Qpsmtpd::SMTP::auth { sub Qpsmtpd::SMTP::auth {
my ( $self, $arg, @stuff ) = @_; my ( $self, $arg, @stuff ) = @_;
@ -235,59 +243,39 @@ sub SASL {
$mechanism = lc($mechanism); $mechanism = lc($mechanism);
if ( $mechanism eq "plain" ) { if ( $mechanism eq "plain" ) {
if ($prekey) { if (!$prekey) {
( $passHash, $user, $passClear ) = split /\x0/, $session->respond( 334, "Please continue" );
decode_base64($prekey); $prekey= <>;
}
else {
$session->respond( 334, "Username:" );
# We read the username and password from STDIN
$user = <>;
chop($user);
chop($user);
if ( $user eq '*' ) {
$session->respond( 501, "Authentification canceled" );
return DECLINED;
}
$session->respond( 334, "Password:" );
$passClear = <>;
chop($passClear);
chop($passClear);
if ( $passClear eq '*' ) {
$session->respond( 501, "Authentification canceled" );
return DECLINED;
}
} }
( $passHash, $user, $passClear ) = split /\x0/,
decode_base64($prekey);
} }
elsif ($mechanism eq "login") {
# elsif ($mechanism eq "login") { if ( $prekey ) {
# if ( $prekey ) { ($passHash, $user, $passClear) = split /\x0/, decode_base64($prekey);
# ($passHash, $user, $passClear) = split /\x0/, decode_base64($prekey); }
# } else {
# else {
# $session->respond(334, e64("Username:"));
# $session->respond(334, encode_base64("User Name:")); $user = decode_base64(<>);
# $user = decode_base64(<>); #warn("Debug: User: '$user'");
# #warn("Debug: User: '$user'"); if ($user eq '*') {
# if ($user eq '*') { $session->respond(501, "Authentification canceled");
# $session->respond(501, "Authentification canceled"); return DECLINED;
# return DECLINED; }
# }
# $session->respond(334, e64("Password:"));
# $session->respond(334, encode_base64("Password:")); $passClear = <>;
# $passClear = <>; $passClear = decode_base64($passClear);
# $passClear = decode_base64($passClear); #warn("Debug: Pass: '$pass'");
# #warn("Debug: Pass: '$pass'"); if ($passClear eq '*') {
# if ($passClear eq '*') { $session->respond(501, "Authentification canceled");
# $session->respond(501, "Authentification canceled"); return DECLINED;
# return DECLINED; }
# } }
# } }
# }
elsif ( $mechanism eq "cram-md5" ) { elsif ( $mechanism eq "cram-md5" ) {
# rand() is not cryptographic, but we only need to generate a globally # rand() is not cryptographic, but we only need to generate a globally