remove double key handling

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index d3263e218312e07d9b366ff5eb2da2cd8bf3dcdb..63e45efc63b2977571eaacc18a133bc9cee3597d 100644 (file)
--- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@ -12,7 +12,6 @@ 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;
 
@@ -62,7 +61,7 @@ public class RemoteLibrary extends BasicLibrary {
                                @Override
                                public void action(Version serverVersion) throws Exception {
                                        try {
-                                               Object rep = sendCmd(this, new Object[] { "PING" });
+                                               Object rep = send(new Object[] { "PING" });
 
                                                if ("PONG".equals(rep)) {
                                                        result[0] = Status.READY;
@@ -99,8 +98,7 @@ public class RemoteLibrary extends BasicLibrary {
                        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[] { "GET_COVER", luid });
                                        result[0] = (Image) rep;
                                }
 
@@ -134,8 +132,8 @@ public class RemoteLibrary extends BasicLibrary {
                        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[] { "GET_CUSTOM_COVER", type,
+                                                       source });
                                        result[0] = (Image) rep;
                                }
 
@@ -165,8 +163,7 @@ public class RemoteLibrary extends BasicLibrary {
                                                pg = new Progress();
                                        }
 
-                                       Object rep = sendCmd(this,
-                                                       new Object[] { "GET_STORY", luid });
+                                       Object rep = send(new Object[] { "GET_STORY", luid });
 
                                        MetaData meta = null;
                                        if (rep instanceof MetaData) {
@@ -222,7 +219,7 @@ public class RemoteLibrary extends BasicLibrary {
                                        pg.setMinMax(0, (int) story.getMeta().getWords());
                                }
 
-                               sendCmd(this, new Object[] { "SAVE_STORY", luid });
+                               send(new Object[] { "SAVE_STORY", luid });
 
                                List<Object> list = RemoteLibraryServer.breakStory(story);
                                for (Object obj : list) {
@@ -262,7 +259,7 @@ public class RemoteLibrary extends BasicLibrary {
                new ConnectActionClientObject(host, port, key) {
                        @Override
                        public void action(Version serverVersion) throws Exception {
-                               sendCmd(this, new Object[] { "DELETE_STORY", luid });
+                               send(new Object[] { "DELETE_STORY", luid });
                        }
 
                        @Override
@@ -289,8 +286,7 @@ public class RemoteLibrary extends BasicLibrary {
                        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[] { "SET_COVER", type, value, luid });
                                }
 
                                @Override
@@ -332,8 +328,7 @@ public class RemoteLibrary extends BasicLibrary {
                                public void action(Version serverVersion) throws Exception {
                                        Progress pg = pgF;
 
-                                       Object rep = sendCmd(this,
-                                                       new Object[] { "IMPORT", url.toString() });
+                                       Object rep = send(new Object[] { "IMPORT", url.toString() });
 
                                        while (true) {
                                                if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@@ -380,8 +375,8 @@ public class RemoteLibrary extends BasicLibrary {
                                public void action(Version serverVersion) throws Exception {
                                        Progress pg = pgF;
 
-                                       Object rep = sendCmd(this, new Object[] { "CHANGE_STA",
-                                                       luid, newSource, newTitle, newAuthor });
+                                       Object rep = send(new Object[] { "CHANGE_STA", luid,
+                                                       newSource, newTitle, newAuthor });
                                        while (true) {
                                                if (!RemoteLibraryServer.updateProgress(pg, rep)) {
                                                        break;
@@ -415,7 +410,7 @@ public class RemoteLibrary extends BasicLibrary {
                        new ConnectActionClientObject(host, port, key) {
                                @Override
                                public void action(Version serverVersion) throws Exception {
-                                       sendCmd(this, new Object[] { "EXIT" });
+                                       send(new Object[] { "EXIT" });
                                }
 
                                @Override
@@ -499,8 +494,7 @@ public class RemoteLibrary extends BasicLibrary {
                                                pg = new Progress();
                                        }
 
-                                       Object rep = sendCmd(this, new Object[] { "GET_METADATA",
-                                                       luid });
+                                       Object rep = send(new Object[] { "GET_METADATA", luid });
 
                                        while (true) {
                                                if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@@ -530,30 +524,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);
-               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);
-       }
 }

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 4a6ed606453fa1cfbdaf6236143832c55603793a..f623163411f9c2a2e1f781039a67518199da75a9 100644 (file)
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -24,14 +24,6 @@ import be.nikiroo.utils.serial.server.ServerObject;
  * The available commands are given as arrays of objects (first item is the
  * command, the rest are the arguments).
  * <p>
- * All commands, including PING, will first return a random value to you that
- * you must hash with your key and return before processing the rest; if the
- * value not correct, the connection will be closed.
- * <p>
- * BTW: this system <b>is by no means secure</b>. It is just slightly
- * obfuscated, and operate on clear text (because Google decided not to support
- * anonymous SSL exchanges on Android, and the main use case for this server is
- * Android).
  * <ul>
  * <li>PING: will return PONG if the key is accepted</li>
  * <li>GET_METADATA *: will return the metadata of all the stories in the
@@ -57,8 +49,6 @@ import be.nikiroo.utils.serial.server.ServerObject;
  * @author niki
  */
 public class RemoteLibraryServer extends ServerObject {
-       private final String key;
-
        /**
         * Create a new remote server (will not be active until
         * {@link RemoteLibraryServer#start()} is called).
@@ -73,7 +63,6 @@ public class RemoteLibraryServer extends ServerObject {
         */
        public RemoteLibraryServer(String key, int port) throws IOException {
                super("Fanfix remote library", port, key);
-               this.key = key;
 
                setTraceHandler(Instance.getTraceHandler());
        }
@@ -103,18 +92,6 @@ public class RemoteLibraryServer extends ServerObject {
                }
                System.out.println(trace);
 
-               // Authentication:
-               String random = StringUtils.getMd5Hash(Double.toString(Math.random()));
-               action.send(random);
-               String answer = "" + action.rec();
-
-               if (!answer.equals(RemoteLibrary.hashKey(key, random))) {
-                       System.out.println("Key rejected.");
-                       action.close();
-                       return null;
-               }
-               //
-
                Object rep = doRequest(action, command, args);
 
                String rec = StringUtils.formatNumber(action.getBytesReceived()) + "b";