X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=f92c37e8e2ecaf6a1b7604d6b0c914a56b03131a;hb=2ef9514282fc9d93bfa73bfcda7f8cc85bd32c5b;hp=1fe182b87980c01e44844b34a1916d40bda6a97e;hpb=5e848e6a19a87f4e14b13147f628667376503d74;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 1fe182b..f92c37e 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -1,97 +1,554 @@
package be.nikiroo.fanfix.library;
import java.io.IOException;
-import java.security.InvalidParameterException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+
+import javax.net.ssl.SSLException;
import be.nikiroo.fanfix.Instance;
+import be.nikiroo.fanfix.bundles.Config;
+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 given as arrays of objects (first item is the
+ * command, the rest are the arguments).
+ *
+ * All the commands are always prefixed by the subkey (which can be EMPTY if
+ * none).
*
- * The available commands are given as String arrays (first item is the command,
- * the rest are the arguments):
*
+ *
PING: will return the mode if the key is accepted (mode can be: "r/o" or
+ * "r/w")
*
GET_METADATA *: will return the metadata of all the stories in the
- * library
+ * 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 [story] [luid]: save the story with the given LUID
+ *
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_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
+ *
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 Map commands = new HashMap();
+ private Map times = new HashMap();
+ private Map wls = new HashMap();
+ private Map rws = new HashMap();
/**
* Create a new remote server (will not be active until
* {@link RemoteLibraryServer#start()} is called).
+ *
+ * Note: the key we use here is the encryption key (it must not contain a
+ * subkey).
*
+ * @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, key);
+ setTraceHandler(Instance.getInstance().getTraceHandler());
}
@Override
- protected Object onRequest(ConnectActionServer action,
- Version clientVersion, Object data) throws Exception {
+ protected Object onRequest(ConnectActionServerObject action,
+ Version clientVersion, Object data, long id) throws Exception {
+ long start = new Date().getTime();
+
+ // defaults are positive (as previous versions without the feature)
+ boolean rw = true;
+ boolean wl = true;
+ String subkey = "";
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 > 0) {
+ subkey = "" + dataArray[0];
+ }
+ if (dataArray.length > 1) {
+ command = "" + dataArray[1];
+
+ args = new Object[dataArray.length - 2];
+ for (int i = 2; i < dataArray.length; i++) {
+ args[i - 2] = dataArray[i];
+ }
+ }
+ }
+
+ List whitelist = Instance.getInstance().getConfig().getList(Config.SERVER_WHITELIST);
+ if (whitelist == null) {
+ whitelist = new ArrayList();
+ }
+
+ if (whitelist.isEmpty()) {
+ wl = false;
+ }
+
+ rw = Instance.getInstance().getConfig().getBoolean(Config.SERVER_RW, rw);
+ if (!subkey.isEmpty()) {
+ List allowed = Instance.getInstance().getConfig().getList(Config.SERVER_ALLOWED_SUBKEYS);
+ if (allowed.contains(subkey)) {
+ if ((subkey + "|").contains("|rw|")) {
+ rw = true;
+ }
+ if ((subkey + "|").contains("|wl|")) {
+ wl = false; // |wl| = bypass whitelist
+ whitelist = new ArrayList();
+ }
}
}
- System.out.print("COMMAND: ");
+ String mode = display(wl, rw);
+
+ String trace = mode + "[ " + command + "] ";
for (Object arg : args) {
- System.out.print(arg + " ");
+ trace += arg + " ";
+ }
+ long now = System.currentTimeMillis();
+ System.out.println(StringUtils.fromTime(now) + ": " + trace);
+
+ Object rep = null;
+ try {
+ rep = doRequest(action, command, args, rw, whitelist);
+ } catch (IOException e) {
+ rep = new RemoteLibraryException(e, true);
}
- System.out.println("");
- // TODO: progress (+send name + %age info back to client)
+ commands.put(id, command);
+ wls.put(id, wl);
+ rws.put(id, rw);
+ times.put(id, (new Date().getTime() - start));
+
+ return rep;
+ }
+
+ private String display(boolean whitelist, boolean rw) {
+ String mode = "";
+ if (!rw) {
+ mode += "RO: ";
+ }
+ if (whitelist) {
+ mode += "WL: ";
+ }
+
+ return mode;
+ }
+
+ @Override
+ protected void onRequestDone(long id, long bytesReceived, long bytesSent) {
+ boolean whitelist = wls.get(id);
+ boolean rw = rws.get(id);
+ wls.remove(id);
+ rws.remove(id);
+
+ String rec = StringUtils.formatNumber(bytesReceived) + "b";
+ String sent = StringUtils.formatNumber(bytesSent) + "b";
+ long now = System.currentTimeMillis();
+ System.out.println(StringUtils.fromTime(now)
+ + ": "
+ + String.format("%s[>%s]: (%s sent, %s rec) in %d ms",
+ display(whitelist, rw), commands.get(id), sent, rec,
+ times.get(id)));
+
+ commands.remove(id);
+ times.remove(id);
+ }
+
+ private Object doRequest(ConnectActionServerObject action, String command,
+ Object[] args, boolean rw, List whitelist)
+ throws NoSuchFieldException, NoSuchMethodException,
+ ClassNotFoundException, IOException {
+ if ("PING".equals(command)) {
+ return rw ? "r/w" : "r/o";
+ } else if ("GET_METADATA".equals(command)) {
+ List metas = new ArrayList();
+
+ if ("*".equals(args[0])) {
+ Progress pg = createPgForwarder(action);
+
+ for (MetaData meta : Instance.getInstance().getLibrary().getMetas(pg)) {
+ metas.add(removeCover(meta));
+ }
- if ("GET_METADATA".equals(command)) {
- if (args[1].equals("*")) {
- List metas = Instance.getLibrary().getMetas(null);
- return metas.toArray(new MetaData[] {});
+ forcePgDoneSent(pg);
+ } else {
+ MetaData meta = Instance.getInstance().getLibrary().getInfo((String) args[0]);
+ MetaData light;
+ if (meta.getCover() == null) {
+ light = meta;
+ } else {
+ light = meta.clone();
+ light.setCover(null);
+ }
+
+ metas.add(light);
+ }
+
+ if (!whitelist.isEmpty()) {
+ for (int i = 0; i < metas.size(); i++) {
+ if (!whitelist.contains(metas.get(i).getSource())) {
+ metas.remove(i);
+ i--;
+ }
+ }
}
- throw new InvalidParameterException(
- "only * is valid here, but you passed: " + args[1]);
+
+ return metas.toArray(new MetaData[0]);
} else if ("GET_STORY".equals(command)) {
- return Instance.getLibrary().getStory("" + args[1], null);
+ MetaData meta = Instance.getInstance().getLibrary().getInfo((String) args[0]);
+ if (meta == null) {
+ return null;
+ }
+
+ if (!whitelist.isEmpty()) {
+ if (!whitelist.contains(meta.getSource())) {
+ return null;
+ }
+ }
+
+ meta = meta.clone();
+ meta.setCover(null);
+
+ action.send(meta);
+ action.rec();
+
+ Story story = Instance.getInstance().getLibrary().getStory((String) args[0], null);
+ for (Object obj : breakStory(story)) {
+ action.send(obj);
+ action.rec();
+ }
} else if ("SAVE_STORY".equals(command)) {
- Instance.getLibrary().save((Story) args[1], "" + args[2], null);
+ if (!rw) {
+ throw new RemoteLibraryException("Read-Only remote library: "
+ + args[0], false);
+ }
+
+ List