1 files changed, 43 insertions, 23 deletions

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();
+			}
+		}
+	}
+
 }