Email service tests

Author: lukewhiting

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/EmailService.java

@@ -365,8 +365,8 @@ static boolean recipientAddressInAllowList(Email email, Set<String> allowedRecip
         }
 
         final Set<String> recipients = getRecipients(email, false);
-        final Predicate<String> matchesAnyAllowedRecipient = recipient -> recipients.stream()
-            .anyMatch(allowedDomain -> Regex.simpleMatch(allowedDomain, recipient, true));
+        final Predicate<String> matchesAnyAllowedRecipient = recipient -> allowedRecipientPatterns.stream()
+            .anyMatch(pattern -> Regex.simpleMatch(pattern, recipient, true));
         return recipients.stream().allMatch(matchesAnyAllowedRecipient);
     }
 

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/email/EmailServiceTests.java

@@ -321,6 +321,103 @@ public void testChangeDomainAllowListSetting() throws UnsupportedEncodingExcepti
         assertThat(e2.getMessage(), containsString("port out of range"));
     }
 
+    public void testRecipientAddressInAllowList_EmptyAllowedPatterns() throws UnsupportedEncodingException {
+        Email email = createTestEmail("[email protected]", "[email protected]");
+        Set<String> allowedPatterns = Set.of();
+        assertThat(EmailService.recipientAddressInAllowList(email, allowedPatterns), is(false));
+    }
+
+    public void testRecipientAddressInAllowList_WildcardPattern() throws UnsupportedEncodingException {
+        Email email = createTestEmail("[email protected]", "[email protected]");
+        Set<String> allowedPatterns = Set.of("*");
+        assertThat(EmailService.recipientAddressInAllowList(email, allowedPatterns), is(true));
+    }
+
+    public void testRecipientAddressInAllowList_SpecificPattern() throws UnsupportedEncodingException {
+        Email email = createTestEmail("[email protected]", "[email protected]");
+        Set<String> allowedPatterns = Set.of("[email protected]");
+        assertThat(EmailService.recipientAddressInAllowList(email, allowedPatterns), is(false));
+    }
+
+    public void testRecipientAddressInAllowList_MultiplePatterns() throws UnsupportedEncodingException {
+        Email email = createTestEmail("[email protected]", "[email protected]");
+        Set<String> allowedPatterns = Set.of("[email protected]", "[email protected]");
+        assertThat(EmailService.recipientAddressInAllowList(email, allowedPatterns), is(true));
+    }
+
+    public void testRecipientAddressInAllowList_MixedCasePatterns() throws UnsupportedEncodingException {
+        Email email = createTestEmail("[email protected]", "[email protected]");
+        Set<String> allowedPatterns = Set.of("[email protected]", "[email protected]");
+        assertThat(EmailService.recipientAddressInAllowList(email, allowedPatterns), is(true));
+    }
+
+    public void testRecipientAddressInAllowList_PartialWildcardPrefixPattern() throws UnsupportedEncodingException {
+        Email email = createTestEmail("[email protected]", "[email protected]");
+        Set<String> allowedPatterns = Set.of("foo@*", "baz@*");
+        assertThat(EmailService.recipientAddressInAllowList(email, allowedPatterns), is(true));
+    }
+
+    public void testRecipientAddressInAllowList_PartialWildcardSuffixPattern() throws UnsupportedEncodingException {
+        Email email = createTestEmail("[email protected]", "[email protected]");
+        Set<String> allowedPatterns = Set.of("*@bar.com", "*@potato.com");
+        assertThat(EmailService.recipientAddressInAllowList(email, allowedPatterns), is(true));
+    }
+
+    public void testRecipientAddressInAllowList_DisallowedCCAddressesFails() throws UnsupportedEncodingException {
+        Email email = new Email(
+            "id",
+            new Email.Address("[email protected]", "Sender"),
+            createAddressList("[email protected]"),
+            randomFrom(Email.Priority.values()),
+            ZonedDateTime.now(),
+            createAddressList("[email protected]"),
+            createAddressList("[email protected]", "[email protected]"),
+            null,
+            "subject",
+            "body",
+            "htmlbody",
+            Collections.emptyMap()
+        );
+        Set<String> allowedPatterns = Set.of("[email protected]", "[email protected]");
+        assertThat(EmailService.recipientAddressInAllowList(email, allowedPatterns), is(false));
+    }
+
+    public void testRecipientAddressInAllowList_DisallowedBCCAddressesFails() throws UnsupportedEncodingException {
+        Email email = new Email(
+            "id",
+            new Email.Address("[email protected]", "Sender"),
+            createAddressList("[email protected]"),
+            randomFrom(Email.Priority.values()),
+            ZonedDateTime.now(),
+            createAddressList("[email protected]"),
+            null,
+            createAddressList("[email protected]", "[email protected]"),
+            "subject",
+            "body",
+            "htmlbody",
+            Collections.emptyMap()
+        );
+        Set<String> allowedPatterns = Set.of("[email protected]", "[email protected]");
+        assertThat(EmailService.recipientAddressInAllowList(email, allowedPatterns), is(false));
+    }
+
+    private Email createTestEmail(String... recipients) throws UnsupportedEncodingException {
+        return new Email(
+            "id",
+            new Email.Address("[email protected]", "Sender"),
+            createAddressList(recipients),
+            randomFrom(Email.Priority.values()),
+            ZonedDateTime.now(),
+            createAddressList(recipients),
+            null,
+            null,
+            "subject",
+            "body",
+            "htmlbody",
+            Collections.emptyMap()
+        );
+    }
+
     private static Email.AddressList createAddressList(String... emails) throws UnsupportedEncodingException {
         List<Email.Address> addresses = new ArrayList<>();
         for (String email : emails) {