Issue #3015 cherry-pick

epam · Mar 14, 2023 · aee4fe0 · aee4fe0
1 parent 8e4043a
commit aee4fe0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...r/smtp/src/main/java/com/epam/pipeline/notifier/service/task/SMTPNotificationManager.java b/...r/smtp/src/main/java/com/epam/pipeline/notifier/service/task/SMTPNotificationManager.java
@@ -148,15 +148,15 @@ private Optional<Email> buildEmail(NotificationMessage message) throws EmailExce
         }
 
         String userEmail = getTargetUserEmail(message);
-        if (userEmail != null) {
+        if (isValidEmail(userEmail)) {
             email.addTo(userEmail);
         }
 
         List<PipelineUser> keepInformedUsers = userRepository.findByIdIn(message.getCopyUserIds());
 
         for (PipelineUser user : keepInformedUsers) {
             String address = user.getEmail();
-            if (address != null) {
+            if (isValidEmail(address)) {
                 email.addBcc(address);
             }
         }
@@ -197,4 +197,8 @@ private void sleepIfRequired(final long delay) {
         }
     }
 
+    private boolean isValidEmail(final String email) {
+        return EmailValidator.getInstance().isValid(email);
+    }
+
 }