allow subkeys, step 2
[fanfix.git] / src / be / nikiroo / fanfix / library / RemoteLibrary.java
index 326a488b1766a8fc9ddf5052dae8c8fdb32b11cc..6e3380b4a2239a074c26750436f8abc0df368e12 100644 (file)
@@ -1,6 +1,5 @@
 package be.nikiroo.fanfix.library;
 
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -8,11 +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.
+        * <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
@@ -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,53 @@ 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 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];
 
                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,32 +158,33 @@ 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];
        }
 
        @Override
-       public BufferedImage getCover(final String luid) {
-               final BufferedImage[] result = new BufferedImage[1];
+       public Image getCover(final String luid) {
+               if (!check()) {
+                       return null;
+               }
+
+               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 });
-                                       result[0] = (BufferedImage) rep;
+                                       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) {
@@ -119,21 +195,48 @@ public class RemoteLibrary extends BasicLibrary {
        }
 
        @Override
-       public BufferedImage getSourceCover(final String source) {
-               final BufferedImage[] result = new BufferedImage[1];
+       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, true) {
+                       new ConnectActionClientObject(host, port, key) {
                                @Override
                                public void action(Version serverVersion) throws Exception {
-                                       Object rep = send(new Object[] { md5, "GET_SOURCE_COVER",
-                                                       source });
-                                       result[0] = (BufferedImage) rep;
+                                       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) {
@@ -145,11 +248,15 @@ 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, true) {
+                       new ConnectActionClientObject(host, port, key) {
                                @Override
                                public void action(Version serverVersion) throws Exception {
                                        Progress pg = pgF;
@@ -157,7 +264,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 +286,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 +304,10 @@ 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();
                Progress pgRefresh = new Progress();
@@ -205,7 +321,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 +329,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<Object> list = RemoteLibraryServer.breakStory(story);
                                for (Object obj : list) {
@@ -228,15 +344,24 @@ 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();
 
                // because the meta changed:
-               invalidateInfo(luidSaved[0]);
-
                MetaData meta = getInfo(luidSaved[0]);
-               meta.setCover(story.getMeta().getCover());
+               if (story.getMeta().getClass() != null) {
+                       // If already available locally:
+                       meta.setCover(story.getMeta().getCover());
+               } else {
+                       // If required:
+                       meta.setCover(getCover(meta.getLuid()));
+               }
                story.setMeta(meta);
 
                pg.done();
@@ -246,31 +371,68 @@ public class RemoteLibrary extends BasicLibrary {
 
        @Override
        public synchronized void delete(final String luid) throws IOException {
-               new ConnectActionClientObject(host, port, true) {
+               if (!check()) {
+                       throw new IOException("Library not ready");
+               }
+
+               new ConnectActionClientObject(host, port, key) {
                        @Override
                        public void action(Version serverVersion) throws Exception {
-                               send(new Object[] { md5, "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();
        }
 
        @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, true) {
+                       new ConnectActionClientObject(host, port, key) {
                                @Override
                                public void action(Version serverVersion) throws Exception {
-                                       send(new Object[] { md5, "SET_SOURCE_COVER", source, 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) {
@@ -281,6 +443,17 @@ 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);
+               }
+
+               // Import it remotely if it is an URL
+
                if (pg == null) {
                        pg = new Progress();
                }
@@ -295,12 +468,12 @@ public class RemoteLibrary extends BasicLibrary {
                final String[] luid = new String[1];
 
                try {
-                       new ConnectActionClientObject(host, port, true) {
+                       new ConnectActionClientObject(host, port, key) {
                                @Override
                                public void action(Version serverVersion) throws Exception {
                                        Progress pg = pgF;
 
-                                       Object rep = send(new Object[] { md5, "IMPORT",
+                                       Object rep = send(new Object[] { subkey, "IMPORT",
                                                        url.toString() });
 
                                        while (true) {
@@ -317,7 +490,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) {
@@ -337,18 +515,23 @@ public class RemoteLibrary extends BasicLibrary {
 
        @Override
        // Could work (more slowly) without it
-       public synchronized void changeSource(final String luid,
-                       final String newSource, Progress pg) throws IOException {
+       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, true) {
+                       new ConnectActionClientObject(host, port, key) {
                                @Override
                                public void action(Version serverVersion) throws Exception {
                                        Progress pg = pgF;
 
-                                       Object rep = send(new Object[] { md5, "CHANGE_SOURCE",
-                                                       luid, newSource });
+                                       Object rep = send(new Object[] { subkey, "CHANGE_STA",
+                                                       luid, newSource, newTitle, newAuthor });
                                        while (true) {
                                                if (!RemoteLibraryServer.updateProgress(pg, rep)) {
                                                        break;
@@ -360,7 +543,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) {
@@ -378,16 +566,25 @@ public class RemoteLibrary extends BasicLibrary {
         * Stop the server.
         */
        public void exit() {
+               if (!check()) {
+                       return;
+               }
+
                try {
-                       new ConnectActionClientObject(host, port, true) {
+                       new ConnectActionClientObject(host, port, key) {
                                @Override
                                public void action(Version serverVersion) throws Exception {
-                                       send(new Object[] { md5, "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) {
@@ -397,6 +594,10 @@ 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);
@@ -410,8 +611,14 @@ public class RemoteLibrary extends BasicLibrary {
                return getMetasList("*", pg);
        }
 
+       @Override
+       protected void updateInfo(MetaData meta) {
+               // Will be taken care of directly server side
+       }
+
        @Override
        protected void invalidateInfo(String luid) {
+               // Will be taken care of directly server side
        }
 
        // The following methods are only used by Save and Delete in BasicLibrary:
@@ -436,6 +643,8 @@ public class RemoteLibrary extends BasicLibrary {
        /**
         * Return the meta of the given story or a list of all known metas if the
         * luid is "*".
+        * <p>
+        * Will not get the covers.
         * 
         * @param luid
         *            the luid of the story or *
@@ -446,11 +655,15 @@ 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, true) {
+                       new ConnectActionClientObject(host, port, key) {
                                @Override
                                public void action(Version serverVersion) throws Exception {
                                        Progress pg = pgF;
@@ -458,7 +671,8 @@ public class RemoteLibrary extends BasicLibrary {
                                                pg = new Progress();
                                        }
 
-                                       Object rep = send(new Object[] { md5, "GET_METADATA", luid });
+                                       Object rep = send(new Object[] { subkey, "GET_METADATA",
+                                                       luid });
 
                                        while (true) {
                                                if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@@ -479,7 +693,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) {