X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=a40103c0b40f5d6e18995609b5731f5fda918a50;hb=96f0625f2aa6f012083c87fa14df854ccdb576be;hp=221fbdfc05b21153f0c6a33ee012657f0b19cd95;hpb=e604986c4208da0091d26bc0e1c4feb4ff3c588f;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 221fbdf..a40103c 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -1,76 +1,380 @@
package be.nikiroo.fanfix.library;
import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import be.nikiroo.fanfix.Instance;
+import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.fanfix.data.Paragraph;
+import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.Progress.ProgressListener;
+import be.nikiroo.utils.StringUtils;
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.
+ * Create a new remote server that will listen for orders on the given port.
*
- * The available commands are:
+ * The available commands are given as arrays of objects (first item is the
+ * command, the rest are the arguments).
+ *
+ * All commands, including PING, will first return a random value to you that
+ * you must hash with your key and return before processing the rest; if the
+ * value not correct, the connection will be closed.
+ *
+ * BTW: this system is by no means secure. It is just slightly
+ * obfuscated, and operate on clear text (because Google decided not to support
+ * anonymous SSL exchanges on Android, and the main use case for this server is
+ * Android).
*
- *
GET_METADATA *: will get the metadata of all the stories in the library
+ *
PING: will return PONG if the key is accepted
+ *
GET_METADATA *: will return the metadata of all the stories in the
+ * library (array)
*
+ *
GET_METADATA [luid]: will return the metadata of the story of LUID luid
*
GET_STORY [luid]: will return the given story if it exists (or NULL if
* not)
+ *
SAVE_STORY [luid]: save the story (that must be sent just after the
+ * command) with the given LUID, then return the LUID
+ *
IMPORT [url]: save the story found at the given URL, then return the LUID
+ *
+ *
DELETE_STORY [luid]: delete the story of LUID luid
+ *
GET_COVER [luid]: return the cover of the story
+ *
GET_CUSTOM_COVER ["SOURCE"|"AUTHOR"] [source]: return the cover for this
+ * source/author
+ *
SET_COVER ["SOURCE"|"AUTHOR"] [value] [luid]: set the default cover for
+ * the given source/author to the cover of the story denoted by luid
+ *
CHANGE_SOURCE [luid] [new source]: change the source of the story of LUID
+ * luid
+ *
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, false);
+ this.key = key;
+
+ setTraceHandler(Instance.getTraceHandler());
}
@Override
- protected Object onRequest(ConnectActionServer action,
+ protected Object onRequest(ConnectActionServerObject action,
Version clientVersion, Object data) throws Exception {
- String command = null;
- String args = null;
- if (data instanceof String) {
- command = (String) data;
- int pos = command.indexOf(" ");
- if (pos >= 0) {
- args = command.substring(pos + 1);
- command = command.substring(0, pos);
+ long start = new Date().getTime();
+
+ String command = "";
+ Object[] args = new Object[0];
+ if (data instanceof Object[]) {
+ Object[] dataArray = (Object[]) data;
+ if (dataArray.length > 0) {
+ command = "" + dataArray[0];
+
+ args = new Object[dataArray.length - 1];
+ for (int i = 1; i < dataArray.length; i++) {
+ args[i - 1] = dataArray[i];
+ }
}
}
- System.out.println(String.format("COMMAND: [%s], ARGS: [%s]", command,
- args));
+ String trace = "[ " + command + "] ";
+ for (Object arg : args) {
+ trace += arg + " ";
+ }
+ System.out.println(trace);
+
+ // Authentication:
+ String random = StringUtils.getMd5Hash(Double.toString(Math.random()));
+ action.send(random);
+ String answer = "" + action.rec();
+
+ if (!answer.equals(RemoteLibrary.hashKey(key, random))) {
+ System.out.println("Key rejected.");
+ action.close();
+ return null;
+ }
+ //
+
+ Object rep = doRequest(action, command, args);
- // TODO: progress (+send name + %age info back to client)
+ String rec = StringUtils.formatNumber(action.getBytesReceived()) + "b";
+ String sent = StringUtils.formatNumber(action.getBytesSent()) + "b";
+ System.out.println(String.format("[>%s]: (%s sent, %s rec) in %d ms",
+ command, sent, rec, (new Date().getTime() - start)));
- if ("GET_METADATA".equals(command)) {
- if (args != null && args.equals("*")) {
- List metas = Instance.getLibrary().getMetas(null);
+ return rep;
+ }
+
+ private Object doRequest(ConnectActionServerObject action, String command,
+ Object[] args) throws NoSuchFieldException, NoSuchMethodException,
+ ClassNotFoundException, IOException {
+ if ("PING".equals(command)) {
+ return "PONG";
+ } else if ("GET_METADATA".equals(command)) {
+ if ("*".equals(args[0])) {
+ Progress pg = createPgForwarder(action);
+
+ List metas = new ArrayList();
+
+ for (MetaData meta : Instance.getLibrary().getMetas(pg)) {
+ MetaData light;
+ if (meta.getCover() == null) {
+ light = meta;
+ } else {
+ light = meta.clone();
+ light.setCover(null);
+ }
+
+ metas.add(light);
+ }
+
+ forcePgDoneSent(pg);
return metas.toArray(new MetaData[] {});
}
+
+ return new MetaData[] { Instance.getLibrary().getInfo(
+ (String) args[0]) };
} else if ("GET_STORY".equals(command)) {
- if (args != null) {
- return Instance.getLibrary().getStory(args, null);
+ MetaData meta = Instance.getLibrary().getInfo((String) args[0]);
+ meta = meta.clone();
+ meta.setCover(null);
+
+ action.send(meta);
+ action.rec();
+
+ Story story = Instance.getLibrary()
+ .getStory((String) args[0], null);
+ for (Object obj : breakStory(story)) {
+ action.send(obj);
+ action.rec();
}
+ } else if ("SAVE_STORY".equals(command)) {
+ List