Simplified the logic by reusing EMAIL_BLACKLIST

jenkins-infra · Mar 7, 2015 · 29c35a8 · 29c35a8
1 parent a6a0181
commit 29c35a8
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/account/Application.java b/src/main/java/org/jenkinsci/account/Application.java
@@ -128,7 +128,7 @@ public HttpResponse doDoSignup(
 
         // spam check
         for (Answer a : new StopForumSpam().build().ip(ip).email(email).query()) {
-            if (a.isAppears() || email.equals("kk+spamtest@kohsuke.org") || email.toLowerCase(Locale.ENGLISH).contains("@yahoo.co.id")) {
+            if (a.isAppears()) {
                 return maybeSpammer(userid, firstName, lastName, email, ip, a);
             }
         }
@@ -456,6 +456,9 @@ public AdminUI getAdmin() {
     private static final Pattern VALID_ID = Pattern.compile("[a-z0-9_]+");
 
     public static final List<String> EMAIL_BLACKLIST = Arrays.asList(
-        "@mailnesia.com"
+        "@mailnesia.com",
+        "@yahoo.co.id",
+        "obat@",
+        "kk+spamtest@kohsuke.org"
     );
 }