remove double key handling

[fanfix.git] / src / be / nikiroo / fanfix / library / RemoteLibraryServer.java

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index b1aebb32e7214f9dcaa6df27e8536d00117dc835..f623163411f9c2a2e1f781039a67518199da75a9 100644 (file)
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -24,15 +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 is OK, it will return "true", if not, it will return NULL and stop the
- * connection.
- * <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
@@ -58,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,8 +62,7 @@ public class RemoteLibraryServer extends ServerObject {
         *             in case of I/O error
         */
        public RemoteLibraryServer(String key, int port) throws IOException {
-               super("Fanfix remote library", port, false);
-               this.key = key;
+               super("Fanfix remote library", port, key);
 
                setTraceHandler(Instance.getTraceHandler());
        }
@@ -88,7 +76,7 @@ public class RemoteLibraryServer extends ServerObject {
                Object[] args = new Object[0];
                if (data instanceof Object[]) {
                        Object[] dataArray = (Object[]) data;
-                       if (dataArray.length >= 2) {
+                       if (dataArray.length > 0) {
                                command = "" + dataArray[0];
 
                                args = new Object[dataArray.length - 1];
@@ -102,32 +90,14 @@ public class RemoteLibraryServer extends ServerObject {
                for (Object arg : args) {
                        trace += arg + " ";
                }
-               getTraceHandler().trace(trace);
-
-               // Authentication:
-               String random = StringUtils.getMd5Hash(Double.toString(Math.random()));
-               action.send(random);
-               String answer = "";
-               try {
-                       answer += action.rec();
-               } catch (NullPointerException e) {
-                       return null;
-               }
-
-               if (answer.equals(RemoteLibrary.hashKey(key, random))) {
-                       action.send(true);
-               } else {
-                       getTraceHandler().trace("Key rejected.");
-                       return null;
-               }
+               System.out.println(trace);
 
                Object rep = doRequest(action, command, args);
 
                String rec = StringUtils.formatNumber(action.getBytesReceived()) + "b";
                String sent = StringUtils.formatNumber(action.getBytesSent()) + "b";
-               getTraceHandler().trace(
-                               String.format("[>%s]: (%s sent, %s rec) in %d ms", command,
-                                               sent, rec, (new Date().getTime() - start)));
+               System.out.println(String.format("[>%s]: (%s sent, %s rec) in %d ms",
+                               command, sent, rec, (new Date().getTime() - start)));
 
                return rep;
        }
@@ -326,8 +296,7 @@ public class RemoteLibraryServer extends ServerObject {
         * 
         * @return the {@link Progress}
         */
-       private static Progress createPgForwarder(
-                       final ConnectActionServerObject action) {
+       private Progress createPgForwarder(final ConnectActionServerObject action) {
                final Boolean[] isDoneForwarded = new Boolean[] { false };
                final Progress pg = new Progress() {
                        @Override
@@ -360,7 +329,7 @@ public class RemoteLibraryServer extends ServerObject {
                                                action.send(new Integer[] { min, max, relativeProgress });
                                                action.rec();
                                        } catch (Exception e) {
-                                               Instance.getTraceHandler().error(e);
+                                               getTraceHandler().error(e);
                                        }
 
                                        lastTime[0] = new Date().getTime();
@@ -374,14 +343,14 @@ public class RemoteLibraryServer extends ServerObject {
        }
 
        // with 30 seconds timeout
-       private static void forcePgDoneSent(Progress pg) {
+       private void forcePgDoneSent(Progress pg) {
                long start = new Date().getTime();
                pg.done();
                while (!pg.isDone() && new Date().getTime() - start < 30000) {
                        try {
                                Thread.sleep(100);
                        } catch (InterruptedException e) {
-                               Instance.getTraceHandler().error(e);
+                               getTraceHandler().error(e);
                        }
                }
        }