rtyler/account-app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Having issues with this triggering all the time. Remove ldap exists check. The create record account will still take care of duplicate user ids... multiple accounts per email are now allowed, until this can be fixed properly.

Browse Source
This commit is contained in:
Larry Shatzer, Jr 2016-04-25 08:17:34 -06:00
parent fb4607dc1e
commit 4bef3a6bfe
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/jenkinsci/account/Application.java
View File

@ -223,20 +223,6 @@ public class Application {
blockReasons.add("circuit breaker");
}
final DirContext con = connect();
try {
if(ldapObjectExists(con, "(id={0})", userid)) {
throw new UserError("ID " + userid + " is already taken. Perhaps you already have an account imported " +
"from legacy java.net? You may try resetting the password.");
}
if(ldapObjectExists(con, "(mail={0})", email)) {
throw new UserError("Mail " + email + " is already used for an account. If you have forgotten your " +
"password, you may try resetting it <a href='https://accounts.jenkins.io/passwordReset'>here</a>.");
}
} finally {
con.close();
}
String userDetails = userDetails(userid, firstName, lastName, email, ip, usedFor);
if(blockReasons.size() > 0) {
String body = "Rejecting, likely spam:\n\n" + userDetails + "\n\nHTTP Headers\n" +
@ -407,10 +393,6 @@ public class Application {
return password;
}
private boolean ldapObjectExists(DirContext con, String filterExpr, Object filterArgs) throws NamingException {
return con.search(params.newUserBaseDN(), filterExpr, new Object[]{filterArgs}, new SearchControls()).hasMore();
}
/**
* Handles the password reset form submission.
*/