X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=4f89a1fa19263c9d4bedf513274442660d3a023f;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=f4075dd7bf5df4e9fb1d734bc8d47fdb95852b5e;hpb=fb25273cf02653ac343d5437083b1bc41af5ce23;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java index f4075dd..4f89a1f 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java @@ -80,7 +80,7 @@ public class RemoteLibraryServer extends ServerObject { */ public RemoteLibraryServer(String key, int port) throws IOException { super("Fanfix remote library", port, key); - setTraceHandler(Instance.getTraceHandler()); + setTraceHandler(Instance.getInstance().getTraceHandler()); } @Override @@ -110,8 +110,7 @@ public class RemoteLibraryServer extends ServerObject { } } - List whitelist = Instance.getConfig().getList( - Config.SERVER_WHITELIST); + List whitelist = Instance.getInstance().getConfig().getList(Config.SERVER_WHITELIST); if (whitelist == null) { whitelist = new ArrayList(); } @@ -120,16 +119,16 @@ public class RemoteLibraryServer extends ServerObject { wl = false; } - rw = Instance.getConfig().getBoolean(Config.SERVER_RW, rw); + rw = Instance.getInstance().getConfig().getBoolean(Config.SERVER_RW, rw); if (!subkey.isEmpty()) { - List allowed = Instance.getConfig().getList( - Config.SERVER_ALLOWED_SUBKEYS); + List allowed = Instance.getInstance().getConfig().getList(Config.SERVER_ALLOWED_SUBKEYS); if (allowed.contains(subkey)) { if ((subkey + "|").contains("|rw|")) { rw = true; } if ((subkey + "|").contains("|wl|")) { wl = false; // |wl| = bypass whitelist + whitelist = new ArrayList(); } } } @@ -140,9 +139,15 @@ public class RemoteLibraryServer extends ServerObject { for (Object arg : args) { trace += arg + " "; } - System.out.println(trace); - - Object rep = doRequest(action, command, args, rw, whitelist); + long now = System.currentTimeMillis(); + System.out.println(StringUtils.fromTime(now) + ": " + trace); + + Object rep = null; + try { + rep = doRequest(action, command, args, rw, whitelist); + } catch (IOException e) { + rep = new RemoteLibraryException(e, true); + } commands.put(id, command); wls.put(id, wl); @@ -173,9 +178,12 @@ public class RemoteLibraryServer extends ServerObject { String rec = StringUtils.formatNumber(bytesReceived) + "b"; String sent = StringUtils.formatNumber(bytesSent) + "b"; - System.out.println(String.format("%s[>%s]: (%s sent, %s rec) in %d ms", - display(whitelist, rw), commands.get(id), sent, rec, - times.get(id))); + long now = System.currentTimeMillis(); + System.out.println(StringUtils.fromTime(now) + + ": " + + String.format("%s[>%s]: (%s sent, %s rec) in %d ms", + display(whitelist, rw), commands.get(id), sent, rec, + times.get(id))); commands.remove(id); times.remove(id); @@ -188,12 +196,12 @@ public class RemoteLibraryServer extends ServerObject { if ("PING".equals(command)) { return rw ? "r/w" : "r/o"; } else if ("GET_METADATA".equals(command)) { + List metas = new ArrayList(); + if ("*".equals(args[0])) { Progress pg = createPgForwarder(action); - List metas = new ArrayList(); - - for (MetaData meta : Instance.getLibrary().getMetas(pg)) { + for (MetaData meta : Instance.getInstance().getLibrary().getMetas(pg)) { MetaData light; if (meta.getCover() == null) { light = meta; @@ -206,26 +214,58 @@ public class RemoteLibraryServer extends ServerObject { } forcePgDoneSent(pg); - return metas.toArray(new MetaData[] {}); + } else { + MetaData meta = Instance.getInstance().getLibrary().getInfo((String) args[0]); + MetaData light; + if (meta.getCover() == null) { + light = meta; + } else { + light = meta.clone(); + light.setCover(null); + } + + metas.add(light); } - return new MetaData[] { Instance.getLibrary().getInfo( - (String) args[0]) }; + if (!whitelist.isEmpty()) { + for (int i = 0; i < metas.size(); i++) { + if (!whitelist.contains(metas.get(i).getSource())) { + metas.remove(i); + i--; + } + } + } + + return metas.toArray(new MetaData[0]); } else if ("GET_STORY".equals(command)) { - MetaData meta = Instance.getLibrary().getInfo((String) args[0]); + MetaData meta = Instance.getInstance().getLibrary().getInfo((String) args[0]); + if (meta == null) { + return null; + } + + if (!whitelist.isEmpty()) { + if (!whitelist.contains(meta.getSource())) { + return null; + } + } + meta = meta.clone(); meta.setCover(null); action.send(meta); action.rec(); - Story story = Instance.getLibrary() - .getStory((String) args[0], null); + Story story = Instance.getInstance().getLibrary().getStory((String) args[0], null); for (Object obj : breakStory(story)) { action.send(obj); action.rec(); } } else if ("SAVE_STORY".equals(command)) { + if (!rw) { + throw new RemoteLibraryException("Read-Only remote library: " + + args[0], false); + } + List list = new ArrayList(); action.send(null); @@ -237,43 +277,62 @@ public class RemoteLibraryServer extends ServerObject { } Story story = rebuildStory(list); - Instance.getLibrary().save(story, (String) args[0], null); + Instance.getInstance().getLibrary().save(story, (String) args[0], null); return story.getMeta().getLuid(); } else if ("IMPORT".equals(command)) { + if (!rw) { + throw new RemoteLibraryException("Read-Only remote library: " + + args[0], false); + } + Progress pg = createPgForwarder(action); - Story story = Instance.getLibrary().imprt( - new URL((String) args[0]), pg); + MetaData meta = Instance.getInstance().getLibrary().imprt(new URL((String) args[0]), pg); forcePgDoneSent(pg); - return story.getMeta().getLuid(); + return meta.getLuid(); } else if ("DELETE_STORY".equals(command)) { - Instance.getLibrary().delete((String) args[0]); + if (!rw) { + throw new RemoteLibraryException("Read-Only remote library: " + + args[0], false); + } + + Instance.getInstance().getLibrary().delete((String) args[0]); } else if ("GET_COVER".equals(command)) { - return Instance.getLibrary().getCover((String) args[0]); + return Instance.getInstance().getLibrary().getCover((String) args[0]); } else if ("GET_CUSTOM_COVER".equals(command)) { if ("SOURCE".equals(args[0])) { - return Instance.getLibrary().getCustomSourceCover( - (String) args[1]); + return Instance.getInstance().getLibrary().getCustomSourceCover((String) args[1]); } else if ("AUTHOR".equals(args[0])) { - return Instance.getLibrary().getCustomAuthorCover( - (String) args[1]); + return Instance.getInstance().getLibrary().getCustomAuthorCover((String) args[1]); } else { return null; } } else if ("SET_COVER".equals(command)) { + if (!rw) { + throw new RemoteLibraryException("Read-Only remote library: " + + args[0] + ", " + args[1], false); + } + if ("SOURCE".equals(args[0])) { - Instance.getLibrary().setSourceCover((String) args[1], - (String) args[2]); + Instance.getInstance().getLibrary().setSourceCover((String) args[1], (String) args[2]); } else if ("AUTHOR".equals(args[0])) { - Instance.getLibrary().setAuthorCover((String) args[1], - (String) args[2]); + Instance.getInstance().getLibrary().setAuthorCover((String) args[1], (String) args[2]); } } else if ("CHANGE_STA".equals(command)) { + if (!rw) { + throw new RemoteLibraryException("Read-Only remote library: " + args[0] + ", " + args[1], false); + } + Progress pg = createPgForwarder(action); - Instance.getLibrary().changeSTA((String) args[0], (String) args[1], - (String) args[2], (String) args[3], pg); + Instance.getInstance().getLibrary().changeSTA((String) args[0], (String) args[1], (String) args[2], + (String) args[3], pg); forcePgDoneSent(pg); } else if ("EXIT".equals(command)) { - stop(0, false); + if (!rw) { + throw new RemoteLibraryException( + "Read-Only remote library: EXIT", false); + } + + stop(10000, false); } return null; @@ -282,7 +341,9 @@ public class RemoteLibraryServer extends ServerObject { @Override protected void onError(Exception e) { if (e instanceof SSLException) { - System.out.println("[Client connection refused (bad key)]"); + long now = System.currentTimeMillis(); + System.out.println(StringUtils.fromTime(now) + ": " + + "[Client connection refused (bad key)]"); } else { getTraceHandler().error(e); }