X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=015fb7bf33c9c2beb79a81173b1f02f180f48db9;hp=5bbe4cdd1f33b77bb67e609b91b7770aa886a35e;hb=210465c33ff5e9b45e7afe808c18b23c4cf14b38;hpb=2070ced5a252b11ae7e19be1bb2430fa8e9220d9

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 5bbe4cd..015fb7b 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -1,43 +1,75 @@
 package be.nikiroo.fanfix.library;
 
 import java.io.IOException;
-import java.security.InvalidParameterException;
+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;
 
 /**
- * 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.
+ * <p>
+ * The available commands are given as arrays of objects (first item is the
+ * command, the rest are the arguments).
+ * <p>
+ * All the commands are always prefixed by the subkey (which can be EMPTY if
+ * none).
  * <p>
- * The available commands are given as String arrays (first item is the key,
- * second is the command, the rest are the arguments):
  * <ul>
- * <li>KEY GET_METADATA *: will return the metadata of all the stories in the
- * library</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>
+ * <li>PING: will return the mode if the key is accepted (mode can be: "r/o" or
+ * "r/w")</li>
+ * <li>GET_METADATA *: will return the metadata of all the stories in the
+ * library (array)</li> *
+ * <li>GET_METADATA [luid]: will return the metadata of the story of LUID luid</li>
+ * <li>GET_STORY [luid]: will return the given story if it exists (or NULL if
+ * not)</li>
+ * <li>SAVE_STORY [luid]: save the story (that must be sent just after the
+ * command) with the given LUID, then return the LUID</li>
+ * <li>IMPORT [url]: save the story found at the given URL, then return the 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_CUSTOM_COVER ["SOURCE"|"AUTHOR"] [source]: return the cover for this
+ * source/author</li>
+ * <li>SET_COVER ["SOURCE"|"AUTHOR"] [value] [luid]: set the default cover for
+ * the given source/author to the cover of the story denoted by luid</li>
+ * <li>CHANGE_SOURCE [luid] [new source]: change the source of the story of LUID
+ * luid</li>
+ * <li>EXIT: stop the server</li>
  * </ul>
  * 
  * @author niki
  */
-public class RemoteLibraryServer extends Server {
-	private final String key;
+public class RemoteLibraryServer extends ServerObject {
+	private Map<Long, String> commands = new HashMap<Long, String>();
+	private Map<Long, Long> times = new HashMap<Long, Long>();
+	private Map<Long, Boolean> wls = new HashMap<Long, Boolean>();
+	private Map<Long, Boolean> rws = new HashMap<Long, Boolean>();
 
 	/**
 	 * Create a new remote server (will not be active until
 	 * {@link RemoteLibraryServer#start()} is called).
+	 * <p>
+	 * 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
@@ -48,66 +80,422 @@ public class RemoteLibraryServer extends Server {
 	 *             in case of I/O error
 	 */
 	public RemoteLibraryServer(String key, int port) throws IOException {
-		super(port, true);
-		this.key = key;
+		super("Fanfix remote library", port, key);
+		setTraceHandler(Instance.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 key = "";
+		String subkey = "";
 		String command = "";
 		Object[] args = new Object[0];
 		if (data instanceof Object[]) {
 			Object[] dataArray = (Object[]) data;
-			if (dataArray.length >= 2) {
+			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] = dataArray[i];
+					args[i - 2] = dataArray[i];
 				}
+			}
+		}
 
-				key = "" + dataArray[0];
-				command = "" + dataArray[1];
+		List<String> whitelist = Instance.getConfig().getList(
+				Config.SERVER_WHITELIST);
+		if (whitelist == null) {
+			whitelist = new ArrayList<String>();
+		}
+
+		if (whitelist.isEmpty()) {
+			wl = false;
+		}
+
+		rw = Instance.getConfig().getBoolean(Config.SERVER_RW, rw);
+		if (!subkey.isEmpty()) {
+			List<String> allowed = Instance.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<String>();
+				}
 			}
 		}
 
-		System.out.print("[" + command + "] ");
+		String mode = display(wl, rw);
+
+		String trace = mode + "[ " + command + "] ";
 		for (Object arg : args) {
-			System.out.print(arg + " ");
+			trace += arg + " ";
 		}
-		System.out.println("");
+		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));
 
