diff options
| author | Nils Schwabe | 2014-04-25 14:28:56 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-04-25 14:28:56 +0200 |
| commit | 40d528627efc309681496b47d66558e15eb3fe5e (patch) | |
| tree | 4cb7ba77b4b55ecb0b29a734c782b68d6926d441 /src/main/java/org/openslx/imagemaster/server/ApiServer.java | |
| parent | Add FTPS to MasterFtpServer (diff) | |
| download | masterserver-40d528627efc309681496b47d66558e15eb3fe5e.tar.gz masterserver-40d528627efc309681496b47d66558e15eb3fe5e.tar.xz masterserver-40d528627efc309681496b47d66558e15eb3fe5e.zip | |
Finally: Add _real_ server authentication. (this challengeresponse thing)
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/server/ApiServer.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/server/ApiServer.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/server/ApiServer.java b/src/main/java/org/openslx/imagemaster/server/ApiServer.java index c88bd05..7479fd3 100644 --- a/src/main/java/org/openslx/imagemaster/server/ApiServer.java +++ b/src/main/java/org/openslx/imagemaster/server/ApiServer.java @@ -1,13 +1,14 @@ package org.openslx.imagemaster.server; import java.io.File; +import java.nio.ByteBuffer; import org.apache.log4j.Logger; import org.apache.thrift.TException; import org.openslx.imagemaster.App; import org.openslx.imagemaster.Globals; import org.openslx.imagemaster.db.DbSatellite; -import org.openslx.imagemaster.db.ImageProcessor; +import org.openslx.imagemaster.ftp.ImageProcessor; import org.openslx.imagemaster.serversession.ServerAuthenticator; import org.openslx.imagemaster.serversession.ServerSession; import org.openslx.imagemaster.serversession.ServerSessionManager; @@ -146,7 +147,7 @@ public class ApiServer * @throws TException */ public static ServerSessionData serverAuthenticate( String organization, - String challengeResponse ) throws AuthenticationException, + ByteBuffer challengeResponse ) throws AuthenticationException, TException { if ( organization == null || challengeResponse == null ) { |