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

perltidy -b watch summarize show_message log2sql

Browse Source
This commit is contained in:
Matt Simerson 2013-04-21 00:54:43 -04:00
parent 9c96ae78e4
commit 610c39dc74
4 changed files with 540 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

246
log/log2sql
View File

@ -26,7 +26,7 @@ foreach my $file ( @logfiles ) {
my ($fid, $offset) = check_logfile($file); my ($fid, $offset) = check_logfile($file);
$fid or next; $fid or next;
parse_logfile($file, $fid, $offset); parse_logfile($file, $fid, $offset);
}; }
exit; exit;
@ -47,7 +47,7 @@ sub trim_message {
return '' if $mess eq 'TLS setup returning'; return '' if $mess eq 'TLS setup returning';
return $mess; return $mess;
}; }
sub get_os_id { sub get_os_id {
my $p0f_string = shift or return; my $p0f_string = shift or return;
@ -66,15 +66,15 @@ sub get_os_id {
my $ref = exec_query('SELECT * FROM os'); my $ref = exec_query('SELECT * FROM os');
foreach my $o (@$ref) { foreach my $o (@$ref) {
$os{$o->{name}} = $o->{id}; $os{$o->{name}} = $o->{id};
}; }
}; }
if (!defined $os{$p0f_string}) { if (!defined $os{$p0f_string}) {
warn "missing OS for $p0f_string\n"; warn "missing OS for $p0f_string\n";
}; }
return $os{$p0f_string}; return $os{$p0f_string};
}; }
sub get_plugin_id { sub get_plugin_id {
my $plugin = shift; my $plugin = shift;
@ -84,20 +84,21 @@ sub get_plugin_id {
foreach my $p (@$ref) { foreach my $p (@$ref) {
$plugins{$p->{name}} = $p->{id}; $plugins{$p->{name}} = $p->{id};
$plugins{$p->{id}} = $p->{name}; $plugins{$p->{id}} = $p->{name};
}; }
$ref = exec_query('SELECT * FROM plugin_aliases'); $ref = exec_query('SELECT * FROM plugin_aliases');
foreach my $pa (@$ref) { foreach my $pa (@$ref) {
$plugins{$pa->{name}} = $pa->{plugin_id}; $plugins{$pa->{name}} = $pa->{plugin_id};
}; }
}; }
if (!defined $plugins{$plugin}) { if (!defined $plugins{$plugin}) {
#warn Dumper(\%plugins); #warn Dumper(\%plugins);
die "missing DB plugin $plugin\n"; die "missing DB plugin $plugin\n";
}; }
return $plugins{$plugin}; return $plugins{$plugin};
}; }
sub get_msg_id { sub get_msg_id {
my ($fid, $pid) = @_; my ($fid, $pid) = @_;
@ -105,16 +106,15 @@ sub get_msg_id {
return $message_ids{"$fid-$pid"} if $message_ids{"$fid-$pid"}; return $message_ids{"$fid-$pid"} if $message_ids{"$fid-$pid"};
#print "searching for message $pid..."; #print "searching for message $pid...";
my $msgs = exec_query( my $msgs = exec_query('SELECT * FROM message WHERE file_id=? AND qp_pid=?',
'SELECT * FROM message WHERE file_id=? AND qp_pid=?', [$fid, $pid]);
[ $fid, $pid ]
);
#print scalar @$msgs ? "y\n" : "n\n"; #print scalar @$msgs ? "y\n" : "n\n";
if ($msgs->[0]{id}) { if ($msgs->[0]{id}) {
$message_ids{"$fid-$pid"} = $msgs->[0]{id}; $message_ids{"$fid-$pid"} = $msgs->[0]{id};
}; }
return $msgs->[0]{id}; return $msgs->[0]{id};
}; }
sub create_message { sub create_message {
my ($fid, $ts, $pid, $message) = @_; my ($fid, $ts, $pid, $message) = @_;
@ -129,9 +129,10 @@ sub create_message {
if ($host && $host ne 'Unknown') { if ($host && $host ne 'Unknown') {
exec_query("UPDATE message SET hostname=? WHERE id=?", [$host, $id]); exec_query("UPDATE message SET hostname=? WHERE id=?", [$host, $id]);
}; }
#warn "host updated: $host\n"; #warn "host updated: $host\n";
}; }
sub insert_plugin { sub insert_plugin {
my ($msg_id, $plugin, $message) = @_; my ($msg_id, $plugin, $message) = @_;
@ -141,21 +142,24 @@ sub insert_plugin {
if ($plugin eq 'ident::geoip') { if ($plugin eq 'ident::geoip') {
my ($gip, $distance) = $message =~ /(.*?),\s+([\d]+)\skm/; my ($gip, $distance) = $message =~ /(.*?),\s+([\d]+)\skm/;
if ($distance) { if ($distance) {
exec_query( 'UPDATE message SET distance=? WHERE id=?', [ $distance, $msg_id ] ); exec_query('UPDATE message SET distance=? WHERE id=?',
[$distance, $msg_id]);
$message = $gip; $message = $gip;
} }
} }
elsif ($plugin =~ /^ident::p0f/) { elsif ($plugin =~ /^ident::p0f/) {
my $os_id = get_os_id($message); my $os_id = get_os_id($message);
if ($os_id) { if ($os_id) {
exec_query( 'UPDATE message SET os_id=? WHERE id=?', [ $os_id, $msg_id ] ); exec_query('UPDATE message SET os_id=? WHERE id=?',
[$os_id, $msg_id]);
$message = 'pass'; $message = 'pass';
} }
} }
elsif ($plugin eq 'connection_time') { elsif ($plugin eq 'connection_time') {
my ($seconds) = $message =~ /\s*([\d\.]+)\s/; my ($seconds) = $message =~ /\s*([\d\.]+)\s/;
if ($seconds) { if ($seconds) {
exec_query( 'UPDATE message SET time=? WHERE id=?', [ $seconds, $msg_id ] ); exec_query('UPDATE message SET time=? WHERE id=?',
[$seconds, $msg_id]);
$message = 'pass'; $message = 'pass';
} }
} }
@ -163,12 +167,13 @@ sub insert_plugin {
my $result = get_score($message); my $result = get_score($message);
if ($result) { if ($result) {
$message = trim_message($message); $message = trim_message($message);
}; }
exec_query( 'INSERT INTO message_plugin SET msg_id=?, plugin_id=?, result=?, string=?', exec_query(
'INSERT INTO message_plugin SET msg_id=?, plugin_id=?, result=?, string=?',
[$msg_id, $plugin_id, $result, $message] [$msg_id, $plugin_id, $result, $message]
); );
}; }
sub parse_logfile { sub parse_logfile {
my $file = shift; my $file = shift;
@ -213,21 +218,27 @@ sub parse_logfile {
} }
elsif ($type eq 'close') { elsif ($type eq 'close') {
if ($message eq 'Connection Timed Out') { if ($message eq 'Connection Timed Out') {
exec_query('UPDATE message SET result=? WHERE id=?', [ -1, $msg_id ] ); exec_query('UPDATE message SET result=? WHERE id=?',
}; [-1, $msg_id]);
}
} }
elsif ($type eq 'connect') { } elsif ($type eq 'connect') { }
elsif ($type eq 'dispatch') { elsif ($type eq 'dispatch') {
if (substr($message, 0, 21) eq 'dispatching MAIL FROM') { if (substr($message, 0, 21) eq 'dispatching MAIL FROM') {
my ($from) = $message =~ /<(.*?)>/; my ($from) = $message =~ /<(.*?)>/;
exec_query('UPDATE message SET mail_from=? WHERE id=?', [ $from, $msg_id ] ); exec_query('UPDATE message SET mail_from=? WHERE id=?',
[$from, $msg_id]);
} }
elsif (substr($message, 0, 19) eq 'dispatching RCPT TO') { elsif (substr($message, 0, 19) eq 'dispatching RCPT TO') {
my ($to) = $message =~ /<(.*?)>/; my ($to) = $message =~ /<(.*?)>/;
exec_query('UPDATE message SET rcpt_to=? WHERE id=? AND rcpt_to IS NULL', [ $to, $msg_id ] ); exec_query(
'UPDATE message SET rcpt_to=? WHERE id=? AND rcpt_to IS NULL',
[$to, $msg_id]
);
} }
elsif ($message =~ m/dispatching (EHLO|HELO) (.*)/) { elsif ($message =~ m/dispatching (EHLO|HELO) (.*)/) {
exec_query('UPDATE message SET helo=? WHERE id=?', [ $2, $msg_id ] ); exec_query('UPDATE message SET helo=? WHERE id=?',
[$2, $msg_id]);
} }
elsif ($message eq 'dispatching DATA') { } elsif ($message eq 'dispatching DATA') { }
elsif ($message eq 'dispatching QUIT') { } elsif ($message eq 'dispatching QUIT') { }
@ -236,15 +247,15 @@ sub parse_logfile {
else { else {
# anything here is likely an unrecognized command # anything here is likely an unrecognized command
#print "$message\n"; #print "$message\n";
}; }
} }
else { else {
print "$type $pid $hook $plugin $message\n"; print "$type $pid $hook $plugin $message\n";
}; }
}; }
close $F; close $F;
}; }
sub check_logfile { sub check_logfile {
my $file = shift; my $file = shift;
@ -258,38 +269,28 @@ sub check_logfile {
#warn "check if file $file is in the DB as 'current'\n"; #warn "check if file $file is in the DB as 'current'\n";
if ($file =~ /^\@/) { if ($file =~ /^\@/) {
$exists = exec_query( $exists = exec_query('SELECT * FROM log WHERE inode=? AND name=?',
'SELECT * FROM log WHERE inode=? AND name=?', [$inode, 'current']);
[ $inode, 'current' ]
);
if (@$exists) { if (@$exists) {
print "Updating current -> $file\n"; print "Updating current -> $file\n";
exec_query( exec_query('UPDATE log SET name=? WHERE inode=? AND name=?',
'UPDATE log SET name=? WHERE inode=? AND name=?', [$file, $inode, 'current']);
[ $file, $inode, 'current' ]
);
return ($exists->[0]{id}, $exists->[0]{size}); # continue parsing return ($exists->[0]{id}, $exists->[0]{size}); # continue parsing
}; }
}; }
if ($file eq 'current') { if ($file eq 'current') {
$exists = exec_query( $exists = exec_query('SELECT * FROM log WHERE inode=? AND name=?',
'SELECT * FROM log WHERE inode=? AND name=?', [$inode, $file]);
[ $inode, $file ]
);
if (@$exists) { if (@$exists) {
exec_query( exec_query('UPDATE log SET size=? WHERE inode=? AND name=?',
'UPDATE log SET size=? WHERE inode=? AND name=?', [$size, $inode, 'current']);
[ $size, $inode, 'current' ]
);
return ($exists->[0]{id}, $exists->[0]{size}); # continue parsing return ($exists->[0]{id}, $exists->[0]{size}); # continue parsing
}; }
}; }
$exists = exec_query( $exists =
'SELECT * FROM log WHERE name=? AND size=?', exec_query('SELECT * FROM log WHERE name=? AND size=?', [$file, $size]);
[ $file, $size ]
);
return if @$exists; # log file hasn't changed, ignore it return if @$exists; # log file hasn't changed, ignore it
#print Dumper($exists); #print Dumper($exists);
@ -300,14 +301,14 @@ sub check_logfile {
); );
print "new file id: $id\n"; print "new file id: $id\n";
return ($id); return ($id);
}; }
sub get_log_dir { sub get_log_dir {
if (-d "log/main") { if (-d "log/main") {
my $wd = Cwd::cwd(); my $wd = Cwd::cwd();
return "$wd/log/main"; return "$wd/log/main";
}; }
foreach my $user (qw/ qpsmtpd smtpd /) { foreach my $user (qw/ qpsmtpd smtpd /) {
@ -315,13 +316,13 @@ sub get_log_dir {
if (-d "$homedir/log") { if (-d "$homedir/log") {
return "$homedir/log/main"; return "$homedir/log/main";
}; }
if (-d "$homedir/smtpd/log") { if (-d "$homedir/smtpd/log") {
return "$homedir/smtpd/log/main"; return "$homedir/smtpd/log/main";
}; }
}; }
}; }
sub get_logfiles { sub get_logfiles {
my $dir = shift; my $dir = shift;
@ -333,13 +334,13 @@ sub get_logfiles {
next if !-f "$dir/$f"; # ignore anything that's not a file next if !-f "$dir/$f"; # ignore anything that's not a file
if ($f =~ /^\@.*s$/) { if ($f =~ /^\@.*s$/) {
push @files, $f; push @files, $f;
}; }
} }
push @files, "current"; # always have this one last push @files, "current"; # always have this one last
closedir $D; closedir $D;
return @files; return @files;
}; }
sub parse_line { sub parse_line {
my $line = shift; my $line = shift;
@ -348,40 +349,65 @@ sub parse_line {
# lines seen many times per connection # lines seen many times per connection
return parse_line_plugin($line) if substr($message, 0, 1) eq '('; return parse_line_plugin($line) if substr($message, 0, 1) eq '(';
return ( 'dispatch', $pid, undef, undef, $message ) if substr($message, 0, 12) eq 'dispatching '; return ('dispatch', $pid, undef, undef, $message)
return ( 'queue', $pid, undef, undef, $message ) if substr($message, 0, 11) eq '250 Queued!'; if substr($message, 0, 12) eq 'dispatching ';
return ( 'response', $pid, undef, undef, $message ) if $message =~ /^[2|3]\d\d/; return ('queue', $pid, undef, undef, $message)
if substr($message, 0, 11) eq '250 Queued!';
return ('response', $pid, undef, undef, $message)
if $message =~ /^[2|3]\d\d/;
# lines seen about once per connection # lines seen about once per connection
return ( 'init', $pid, undef, undef, $message ) if substr($message, 0, 19) eq 'Accepted connection'; return ('init', $pid, undef, undef, $message)
return ( 'connect', $pid, undef, undef, substr( $message, 16) ) if substr($message, 0, 15) eq 'Connection from'; if substr($message, 0, 19) eq 'Accepted connection';
return ( 'connect', $pid, undef, undef, substr( $message, 16) ) if substr($message, 0, 8) eq 'connect '; return ('connect', $pid, undef, undef, substr($message, 16))
return ( 'close', $pid, undef, undef, $message ) if substr($message, 0, 6) eq 'close '; if substr($message, 0, 15) eq 'Connection from';
return ( 'close', $pid, undef, undef, $message ) if $message eq 'Connection Timed Out'; return ('connect', $pid, undef, undef, substr($message, 16))
return ( 'close', $pid, undef, undef, $message ) if substr($message, 0, 20) eq 'click, disconnecting'; if substr($message, 0, 8) eq 'connect ';
return parse_line_cleanup( $line ) if substr($message, 0, 11) eq 'cleaning up'; return ('close', $pid, undef, undef, $message)
if substr($message, 0, 6) eq 'close ';
return ('close', $pid, undef, undef, $message)
if $message eq 'Connection Timed Out';
return ('close', $pid, undef, undef, $message)
if substr($message, 0, 20) eq 'click, disconnecting';
return parse_line_cleanup($line)
if substr($message, 0, 11) eq 'cleaning up';
# lines seen less than once per connection # lines seen less than once per connection
return ( 'info', $pid, undef, undef, $message ) if $message eq 'spooling message to disk'; return ('info', $pid, undef, undef, $message)
if $message eq 'spooling message to disk';
return ('reject', $pid, undef, undef, $message) if $message =~ /^[4|5]\d\d/; return ('reject', $pid, undef, undef, $message) if $message =~ /^[4|5]\d\d/;
return ( 'reject', $pid, undef, undef, $message ) if substr($message, 0, 14) eq 'deny mail from'; return ('reject', $pid, undef, undef, $message)
return ( 'reject', $pid, undef, undef, $message ) if substr($message, 0, 18) eq 'denysoft mail from'; if substr($message, 0, 14) eq 'deny mail from';
return ( 'info', $pid, undef, undef, $message ) if substr($message, 0, 15) eq 'Lost connection'; return ('reject', $pid, undef, undef, $message)
return ( 'info', $pid, undef, undef, $message ) if $message eq 'auth success cleared naughty'; if substr($message, 0, 18) eq 'denysoft mail from';
return ( 'info', $pid, undef, undef, $message ) if substr($message, 0, 15) eq 'Running as user'; return ('info', $pid, undef, undef, $message)
return ( 'info', $pid, undef, undef, $message ) if substr($message, 0, 16) eq 'Loaded Qpsmtpd::'; if substr($message, 0, 15) eq 'Lost connection';
return ( 'info', $pid, undef, undef, $message ) if substr($message, 0, 24) eq 'Permissions on spool_dir'; return ('info', $pid, undef, undef, $message)
return ( 'info', $pid, undef, undef, $message ) if substr($message, 0, 13) eq 'Listening on '; if $message eq 'auth success cleared naughty';
return ( 'info', $pid, undef, undef, $message ) if substr($message, 0, 18) eq 'size_threshold set'; return ('info', $pid, undef, undef, $message)
return ( 'info', $pid, undef, undef, $message ) if substr($message, 0, 12) eq 'tls: ciphers'; if substr($message, 0, 15) eq 'Running as user';
return ( 'error', $pid, undef, undef, $message ) if substr($message, 0, 22) eq 'of uninitialized value'; return ('info', $pid, undef, undef, $message)
return ( 'error', $pid, undef, undef, $message ) if substr($message, 0, 8) eq 'symbol "'; if substr($message, 0, 16) eq 'Loaded Qpsmtpd::';
return ( 'error', $pid, undef, undef, $message ) if substr($message, 0, 9) eq 'error at '; return ('info', $pid, undef, undef, $message)
return ( 'error', $pid, undef, undef, $message ) if substr($message, 0, 15) eq 'Could not print'; if substr($message, 0, 24) eq 'Permissions on spool_dir';
return ('info', $pid, undef, undef, $message)
if substr($message, 0, 13) eq 'Listening on ';
return ('info', $pid, undef, undef, $message)
if substr($message, 0, 18) eq 'size_threshold set';
return ('info', $pid, undef, undef, $message)
if substr($message, 0, 12) eq 'tls: ciphers';
return ('error', $pid, undef, undef, $message)
if substr($message, 0, 22) eq 'of uninitialized value';
return ('error', $pid, undef, undef, $message)
if substr($message, 0, 8) eq 'symbol "';
return ('error', $pid, undef, undef, $message)
if substr($message, 0, 9) eq 'error at ';
return ('error', $pid, undef, undef, $message)
if substr($message, 0, 15) eq 'Could not print';
print "UNKNOWN LINE: $line\n"; print "UNKNOWN LINE: $line\n";
return ('unknown', $pid, undef, undef, $message); return ('unknown', $pid, undef, undef, $message);
}; }
sub parse_line_plugin { sub parse_line_plugin {
my ($line) = @_; my ($line) = @_;
@ -411,10 +437,10 @@ sub parse_line_plugin {
} }
elsif ($plugin =~ /resolvable_fromhost/) { elsif ($plugin =~ /resolvable_fromhost/) {
$message = 'pass' if $message =~ /^pass/; $message = 'pass' if $message =~ /^pass/;
}; }
return ('plugin', $pid, $hook, $plugin, $message); return ('plugin', $pid, $hook, $plugin, $message);
}; }
sub parse_line_plugin_dspam { sub parse_line_plugin_dspam {
my $line = shift; my $line = shift;
@ -424,13 +450,13 @@ sub parse_line_plugin_dspam {
if ($message =~ /Innocent, (\d\.\d\d c)/) { if ($message =~ /Innocent, (\d\.\d\d c)/) {
$message = "pass, $1"; $message = "pass, $1";
}; }
if ($message =~ /Spam, (\d\.\d\d c)/) { if ($message =~ /Spam, (\d\.\d\d c)/) {
$message = "fail, $1"; $message = "fail, $1";
}; }
return ('plugin', $pid, $hook, $plugin, $message); return ('plugin', $pid, $hook, $plugin, $message);
}; }
sub parse_line_plugin_spamassassin { sub parse_line_plugin_spamassassin {
my $line = shift; my $line = shift;
@ -440,13 +466,13 @@ sub parse_line_plugin_spamassassin {
if ($message =~ /pass, Ham, ([\d\-\.]+)\s/) { if ($message =~ /pass, Ham, ([\d\-\.]+)\s/) {
$message = "pass, $1"; $message = "pass, $1";
}; }
if ($message =~ /^fail, Spam,\s([\d\.]+)\s< 100/) { if ($message =~ /^fail, Spam,\s([\d\.]+)\s< 100/) {
$message = "fail, $1"; $message = "fail, $1";
}; }
return ('plugin', $pid, $hook, $plugin, $message); return ('plugin', $pid, $hook, $plugin, $message);
}; }
sub parse_line_plugin_p0f { sub parse_line_plugin_p0f {
my $line = shift; my $line = shift;
@ -456,7 +482,7 @@ sub parse_line_plugin_p0f {
if (substr($message, -5, 5) eq 'hops)') { if (substr($message, -5, 5) eq 'hops)') {
($message) = split(/\s\(/, $message); ($message) = split(/\s\(/, $message);
}; }
$message = 'iOS' if $message =~ /^iOS/; $message = 'iOS' if $message =~ /^iOS/;
$message = 'Solaris' if $message =~ /^Solaris/; $message = 'Solaris' if $message =~ /^Solaris/;
@ -479,15 +505,16 @@ sub parse_line_plugin_p0f {
$message = 'Netware' if $message =~ /Netware/i; $message = 'Netware' if $message =~ /Netware/i;
return ('plugin', $pid, $hook, $plugin, $message); return ('plugin', $pid, $hook, $plugin, $message);
}; }
sub parse_line_cleanup { sub parse_line_cleanup {
my ($line) = @_; my ($line) = @_;
# @tai 85931 cleaning up after 3210 # @tai 85931 cleaning up after 3210
my $pid = (split /\s+/, $line)[-1]; my $pid = (split /\s+/, $line)[-1];
$has_cleanup++; $has_cleanup++;
return ('cleanup', $pid, undef, undef, $line); return ('cleanup', $pid, undef, undef, $line);
}; }
sub get_score { sub get_score {
my $mess = shift; my $mess = shift;
@ -498,8 +525,7 @@ sub get_score {
return 2 if $mess =~ /^positive/; return 2 if $mess =~ /^positive/;
return 1 if $mess =~ /^skip/; return 1 if $mess =~ /^skip/;
return 0; return 0;
}; }
sub get_db { sub get_db {
@ -507,7 +533,7 @@ sub get_db {
or die DBIx::Simple->error; or die DBIx::Simple->error;
return $db; return $db;
}; }
sub exec_query { sub exec_query {
my $query = shift; my $query = shift;
@ -516,12 +542,12 @@ sub exec_query {
my @params; my @params;
if (defined $params) { if (defined $params) {
@params = ref $params eq 'ARRAY' ? @$params : $params; @params = ref $params eq 'ARRAY' ? @$params : $params;
}; }
my $err = "query failed: $query\n"; my $err = "query failed: $query\n";
if (scalar @params) { if (scalar @params) {
$err .= join(',', @params); $err .= join(',', @params);
}; }
#warn "err: $err\n"; #warn "err: $err\n";
if ($query =~ /INSERT INTO/) { if ($query =~ /INSERT INTO/) {
@ -537,9 +563,9 @@ sub exec_query {
elsif ($query =~ /DELETE/) { elsif ($query =~ /DELETE/) {
$db->query($query, @params) or die $err; $db->query($query, @params) or die $err;
return $db->query("SELECT ROW_COUNT()")->list; return $db->query("SELECT ROW_COUNT()")->list;
}; }
my $r = $db->query($query, @params)->hashes or die $err; my $r = $db->query($query, @params)->hashes or die $err;
return $r; return $r;
}; }

28
log/show_message
View File

@ -13,12 +13,13 @@ my $search = $ARGV[0];
if (!$search) { if (!$search) {
die "\nusage: $0 [ ip_address | PID ]\n\n"; die "\nusage: $0 [ ip_address | PID ]\n\n";
}; }
if ($search =~ /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/) { if ($search =~ /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/) {
#print "it's an IP\n"; #print "it's an IP\n";
$is_ip++; $is_ip++;
}; }
open my $LOG, '<', $logfile or die "unable to open $logfile\n"; open my $LOG, '<', $logfile or die "unable to open $logfile\n";
@ -34,13 +35,13 @@ if ( $is_ip ) { # look for the connection start message for the IP
$ip_matches++; $ip_matches++;
$search = $pid; $search = $pid;
$is_ip = 0; $is_ip = 0;
}; }
}; }
}; }
seek $LOG, 0, 0; seek $LOG, 0, 0;
die "no pid found for ip $search\n" if $is_ip; die "no pid found for ip $search\n" if $is_ip;
print "showing the last of $ip_matches connnections from $ARGV[0]\n"; print "showing the last of $ip_matches connnections from $ARGV[0]\n";
}; }
print "showing QP message PID $search\n"; print "showing QP message PID $search\n";
@ -49,24 +50,23 @@ while ( defined (my $line = <$LOG>) ) {
my ($tai, $pid, $mess) = split /\s/, $line, 3; my ($tai, $pid, $mess) = split /\s/, $line, 3;
next if !$pid; next if !$pid;
print $mess if ($pid eq $search); print $mess if ($pid eq $search);
}; }
close $LOG; close $LOG;
sub get_qp_dir { sub get_qp_dir {
foreach my $user (qw/ qpsmtpd smtpd /) { foreach my $user (qw/ qpsmtpd smtpd /) {
my ($homedir) = (getpwnam($user))[7] or next; my ($homedir) = (getpwnam($user))[7] or next;
if (-d "$homedir/plugins") { if (-d "$homedir/plugins") {
return "$homedir"; return "$homedir";
}; }
foreach my $s (qw/ smtpd qpsmtpd qpsmtpd-dev /) { foreach my $s (qw/ smtpd qpsmtpd qpsmtpd-dev /) {
if (-d "$homedir/$s/plugins") { if (-d "$homedir/$s/plugins") {
return "$homedir/$s"; return "$homedir/$s";
}; }
}; }
}; }
if (-d "./plugins") { if (-d "./plugins") {
return Cwd::getcwd(); return Cwd::getcwd();
}; }
}; }

139
log/summarize
View File

@ -15,9 +15,16 @@ my %hide_plugins = map { $_ => 1 } qw/ hostname /;
my $qpdir = get_qp_dir(); my $qpdir = get_qp_dir();
my $file = "$qpdir/log/main/current"; my $file = "$qpdir/log/main/current";
populate_plugins_from_registry(); populate_plugins_from_registry();
my @sorted_plugins = sort { $plugins{$a}{id} <=> $plugins{$b}{id} } keys %plugins; my @sorted_plugins =
sort { $plugins{$a}{id} <=> $plugins{$b}{id} } keys %plugins;
my $fh = File::Tail->new(name=>$file, interval=>1, maxinterval=>1, debug =>1, tail =>1000 ); my $fh = File::Tail->new(
name => $file,
interval => 1,
maxinterval => 1,
debug => 1,
tail => 1000
);
my $printed = 0; my $printed = 0;
my $has_cleanup; my $has_cleanup;
@ -69,7 +76,6 @@ my %formats3 = (
'virus::clamdscan' => "%-3.3s", 'virus::clamdscan' => "%-3.3s",
); );
while (defined(my $line = $fh->read)) { while (defined(my $line = $fh->read)) {
chomp $line; chomp $line;
next if !$line; next if !$line;
@ -82,10 +88,12 @@ while ( defined (my $line = $fh->read) ) {
next if $type ne 'connect'; # ignore unless connect next if $type ne 'connect'; # ignore unless connect
my ($host, $ip) = split /\s/, $message; my ($host, $ip) = split /\s/, $message;
$ip = substr $ip, 1, -1; $ip = substr $ip, 1, -1;
foreach ( keys %seen_plugins, qw/ helo_host from to / ) { $pids{$pid}{$_} = ''; }; foreach (keys %seen_plugins, qw/ helo_host from to /) {
$pids{$pid}{$_} = '';
}
$pids{$pid}{ip} = $ip; $pids{$pid}{ip} = $ip;
$pids{$pid}{hostname} = $host if $host ne 'Unknown'; $pids{$pid}{hostname} = $host if $host ne 'Unknown';
}; }
if ($type eq 'close') { if ($type eq 'close') {
next if $has_cleanup; # it'll get handled later next if $has_cleanup; # it'll get handled later
@ -107,8 +115,8 @@ while ( defined (my $line = $fh->read) ) {
} }
else { else {
#print "ignoring subsequent hit on $plugin: $message\n"; #print "ignoring subsequent hit on $plugin: $message\n";
}; }
}; }
if ($plugin eq 'ident::geoip') { if ($plugin eq 'ident::geoip') {
if (length $message < 3) { if (length $message < 3) {
@ -120,9 +128,9 @@ while ( defined (my $line = $fh->read) ) {
if ($distance) { if ($distance) {
$pids{$pid}{$plugin} = $gip; $pids{$pid}{$plugin} = $gip;
$pids{$pid}{distance} = $distance; $pids{$pid}{distance} = $distance;
}; }
}; }
}; }
} }
elsif ($type eq 'reject') { } elsif ($type eq 'reject') { }
elsif ($type eq 'connect') { } elsif ($type eq 'connect') { }
@ -147,12 +155,12 @@ while ( defined (my $line = $fh->read) ) {
else { else {
# anything here is likely an unrecognized command # anything here is likely an unrecognized command
#print "$message\n"; #print "$message\n";
}; }
} }
else { else {
print "$type $pid $hook $plugin $message\n"; print "$type $pid $hook $plugin $message\n";
}; }
}; }
sub parse_line { sub parse_line {
my $line = shift; my $line = shift;
@ -161,33 +169,51 @@ sub parse_line {
# lines seen many times per connection # lines seen many times per connection
return parse_line_plugin($line) if substr($message, 0, 1) eq '('; return parse_line_plugin($line) if substr($message, 0, 1) eq '(';
return ( 'dispatch', $pid, undef, undef, $message ) if substr($message, 0, 12) eq 'dispatching '; return ('dispatch', $pid, undef, undef, $message)
return ( 'response', $pid, undef, undef, $message ) if $message =~ /^[2|3]\d\d/; if substr($message, 0, 12) eq 'dispatching ';
return ( 'tcpserver', $pid, undef, undef, undef ) if substr($pid, 0, 10) eq 'tcpserver:'; return ('response', $pid, undef, undef, $message)
if $message =~ /^[2|3]\d\d/;
return ('tcpserver', $pid, undef, undef, undef)
if substr($pid, 0, 10) eq 'tcpserver:';
# lines seen about once per connection # lines seen about once per connection
return ( 'init', $pid, undef, undef, $message ) if substr($message, 0, 19) eq 'Accepted connection'; return ('init', $pid, undef, undef, $message)
return ( 'connect', $pid, undef, undef, substr( $message, 16) ) if substr($message, 0, 15) eq 'Connection from'; if substr($message, 0, 19) eq 'Accepted connection';
return ( 'close', $pid, undef, undef, $message ) if substr($message, 0, 6) eq 'close '; return ('connect', $pid, undef, undef, substr($message, 16))
return ( 'close', $pid, undef, undef, $message ) if substr($message, 0, 20) eq 'click, disconnecting'; if substr($message, 0, 15) eq 'Connection from';
return parse_line_cleanup( $line ) if substr($message, 0, 11) eq 'cleaning up'; return ('close', $pid, undef, undef, $message)
if substr($message, 0, 6) eq 'close ';
return ('close', $pid, undef, undef, $message)
if substr($message, 0, 20) eq 'click, disconnecting';
return parse_line_cleanup($line)
if substr($message, 0, 11) eq 'cleaning up';
# lines seen less than once per connection # lines seen less than once per connection
return ( 'info', $pid, undef, undef, $message ) if $message eq 'spooling message to disk'; return ('info', $pid, undef, undef, $message)
if $message eq 'spooling message to disk';
return ('reject', $pid, undef, undef, $message) if $message =~ /^[4|5]\d\d/; return ('reject', $pid, undef, undef, $message) if $message =~ /^[4|5]\d\d/;
return ( 'reject', $pid, undef, undef, $message ) if substr($message, 0, 14) eq 'deny mail from'; return ('reject', $pid, undef, undef, $message)
return ( 'reject', $pid, undef, undef, $message ) if substr($message, 0, 18) eq 'denysoft mail from'; if substr($message, 0, 14) eq 'deny mail from';
return ( 'info', $pid, undef, undef, $message ) if substr($message, 0, 15) eq 'Lost connection'; return ('reject', $pid, undef, undef, $message)
return ( 'info', $pid, undef, undef, $message ) if $message eq 'auth success cleared naughty'; if substr($message, 0, 18) eq 'denysoft mail from';
return ( 'info', $pid, undef, undef, $message ) if substr($message, 0, 15) eq 'Running as user'; return ('info', $pid, undef, undef, $message)
return ( 'info', $pid, undef, undef, $message ) if substr($message, 0, 16) eq 'Loaded Qpsmtpd::'; if substr($message, 0, 15) eq 'Lost connection';
return ( 'info', $pid, undef, undef, $message ) if substr($message, 0, 24) eq 'Permissions on spool_dir'; return ('info', $pid, undef, undef, $message)
return ( 'info', $pid, undef, undef, $message ) if substr($message, 0, 13) eq 'Listening on '; if $message eq 'auth success cleared naughty';
return ('info', $pid, undef, undef, $message)
if substr($message, 0, 15) eq 'Running as user';
return ('info', $pid, undef, undef, $message)
if substr($message, 0, 16) eq 'Loaded Qpsmtpd::';
return ('info', $pid, undef, undef, $message)
if substr($message, 0, 24) eq 'Permissions on spool_dir';
return ('info', $pid, undef, undef, $message)
if substr($message, 0, 13) eq 'Listening on ';
return ( 'err', $pid, undef, undef, $message ) if $line =~ /at [\S]+ line \d/; # generic perl error return ('err', $pid, undef, undef, $message)
if $line =~ /at [\S]+ line \d/; # generic perl error
print "UNKNOWN LINE: $line\n"; print "UNKNOWN LINE: $line\n";
return ('unknown', $pid, undef, undef, $message); return ('unknown', $pid, undef, undef, $message);
}; }
sub parse_line_plugin { sub parse_line_plugin {
my ($line) = @_; my ($line) = @_;
@ -200,25 +226,27 @@ sub parse_line_plugin {
$plugin =~ s/:$//; $plugin =~ s/:$//;
if ($plugin =~ /_3a/) { if ($plugin =~ /_3a/) {
($plugin) = split /_3a/, $plugin; # trim :N off the plugin log entry ($plugin) = split /_3a/, $plugin; # trim :N off the plugin log entry
}; }
$plugin =~ s/_2d/-/g; $plugin =~ s/_2d/-/g;
$plugin = $plugin_aliases{$plugin} if $plugin_aliases{$plugin}; # map alias to master $plugin = $plugin_aliases{$plugin}
if $plugin_aliases{$plugin}; # map alias to master
if ($hook eq '(queue)') { if ($hook eq '(queue)') {
($pid) = $message =~ /\(for ([\d]+)\)\s/; ($pid) = $message =~ /\(for ([\d]+)\)\s/;
$message = 'pass'; $message = 'pass';
}; }
return ('plugin', $pid, $hook, $plugin, $message); return ('plugin', $pid, $hook, $plugin, $message);
}; }
sub parse_line_cleanup { sub parse_line_cleanup {
my ($line) = @_; my ($line) = @_;
# @tai 85931 cleaning up after 3210 # @tai 85931 cleaning up after 3210
my $pid = (split /\s+/, $line)[-1]; my $pid = (split /\s+/, $line)[-1];
$has_cleanup++; $has_cleanup++;
return ('cleanup', $pid, undef, undef, $line); return ('cleanup', $pid, undef, undef, $line);
}; }
sub print_auto_format { sub print_auto_format {
my ($pid, $line) = @_; my ($pid, $line) = @_;
@ -231,15 +259,15 @@ sub print_auto_format {
if (defined $pids{$pid}{$plugin}) { if (defined $pids{$pid}{$plugin}) {
if (!$seen_plugins{$plugin}) { # first time seeing this plugin if (!$seen_plugins{$plugin}) { # first time seeing this plugin
$printed = 0; # force header print $printed = 0; # force header print
}; }
$seen_plugins{$plugin}++; $seen_plugins{$plugin}++;
}; }
next if !$seen_plugins{$plugin}; # hide unused plugins next if !$seen_plugins{$plugin}; # hide unused plugins
if ($hide_plugins{$plugin}) { # user doesn't want to see if ($hide_plugins{$plugin}) { # user doesn't want to see
delete $pids{$pid}{$plugin}; delete $pids{$pid}{$plugin};
next; next;
}; }
if (defined $pids{$pid}{helo_host} && $plugin =~ /helo/) { if (defined $pids{$pid}{helo_host} && $plugin =~ /helo/) {
$format .= " %-18.18s"; $format .= " %-18.18s";
@ -255,7 +283,7 @@ sub print_auto_format {
$format .= " %-20.20s"; $format .= " %-20.20s";
push @values, delete $pids{$pid}{to}; push @values, delete $pids{$pid}{to};
push @headers, 'RCPT TO'; push @headers, 'RCPT TO';
}; }
$format .= $formats3{$plugin} ? " $formats3{$plugin}" : " %-10.10s"; $format .= $formats3{$plugin} ? " $formats3{$plugin}" : " %-10.10s";
@ -264,15 +292,16 @@ sub print_auto_format {
} }
else { else {
push @values, ''; push @values, '';
}; }
push @headers, ($plugins{$plugin}{abb3} ? $plugins{$plugin}{abb3} : $plugin); push @headers,
($plugins{$plugin}{abb3} ? $plugins{$plugin}{abb3} : $plugin);
} }
$format .= "\n"; $format .= "\n";
printf("\n$format", @headers) if (!$printed || $printed % 20 == 0); printf("\n$format", @headers) if (!$printed || $printed % 20 == 0);
printf($format, @values); printf($format, @values);
print Data::Dumper::Dumper($pids{$pid}) if keys %{$pids{$pid}}; print Data::Dumper::Dumper($pids{$pid}) if keys %{$pids{$pid}};
$printed++; $printed++;
}; }
sub show_symbol { sub show_symbol {
my $mess = shift; my $mess = shift;
@ -288,7 +317,7 @@ sub show_symbol {
return ' !' if $mess =~ /^error[,:\s]/i; return ' !' if $mess =~ /^error[,:\s]/i;
$mess =~ s/\s\s/ /g; $mess =~ s/\s\s/ /g;
return $mess; return $mess;
}; }
sub get_qp_dir { sub get_qp_dir {
foreach my $user (qw/ qpsmtpd smtpd /) { foreach my $user (qw/ qpsmtpd smtpd /) {
@ -296,24 +325,24 @@ sub get_qp_dir {
if (-d "$homedir/plugins") { if (-d "$homedir/plugins") {
return "$homedir"; return "$homedir";
}; }
foreach my $s (qw/ smtpd qpsmtpd qpsmtpd-dev /) { foreach my $s (qw/ smtpd qpsmtpd qpsmtpd-dev /) {
if (-d "$homedir/$s/plugins") { if (-d "$homedir/$s/plugins") {
return "$homedir/$s"; return "$homedir/$s";
}; }
}; }
}; }
if (-d "./plugins") { if (-d "./plugins") {
return Cwd::getcwd(); return Cwd::getcwd();
}; }
}; }
sub populate_plugins_from_registry { sub populate_plugins_from_registry {
my $file = "$qpdir/plugins/registry.txt"; my $file = "$qpdir/plugins/registry.txt";
if (!-f $file) { if (!-f $file) {
die "unable to find plugin registry\n"; die "unable to find plugin registry\n";
}; }
open my $F, '<', $file; open my $F, '<', $file;
while (defined(my $line = <$F>)) { while (defined(my $line = <$F>)) {
@ -327,7 +356,7 @@ sub populate_plugins_from_registry {
$plugins{$name}{aliases} = $aliases; $plugins{$name}{aliases} = $aliases;
foreach my $a (split /,/, $aliases) { foreach my $a (split /,/, $aliases) {
$plugin_aliases{$a} = $name; $plugin_aliases{$a} = $name;
}; }
}; }
}; }

22
log/watch
View File

@ -11,12 +11,18 @@ use File::Tail;
my $dir = get_qp_dir() or die "unable to find QP home dir"; my $dir = get_qp_dir() or die "unable to find QP home dir";
my $file = "$dir/log/main/current"; my $file = "$dir/log/main/current";
my $fh = File::Tail->new(name=>$file, interval=>1, maxinterval=>1, debug =>1, tail =>300 ); my $fh = File::Tail->new(
name => $file,
interval => 1,
maxinterval => 1,
debug => 1,
tail => 300
);
while (defined(my $line = $fh->read)) { while (defined(my $line = $fh->read)) {
my (undef, $line) = split /\s/, $line, 2; # strip off tai timestamps my (undef, $line) = split /\s/, $line, 2; # strip off tai timestamps
print $line; print $line;
}; }
sub get_qp_dir { sub get_qp_dir {
foreach my $user (qw/ qpsmtpd smtpd /) { foreach my $user (qw/ qpsmtpd smtpd /) {
@ -24,15 +30,15 @@ sub get_qp_dir {
if (-d "$homedir/plugins") { if (-d "$homedir/plugins") {
return "$homedir"; return "$homedir";
}; }
foreach my $s (qw/ smtpd qpsmtpd qpsmtpd-dev /) { foreach my $s (qw/ smtpd qpsmtpd qpsmtpd-dev /) {
if (-d "$homedir/$s/plugins") { if (-d "$homedir/$s/plugins") {
return "$homedir/$s"; return "$homedir/$s";
}; }
}; }
}; }
if (-d "./plugins") { if (-d "./plugins") {
return Cwd::getcwd(); return Cwd::getcwd();
}; }
}; }