diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/session')
3 files changed, 73 insertions, 54 deletions
diff --git a/src/main/java/org/openslx/imagemaster/session/Authenticator.java b/src/main/java/org/openslx/imagemaster/session/Authenticator.java index 19891b9..91f3127 100644 --- a/src/main/java/org/openslx/imagemaster/session/Authenticator.java +++ b/src/main/java/org/openslx/imagemaster/session/Authenticator.java @@ -1,9 +1,13 @@ package org.openslx.imagemaster.session; +import java.sql.SQLException; + import org.apache.log4j.Logger; -import org.openslx.imagemaster.db.DbUser; -import org.openslx.imagemaster.thrift.iface.AuthenticationError; -import org.openslx.imagemaster.thrift.iface.AuthenticationException; +import org.openslx.bwlp.thrift.iface.AuthorizationError; +import org.openslx.bwlp.thrift.iface.TAuthorizationException; +import org.openslx.bwlp.thrift.iface.UserInfo; +import org.openslx.imagemaster.db.mappers.DbUser; +import org.openslx.imagemaster.db.models.LocalUser; /** * Authenticates a user against a backend (ldap here) @@ -19,38 +23,27 @@ public class Authenticator * @param username * @param password * @return - * @throws AuthenticationException + * @throws TAuthenticationException */ - public static User authenticate( String username, String password ) throws AuthenticationException + public static UserInfo authenticate( String username, String password ) throws TAuthorizationException { String login = username; - /* - if ( username.split( "@" ).length == 2 ) { - log.info( "username is in username@organization format" ); - // we are in username@organization format - DbSatellite satellite = DbSatellite.fromOrganization( username.split( "@" )[1] ); - if ( satellite == null ) - throw new AuthenticationException( AuthenticationError.INVALID_CREDENTIALS, "Unkown Organization." ); - login = satellite.getPrefix() + "_" + username.split( "@" )[0]; - } else if ( username.split( "_" ).length != 2 ) { - 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 ); - User user = DbUser.forLogin( login, password ); // throws exception if credentials are invalid + LocalUser user; + try { + user = DbUser.forLogin( login, password ); + } catch ( SQLException e ) { + user = null; + } // throws exception if credentials are invalid if ( user == null ) { log.debug( "Login failed: " + username ); - throw new AuthenticationException( AuthenticationError.GENERIC_ERROR, "Something went wrong." ); + throw new TAuthorizationException( AuthorizationError.GENERIC_ERROR, "Something went wrong." ); } log.debug( "Login succesful: " + username ); - // if successfull: update/insert into db - DbUser.insertOrUpdate( user ); - - return user; + return user.toUserInfo(); } // } diff --git a/src/main/java/org/openslx/imagemaster/session/Session.java b/src/main/java/org/openslx/imagemaster/session/Session.java index f91a3ae..ed36274 100644 --- a/src/main/java/org/openslx/imagemaster/session/Session.java +++ b/src/main/java/org/openslx/imagemaster/session/Session.java @@ -1,5 +1,6 @@ package org.openslx.imagemaster.session; +import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.imagemaster.Globals; /** @@ -12,9 +13,9 @@ public class Session private static final long TIMEOUT = Long.valueOf( Globals.getSessionTimeoutUser() ) * 1000L; private long timeOut = 0; - private final User user; + private final UserInfo user; - public Session(final User dbuser) + public Session( final UserInfo dbuser ) { this.user = dbuser; this.timeOut = System.currentTimeMillis() + TIMEOUT; @@ -29,17 +30,17 @@ public class Session public synchronized boolean timedOut() { - return System.currentTimeMillis() > this.timeOut; + return this.timeOut == 0 || System.currentTimeMillis() > this.timeOut; } - public String getSatelliteAddress() + public synchronized void invalidate() { - return user.satelliteAddress; + this.timeOut = 0; } public String getLogin() { - return user.login; + return user.userId; } public String getFirstName() @@ -56,10 +57,15 @@ public class Session { return user.eMail; } - + public String getOrgenizationId() { return user.organizationId; } + public UserInfo getUserInfo() + { + 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 7dcb754..c12334a 100644 --- a/src/main/java/org/openslx/imagemaster/session/SessionManager.java +++ b/src/main/java/org/openslx/imagemaster/session/SessionManager.java @@ -1,13 +1,21 @@ package org.openslx.imagemaster.session; +import java.sql.SQLException; import java.util.Iterator; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.concurrent.TimeUnit; import org.apache.log4j.Logger; -import org.openslx.imagemaster.thrift.iface.SessionData; +import org.openslx.bwlp.thrift.iface.ClientSessionData; +import org.openslx.bwlp.thrift.iface.Satellite; +import org.openslx.bwlp.thrift.iface.UserInfo; +import org.openslx.imagemaster.db.mappers.DbSatellite; import org.openslx.imagemaster.util.Hash; +import org.openslx.util.QuickTimer; +import org.openslx.util.QuickTimer.Task; /** * Class for managing active user sessions. This class and all its function are @@ -19,9 +27,8 @@ public class SessionManager // Map of currently known sessions private static final Map<String, Session> sessions = new LinkedHashMap<>(); - private static final Thread gcThread; - public static SessionData addSession( Session session ) + public static ClientSessionData addSession( Session session ) { final String authToken = Hash.md5( UUID.randomUUID().toString() ); final String sessionId = Hash.sha256( UUID.randomUUID().toString() ); @@ -30,13 +37,20 @@ public class SessionManager sessions.put( authToken, session ); sessions.put( sessionId, session ); } - return new SessionData( sessionId, authToken, session.getSatelliteAddress() ); + UserInfo ui = session.getUserInfo(); + List<Satellite> sats; + try { + sats = DbSatellite.getSatellites( ui ); + } catch ( SQLException e ) { + sats = null; + } + return new ClientSessionData( sessionId, authToken, sats, ui ); } public static Session getSessionFromToken( String token ) { if ( token == null || token.length() != 32 ) { - log.debug("invalid token format: " + token); + log.debug( "invalid token format: " + token ); return null; } final Session session; @@ -50,35 +64,27 @@ public class SessionManager } static { - gcThread = new Thread( new Runnable() { - + QuickTimer.scheduleAtFixedDelay( new Task() { @Override - public void run() + public void fire() { - for ( ;; ) { - try { - Thread.sleep( 1800L * 1000L ); - } catch ( InterruptedException e ) { - } - synchronized ( sessions ) { - Iterator<Session> it = sessions.values().iterator(); - while ( it.hasNext() ) { - final Session s = it.next(); - if ( s.timedOut() ) { - it.remove(); - } + synchronized ( sessions ) { + Iterator<Session> it = sessions.values().iterator(); + while ( it.hasNext() ) { + final Session s = it.next(); + if ( s.timedOut() ) { + it.remove(); } } } } - } ); - gcThread.start(); + }, 123, TimeUnit.MINUTES.toMillis( 13 ) ); } public static Object getSessionFromSessionId( String sessionId ) { if ( sessionId == null || sessionId.length() != 64 ) { - log.debug("invalid sessionid format: " + sessionId); + log.debug( "invalid sessionid format: " + sessionId ); return null; } final Session session; @@ -91,4 +97,18 @@ public class SessionManager return session; } + public static void invalidate( String sessionId ) + { + if ( sessionId == null || sessionId.length() != 64 ) { + log.debug( "invalidate: invalid sessionid format: " + sessionId ); + return; + } + synchronized ( sessions ) { + Session session = sessions.get( sessionId ); + if ( session != null ) { + session.invalidate(); + } + } + } + } |