X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=55c50c1b44e13fc7c682211529ac83d00098f018;hb=39cd9738bfcdafaf8806d5007e443e572f8994c0;hp=8c836ed07ea6916c4c67818a6370bc66980631c1;hpb=085a2f9a3a811a910de7c3011eb6f5ef2ab18aa0;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 8c836ed..55c50c1 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -8,85 +8,106 @@ import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.utils.Version;
-import be.nikiroo.utils.serial.ConnectActionServer;
-import be.nikiroo.utils.serial.Server;
+import be.nikiroo.utils.serial.server.ConnectActionServerObject;
+import be.nikiroo.utils.serial.server.ServerObject;
/**
* Create a new remote server that will listen for order on the given port.
*
- * The available commands are given as String arrays (first item is the command,
- * the rest are the arguments):
+ * The available commands are given as arrays of objects (first item is the key,
+ * second is the command, the rest are the arguments).
+ *
+ * The key is always a String, the commands are also Strings; the parameters
+ * vary depending upon the command.
*
- * - GET_METADATA *: will return the metadata of all the stories in the
+ *
- [key] GET_METADATA *: will return the metadata of all the stories in the
* library
- * - GET_STORY [luid]: will return the given story if it exists (or NULL if
- * not)
- * - SAVE_STORY [story] [luid]: save the story with the given LUID
- * - DELETE_STORY [luid]: delete the story of LUID luid
- * - GET_COVER [luid]: return the cover of the story
- * - GET_SOURCE_COVER [source]: return the cover for this source
- * - SET_SOURCE_COVER [source], [luid]: set the default cover for the given
- * source to the cover of the story denoted by luid
+ * - [key] GET_STORY [luid]: will return the given story if it exists (or NULL
+ * if not)
+ * - [key] SAVE_STORY [story] [luid]: save the story with the given LUID
+ * - [key] DELETE_STORY [luid]: delete the story of LUID luid
+ * - [key] GET_COVER [luid]: return the cover of the story
+ * - [key] GET_SOURCE_COVER [source]: return the cover for this source
+ * - [key] SET_SOURCE_COVER [source], [luid]: set the default cover for the
+ * given source to the cover of the story denoted by luid
+ * - [key] EXIT: stop the server
*
*
* @author niki
*/
-public class RemoteLibraryServer extends Server {
+public class RemoteLibraryServer extends ServerObject {
+ private final String key;
/**
* Create a new remote server (will not be active until
* {@link RemoteLibraryServer#start()} is called).
*
+ * @param key
+ * the key that will restrict access to this server
* @param port
* the port to listen on
*
* @throws IOException
* in case of I/O error
*/
- public RemoteLibraryServer(int port) throws IOException {
- super(port, true);
+ public RemoteLibraryServer(String key, int port) throws IOException {
+ super("Fanfix remote library", port, true);
+ this.key = key;
}
@Override
- protected Object onRequest(ConnectActionServer action,
+ protected Object onRequest(ConnectActionServerObject action,
Version clientVersion, Object data) throws Exception {
-
+ String key = "";
String command = "";
Object[] args = new Object[0];
if (data instanceof Object[]) {
- args = (Object[]) data;
- if (args.length > 0) {
- command = "" + args[0];
+ Object[] dataArray = (Object[]) data;
+ if (dataArray.length >= 2) {
+ args = new Object[dataArray.length - 2];
+ for (int i = 2; i < dataArray.length; i++) {
+ args[i - 2] = dataArray[i];
+ }
+
+ key = "" + dataArray[0];
+ command = "" + dataArray[1];
}
}
- System.out.print("COMMAND: ");
+ System.out.print("[" + command + "] ");
for (Object arg : args) {
System.out.print(arg + " ");
}
System.out.println("");
+ if (!key.equals(this.key)) {
+ System.out.println("Key rejected.");
+ throw new SecurityException("Invalid key");
+ }
+
// TODO: progress (+send name + %age info back to client)
if ("GET_METADATA".equals(command)) {
- if (args[1].equals("*")) {
+ if (args[0].equals("*")) {
List metas = Instance.getLibrary().getMetas(null);
return metas.toArray(new MetaData[] {});
}
throw new InvalidParameterException(
- "only * is valid here, but you passed: " + args[1]);
+ "only * is valid here, but you passed: " + args[0]);
} else if ("GET_STORY".equals(command)) {
- return Instance.getLibrary().getStory("" + args[1], null);
+ return Instance.getLibrary().getStory("" + args[0], null);
} else if ("SAVE_STORY".equals(command)) {
- Instance.getLibrary().save((Story) args[1], "" + args[2], null);
+ Instance.getLibrary().save((Story) args[0], "" + args[1], null);
} else if ("DELETE_STORY".equals(command)) {
- Instance.getLibrary().delete("" + args[1]);
+ Instance.getLibrary().delete("" + args[0]);
} else if ("GET_COVER".equals(command)) {
- return Instance.getLibrary().getCover("" + args[1]);
+ return Instance.getLibrary().getCover("" + args[0]);
} else if ("GET_SOURCE_COVER".equals(command)) {
- return Instance.getLibrary().getSourceCover("" + args[1]);
+ return Instance.getLibrary().getSourceCover("" + args[0]);
} else if ("SET_SOURCE_COVER".equals(command)) {
- Instance.getLibrary().setSourceCover("" + args[1], "" + args[2]);
+ Instance.getLibrary().setSourceCover("" + args[0], "" + args[1]);
+ } else if ("EXIT".equals(command)) {
+ stop(0, false);
}
return null;