diff options
author | Simon Rettberg | 2014-10-01 16:53:55 +0200 |
---|---|---|
committer | Simon Rettberg | 2014-10-01 16:53:55 +0200 |
commit | 0ed5db9366541069ac4585c16d57138a9c4deac2 (patch) | |
tree | 858240c146daf7876e0c231f127ec8fdbc8f878b /src/main/java/org/openslx/imagemaster/serversession | |
parent | Handle uploads properly if satellite does not supply crc list (diff) | |
download | masterserver-0ed5db9366541069ac4585c16d57138a9c4deac2.tar.gz masterserver-0ed5db9366541069ac4585c16d57138a9c4deac2.tar.xz masterserver-0ed5db9366541069ac4585c16d57138a9c4deac2.zip |
Adapt to changed DB scheme (eppn handling for multiple suffixes)
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/serversession')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java index d851c4e..4ec5acf 100644 --- a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java +++ b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java @@ -45,7 +45,7 @@ public class ServerAuthenticator /** * Authenticate with the challengeResponse. * - * @param organization Is already verified. + * @param organizationId Is already verified. * @param address * @param challengeResponse * @return @@ -60,13 +60,13 @@ public class ServerAuthenticator AsymEncryptionHandler verifier = new AsymEncryptionHandler( satellite.getPubkey() ); - if ( !verifier.verifyMessage( encryptedBytes, authenticatingServers.get( satellite.getOrganization() ) ) ) + if ( !verifier.verifyMessage( encryptedBytes, authenticatingServers.get( satellite.getOrganizationId() ) ) ) throw new ServerAuthenticationException( ServerAuthenticationError.CHALLENGE_FAILED, "You failed the encryption challenge. private and public key don't seem to match." ); - log.info( "Server of organinzation '" + satellite.getOrganization() + " authenticated." ); + log.info( "Server of organinzation " + satellite.getName() + " (" + satellite.getOrganizationId() + ") authenticated." ); - authenticatingServers.remove( satellite.getOrganization() ); + authenticatingServers.remove( satellite.getOrganizationId() ); - return new ServerUser( satellite.getOrganization(), satellite.getAddress() ); + return new ServerUser( satellite.getOrganizationId(), satellite.getAddress() ); } } |