diff options
| author | Nils Schwabe | 2014-04-23 15:10:36 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-04-23 15:10:36 +0200 |
| commit | f71e8a5bcd2d7f85f58fedf3f6ea8dc8c7f89b63 (patch) | |
| tree | 5a79e7f320e6ca76ade3cf8039079d182f0178ad /src/main/java/org/openslx/imagemaster/session | |
| parent | Fix some issues with FtpCredentialsScheduler (diff) | |
| download | masterserver-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')
3 files changed, 14 insertions, 14 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; } // diff --git a/src/main/java/org/openslx/imagemaster/session/SessionManager.java b/src/main/java/org/openslx/imagemaster/session/SessionManager.java index cc68d0b..7891904 100644 --- a/src/main/java/org/openslx/imagemaster/session/SessionManager.java +++ b/src/main/java/org/openslx/imagemaster/session/SessionManager.java @@ -46,6 +46,7 @@ public class SessionManager static { gcThread = new Thread( new Runnable() { + @Override public void run() { diff --git a/src/main/java/org/openslx/imagemaster/session/User.java b/src/main/java/org/openslx/imagemaster/session/User.java index 7ff9a24..82ba8ca 100644 --- a/src/main/java/org/openslx/imagemaster/session/User.java +++ b/src/main/java/org/openslx/imagemaster/session/User.java @@ -7,7 +7,6 @@ package org.openslx.imagemaster.session; */ public abstract class User { - public final String username, organization; public final String password; public final String firstName, lastName; |