X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=653c25743e6730f59b1bd233ace4d11525ccafce;hb=b92c88dfa4f8455894fb2a37aa8e97ac68e06190;hp=e35c57d146387ee3c582e08b398ba46dda792779;hpb=99206a39d3c58140402d2b4903f7436168d1d349;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index e35c57d..653c257 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@ -14,6 +14,7 @@ import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.Image;
 import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.Version;
 import be.nikiroo.utils.serial.server.ConnectActionClientObject;
 
 /**
@@ -27,11 +28,47 @@ public class RemoteLibrary extends BasicLibrary {
 	private String host;
 	private int port;
 	private final String key;
+	private final String subkey;
+
+	// informative only (server will make the actual checks)
+	private boolean rw;
 
 	// TODO: error handling is not up to par!
 
 	/**
 	 * Create a {@link RemoteLibrary} linked to the given server.
+	 * <p>
+	 * Note that the key is structured:
+	 * <tt><b><i>xxx</i></b>(|<b><i>yyy</i></b>|<b>wl</b>)(|<b>rw</b>)</tt>
+	 * <p>
+	 * Note that anything before the first pipe (<tt>|</tt>) character is
+	 * considered to be the encryption key, anything after that character is
+	 * called the subkey (including the other pipe characters and flags!).
+	 * <p>
+	 * This is important because the subkey (including the pipe characters and
+	 * flags) must be present as-is in the server configuration file to be
+	 * allowed.
+	 * <ul>
+	 * <li><b><i>xxx</i></b>: the encryption key used to communicate with the
+	 * server</li>
+	 * <li><b><i>yyy</i></b>: the secondary key</li>
+	 * <li><b>rw</b>: flag to allow read and write access if it is not the
+	 * default on this server</li>
+	 * <li><b>wl</b>: flag to allow access to all the stories (bypassing the
+	 * whitelist if it exists)</li>
+	 * </ul>
+	 * 
+	 * Some examples:
+	 * <ul>
+	 * <li><b>my_key</b>: normal connection, will take the default server
+	 * options</li>
+	 * <li><b>my_key|agzyzz|wl</b>: will ask to bypass the white list (if it
+	 * exists)</li>
+	 * <li><b>my_key|agzyzz|rw</b>: will ask read-write access (if the default
+	 * is read-only)</li>
+	 * <li><b>my_key|agzyzz|wl|rw</b>: will ask both read-write access and white
+	 * list bypass</li>
+	 * </ul>
 	 * 
 	 * @param key
 	 *            the key that will allow us to exchange information with the
@@ -42,7 +79,19 @@ public class RemoteLibrary extends BasicLibrary {
 	 *            the port to contact it on
 	 */
 	public RemoteLibrary(String key, String host, int port) {
-		this.key = key;
+		int index = -1;
+		if (key != null) {
+			index = key.indexOf('|');
+		}
+
+		if (index >= 0) {
+			this.key = key.substring(0, index);
+			this.subkey = key.substring(index + 1);
+		} else {
+			this.key = key;
+			this.subkey = "";
+		}
+
 		this.host = host;
 		this.port = port;
 	}
@@ -60,16 +109,6 @@ public class RemoteLibrary extends BasicLibrary {
 		return status;
 	}
 
