summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx
diff options
context:
space:
mode:
authorNils Schwabe2014-04-10 10:08:15 +0200
committerNils Schwabe2014-04-10 10:08:15 +0200
commit94b81297b37105f376ff3b35cffd8c62d1005c4f (patch)
tree99e3a2ea5d955febb435a7b9869eb1902023f802 /src/main/java/org/openslx
parentAdded Globals.java and global properties (diff)
downloadmasterserver-94b81297b37105f376ff3b35cffd8c62d1005c4f.tar.gz
masterserver-94b81297b37105f376ff3b35cffd8c62d1005c4f.tar.xz
masterserver-94b81297b37105f376ff3b35cffd8c62d1005c4f.zip
added new thrift methods:
- authentication (for server) - submitImage (for server)
Diffstat (limited to 'src/main/java/org/openslx')
-rw-r--r--src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java26
1 files changed, 26 insertions, 0 deletions
diff --git a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java
index c1d3aa8..dc1b8f1 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java
@@ -4,8 +4,12 @@ import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.openslx.imagemaster.server.ApiServer;
import org.openslx.imagemaster.thrift.iface.AuthenticationException;
+import org.openslx.imagemaster.thrift.iface.AuthorizationException;
+import org.openslx.imagemaster.thrift.iface.FtpCredentials;
+import org.openslx.imagemaster.thrift.iface.ImageData;
import org.openslx.imagemaster.thrift.iface.ImageServer;
import org.openslx.imagemaster.thrift.iface.InvalidTokenException;
+import org.openslx.imagemaster.thrift.iface.ServerSessionData;
import org.openslx.imagemaster.thrift.iface.SessionData;
import org.openslx.imagemaster.thrift.iface.UserInfo;
@@ -35,4 +39,26 @@ public class ImageServerHandler implements ImageServer.Iface
return ApiServer.getUserFromToken( token );
}
+ @Override
+ public String startServerAuthentication(String organization)
+ throws TException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public ServerSessionData serverAuthenticate(String organization,
+ String challengeResponse) throws AuthenticationException,
+ TException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public FtpCredentials submitImage(ImageData imageDescription)
+ throws AuthorizationException, TException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}