diff options
author | Nils Schwabe | 2014-04-10 12:13:27 +0200 |
---|---|---|
committer | Nils Schwabe | 2014-04-10 12:13:27 +0200 |
commit | f7b3d0adcd4902ae3e58879b57c4d95046d729d7 (patch) | |
tree | c43f799c44f222c42e64baddc4647b9f7b979394 /src/main/java/org/openslx/imagemaster/serversession | |
parent | Added authentification for uni/hs server (diff) | |
download | masterserver-f7b3d0adcd4902ae3e58879b57c4d95046d729d7.tar.gz masterserver-f7b3d0adcd4902ae3e58879b57c4d95046d729d7.tar.xz masterserver-f7b3d0adcd4902ae3e58879b57c4d95046d729d7.zip |
added some comments
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/serversession')
3 files changed, 20 insertions, 6 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java index b16766a..b0fd72f 100644 --- a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java +++ b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java @@ -7,6 +7,7 @@ import org.openslx.imagemaster.thrift.iface.AuthenticationException; import org.openslx.imagemaster.util.RandomString; public class ServerAuthenticator { + // map of currently authenticating servers private static HashMap<String, String> authenticatingServers = new HashMap<String, String>(); /** * Start the server authentification. @@ -14,11 +15,6 @@ public class ServerAuthenticator { * @return encrypted random string */ public static String startServerAuthentication(String organization) { - /* - * TODO: - * Create random string, send it to server. - * Remember organization for later authentification. - */ String secret = RandomString.generate(100, false); synchronized (authenticatingServers) { authenticatingServers.put(organization, secret); @@ -26,7 +22,15 @@ public class ServerAuthenticator { return secret; } - + /** + * Authenticate with the challengeResponse + * @param organization + * @param address + * @param challengeResponse + * @return + * @throws AuthenticationException + * @throws TException + */ public static ServerUser serverAuthenticate(String organization, String address, String challengeResponse) throws AuthenticationException, TException { diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerSession.java b/src/main/java/org/openslx/imagemaster/serversession/ServerSession.java index e15f863..818439c 100644 --- a/src/main/java/org/openslx/imagemaster/serversession/ServerSession.java +++ b/src/main/java/org/openslx/imagemaster/serversession/ServerSession.java @@ -1,5 +1,10 @@ package org.openslx.imagemaster.serversession; +/** + * Holds the session id of the server and manages the timeout. + * @author nils + * + */ public class ServerSession { private static final long TIMEOUT = 600L * 1000L; // TODO: config diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerSessionManager.java b/src/main/java/org/openslx/imagemaster/serversession/ServerSessionManager.java index 1fd4322..e88c1f9 100644 --- a/src/main/java/org/openslx/imagemaster/serversession/ServerSessionManager.java +++ b/src/main/java/org/openslx/imagemaster/serversession/ServerSessionManager.java @@ -10,6 +10,11 @@ import org.openslx.imagemaster.session.SessionManager; import org.openslx.imagemaster.thrift.iface.ServerSessionData; import org.openslx.imagemaster.util.Hash; +/** + * Manages all server sessions and kicks timeouted sessions. + * @author nils + * + */ public class ServerSessionManager { private static Logger log = Logger.getLogger( SessionManager.class ); |