-	private boolean check() {
-		Status status = getStatusDo();
-		if (status != Status.READY) {
-			Instance.getTraceHandler().error("Remote lib not ready: " + status);
-			return false;
-		}
-
-		return true;
-	}
-
 	private Status getStatusDo() {
 		final Status[] result = new Status[1];
 
@@ -78,10 +117,14 @@ public class RemoteLibrary extends BasicLibrary {
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action() throws Exception {
-					Object rep = send(new Object[] { "PING" });
+				public void action(Version serverVersion) throws Exception {
+					Object rep = send(new Object[] { subkey, "PING" });
 
-					if ("PONG".equals(rep)) {
+					if ("r/w".equals(rep)) {
+						rw = true;
+						result[0] = Status.READY;
+					} else if ("r/o".equals(rep)) {
+						rw = false;
 						result[0] = Status.READY;
 					} else {
 						result[0] = Status.UNAUTHORIZED;
@@ -90,11 +133,11 @@ public class RemoteLibrary extends BasicLibrary {
 
 				@Override
 				protected void onError(Exception e) {
-					// if (e instanceof SSLException) {
-					result[0] = Status.UNAUTHORIZED;
-					// } else {
-					// result[0] = Status.UNAVAILABLE;
-					// }
+					if (e instanceof SSLException) {
+						result[0] = Status.UNAUTHORIZED;
+					} else {
+						result[0] = Status.UNAVAILABLE;
+					}
 				}
 			}.connect();
 		} catch (UnknownHostException e) {
@@ -110,17 +153,13 @@ public class RemoteLibrary extends BasicLibrary {
 
 	@Override
 	public Image getCover(final String luid) {
-		if (!check()) {
-			return null;
-		}
-
 		final Image[] result = new Image[1];
 
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action() throws Exception {
-					Object rep = send(new Object[] { "GET_COVER", luid });
+				public void action(Version serverVersion) throws Exception {
+					Object rep = send(new Object[] { subkey, "GET_COVER", luid });
 					result[0] = (Image) rep;
 				}
 
@@ -143,36 +182,24 @@ public class RemoteLibrary extends BasicLibrary {
 
 	@Override
 	public Image getCustomSourceCover(final String source) {
-		if (!check()) {
-			return null;
-		}
-
 		return getCustomCover(source, "SOURCE");
 	}
 
 	@Override
 	public Image getCustomAuthorCover(final String author) {
-		if (!check()) {
-			return null;
-		}
-
 		return getCustomCover(author, "AUTHOR");
 	}
 
 	// type: "SOURCE" or "AUTHOR"
 	private Image getCustomCover(final String source, final String type) {
-		if (!check()) {
-			return null;
-		}
-
 		final Image[] result = new Image[1];
 
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action() throws Exception {
-					Object rep = send(new Object[] { "GET_CUSTOM_COVER", type,
-							source });
+				public void action(Version serverVersion) throws Exception {
+					Object rep = send(new Object[] { subkey,
+							"GET_CUSTOM_COVER", type, source });
 					result[0] = (Image) rep;
 				}
 
@@ -195,23 +222,19 @@ public class RemoteLibrary extends BasicLibrary {
 
 	@Override
 	public synchronized Story getStory(final String luid, Progress pg) {
-		if (!check()) {
-			return null;
-		}
-
 		final Progress pgF = pg;
 		final Story[] result = new Story[1];
 
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action() throws Exception {
+				public void action(Version serverVersion) throws Exception {
 					Progress pg = pgF;
 					if (pg == null) {
 						pg = new Progress();
 					}
 
-					Object rep = send(new Object[] { "GET_STORY", luid });
+					Object rep = send(new Object[] { subkey, "GET_STORY", luid });
 
 					MetaData meta = null;
 					if (rep instanceof MetaData) {
@@ -251,9 +274,6 @@ public class RemoteLibrary extends BasicLibrary {
 	@Override
 	public synchronized Story save(final Story story, final String luid,
 			Progress pg) throws IOException {
-		if (!check()) {
-			return null;
-		}
 
 		final String[] luidSaved = new String[1];
 		Progress pgSave = new Progress();
@@ -270,13 +290,13 @@ public class RemoteLibrary extends BasicLibrary {
 
 		new ConnectActionClientObject(host, port, key) {
 			@Override
-			public void action() throws Exception {
+			public void action(Version serverVersion) throws Exception {
 				Progress pg = pgF;
 				if (story.getMeta().getWords() <= Integer.MAX_VALUE) {
 					pg.setMinMax(0, (int) story.getMeta().getWords());
 				}
 
-				send(new Object[] { "SAVE_STORY", luid });
+				send(new Object[] { subkey, "SAVE_STORY", luid });
 
 				List<Object> list = RemoteLibraryServer.breakStory(story);
 				for (Object obj : list) {
@@ -318,14 +338,10 @@ public class RemoteLibrary extends BasicLibrary {
 
 	@Override
 	public synchronized void delete(final String luid) throws IOException {
-		if (!check()) {
-			throw new IOException("Library not ready");
-		}
-
 		new ConnectActionClientObject(host, port, key) {
 			@Override
-			public void action() throws Exception {
-				send(new Object[] { "DELETE_STORY", luid });
+			public void action(Version serverVersion) throws Exception {
+				send(new Object[] { subkey, "DELETE_STORY", luid });
 			}
 
 			@Override
@@ -342,34 +358,22 @@ public class RemoteLibrary extends BasicLibrary {
 
 	@Override
 	public void setSourceCover(final String source, final String luid) {
-		if (!check()) {
-			return;
-		}
-
 		setCover(source, luid, "SOURCE");
 	}
 
 	@Override
 	public void setAuthorCover(final String author, final String luid) {
-		if (!check()) {
-			return;
-		}
-
 		setCover(author, luid, "AUTHOR");
 	}
 
 	// type = "SOURCE" | "AUTHOR"
 	private void setCover(final String value, final String luid,
 			final String type) {
-		if (!check()) {
-			return;
-		}
-
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action() throws Exception {
-					send(new Object[] { "SET_COVER", type, value, luid });
+				public void action(Version serverVersion) throws Exception {
+					send(new Object[] { subkey, "SET_COVER", type, value, luid });
 				}
 
 				@Override
@@ -390,10 +394,6 @@ public class RemoteLibrary extends BasicLibrary {
 	@Override
 	// Could work (more slowly) without it
 	public Story imprt(final URL url, Progress pg) throws IOException {
-		if (!check()) {
-			return null;
-		}
-
 		// Import the file locally if it is actually a file
 		if (url == null || url.getProtocol().equalsIgnoreCase("file")) {
 			return super.imprt(url, pg);
@@ -417,10 +417,11 @@ public class RemoteLibrary extends BasicLibrary {
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action() throws Exception {
+				public void action(Version serverVersion) throws Exception {
 					Progress pg = pgF;
 
-					Object rep = send(new Object[] { "IMPORT", url.toString() });
+					Object rep = send(new Object[] { subkey, "IMPORT",
+							url.toString() });
 
 					while (true) {
 						if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@@ -464,20 +465,17 @@ public class RemoteLibrary extends BasicLibrary {
 	protected synchronized void changeSTA(final String luid,
 			final String newSource, final String newTitle,
 			final String newAuthor, Progress pg) throws IOException {
-		if (!check()) {
-			return;
-		}
 
 		final Progress pgF = pg == null ? new Progress() : pg;
 
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action() throws Exception {
+				public void action(Version serverVersion) throws Exception {
 					Progress pg = pgF;
 
-					Object rep = send(new Object[] { "CHANGE_STA", luid,
-							newSource, newTitle, newAuthor });
+					Object rep = send(new Object[] { subkey, "CHANGE_STA",
+							luid, newSource, newTitle, newAuthor });
 					while (true) {
 						if (!RemoteLibraryServer.updateProgress(pg, rep)) {
 							break;
@@ -512,15 +510,11 @@ public class RemoteLibrary extends BasicLibrary {
 	 * Stop the server.
 	 */
 	public void exit() {
-		if (!check()) {
-			return;
-		}
-
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action() throws Exception {
-					send(new Object[] { "EXIT" });
+				public void action(Version serverVersion) throws Exception {
+					send(new Object[] { subkey, "EXIT" });
 				}
 
 				@Override
@@ -540,10 +534,6 @@ public class RemoteLibrary extends BasicLibrary {
 
 	@Override
 	public synchronized MetaData getInfo(String luid) {
-		if (!check()) {
-			return null;
-		}
-
 		List<MetaData> metas = getMetasList(luid, null);
 		if (!metas.isEmpty()) {
 			return metas.get(0);
@@ -601,23 +591,20 @@ public class RemoteLibrary extends BasicLibrary {
 	 * @return the metas
 	 */
 	private List<MetaData> getMetasList(final String luid, Progress pg) {
-		if (!check()) {
-			return null;
-		}
-
 		final Progress pgF = pg;
 		final List<MetaData> metas = new ArrayList<MetaData>();
 
 		try {
 			new ConnectActionClientObject(host, port, key) {
 				@Override
-				public void action() throws Exception {
+				public void action(Version serverVersion) throws Exception {
 					Progress pg = pgF;
 					if (pg == null) {
 						pg = new Progress();
 					}
 
-					Object rep = send(new Object[] { "GET_METADATA", luid });
+					Object rep = send(new Object[] { subkey, "GET_METADATA",
+							luid });
 
 					while (true) {
 						if (!RemoteLibraryServer.updateProgress(pg, rep)) {