summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java
diff options
context:
space:
mode:
authorNils Schwabe2014-04-10 12:13:27 +0200
committerNils Schwabe2014-04-10 12:13:27 +0200
commitf7b3d0adcd4902ae3e58879b57c4d95046d729d7 (patch)
treec43f799c44f222c42e64baddc4647b9f7b979394 /src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java
parentAdded authentification for uni/hs server (diff)
downloadmasterserver-f7b3d0adcd4902ae3e58879b57c4d95046d729d7.tar.gz
masterserver-f7b3d0adcd4902ae3e58879b57c4d95046d729d7.tar.xz
masterserver-f7b3d0adcd4902ae3e58879b57c4d95046d729d7.zip
added some comments
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java16
1 files changed, 10 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 {