diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/session/Authenticator.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/session/Authenticator.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/openslx/imagemaster/session/Authenticator.java b/src/main/java/org/openslx/imagemaster/session/Authenticator.java index 5d1b728..19891b9 100644 --- a/src/main/java/org/openslx/imagemaster/session/Authenticator.java +++ b/src/main/java/org/openslx/imagemaster/session/Authenticator.java @@ -1,9 +1,7 @@ package org.openslx.imagemaster.session; import org.apache.log4j.Logger; -import org.openslx.imagemaster.db.DbSatellite; import org.openslx.imagemaster.db.DbUser; -import org.openslx.imagemaster.db.LdapUser; import org.openslx.imagemaster.thrift.iface.AuthenticationError; import org.openslx.imagemaster.thrift.iface.AuthenticationException; @@ -26,6 +24,7 @@ public class Authenticator public static User authenticate( String username, String password ) throws AuthenticationException { String login = username; + /* if ( username.split( "@" ).length == 2 ) { log.info( "username is in username@organization format" ); // we are in username@organization format @@ -37,10 +36,11 @@ public class Authenticator log.info( "username is not in a valid format." ); throw new AuthenticationException( AuthenticationError.INVALID_CREDENTIALS, "Credentials must be in (username@organization) or (prefix@username)" ); } + */ log.info( "Logging in with: " + login ); - LdapUser user = LdapUser.forLogin( login, password ); // throws exception if credentials are invalid + User user = DbUser.forLogin( login, password ); // throws exception if credentials are invalid if ( user == null ) { log.debug( "Login failed: " + username ); throw new AuthenticationException( AuthenticationError.GENERIC_ERROR, "Something went wrong." ); |