Bug 1450791 - SES handler needs to support both "event" and "notification" messages

diff --git a/ses/index.cgi b/ses/index.cgi
index 9e1632586a7bde88e86c82b45b26d769f35f2033..8abd98e24ac154a82e68fef27f1523115aa0f12b 100755 (executable)
--- a/ses/index.cgi
+++ b/ses/index.cgi
@@ -13,14 +13,14 @@ use warnings;
 use lib qw(.. ../lib ../local/lib/perl5);
 
 use Bugzilla ();
+use Bugzilla::Constants qw(ERROR_MODE_DIE);
 use Bugzilla::Logging;
-use Bugzilla::Constants qw( ERROR_MODE_DIE );
-use Bugzilla::Mailer qw( MessageToMTA );
+use Bugzilla::Mailer qw(MessageToMTA);
 use Bugzilla::User ();
-use Bugzilla::Util qw( html_quote remote_ip );
-use JSON::MaybeXS qw( decode_json encode_json );
+use Bugzilla::Util qw(html_quote remote_ip);
+use JSON::MaybeXS qw(decode_json);
 use LWP::UserAgent ();
-use Try::Tiny qw( try catch );
+use Try::Tiny qw(catch try);
 
 Bugzilla->error_mode(ERROR_MODE_DIE);
 try {
@@ -41,21 +41,16 @@ sub main {
 
     elsif ( $message_type eq 'Notification' ) {
         my $notification = decode_json_wrapper( $message->{Message} ) // return;
-
-        my $notification_type = $notification->{notificationType} // '';
-        if ( $notification_type eq '' ) {
-            my $keys = join ', ', keys %$notification;
-            WARN("No notificationType in notification (keys: $keys)");
-        }
-        if ( $notification_type eq 'Bounce' ) {
-            process_bounce($notification);
-        }
-        elsif ( $notification_type eq 'Complaint' ) {
-            process_complaint($notification);
-        }
-        else {
-            WARN("Unsupported notification-type: $notification_type");
-            respond( 200 => 'OK' );
+        unless (
+            # https://docs.aws.amazon.com/ses/latest/DeveloperGuide/event-publishing-retrieving-sns-contents.html
+            handle_notification( $notification, 'eventType' )
+
+            # https://docs.aws.amazon.com/ses/latest/DeveloperGuide/notification-contents.html
+            || handle_notification( $notification, 'notificationType' )
+            )
+        {
+            WARN('Failed to find notification type');
+            respond( 400 => 'Bad Request' );
         }
     }
 
@@ -86,6 +81,27 @@ sub confirm_subscription {
     respond( 200 => 'OK' );
 }
 
+sub handle_notification {
+    my ( $notification, $type_field ) = @_;
+
+    if ( !exists $notification->{$type_field} ) {
+        return 0;
+    }
+    my $type = $notification->{$type_field};
+
+    if ( $type eq 'Bounce' ) {
+        process_bounce($notification);
+    }
+    elsif ( $type eq 'Complaint' ) {
+        process_complaint($notification);
+    }
+    else {
+        WARN("Unsupported notification-type: $type");
+        respond( 200 => 'OK' );
+    }
+    return 1;
+}
+
 sub process_bounce {
     my ($notification) = @_;
     my $type = $notification->{bounce}->{bounceType};
@@ -104,8 +120,7 @@ sub process_bounce {
         # disable each account that is permanently bouncing
         foreach my $recipient ( @{ $notification->{bounce}->{bouncedRecipients} } ) {
             my $address = $recipient->{emailAddress};
-            my $reason
-                = sprintf( '(%s) %s', $recipient->{action} // 'error', $recipient->{diagnosticCode} // 'unknown' );
+            my $reason = sprintf '(%s) %s', $recipient->{action} // 'error', $recipient->{diagnosticCode} // 'unknown';
 
             my $user = Bugzilla::User->new( { name => $address, cache => 1 } );
             if ($user) {
@@ -128,8 +143,7 @@ sub process_bounce {
                     $user->set_disabledtext($disable_text);
                     $user->set_disable_mail(1);
                     $user->update();
-                    Bugzilla->audit(
-                        "permanent bounce for <$address> disabled userid-" . $user->id . ": $reason" );
+                    Bugzilla->audit( "permanent bounce for <$address> disabled userid-" . $user->id . ": $reason" );
                 }
             }