-		if (!key.equals(this.key)) {
-			System.out.println("Key rejected.");
-			throw new SecurityException("Invalid key");
+		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<String> whitelist)
+			throws NoSuchFieldException, NoSuchMethodException,
+			ClassNotFoundException, IOException {
+		if ("PING".equals(command)) {
+			return rw ? "r/w" : "r/o";
+		} else if ("GET_METADATA".equals(command)) {
+			List<MetaData> metas = new ArrayList<MetaData>();
 
-		// TODO: progress (+send name + %age info back to client)
+			if ("*".equals(args[0])) {
+				Progress pg = createPgForwarder(action);
 
-		if ("GET_METADATA".equals(command)) {
-			if (args[0].equals("*")) {
-				List<MetaData> metas = Instance.getLibrary().getMetas(null);
-				return metas.toArray(new MetaData[] {});
+				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--;
+					}
+				}
 			}
-			throw new InvalidParameterException(
-					"only * is valid here, but you passed: " + args[0]);
+
+			return metas.toArray(new MetaData[0]);
 		} else if ("GET_STORY".equals(command)) {
-			return Instance.getLibrary().getStory("" + args[0], null);
+			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)) {
-			Instance.getLibrary().save((Story) args[0], "" + args[1], null);
+			if (!rw) {
+				throw new AccessDeniedException("" + args[0], null,
+						"Read-Only remote library");
+			}
+
+			List<Object> list = new ArrayList<Object>();
+
+			action.send(null);
+			Object obj = action.rec();
+			while (obj != null) {
+				list.add(obj);
+				action.send(null);
+				obj = action.rec();
+			}
+
+			Story story = rebuildStory(list);
+			Instance.getLibrary().save(story, (String) args[0], null);
+			return story.getMeta().getLuid();
+		} else if ("IMPORT".equals(command)) {
+			if (!rw) {
+				throw new AccessDeniedException("" + args[0], null,
+						"Read-Only remote library");
+			}
+
+			Progress pg = createPgForwarder(action);
+			Story story = Instance.getLibrary().imprt(
+					new URL((String) args[0]), pg);
+			forcePgDoneSent(pg);
+			return story.getMeta().getLuid();
 		} else if ("DELETE_STORY".equals(command)) {
-			Instance.getLibrary().delete("" + args[0]);
+			if (!rw) {
+				throw new AccessDeniedException("" + args[0], null,
+						"Read-Only remote library");
+			}
+
+			Instance.getLibrary().delete((String) args[0]);
 		} else if ("GET_COVER".equals(command)) {
-			return Instance.getLibrary().getCover("" + args[0]);
-		} else if ("GET_SOURCE_COVER".equals(command)) {
-			return Instance.getLibrary().getSourceCover("" + args[0]);
-		} else if ("SET_SOURCE_COVER".equals(command)) {
-			Instance.getLibrary().setSourceCover("" + args[0], "" + args[1]);
+			return Instance.getLibrary().getCover((String) args[0]);
+		} else if ("GET_CUSTOM_COVER".equals(command)) {
+			if ("SOURCE".equals(args[0])) {
+				return Instance.getLibrary().getCustomSourceCover(
+						(String) args[1]);
+			} else if ("AUTHOR".equals(args[0])) {
+				return Instance.getLibrary().getCustomAuthorCover(
+						(String) args[1]);
+			} else {
+				return null;
+			}
+		} else if ("SET_COVER".equals(command)) {
+			if (!rw) {
+				throw new AccessDeniedException("" + args[0], "" + args[1],
+						"Read-Only remote library");
+			}
+
+			if ("SOURCE".equals(args[0])) {
+				Instance.getLibrary().setSourceCover((String) args[1],
+						(String) args[2]);
+			} else if ("AUTHOR".equals(args[0])) {
+				Instance.getLibrary().setAuthorCover((String) args[1],
+						(String) args[2]);
+			}
+		} else if ("CHANGE_STA".equals(command)) {
+			if (!rw) {
+				throw new AccessDeniedException("" + args[0], "" + args[1],
+						"Read-Only remote library");
+			}
+
+			Progress pg = createPgForwarder(action);
+			Instance.getLibrary().changeSTA((String) args[0], (String) args[1],
+					(String) args[2], (String) args[3], pg);
+			forcePgDoneSent(pg);
 		} else if ("EXIT".equals(command)) {
+			if (!rw) {
+				throw new AccessDeniedException("EXIT", "",
+						"Read-Only remote library, cannot close it");
+			}
+
 			stop(0, false);
 		}
 
 		return null;
 	}
