X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=5bbe4cdd1f33b77bb67e609b91b7770aa886a35e;hp=1fe182b87980c01e44844b34a1916d40bda6a97e;hb=2070ced5a252b11ae7e19be1bb2430fa8e9220d9;hpb=5e848e6a19a87f4e14b13147f628667376503d74

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 1fe182b..5bbe4cd 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -14,80 +14,96 @@ import be.nikiroo.utils.serial.Server;
 /**
  * Create a new remote server that will listen for order on the given port.
  * <p>
- * The available commands are given as String arrays (first item is the command,
- * the rest are the arguments):
+ * The available commands are given as String arrays (first item is the key,
+ * second is the command, the rest are the arguments):
  * <ul>
- * <li>GET_METADATA *: will return the metadata of all the stories in the
+ * <li>KEY GET_METADATA *: will return the metadata of all the stories in the
  * library</li>
- * <li>GET_STORY [luid]: will return the given story if it exists (or NULL if
- * not)</li>
- * <li>SAVE_STORY [story] [luid]: save the story with the given LUID</li>
- * <li>DELETE_STORY [luid]: delete the story of LUID luid</li>
- * <li>GET_COVER [luid]: return the cover of the story</li>
- * <li>GET_SOURCE_COVER [source]: return the cover for this source</li>
- * <li>SET_SOURCE_COVER [source], [luid]: set the default cover for the given
- * source to the cover of the story denoted by luid</li>
- * <li>EXIT: stop the server</li>
+ * <li>KEY GET_STORY [luid]: will return the given story if it exists (or NULL
+ * if not)</li>
+ * <li>KEY SAVE_STORY [story] [luid]: save the story with the given LUID</li>
+ * <li>KEY DELETE_STORY [luid]: delete the story of LUID luid</li>
+ * <li>KEY GET_COVER [luid]: return the cover of the story</li>
+ * <li>KEY GET_SOURCE_COVER [source]: return the cover for this source</li>
+ * <li>KEY SET_SOURCE_COVER [source], [luid]: set the default cover for the
+ * given source to the cover of the story denoted by luid</li>
+ * <li>KEY EXIT: stop the server</li>
  * </ul>
  * 
  * @author niki
  */
 public class RemoteLibraryServer extends Server {
+	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 {
+	public RemoteLibraryServer(String key, int port) throws IOException {
 		super(port, true);
+		this.key = key;
 	}
 
 	@Override
 	protected Object onRequest(ConnectActionServer 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] = 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<MetaData> 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);
 		}