[FIXED JENKINS-13324] don't return invalid email addresses in mailres…

…olver it will now check that the email address matches '.+@.+' before returning it to jenkins
jenkinsci · Apr 17, 2012 · 1986bb1 · 1986bb1
1 parent 13f9f49
commit 1986bb1
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/perforce/PerforceMailResolver.java b/src/main/java/hudson/plugins/perforce/PerforceMailResolver.java
@@ -26,8 +26,20 @@
 public class PerforceMailResolver extends MailAddressResolver {
     private static final Logger LOGGER = Logger.getLogger(PerforceMailResolver.class.getName());
 
-    @SuppressWarnings("unchecked")
     public String findMailAddressFor(User u) {
+        String email = findPerforceMailAddressFor(u);
+        if (email == null){
+            return null;
+        } else if (email.matches(".+@.+")){
+            return email;
+        } else {
+            LOGGER.fine("Rejecting invalid email ("+ email +") retrieved from perforce.");
+            return null;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public String findPerforceMailAddressFor(User u) {
         LOGGER.fine("Email address for " + u.getId() + " requested.");
         String perforceId = u.getId();
         PerforceUserProperty puprop = u.getProperty(PerforceUserProperty.class);