X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=653c25743e6730f59b1bd233ace4d11525ccafce;hb=b92c88dfa4f8455894fb2a37aa8e97ac68e06190;hp=884eee9a114d2c40853fb6659044bf4b0b3122e9;hpb=ea734ab478afa830550dd63800e855618a4cab4d;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java index 884eee9..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; @@ -27,9 +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. + *

+ * 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. + *

+ * + * Some examples: + * * * @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.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; } @@ -52,31 +103,41 @@ 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; try { - Instance.getTraceHandler().trace("Getting remote lib status..."); - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override public void action(Version serverVersion) throws Exception { - try { - Object rep = sendCmd(this, new Object[] { "PING" }); - - if ("PONG".equals(rep)) { - result[0] = Status.READY; - } else { - result[0] = Status.UNAUTORIZED; - } - } catch (IllegalArgumentException e) { - result[0] = Status.UNAUTORIZED; + 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.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) { @@ -87,7 +148,6 @@ public class RemoteLibrary extends BasicLibrary { result[0] = Status.UNAVAILABLE; } - Instance.getTraceHandler().trace("Remote lib status: " + result[0]); return result[0]; } @@ -96,17 +156,21 @@ public class RemoteLibrary extends BasicLibrary { final Image[] result = new Image[1]; try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override public void action(Version serverVersion) throws Exception { - Object rep = sendCmd(this, - new Object[] { "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) { @@ -131,17 +195,22 @@ public class RemoteLibrary extends BasicLibrary { final Image[] result = new Image[1]; try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override public void action(Version serverVersion) throws Exception { - Object rep = sendCmd(this, - new Object[] { "GET_CUSTOM_COVER", type, 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) { @@ -157,7 +226,7 @@ public class RemoteLibrary extends BasicLibrary { final Story[] result = new Story[1]; try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override public void action(Version serverVersion) throws Exception { Progress pg = pgF; @@ -165,8 +234,7 @@ public class RemoteLibrary extends BasicLibrary { pg = new Progress(); } - Object rep = sendCmd(this, - new Object[] { "GET_STORY", luid }); + Object rep = send(new Object[] { subkey, "GET_STORY", luid }); MetaData meta = null; if (rep instanceof MetaData) { @@ -177,8 +245,7 @@ public class RemoteLibrary extends BasicLibrary { } List list = new ArrayList(); - for (Object obj = send(null); obj != null; obj = send( - null)) { + for (Object obj = send(null); obj != null; obj = send(null)) { list.add(obj); pg.add(1); } @@ -189,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) { @@ -202,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(); @@ -215,7 +288,7 @@ public class RemoteLibrary extends BasicLibrary { final Progress pgF = pgSave; - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override public void action(Version serverVersion) throws Exception { Progress pg = pgF; @@ -223,7 +296,7 @@ public class RemoteLibrary extends BasicLibrary { pg.setMinMax(0, (int) story.getMeta().getWords()); } - sendCmd(this, new Object[] { "SAVE_STORY", luid }); + send(new Object[] { subkey, "SAVE_STORY", luid }); List list = RemoteLibraryServer.breakStory(story); for (Object obj : list) { @@ -238,7 +311,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(); @@ -260,15 +338,20 @@ public class RemoteLibrary extends BasicLibrary { @Override public synchronized void delete(final String luid) throws IOException { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override public void action(Version serverVersion) throws Exception { - sendCmd(this, new Object[] { "DELETE_STORY", luid }); + send(new Object[] { subkey, "DELETE_STORY", luid }); } @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(); } @@ -287,16 +370,20 @@ public class RemoteLibrary extends BasicLibrary { private void setCover(final String value, final String luid, final String type) { try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override public void action(Version serverVersion) throws Exception { - sendCmd(this, - new Object[] { "SET_COVER", type, value, luid }); + send(new Object[] { subkey, "SET_COVER", type, value, luid }); } @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 (IOException e) { @@ -328,13 +415,13 @@ public class RemoteLibrary extends BasicLibrary { final String[] luid = new String[1]; try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override public void action(Version serverVersion) throws Exception { Progress pg = pgF; - Object rep = sendCmd(this, - new Object[] { "IMPORT", url.toString() }); + Object rep = send(new Object[] { subkey, "IMPORT", + url.toString() }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { @@ -350,7 +437,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 (IOException e) { @@ -373,15 +465,16 @@ 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 { + final Progress pgF = pg == null ? new Progress() : pg; try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override public void action(Version serverVersion) throws Exception { Progress pg = pgF; - Object rep = sendCmd(this, new Object[] { "CHANGE_STA", + Object rep = send(new Object[] { subkey, "CHANGE_STA", luid, newSource, newTitle, newAuthor }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { @@ -394,7 +487,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 (IOException e) { @@ -413,15 +511,20 @@ public class RemoteLibrary extends BasicLibrary { */ public void exit() { try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override public void action(Version serverVersion) throws Exception { - sendCmd(this, new Object[] { "EXIT" }); + send(new Object[] { subkey, "EXIT" }); } @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 (IOException e) { @@ -492,7 +595,7 @@ public class RemoteLibrary extends BasicLibrary { final List metas = new ArrayList(); try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override public void action(Version serverVersion) throws Exception { Progress pg = pgF; @@ -500,9 +603,8 @@ public class RemoteLibrary extends BasicLibrary { pg = new Progress(); } - - Object rep = sendCmd(this, - new Object[] { "GET_METADATA", luid }); + Object rep = send(new Object[] { subkey, "GET_METADATA", + luid }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { @@ -523,7 +625,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) { @@ -532,35 +639,4 @@ public class RemoteLibrary extends BasicLibrary { return metas; } - - // IllegalArgumentException if key is bad - private Object sendCmd(ConnectActionClientObject action, Object[] params) - throws IOException, NoSuchFieldException, NoSuchMethodException, - ClassNotFoundException { - Object rep = action.send(params); - - String hash = hashKey(key, "" + rep); - rep = action.send(hash); - if (rep == null) { - throw new java.lang.IllegalArgumentException(); - } - - return action.send(hash); - } - - /** - * Return a hash that corresponds to the given key and the given random - * value. - * - * @param key - * the key (the secret) - * - * @param random - * the random value - * - * @return a hash that was computed using both - */ - static String hashKey(String key, String random) { - return StringUtils.getMd5Hash(key + " <==> " + random); - } }