From 49f3dec53ec85b1720dbbfb62a2d495011b66622 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Mon, 22 Apr 2019 11:15:00 +0200 Subject: [PATCH] server: fix traces, auth errors --- libs/nikiroo-utils-4.7.2-dev-sources.jar | Bin 303117 -> 307392 bytes .../fanfix/library/RemoteLibraryServer.java | 34 +++++++----------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/libs/nikiroo-utils-4.7.2-dev-sources.jar b/libs/nikiroo-utils-4.7.2-dev-sources.jar index 4b72c09b75cd63d27ac61ec435a008f2983c0691..dd97f475bca15dd5758bb645091e3f7dfeb5a015 100644 GIT binary patch delta 14198 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 Z5UW2$M!6ft{)qn<#3aY!ikNvo{|{lYxd8wG diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java index b1aebb32..f0d5f7ae 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java @@ -26,8 +26,7 @@ import be.nikiroo.utils.serial.server.ServerObject; *

* 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. + * value not correct, the connection will be closed. *

* BTW: this system is by no means secure. It is just slightly * obfuscated, and operate on clear text (because Google decided not to support @@ -102,32 +101,26 @@ public class RemoteLibraryServer extends ServerObject { for (Object arg : args) { trace += arg + " "; } - getTraceHandler().trace(trace); + System.out.println(trace); // Authentication: String random = StringUtils.getMd5Hash(Double.toString(Math.random())); action.send(random); - String answer = ""; - try { - answer += action.rec(); - } catch (NullPointerException e) { - return null; - } + String answer = "" + action.rec(); - if (answer.equals(RemoteLibrary.hashKey(key, random))) { - action.send(true); - } else { - getTraceHandler().trace("Key rejected."); + 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"; 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 +319,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 +352,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 +366,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); } } } -- 2.27.0