diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java index 4ec5acf..88697bf 100644 --- a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java +++ b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java @@ -8,8 +8,8 @@ import org.apache.log4j.Logger; import org.apache.thrift.TException; import org.openslx.encryption.AsymEncryptionHandler; import org.openslx.imagemaster.db.DbSatellite; -import org.openslx.imagemaster.thrift.iface.ServerAuthenticationError; -import org.openslx.imagemaster.thrift.iface.ServerAuthenticationException; +import org.openslx.imagemaster.thrift.iface.AuthenticationError; +import org.openslx.imagemaster.thrift.iface.AuthenticationException; import org.openslx.imagemaster.util.RandomString; /** @@ -53,7 +53,7 @@ public class ServerAuthenticator * @throws TException */ public static ServerUser serverAuthenticate( DbSatellite satellite, ByteBuffer challengeResponse ) - throws ServerAuthenticationException + throws AuthenticationException { byte[] encryptedBytes = new byte[ challengeResponse.remaining() ]; challengeResponse.get( encryptedBytes ); @@ -61,7 +61,7 @@ public class ServerAuthenticator AsymEncryptionHandler verifier = new AsymEncryptionHandler( satellite.getPubkey() ); 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." ); + throw new AuthenticationException( AuthenticationError.CHALLENGE_FAILED, "You failed the encryption challenge. private and public key don't seem to match." ); log.info( "Server of organinzation " + satellite.getName() + " (" + satellite.getOrganizationId() + ") authenticated." ); |