4 files changed, 53 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Contact.pm b/perllib/FixMyStreet/App/Controller/Contact.pm
index 912224649..115f4e3d2 100644
--- a/perllib/FixMyStreet/App/Controller/Contact.pm
+++ b/perllib/FixMyStreet/App/Controller/Contact.pm
@@ -5,6 +5,7 @@ use namespace::autoclean;
 BEGIN { extends 'Catalyst::Controller'; }
 
 use mySociety::EmailUtil;
+use FixMyStreet::Email;
 
 =head1 NAME
 
@@ -239,11 +240,19 @@ sub send_email : Private {
       ? ' ( forwarded from ' . $c->req->header('X-Forwarded-For') . ' )'
       : '';
 
-    $c->send_email( 'contact.txt', {
+    my $from = [ $c->stash->{em}, $c->stash->{form_name} ];
+    my $params = {
         to      => [ [ $recipient, _($recipient_name) ] ],
-        from    => [ $c->stash->{em}, $c->stash->{form_name} ],
         subject => 'FMS message: ' . $c->stash->{subject},
-    });
+    };
+    if (FixMyStreet::Email::test_dmarc($c->stash->{em})) {
+        $params->{'Reply-To'} = [ $from ];
+        $params->{from} = [ $recipient, $c->stash->{form_name} ];
+    } else {
+        $params->{from} = $from;
+    }
+
+    $c->send_email('contact.txt', $params);
 
     # above is always succesful :(
     $c->stash->{success} = 1;
diff --git a/perllib/FixMyStreet/Email.pm b/perllib/FixMyStreet/Email.pm
new file mode 100644
index 000000000..4a2784787
--- /dev/null
+++ b/perllib/FixMyStreet/Email.pm
@@ -0,0 +1,12 @@
+package FixMyStreet::Email;
+
+use Utils::Email;
+use FixMyStreet;
+
+sub test_dmarc {
+    my $email = shift;
+    return if FixMyStreet->test_mode;
+    return Utils::Email::test_dmarc($email);
+}
+
+1;
diff --git a/perllib/FixMyStreet/SendReport/Email.pm b/perllib/FixMyStreet/SendReport/Email.pm
index fa4d437fb..9fec0ac9c 100644
--- a/perllib/FixMyStreet/SendReport/Email.pm
+++ b/perllib/FixMyStreet/SendReport/Email.pm
@@ -1,6 +1,7 @@
 package FixMyStreet::SendReport::Email;
 
 use Moose;
+use FixMyStreet::Email;
 
 BEGIN { extends 'FixMyStreet::SendReport'; }
 
@@ -93,6 +94,12 @@ sub send {
         From => $self->send_from( $row ),
     };
     $params->{Bcc} = $self->bcc if @{$self->bcc};
+
+    if (FixMyStreet::Email::test_dmarc($params->{From}[0])) {
+        $params->{'Reply-To'} = [ $params->{From} ];
+        $params->{From} = [ mySociety::Config::get('CONTACT_EMAIL'), $params->{From}[1] ];
+    }
+
     my $result = FixMyStreet::App->send_email_cron(
         $params,
         mySociety::Config::get('CONTACT_EMAIL'),
diff --git a/perllib/Utils/Email.pm b/perllib/Utils/Email.pm
new file mode 100644
index 000000000..466c05ad1
--- /dev/null
+++ b/perllib/Utils/Email.pm
@@ -0,0 +1,22 @@
+package Utils::Email;
+
+use Email::Address;
+use Net::DNS::Resolver;
+
+# DMARC stabbity stab
+sub test_dmarc {
+    my $email = shift;
+
+    my $addr = (Email::Address->parse($email))[0];
+    return unless $addr;
+
+    my $domain = $addr->host;
+    my @answers = Net::DNS::Resolver->new->send("_dmarc.$domain", 'TXT')->answer;
+    @answers = map { $_->txtdata } @answers;
+    my $dmarc = join(' ', @answers);
+    return unless $dmarc =~ /p *= *reject/;
+
+    return 1;
+}
+
+1;