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

Merge pull request #242 from analogic/patch-1

Browse Source 
DMARC plugin: Added option to disable reporting
This commit is contained in:
Jared Johnson 2015-03-13 16:16:38 -05:00
commit 8f14cc01e4
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/dmarc
View File

@ -52,6 +52,14 @@ _dmarc IN TXT "v=DMARC1; p=reject; rua=mailto:dmarc-feedback@example.com;"
3. activate this plugin. (add to config/plugins, listing it after SPF & DKIM. Check that SPF and DKIM are configured to not reject mail. 3. activate this plugin. (add to config/plugins, listing it after SPF & DKIM. Check that SPF and DKIM are configured to not reject mail.
=head1 CONFIGURATION
=head2 reporting [ 0 | 1 ]
Default: 1
0: do not save and publish aggregate reports
1: publish reports (requires proper Mail::DMARC configuration)
=head1 MORE INFORMATION =head1 MORE INFORMATION
@ -85,6 +93,8 @@ sub register {
$self->{_args}{reject_type} ||= 'perm'; $self->{_args}{reject_type} ||= 'perm';
$self->{_args}{p_vals} = {map { $_ => 1 } qw/ none reject quarantine /}; $self->{_args}{p_vals} = {map { $_ => 1 } qw/ none reject quarantine /};
$self->{_args}{reporting} = 1 if !defined $self->{_args}{reporting};
eval 'require Mail::DMARC::PurePerl'; eval 'require Mail::DMARC::PurePerl';
if ( $@ ) { if ( $@ ) {
$self->log(LOGERROR, "failed to load Mail::DMARC::PurePerl" ); $self->log(LOGERROR, "failed to load Mail::DMARC::PurePerl" );
@ -133,7 +143,7 @@ sub check_dmarc {
my $pol; my $pol;
eval { $pol = $dmarc->result->published; }; eval { $pol = $dmarc->result->published; };
if ( $pol ) { if ( $self->{_args}{reporting} && $pol ) {
if ( $dmarc->has_valid_reporting_uri($pol->rua) ) { if ( $dmarc->has_valid_reporting_uri($pol->rua) ) {
eval { $dmarc->save_aggregate(); }; eval { $dmarc->save_aggregate(); };
$self->log(LOGERROR, $@ ) if $@; $self->log(LOGERROR, $@ ) if $@;