X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerBridge.java;h=6c2ed019e830226ce93ed95a95c316d4b6f220eb;hb=8468bb79f0fc9c88fa21355509731625732eb10e;hp=9ccae1c498cd04611ccb4d6016da4255efdae68f;hpb=f4053377fa15da2f11e82955bfab86e673fa371c;p=nikiroo-utils.git diff --git a/src/be/nikiroo/utils/serial/server/ServerBridge.java b/src/be/nikiroo/utils/serial/server/ServerBridge.java index 9ccae1c..6c2ed01 100644 --- a/src/be/nikiroo/utils/serial/server/ServerBridge.java +++ b/src/be/nikiroo/utils/serial/server/ServerBridge.java @@ -25,7 +25,7 @@ import be.nikiroo.utils.serial.Importer; public class ServerBridge extends Server { private final String forwardToHost; private final int forwardToPort; - private final boolean forwardToSsl; + private final String forwardToKey; /** * Create a new server that will start listening on the network when @@ -35,14 +35,16 @@ public class ServerBridge extends Server { * the port to listen on, or 0 to assign any unallocated port * found (which can later on be queried via * {@link ServerBridge#getPort()} - * @param ssl - * use an SSL connection (or not) + * @param key + * an optional key to encrypt all the communications (if NULL, + * everything will be sent in clear text) * @param forwardToHost * the host server to forward the calls to * @param forwardToPort * the host port to forward the calls to - * @param forwardToSsl - * use an SSL connection for the forward server or not + * @param forwardToKey + * an optional key to encrypt all the communications (if NULL, + * everything will be sent in clear text) * * @throws IOException * in case of I/O error @@ -52,12 +54,12 @@ public class ServerBridge extends Server { * if the port parameter is outside the specified range of valid * port values, which is between 0 and 65535, inclusive */ - public ServerBridge(int port, boolean ssl, String forwardToHost, - int forwardToPort, boolean forwardToSsl) throws IOException { - super(port, ssl); + public ServerBridge(int port, String key, String forwardToHost, + int forwardToPort, String forwardToKey) throws IOException { + super(port, key); this.forwardToHost = forwardToHost; this.forwardToPort = forwardToPort; - this.forwardToSsl = forwardToSsl; + this.forwardToKey = forwardToKey; } /** @@ -68,14 +70,17 @@ public class ServerBridge extends Server { * the server name (only used for debug info and traces) * @param port * the port to listen on - * @param ssl - * use an SSL connection (or not) + * @param key + * an optional key to encrypt all the communications (if NULL, + * everything will be sent in clear text) * @param forwardToHost * the host server to forward the calls to * @param forwardToPort * the host port to forward the calls to - * @param forwardToSsl - * use an SSL connection for the forward server or not + * @param forwardToKey + * an optional key to encrypt all the communications (if NULL, + * everything will be sent in clear text) use an SSL connection + * for the forward server or not * * @throws IOException * in case of I/O error @@ -85,13 +90,13 @@ public class ServerBridge extends Server { * if the port parameter is outside the specified range of valid * port values, which is between 0 and 65535, inclusive */ - public ServerBridge(String name, int port, boolean ssl, - String forwardToHost, int forwardToPort, boolean forwardToSsl) + public ServerBridge(String name, int port, String key, + String forwardToHost, int forwardToPort, String forwardToKey) throws IOException { - super(name, port, ssl); + super(name, port, key); this.forwardToHost = forwardToHost; this.forwardToPort = forwardToPort; - this.forwardToSsl = forwardToSsl; + this.forwardToKey = forwardToKey; } /** @@ -118,7 +123,7 @@ public class ServerBridge extends Server { @Override protected ConnectActionServer createConnectActionServer(Socket s) { - return new ConnectActionServerString(s) { + return new ConnectActionServerString(s, key) { @Override public void action(final Version clientVersion) throws Exception { onClientContact(clientVersion); @@ -126,7 +131,7 @@ public class ServerBridge extends Server { try { new ConnectActionClientString(forwardToHost, forwardToPort, - forwardToSsl, clientVersion) { + forwardToKey, clientVersion) { @Override public void action(final Version serverVersion) throws Exception { @@ -207,7 +212,8 @@ public class ServerBridge extends Server { getTraceHandler().trace( getName() + ": will forward to " + forwardToHost + ":" + forwardToPort + " (" - + (forwardToSsl ? "SSL" : "plain text") + ")"); + + (forwardToKey != null ? "encrypted" : "plain text") + + ")"); super.run(); } @@ -220,26 +226,19 @@ public class ServerBridge extends Server { * the data to trace */ private void trace(String prefix, String data) { - int size = data.length(); - String ssize = size + " byte"; - if (size > 1) { - ssize = size + " bytes"; - if (size >= 1000) { - size = size / 1000; - ssize = size + " kb"; - if (size > 1000) { - size = size / 1000; - ssize = size + " MB"; - } - } - } + int size = data == null ? 0 : data.length(); + String ssize = StringUtils.formatNumber(size) + "bytes"; getTraceHandler().trace(prefix + ": " + ssize, 1); if (getTraceHandler().getTraceLevel() >= 2) { try { - if (data.startsWith("ZIP:")) { - data = StringUtils.unzip64(data.substring(4)); + while (data.startsWith("ZIP:") || data.startsWith("B64:")) { + if (data.startsWith("ZIP:")) { + data = StringUtils.unbase64s(data.substring(4), true); + } else if (data.startsWith("B64:")) { + data = StringUtils.unbase64s(data.substring(4), false); + } } Object obj = new Importer().read(data).getValue(); @@ -283,64 +282,4 @@ public class ServerBridge extends Server { getTraceHandler().trace("", 2); } } - - /** - * Start a bridge between 2 servers. - * - * @param args - * an array containing: - * - */ - public static void main(String[] args) { - final TraceHandler tracer = new TraceHandler(true, false, 0); - try { - if (args.length < 6) { - tracer.error("Invalid syntax.\n" - + "Syntax: [name] [port] [ssl] [fhost] [fport] [fssl] ([trace level]) ([max])\n" - + "\tname: the bridge name\n" - + "\tport: the bridge port\n" - + "\tssl: TRUE for an SSL bridge, FALSE for plain text\n" - + "\tfhost: the forward server host\n" - + "\tfport: the forward server port\n" - + "\tfssl: TRUE for an SSL forward server, FALSE for plain text\n" - + "\ttrace level: the optional trace level (default is 1)\n" - + "\tmax: the maximum size after which to truncate data\n"); - return; - } - - int i = 0; - String name = args[i++]; - int port = Integer.parseInt(args[i++]); - boolean ssl = Boolean.parseBoolean(args[i++]); - String fhost = args[i++]; - int fport = Integer.parseInt(args[i++]); - boolean fssl = Boolean.parseBoolean(args[i++]); - - int traceLevel = 1; - if (args.length > 6) { - traceLevel = Integer.parseInt(args[i++]); - } - int maxPrintSize = 0; - if (args.length > 7) { - maxPrintSize = Integer.parseInt(args[i++]); - } - - ServerBridge bridge = new ServerBridge(name, port, ssl, fhost, - fport, fssl); - bridge.setTraceHandler(new TraceHandler(true, true, traceLevel, - maxPrintSize)); - bridge.run(); - } catch (Exception e) { - tracer.error(e); - } - } }