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

Add some p0f results to message headers

Browse Source
This commit is contained in:
Jared Johnson 2014-11-21 16:51:19 -06:00
parent 0399d631d7
commit 30dd9cafeb
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/ident/p0f
View File

@ -154,6 +154,10 @@ sub register {
foreach (keys %args) { foreach (keys %args) {
$self->{_args}->{$_} = $args{$_}; $self->{_args}->{$_} = $args{$_};
} }
my $enabled = $self->{_args}{add_headers};
$enabled = 'true' if ! defined $enabled;
return if $enabled =~ /false/i;
$self->register_hook( data_post => 'add_headers' );
} }
sub hook_connect { sub hook_connect {
@ -174,6 +178,21 @@ sub hook_connect {
return DECLINED; return DECLINED;
} }
sub add_headers {
my ( $self, $txn ) = @_;
my $p0f = $self->connection->notes('p0f') or return DECLINED;
$self->add_p0f_header( 'X-P0F-Genre' => $p0f->{genre} );
$self->add_p0f_header( 'X-P0F-Link-Type' => $p0f->{link_type} );
return DECLINED;
}
sub add_p0f_header {
my ( $self, $tag, $value ) = @_;
return if ! $value;
$self->transaction->header->delete( $tag );
$self->transaction->header->add( $tag, $value, 0 );
}
sub get_v2_query { sub get_v2_query {
my $self = shift; my $self = shift;

25
t/plugin_tests/ident/p0f
View File

@ -8,12 +8,37 @@ use Qpsmtpd::Constants;
sub register_tests { sub register_tests {
my $self = shift; my $self = shift;
$self->register_test('test_add_headers');
$self->register_test('test_get_v2_query'); $self->register_test('test_get_v2_query');
$self->register_test('test_get_v3_query'); $self->register_test('test_get_v3_query');
$self->register_test('test_store_v2_results'); $self->register_test('test_store_v2_results');
$self->register_test('test_store_v3_results'); $self->register_test('test_store_v3_results');
} }
sub test_add_headers {
my ( $self ) = @_;
$self->connection->notes( 'p0f',
{
genre => 'test genre',
link_type => 'test link_type',
}
);
my $header = $self->transaction->header( Mail::Header->new );
my @tags = (qw( X-P0F-Genre X-P0F-Link-Type ));
$header->add( $_ => 'DELETETHIS' ) for @tags;
$self->add_headers($self->transaction);
is( $self->all_headers('X-P0F-Genre'), 'test genre',
'X-P0F-Genre header added' );
is( $self->all_headers('X-P0F-Link-Type'), 'test link_type',
'X-P0F-Link-Type header added' );
}
sub all_headers {
# Return all instances of a given message header
my ( $self, $tag ) = @_;
return join " | ", map { chomp $_; $_ } $self->transaction->header->get($tag);
}
sub test_query_p0f_v2 { sub test_query_p0f_v2 {
#TODO #TODO
# get path to p0f socket # get path to p0f socket