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

vpopmaild: logging improvements

Browse Source 
added a couple logging calls
prefixed others with pass/skip/fail keywords
This commit is contained in:
Matt Simerson 2012-05-15 00:48:55 -04:00 committed by Robert
parent beca1e5e41
commit 4c6054c9fc
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/auth/auth_vpopmaild
View File

@ -6,7 +6,7 @@ use warnings;
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
use IO::Socket; use IO::Socket;
use version; use version;
my $VERSION = qv('1.0.2'); my $VERSION = qv('1.0.3');
sub register { sub register {
my ($self, $qp, %args) = @_; my ($self, $qp, %args) = @_;
@ -23,31 +23,33 @@ sub auth_vpopmaild {
my ($self, $transaction, $method, $user, $passClear, $passHash, $ticket) = @_; my ($self, $transaction, $method, $user, $passClear, $passHash, $ticket) = @_;
if ( ! $passClear ) { if ( ! $passClear ) {
$self->log(LOGINFO, "vpopmaild does not support cram-md5"); $self->log(LOGINFO, "skip: vpopmaild does not support cram-md5");
return DECLINED; return DECLINED;
} }
# create socket # create socket
my $vpopmaild_socket = my $vpopmaild_socket = IO::Socket::INET->new(
IO::Socket::INET->new(
PeerAddr => $self->{_vpopmaild_host}, PeerAddr => $self->{_vpopmaild_host},
PeerPort => $self->{_vpopmaild_port}, PeerPort => $self->{_vpopmaild_port},
Proto => 'tcp', Proto => 'tcp',
Type => SOCK_STREAM Type => SOCK_STREAM
) or return DECLINED; ) or do {
$self->log(LOGERROR, "skip: socket connection to vpopmaild failed");
return DECLINED;
};
$self->log(LOGDEBUG, "attempting $method"); $self->log(LOGDEBUG, "attempting $method");
# Get server greeting (+OK) # Get server greeting (+OK)
my $connect_response = <$vpopmaild_socket>; my $connect_response = <$vpopmaild_socket>;
if ( ! $connect_response ) { if ( ! $connect_response ) {
$self->log(LOGERROR, "no connection response"); $self->log(LOGERROR, "skip: no connection response");
close($vpopmaild_socket); close($vpopmaild_socket);
return DECLINED; return DECLINED;
}; };
if ( $connect_response !~ /^\+OK/ ) { if ( $connect_response !~ /^\+OK/ ) {
$self->log(LOGERROR, "bad connection response: $connect_response"); $self->log(LOGERROR, "skip: bad connection response: $connect_response");
close($vpopmaild_socket); close($vpopmaild_socket);
return DECLINED; return DECLINED;
}; };
@ -57,18 +59,18 @@ sub auth_vpopmaild {
close($vpopmaild_socket); close($vpopmaild_socket);
if ( ! $login_response ) { if ( ! $login_response ) {
$self->log(LOGERROR, "no login response"); $self->log(LOGERROR, "skip: no login response");
return DECLINED; return DECLINED;
}; };
# check for successful login (single line (+OK) or multiline (+OK+)) # check for successful login (single line (+OK) or multiline (+OK+))
if ( $login_response =~ /^\+OK/ ) { if ( $login_response =~ /^\+OK/ ) {
$self->log(LOGDEBUG, "auth success"); $self->log(LOGINFO, "pass: clear");
return (OK, 'auth_vpopmaild'); return (OK, 'auth_vpopmaild');
}; };
$self->log(LOGNOTICE, "failed authentication response: $login_response"); chomp $login_response;
$self->log(LOGNOTICE, "fail: $login_response");
return DECLINED; return DECLINED;
} }
@ -106,7 +108,7 @@ please read the VPOPMAIL section in doc/authentication.pod
Robin Bowes <robin.bowes@yo61.com> Robin Bowes <robin.bowes@yo61.com>
Matt Simerson (4/2012: added CRAM-MD5 support, updated response parsing) Matt Simerson (updated response parsing, added logging)
=head1 COPYRIGHT AND LICENSE =head1 COPYRIGHT AND LICENSE