X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=015fb7bf33c9c2beb79a81173b1f02f180f48db9;hb=210465c33ff5e9b45e7afe808c18b23c4cf14b38;hp=566c70fa69a572043ea6749ae5361b05b6ac4b73;hpb=e42573a004fac26378c693ce9ef0d6319713c682;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 566c70f..015fb7b 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -1,50 +1,501 @@
package be.nikiroo.fanfix.library;
import java.io.IOException;
+import java.net.URL;
+import java.nio.file.AccessDeniedException;
+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;
-public class RemoteLibraryServer extends Server {
+/**
+ * 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).
+ *
+ *
+ *
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 (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 ServerObject {
+ private Map commands = new HashMap();
+ private Map times = new HashMap();
+ private Map wls = new HashMap();
+ private Map rws = new HashMap();
- public RemoteLibraryServer(int port) throws IOException {
- super(Version.getCurrentVersion(), port, true);
+ /**
+ * 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(String key, int port) throws IOException {
+ super("Fanfix remote library", port, key);
+ setTraceHandler(Instance.getTraceHandler());
}
@Override
- protected Object onRequest(ConnectActionServer 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);
+ 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[]) {
+ 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.getConfig().getList(
+ Config.SERVER_WHITELIST);
+ if (whitelist == null) {
+ whitelist = new ArrayList();
}
- System.out.println(String.format("COMMAND: [%s], ARGS: [%s]", command,
- args));
+ if (whitelist.isEmpty()) {
+ wl = false;
+ }
- if (command != null) {
- if (command.equals("GET_METADATA")) {
- if (args != null && args.equals("*")) {
- List metas = Instance.getLibrary().getMetas(null);
- return metas.toArray(new MetaData[] {});
+ rw = Instance.getConfig().getBoolean(Config.SERVER_RW, rw);
+ if (!subkey.isEmpty()) {
+ List allowed = Instance.getConfig().getList(
+ Config.SERVER_ALLOWED_SUBKEYS);
+ if (allowed.contains(subkey)) {
+ if ((subkey + "|").contains("|rw|")) {
+ rw = true;
}
- } else if (command.equals("GET_STORY")) {
- if (args != null) {
- return Instance.getLibrary().getStory(args, null);
+ if ((subkey + "|").contains("|wl|")) {
+ wl = false; // |wl| = bypass whitelist
+ whitelist = new ArrayList();
}
}
}
+ String mode = display(wl, rw);
+
+ String trace = mode + "[ " + command + "] ";
+ for (Object arg : args) {
+ trace += arg + " ";
+ }
+ System.out.println(trace);
+
+ Object rep = doRequest(action, command, args, rw, whitelist);
+
+ 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";
+ System.out.println(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.getLibrary().getMetas(pg)) {
+ MetaData light;
+ if (meta.getCover() == null) {
+ light = meta;
+ } else {
+ light = meta.clone();
+ light.setCover(null);
+ }
+
+ metas.add(light);
+ }
+
+ forcePgDoneSent(pg);
+ } else {
+ MetaData meta = Instance.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--;
+ }
+ }
+ }
+
+ return metas.toArray(new MetaData[0]);
+ } else if ("GET_STORY".equals(command)) {
+ MetaData meta = Instance.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.getLibrary()
+ .getStory((String) args[0], null);
+ for (Object obj : breakStory(story)) {
+ action.send(obj);
+ action.rec();
+ }
+ } else if ("SAVE_STORY".equals(command)) {
+ if (!rw) {
+ throw new AccessDeniedException("" + args[0], null,
+ "Read-Only remote library");
+ }
+
+ List