X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=653c25743e6730f59b1bd233ace4d11525ccafce;hb=b92c88dfa4f8455894fb2a37aa8e97ac68e06190;hp=c01275b62d5db57e95bf4b8542b64a09b09ea591;hpb=c8d48938ca540d7b619a2c19bd76623d689b72cb;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index c01275b..653c257 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@ -7,12 +7,13 @@ import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
+import javax.net.ssl.SSLException;
+
import be.nikiroo.fanfix.Instance;
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.StringUtils;
import be.nikiroo.utils.Version;
import be.nikiroo.utils.serial.server.ConnectActionClientObject;
@@ -26,10 +27,48 @@ import be.nikiroo.utils.serial.server.ConnectActionClientObject;
public class RemoteLibrary extends BasicLibrary {
private String host;
private int port;
- private final String md5;
+ 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.
+ *
+ * Note that the key is structured:
+ * xxx(|yyy|wl)(|rw)
+ *
+ * Note that anything before the first pipe (|) character is
+ * considered to be the encryption key, anything after that character is
+ * called the subkey (including the other pipe characters and flags!).
+ *
+ * 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.
+ *
+ *
xxx: the encryption key used to communicate with the
+ * server
+ *
yyy: the secondary key
+ *
rw: flag to allow read and write access if it is not the
+ * default on this server
+ *
wl: flag to allow access to all the stories (bypassing the
+ * whitelist if it exists)
+ *
+ *
+ * Some examples:
+ *
+ *
my_key: normal connection, will take the default server
+ * options
+ *
my_key|agzyzz|wl: will ask to bypass the white list (if it
+ * exists)
+ *
my_key|agzyzz|rw: will ask read-write access (if the default
+ * is read-only)
+ *
my_key|agzyzz|wl|rw: will ask both read-write access and white
+ * list bypass
+ *
*
* @param key
* the key that will allow us to exchange information with the
@@ -40,7 +79,19 @@ public class RemoteLibrary extends BasicLibrary {
* the port to contact it on
*/
public RemoteLibrary(String key, String host, int port) {
- this.md5 = StringUtils.getMd5Hash(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;
}
@@ -52,29 +103,43 @@ public class RemoteLibrary extends BasicLibrary {
@Override
public Status getStatus() {
+ Instance.getTraceHandler().trace("Getting remote lib status...");
+ Status status = getStatusDo();
+ Instance.getTraceHandler().trace("Remote lib status: " + status);
+ return status;
+ }
+
+ private Status getStatusDo() {
final Status[] result = new Status[1];
result[0] = Status.INVALID;
- ConnectActionClientObject action = null;
try {
- action = new ConnectActionClientObject(host, port, true) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- Object rep = send(new Object[] { md5, "PING" });
- if ("PONG".equals(rep)) {
+ Object rep = send(new Object[] { subkey, "PING" });
+
+ 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.UNAUTORIZED;
+ result[0] = Status.UNAUTHORIZED;
}
}
@Override
protected void onError(Exception e) {
- result[0] = Status.UNAVAILABLE;
+ if (e instanceof SSLException) {
+ result[0] = Status.UNAUTHORIZED;
+ } else {
+ result[0] = Status.UNAVAILABLE;
+ }
}
- };
-
+ }.connect();
} catch (UnknownHostException e) {
result[0] = Status.INVALID;
} catch (IllegalArgumentException e) {
@@ -83,14 +148,6 @@ public class RemoteLibrary extends BasicLibrary {
result[0] = Status.UNAVAILABLE;
}
- if (action != null) {
- try {
- action.connect();
- } catch (Exception e) {
- result[0] = Status.UNAVAILABLE;
- }
- }
-
return result[0];
}
@@ -99,16 +156,21 @@ public class RemoteLibrary extends BasicLibrary {
final Image[] result = new Image[1];
try {
- new ConnectActionClientObject(host, port, true) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- Object rep = send(new Object[] { md5, "GET_COVER", luid });
+ Object rep = send(new Object[] { subkey, "GET_COVER", luid });
result[0] = (Image) rep;
}
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (Exception e) {
@@ -120,20 +182,35 @@ public class RemoteLibrary extends BasicLibrary {
@Override
public Image getCustomSourceCover(final String source) {
+ return getCustomCover(source, "SOURCE");
+ }
+
+ @Override
+ public Image getCustomAuthorCover(final String author) {
+ return getCustomCover(author, "AUTHOR");
+ }
+
+ // type: "SOURCE" or "AUTHOR"
+ private Image getCustomCover(final String source, final String type) {
final Image[] result = new Image[1];
try {
- new ConnectActionClientObject(host, port, true) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- Object rep = send(new Object[] { md5,
- "GET_CUSTOM_SOURCE_COVER", source });
+ Object rep = send(new Object[] { subkey,
+ "GET_CUSTOM_COVER", type, source });
result[0] = (Image) rep;
}
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (Exception e) {
@@ -149,7 +226,7 @@ public class RemoteLibrary extends BasicLibrary {
final Story[] result = new Story[1];
try {
- new ConnectActionClientObject(host, port, true) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
@@ -157,7 +234,7 @@ public class RemoteLibrary extends BasicLibrary {
pg = new Progress();
}
- Object rep = send(new Object[] { md5, "GET_STORY", luid });
+ Object rep = send(new Object[] { subkey, "GET_STORY", luid });
MetaData meta = null;
if (rep instanceof MetaData) {
@@ -179,7 +256,12 @@ public class RemoteLibrary extends BasicLibrary {
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (Exception e) {
@@ -192,6 +274,7 @@ public class RemoteLibrary extends BasicLibrary {
@Override
public synchronized Story save(final Story story, final String luid,
Progress pg) throws IOException {
+
final String[] luidSaved = new String[1];
Progress pgSave = new Progress();
Progress pgRefresh = new Progress();
@@ -205,7 +288,7 @@ public class RemoteLibrary extends BasicLibrary {
final Progress pgF = pgSave;
- new ConnectActionClientObject(host, port, true) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
@@ -213,7 +296,7 @@ public class RemoteLibrary extends BasicLibrary {
pg.setMinMax(0, (int) story.getMeta().getWords());
}
- send(new Object[] { md5, "SAVE_STORY", luid });
+ send(new Object[] { subkey, "SAVE_STORY", luid });
List