diff options
| author | Nils Schwabe | 2014-05-05 14:56:24 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-05-05 14:56:24 +0200 |
| commit | 65cd27a324a80a4ed956aaf68fe68ed8a939a3af (patch) | |
| tree | 4ee402305cf17ab6dbff23c3e994dc0f280bc868 /src/main/java/org/openslx/imagemaster/db/LdapUser.java | |
| parent | Removed todo from LDAPUser (diff) | |
| download | masterserver-65cd27a324a80a4ed956aaf68fe68ed8a939a3af.tar.gz masterserver-65cd27a324a80a4ed956aaf68fe68ed8a939a3af.tar.xz masterserver-65cd27a324a80a4ed956aaf68fe68ed8a939a3af.zip | |
Add login can be in format prefix_userid OR userid@organization
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db/LdapUser.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/db/LdapUser.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/LdapUser.java b/src/main/java/org/openslx/imagemaster/db/LdapUser.java index a887640..f9554c0 100644 --- a/src/main/java/org/openslx/imagemaster/db/LdapUser.java +++ b/src/main/java/org/openslx/imagemaster/db/LdapUser.java @@ -47,16 +47,15 @@ public class LdapUser extends User /** * Query LDAP for user with given login * - * @param login Login of user in the form "user@organization.com" + * @param login Login of user in the form "prefix_username" * @return instance of LDAPUser for matching entry from LDAP or null if sth went wrong */ public static LdapUser forLogin( final String login, final String password ) throws AuthenticationException { String username, organization, firstName, lastName, eMail, satelliteAddress; - -// String[] temp = login.split( "@" ); -// if ( temp.length != 2 ) -// throw new AuthenticationException( AuthenticationError.GENERIC_ERROR, "Login must be in form user@organization.com" ); + + if (login.split( "_" ).length != 2) + throw new AuthenticationException(AuthenticationError.GENERIC_ERROR, "Login must be in form: prefix_username"); LdapConnection connection = null; try { |