+
+	@Override
+	protected void onError(Exception e) {
+		if (e instanceof SSLException) {
+			System.out.println("[Client connection refused (bad key)]");
+		} else {
+			getTraceHandler().error(e);
+		}
+	}
+
+	/**
+	 * Break a story in multiple {@link Object}s for easier serialisation.
+	 * 
+	 * @param story
+	 *            the {@link Story} to break
+	 * 
+	 * @return the list of {@link Object}s
+	 */
+	static List<Object> breakStory(Story story) {
+		List<Object> list = new ArrayList<Object>();
+
+		story = story.clone();
+		list.add(story);
+
+		if (story.getMeta().isImageDocument()) {
+			for (Chapter chap : story) {
+				list.add(chap);
+				list.addAll(chap.getParagraphs());
+				chap.setParagraphs(new ArrayList<Paragraph>());
+			}
+			story.setChapters(new ArrayList<Chapter>());
+		}
+
+		return list;
+	}
+
+	/**
+	 * Rebuild a story from a list of broke up {@link Story} parts.
+	 * 
+	 * @param list
+	 *            the list of {@link Story} parts
+	 * 
+	 * @return the reconstructed {@link Story}
+	 */
+	static Story rebuildStory(List<Object> list) {
+		Story story = null;
+		Chapter chap = null;
+
+		for (Object obj : list) {
+			if (obj instanceof Story) {
+				story = (Story) obj;
+			} else if (obj instanceof Chapter) {
+				chap = (Chapter) obj;
+				story.getChapters().add(chap);
+			} else if (obj instanceof Paragraph) {
+				chap.getParagraphs().add((Paragraph) obj);
+			}
+		}
+
+		return story;
+	}
+
+	/**
+	 * Update the {@link Progress} with the adequate {@link Object} received
+	 * from the network via {@link RemoteLibraryServer}.
+	 * 
+	 * @param pg
+	 *            the {@link Progress} to update
+	 * @param rep
+	 *            the object received from the network
+	 * 
+	 * @return TRUE if it was a progress event, FALSE if not
+	 */
+	static boolean updateProgress(Progress pg, Object rep) {
+		if (rep instanceof Integer[]) {
+			Integer[] a = (Integer[]) rep;
+			if (a.length == 3) {
+				int min = a[0];
+				int max = a[1];
+				int progress = a[2];
+
+				if (min >= 0 && min <= max) {
+					pg.setMinMax(min, max);
+					pg.setProgress(progress);
+
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Create a {@link Progress} that will forward its progress over the
+	 * network.
+	 * 
+	 * @param action
+	 *            the {@link ConnectActionServerObject} to use to forward it
+	 * 
+	 * @return the {@link Progress}
+	 */
+	private Progress createPgForwarder(final ConnectActionServerObject action) {
+		final Boolean[] isDoneForwarded = new Boolean[] { false };
+		final Progress pg = new Progress() {
+			@Override
+			public boolean isDone() {
+				return isDoneForwarded[0];
+			}
+		};
+
+		final Integer[] p = new Integer[] { -1, -1, -1 };
+		final Long[] lastTime = new Long[] { new Date().getTime() };
+		pg.addProgressListener(new ProgressListener() {
+			@Override
+			public void progress(Progress progress, String name) {
+				int min = pg.getMin();
+				int max = pg.getMax();
+				int relativeProgress = min
+						+ (int) Math.round(pg.getRelativeProgress()
+								* (max - min));
+
+				// Do not re-send the same value twice over the wire,
+				// unless more than 2 seconds have elapsed (to maintain the
+				// connection)
+				if ((p[0] != min || p[1] != max || p[2] != relativeProgress)
+						|| (new Date().getTime() - lastTime[0] > 2000)) {
+					p[0] = min;
+					p[1] = max;
+					p[2] = relativeProgress;
+
+					try {
+						action.send(new Integer[] { min, max, relativeProgress });
+						action.rec();
+					} catch (Exception e) {
+						getTraceHandler().error(e);
+					}
+
+					lastTime[0] = new Date().getTime();
+				}
+
+				isDoneForwarded[0] = (pg.getProgress() >= pg.getMax());
+			}
+		});
+
+		return pg;
+	}
+
+	// with 30 seconds timeout
+	private void forcePgDoneSent(Progress pg) {
+		long start = new Date().getTime();
+		pg.done();
+		while (!pg.isDone() && new Date().getTime() - start < 30000) {
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+				getTraceHandler().error(e);
+			}
+		}
+	}
 }