X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=077a857cf9a748ddbd242b1af625b853ecf6d75e;hb=c1bb921e4435bdc48fce18be3ca808226d4930e9;hp=ffcf8f19c9c34f2923a969443aaaaee69eba30b8;hpb=41029926975167de96709f739f8393a127925a7e;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index ffcf8f1..077a857 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;
@@ -24,12 +25,78 @@ import be.nikiroo.utils.serial.server.ConnectActionClientObject;
* @author niki
*/
public class RemoteLibrary extends BasicLibrary {
+ interface RemoteAction {
+ public void action(ConnectActionClientObject action) throws Exception;
+ }
+
+ class RemoteConnectAction extends ConnectActionClientObject {
+ public RemoteConnectAction() throws IOException {
+ super(host, port, key);
+ }
+
+ @Override
+ public Object send(Object data) throws IOException,
+ NoSuchFieldException, NoSuchMethodException,
+ ClassNotFoundException {
+ Object rep = super.send(data);
+ if (rep instanceof RemoteLibraryException) {
+ RemoteLibraryException remoteEx = (RemoteLibraryException) rep;
+ IOException cause = remoteEx.getCause();
+ if (cause == null) {
+ cause = new IOException("IOException");
+ }
+
+ throw cause;
+ }
+
+ return rep;
+ }
+ }
+
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 +107,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,30 +131,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 {
- Instance.getTraceHandler().trace("Getting remote lib status...");
- action = new ConnectActionClientObject(host, port, true) {
+ new RemoteConnectAction() {
@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) {
@@ -84,15 +176,6 @@ public class RemoteLibrary extends BasicLibrary {
result[0] = Status.UNAVAILABLE;
}
- if (action != null) {
- try {
- action.connect();
- } catch (Exception e) {
- result[0] = Status.UNAVAILABLE;
- }
- }
-
- Instance.getTraceHandler().trace("Remote lib status: " + result[0]);
return result[0];
}
@@ -100,22 +183,15 @@ public class RemoteLibrary extends BasicLibrary {
public Image getCover(final String luid) {
final Image[] result = new Image[1];
- try {
- new ConnectActionClientObject(host, port, true) {
- @Override
- public void action(Version serverVersion) throws Exception {
- Object rep = send(new Object[] { md5, "GET_COVER", luid });
- result[0] = (Image) rep;
- }
-
- @Override
- protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
- }
- }.connect();
- } catch (Exception e) {
- Instance.getTraceHandler().error(e);
- }
+ connectRemoteAction(new RemoteAction() {
+ @Override
+ public void action(ConnectActionClientObject action)
+ throws Exception {
+ Object rep = action.send(new Object[] { subkey, "GET_COVER",
+ luid });
+ result[0] = (Image) rep;
+ }
+ });
return result[0];
}
@@ -134,23 +210,15 @@ public class RemoteLibrary extends BasicLibrary {
private Image getCustomCover(final String source, final String type) {
final Image[] result = new Image[1];
- try {
- new ConnectActionClientObject(host, port, true) {
- @Override
- public void action(Version serverVersion) throws Exception {
- Object rep = send(new Object[] { md5, "GET_CUSTOM_COVER",
- type, source });
- result[0] = (Image) rep;
- }
-
- @Override
- protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
- }
- }.connect();
- } catch (Exception e) {
- Instance.getTraceHandler().error(e);
- }
+ connectRemoteAction(new RemoteAction() {
+ @Override
+ public void action(ConnectActionClientObject action)
+ throws Exception {
+ Object rep = action.send(new Object[] { subkey,
+ "GET_CUSTOM_COVER", type, source });
+ result[0] = (Image) rep;
+ }
+ });
return result[0];
}
@@ -160,43 +228,37 @@ public class RemoteLibrary extends BasicLibrary {
final Progress pgF = pg;
final Story[] result = new Story[1];
- try {
- new ConnectActionClientObject(host, port, true) {
- @Override
- public void action(Version serverVersion) throws Exception {
- Progress pg = pgF;
- if (pg == null) {
- pg = new Progress();
- }
-
- Object rep = send(new Object[] { md5, "GET_STORY", luid });
+ connectRemoteAction(new RemoteAction() {
+ @Override
+ public void action(ConnectActionClientObject action)
+ throws Exception {
+ Progress pg = pgF;
+ if (pg == null) {
+ pg = new Progress();
+ }
- MetaData meta = null;
- if (rep instanceof MetaData) {
- meta = (MetaData) rep;
- if (meta.getWords() <= Integer.MAX_VALUE) {
- pg.setMinMax(0, (int) meta.getWords());
- }
- }
+ Object rep = action.send(new Object[] { subkey, "GET_STORY",
+ luid });
- List