From b9878eda35e354d16ce732a57b7fabebb46c1a46 Mon Sep 17 00:00:00 2001 From: Nils Schwabe Date: Fri, 25 Apr 2014 16:20:50 +0200 Subject: Add remove image from process list (when user gets deleted after timeout) Fix problems with timeout user deleting --- .../serversession/ServerAuthenticator.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/main/java/org/openslx/imagemaster/serversession') diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java index 24e2928..4f67415 100644 --- a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java +++ b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java @@ -13,11 +13,12 @@ import org.openslx.imagemaster.util.RandomString; public class ServerAuthenticator { + private static Logger log = Logger.getLogger( ServerAuthenticator.class ); // map of currently authenticating servers private static HashMap authenticatingServers = new HashMap(); private static AsymMessageSign messageSign = null; - + /** * Initialize the message signer/verifier */ @@ -29,7 +30,7 @@ public class ServerAuthenticator log.info( "Loaded keystore" ); } catch ( Exception e ) { log.error( "Error loading the keystore", e ); - System.exit(1); + System.exit( 1 ); } } @@ -67,22 +68,22 @@ public class ServerAuthenticator throws AuthenticationException, TException { byte[] bytes = challengeResponse.array(); - log.info( "Response was: " + challengeResponse + " with length: " + bytes.length); - + log.info( "Response was: " + challengeResponse + " with length: " + bytes.length ); + boolean result = false; - + try { result = messageSign.verifyMessage( bytes, authenticatingServers.get( organization ).getBytes() ); - } catch (Exception e) { - log.error( "Error while verifying message", e ); + } catch ( Exception e ) { + log.error( "Error while verifying message", e ); } - + if ( !result ) { throw new AuthenticationException(); } log.info( "Server of organinzation '" + organization - + " authenticated."); + + " authenticated." ); authenticatingServers.remove( organization ); -- cgit v1.2.3-55-g7522