added country name to GeoIP plugin

and removed redundant words from log entries
This commit is contained in:
Matt Simerson 2012-05-07 03:36:00 -04:00 committed by Robert
parent 57d72b3cb4
commit 8103c5a132

View File

@ -7,9 +7,11 @@ do a lookup on incoming connections and record the country of origin.
Thats all it does. Thats all it does.
It logs the country to the connection notes 'geoip_country'. Another It logs the 2 char country code to note 'geoip_country'.
plugin can use that value to do things to the connection, like reject, It logs the country name to the connection note 'geoip_country_name'.
or greylist.
Other plugins can use that info to do things to the connection, like
reject or greylist.
=cut =cut
@ -19,12 +21,18 @@ sub hook_connect {
my ($self) = @_; my ($self) = @_;
my $geoip = Geo::IP->new(GEOIP_STANDARD); my $geoip = Geo::IP->new(GEOIP_STANDARD);
my $country = my $remote_ip = $self->qp->connection->remote_ip;
$geoip->country_code_by_addr( $self->qp->connection->remote_ip )
or return (DECLINED);
$self->qp->connection->notes('geoip_country', $country); my $c_code = $geoip->country_code_by_addr( $remote_ip )
$self->log(LOGNOTICE, "GeoIP Country: $country"); or return DECLINED; # if this fails, so too will name
my $c_name = $geoip->country_name_by_addr( $remote_ip );
$self->qp->connection->notes('geoip_country_name', $c_name);
$self->qp->connection->notes('geoip_country', $c_code);
my $message = $c_code;
$message .= ", $c_name" if $c_name;
$self->log(LOGINFO, $message);
return DECLINED; return DECLINED;
} }