diff options
author | Nino Breuer | 2014-11-24 15:23:21 +0100 |
---|---|---|
committer | Nino Breuer | 2014-11-24 15:23:21 +0100 |
commit | 2f2609d0667044d1fd2ed43cf82c862718e703f6 (patch) | |
tree | cdce2b3e3318fefb84b0702d8e19c04259cda474 /dozentenmodulserver | |
parent | • Only allow permission changes for users who are authorized to do so (diff) | |
download | tutor-module-2f2609d0667044d1fd2ed43cf82c862718e703f6.tar.gz tutor-module-2f2609d0667044d1fd2ed43cf82c862718e703f6.tar.xz tutor-module-2f2609d0667044d1fd2ed43cf82c862718e703f6.zip |
• started changing the authentification
Diffstat (limited to 'dozentenmodulserver')
-rw-r--r-- | dozentenmodulserver/src/main/java/server/ServerHandler.java | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java index a0809546..1671b893 100644 --- a/dozentenmodulserver/src/main/java/server/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java @@ -48,21 +48,38 @@ public class ServerHandler implements Server.Iface } + public boolean checkSession(String authToken) throws InvalidTokenException + { + //cached proof. if session is valid, return + if(SessionData.session.getAuthToken().equals(authToken)) + { + return true; + } + + //else, set session to current token and check against masterserver + //TODO change calls from functions + SessionData.session.setAuthToken(authToken); + + return authenticated(); + } + public boolean authenticated() throws InvalidTokenException { - MasterThriftConnection thrift = new MasterThriftConnection(); - client = thrift.getMasterThriftConnection(); - try { - if(client.getUserFromToken(SessionData.session.getAuthToken()) != null) - { - return true; + //start initial authentication with the masterserver + MasterThriftConnection thrift = new MasterThriftConnection(); + client = thrift.getMasterThriftConnection(); + try { + if(client.getUserFromToken(SessionData.session.getAuthToken()) != null) + { + return true; + } + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - log.info("User not authenticated."); + log.info("User not authenticated."); + return false; } |