summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/session/Authenticator.java
diff options
context:
space:
mode:
authorNils Schwabe2014-04-23 15:10:36 +0200
committerNils Schwabe2014-04-23 15:10:36 +0200
commitf71e8a5bcd2d7f85f58fedf3f6ea8dc8c7f89b63 (patch)
tree5a79e7f320e6ca76ade3cf8039079d182f0178ad /src/main/java/org/openslx/imagemaster/session/Authenticator.java
parentFix some issues with FtpCredentialsScheduler (diff)
downloadmasterserver-f71e8a5bcd2d7f85f58fedf3f6ea8dc8c7f89b63.tar.gz
masterserver-f71e8a5bcd2d7f85f58fedf3f6ea8dc8c7f89b63.tar.xz
masterserver-f71e8a5bcd2d7f85f58fedf3f6ea8dc8c7f89b63.zip
Reformat all files with simon's new layout
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/session/Authenticator.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/session/Authenticator.java26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/org/openslx/imagemaster/session/Authenticator.java b/src/main/java/org/openslx/imagemaster/session/Authenticator.java
index 3f86fad..aaaa7d7 100644
--- a/src/main/java/org/openslx/imagemaster/session/Authenticator.java
+++ b/src/main/java/org/openslx/imagemaster/session/Authenticator.java
@@ -6,13 +6,13 @@ import org.openslx.imagemaster.db.LdapUser;
import org.openslx.imagemaster.thrift.iface.AuthenticationError;
import org.openslx.imagemaster.thrift.iface.AuthenticationException;
-
public class Authenticator
{
private static Logger log = Logger.getLogger( Authenticator.class );
/**
* Authenticate the user against whatever backend
+ *
* @param username
* @param password
* @return
@@ -20,23 +20,23 @@ public class Authenticator
*/
public static User authenticate( String username, String password ) throws AuthenticationException
{
-// DbUser user = DbUser.forLogin( username );
-// if ( user == null || !Sha512Crypt.verifyPassword( password, user.password ) ) {
-// log.debug( "Login failed: " + username );
-// throw new AuthenticationException( AuthenticationError.INVALID_CREDENTIALS, "Invalid username or password!" );
-// }
-// log.debug( "Login successful: " + username );
-
+ // DbUser user = DbUser.forLogin( username );
+ // if ( user == null || !Sha512Crypt.verifyPassword( password, user.password ) ) {
+ // log.debug( "Login failed: " + username );
+ // throw new AuthenticationException( AuthenticationError.INVALID_CREDENTIALS, "Invalid username or password!" );
+ // }
+ // log.debug( "Login successful: " + username );
+
LdapUser user = LdapUser.forLogin( username, password ); // throws exception if credentials are invalid
- if (user == null) {
- log.debug( "Login failed: " + username);
+ if ( user == null ) {
+ log.debug( "Login failed: " + username );
throw new AuthenticationException( AuthenticationError.INVALID_CREDENTIALS, "Invalid username or password!" );
}
log.debug( "Login succesful: " + username );
-
+
// if successfull: update/insert into db
- DbUser.insertOrUpdate(user);
-
+ DbUser.insertOrUpdate( user );
+
return user;
}
//