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

geoip: improve log messages

Browse Source 
list fixed with continent code first to improve readability
added ability to include city in logging
This commit is contained in:
Matt Simerson 2012-06-22 20:29:42 -04:00
parent b1850e8d85
commit 4b2c256819
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
plugins/ident/geoip
View File

@ -14,24 +14,25 @@ information about incoming connections.
This plugin saves geographic information in the following connection notes: This plugin saves geographic information in the following connection notes:
geoip_country - 2 char country code geoip_country - 2 char country code
geoip_country_name - full english name of country geoip_country_name - english name of country
geoip_continent - 2 char continent code geoip_continent - 2 char continent code
geoip_city - english name of city
geoip_distance - distance in kilometers geoip_distance - distance in kilometers
And adds entries like this to your logs: And adds entries like this to your logs:
(connect) ident::geoip: US, United States, NA, 1319 km (connect) ident::geoip: NA, US, United States, 1319 km
(connect) ident::geoip: IN, India, AS, 13862 km (connect) ident::geoip: AS, IN, India, 13862 km
(connect) ident::geoip: fail: no results (connect) ident::geoip: fail: no results
(connect) ident::geoip: CA, Canada, NA, 2464 km (connect) ident::geoip: NA, CA, Canada, 2464 km
(connect) ident::geoip: US, United States, NA, 2318 km (connect) ident::geoip: NA, US, United States, 2318 km
(connect) ident::geoip: PK, Pakistan, AS, 12578 km (connect) ident::geoip: AS, PK, Pakistan, 12578 km
(connect) ident::geoip: TJ, Tajikistan, AS, 11965 km (connect) ident::geoip: AS, TJ, Tajikistan, 11965 km
(connect) ident::geoip: AT, Austria, EU, 8745 km (connect) ident::geoip: EU, AT, Austria, 8745 km
(connect) ident::geoip: IR, Iran, Islamic Republic of, AS, 12180 km (connect) ident::geoip: AS, IR, Iran, Islamic Republic of, 12180 km
(connect) ident::geoip: BY, Belarus, EU, 9030 km (connect) ident::geoip: EU, BY, Belarus, 9030 km
(connect) ident::geoip: CN, China, AS, 11254 km (connect) ident::geoip: AS, CN, China, 11254 km
(connect) ident::geoip: PA, Panama, NA, 3163 km (connect) ident::geoip: NA, PA, Panama, 3163 km
Calculating the distance has three prerequsites: Calculating the distance has three prerequsites:
@ -145,18 +146,21 @@ sub connect_handler {
$self->qp->connection->notes('geoip_country', $c_code); $self->qp->connection->notes('geoip_country', $c_code);
my $c_name = $self->set_country_name(); my $c_name = $self->set_country_name();
my ($continent_code, $distance); my ($city, $continent_code, $distance) = '';
if ( $self->{_my_country_code} ) { if ( $self->{_my_country_code} ) {
$continent_code = $self->set_continent( $c_code ); $continent_code = $self->set_continent( $c_code );
$city = $self->set_city_gc();
$distance = $self->set_distance_gc(); $distance = $self->set_distance_gc();
}; };
my $message = $c_code; my @msg_parts;
$message .= ", $c_name" if $c_name; push @msg_parts, $continent_code if $continent_code && $continent_code ne '--';
$message .= ", $continent_code" if $continent_code && $continent_code ne '--'; push @msg_parts, $c_code if $c_code;
$message .= ", \t$distance km" if $distance; #push @msg_parts, $c_name if $c_name;
$self->log(LOGINFO, $message); push @msg_parts, $city if $city;
push @msg_parts, "\t$distance km" if $distance;
$self->log(LOGINFO, join( ", ", @msg_parts) );
return DECLINED; return DECLINED;
} }
@ -250,6 +254,15 @@ sub set_continent_gc {
return $continent; return $continent;
}; };
sub set_city_gc {
my $self = shift;
return if ! $self->{_geoip_record};
my $remote_ip = $self->qp->connection->remote_ip;
my $city = $self->{_geoip_record}->city() or return;
$self->qp->connection->notes('geoip_city', $city);
return $city;
};
sub set_distance_gc { sub set_distance_gc {
my $self = shift; my $self = shift;
return if ! $self->{_geoip_record}; return if ! $self->{_geoip_record};