Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARC: Comment in Authentication-Results field prevents check on srvid (See #575) #585

Merged
merged 4 commits into from
Apr 13, 2019
Merged

ARC: Comment in Authentication-Results field prevents check on srvid (See #575) #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7498dc1
ARC: Comments in Authentication-Results field prevents check on srvid.
ikedas Apr 5, 2019
5dca2d4
[-bug] arc_seal() crashes if seal is skipped.
ikedas Apr 6, 2019
68c2443
Adding debug log.
ikedas Apr 7, 2019
f1bd0bd
Version of a dependency Mail::DKIM::ARC::Signer to 0.55 due to bug fix.
ikedas Apr 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpanfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ feature 'Mail::DKIM::Verifier', 'Required in order to use DKIM features (both fo
};

feature 'Mail::DKIM::ARC::Signer', 'Required in order to use ARC features to add ARC seals.' => sub {
requires 'Mail::DKIM::ARC::Signer', '>= 0.51';
requires 'Mail::DKIM::ARC::Signer', '>= 0.55';
};

feature 'Net::DNS', 'This is required if you set a value for "dmarc_protection_mode" which requires DNS verification.' => sub {
Expand Down
24 changes: 16 additions & 8 deletions src/lib/Sympa/Message.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
# Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
# 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
# Copyright 2017, 2018 The Sympa Community. See the AUTHORS.md file at the
# top-level directory of this distribution and at
# Copyright 2017, 2018, 2019 The Sympa Community. See the AUTHORS.md file at
# the top-level directory of this distribution and at
# <https://github.com/sympa-community/sympa.git>.
#
# This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -37,6 +37,7 @@ use Mail::Address;
use MIME::Charset;
use MIME::EncWords;
use MIME::Entity;
use MIME::Field::ParamVal;
use MIME::Parser;
use MIME::Tools;
use Scalar::Util qw();
Expand Down Expand Up @@ -604,16 +605,20 @@ sub arc_seal {
$log->syslog('err', 'Cannot ARC seal message');
return undef;
}
$log->syslog('debug2', 'ARC %s: %s', $arc->{result},
$arc->{result_reason});

# don't need this since DKIM just did it
# my ($dummy, $new_body) = split /\r\n\r\n/, $msg_as_string, 2;
#$new_body =~ s/\r\n/\n/g;

# Seal is done. Add new headers for the seal
my @seal = $arc->as_strings();
foreach my $ahdr (@seal) {
my ($ah, $av) = split /:\s*/, $ahdr, 2;
$self->add_header($ah, $av, 0);
if (grep { $_ and /\AARC-Seal:/i } @seal) {
foreach my $ahdr (reverse @seal) {
my ($ah, $av) = split /:\s*/, $ahdr, 2;
$self->add_header($ah, $av, 0);
}
}
#$self->{_body} = $new_body;
delete $self->{_entity_cache}; # Clear entity cache.
Expand Down Expand Up @@ -685,7 +690,9 @@ sub check_arc_chain {
# since we can't add a new seal

my @ars =
grep {m{^\s*\Q$srvid\E;}} $self->get_header('Authentication-Results');
grep { my $d = $_->param('_'); $d and lc $d eq lc $srvid }
map { MIME::Field::ParamVal->parse($_) }
$self->get_header('Authentication-Results');

unless (@ars) {
$log->syslog('debug2',
Expand All @@ -694,9 +701,10 @@ sub check_arc_chain {
}
# already checked?
foreach my $ar (@ars) {
if ($ar =~ m{\barc=(pass|fail|none)\b}i) {
$log->syslog('debug2', "ARC already $1");
my $param_arc = $ar->param('arc');
if ($param_arc and $param_arc =~ m{\A(pass|fail|none)\b}i) {
$self->{shelved}->{arc_cv} = $1;
$log->syslog('debug2', 'ARC already checked: %s', $param_arc);
return;
}
}
Expand Down