X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerBridge.java;h=0b734c6bbd6ca105b852406b2a97ec64ee71b589;hb=d80040bdb4bacb152c67eb40141f9e1dc1aa3c8b;hp=786d018ae00eaf38ee1ab55160ca05f0628c2003;hpb=8537d55a7dacf9f528ea9453b03d2391ea348846;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 786d018..0b734c6 100644
--- a/src/be/nikiroo/utils/serial/server/ServerBridge.java
+++ b/src/be/nikiroo/utils/serial/server/ServerBridge.java
@@ -1,8 +1,13 @@
package be.nikiroo.utils.serial.server;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Array;
import java.net.Socket;
+import java.net.UnknownHostException;
+import be.nikiroo.utils.StringUtils;
import be.nikiroo.utils.TraceHandler;
import be.nikiroo.utils.Version;
import be.nikiroo.utils.serial.Importer;
@@ -22,7 +27,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
@@ -32,18 +37,31 @@ 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 a 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 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
+ * @throws UnknownHostException
+ * if the IP address of the host could not be determined
+ * @throws IllegalArgumentException
+ * 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;
}
/**
@@ -54,31 +72,47 @@ 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 a 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 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
+ * @throws UnknownHostException
+ * if the IP address of the host could not be determined
+ * @throws IllegalArgumentException
+ * 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;
}
/**
* The traces handler for this {@link Server}.
*
+ * The trace levels are handled as follow:
*
- * - At level 1, it will only print basic IN/OUT messages with length.
- * - At level 2, it will also print the data as a String.
- * - At level 3, it will try to interpret it (SLOW) and print the object
- * type if possible.
- * - At level 4, it will try to print the {@link Object#toString()} value.
- *
+ * - 1: it will only print basic IN/OUT messages with length
+ * - 2: it will try to interpret it as an object (SLOW) and print the
+ * object class if possible
+ * - 3: it will try to print the {@link Object#toString()} value, or the
+ * data if it is not an object
+ * - 4: it will also print the unzipped serialised value if it is an
+ * object
*
*
* @param tracer
@@ -91,79 +125,96 @@ public class ServerBridge extends Server {
@Override
protected ConnectActionServer createConnectActionServer(Socket s) {
- return new ConnectActionServerString(s) {
+ // Bad impl, not up to date (should work, but not efficient)
+ return new ConnectActionServerString(s, key) {
@Override
- public void action(final Version clientVersion) throws Exception {
+ public void action(Version clientVersion) throws Exception {
onClientContact(clientVersion);
final ConnectActionServerString bridge = this;
- new ConnectActionClientString(forwardToHost, forwardToPort,
- forwardToSsl, clientVersion) {
- @Override
- public void action(final Version serverVersion)
- throws Exception {
- onServerContact(serverVersion);
-
- for (String fromClient = bridge.rec(); fromClient != null; fromClient = bridge
- .rec()) {
- onRec(clientVersion, fromClient);
- String fromServer = send(fromClient);
- onSend(serverVersion, fromServer);
- bridge.send(fromServer);
+ try {
+ new ConnectActionClientString(forwardToHost, forwardToPort,
+ forwardToKey) {
+ @Override
+ public void action(Version serverVersion)
+ throws Exception {
+ onServerContact(serverVersion);
+
+ for (String fromClient = bridge.rec(); fromClient != null; fromClient = bridge
+ .rec()) {
+ onRec(fromClient);
+ String fromServer = send(fromClient);
+ onSend(fromServer);
+ bridge.send(fromServer);
+ }
+
+ getTraceHandler().trace("=== DONE", 1);
+ getTraceHandler().trace("", 1);
}
- }
- }.connect();
+
+ @Override
+ protected void onError(Exception e) {
+ ServerBridge.this.onError(e);
+ }
+ }.connect();
+ } catch (Exception e) {
+ ServerBridge.this.onError(e);
+ }
}
};
}
/**
* This is the method that is called each time a client contact us.
- *
- * @param clientVersion
- * the client version
- * @param data
- * the data sent by the client
*/
protected void onClientContact(Version clientVersion) {
- getTraceHandler().trace("CLIENT " + clientVersion);
+ getTraceHandler().trace(">>> CLIENT " + clientVersion);
}
/**
* This is the method that is called each time a client contact us.
- *
- * @param serverVersion
- * the server version
- * @param data
- * the data sent by the client
*/
protected void onServerContact(Version serverVersion) {
- getTraceHandler().trace("SERVER " + serverVersion);
+ getTraceHandler().trace("<<< SERVER " + serverVersion);
+ getTraceHandler().trace("");
}
/**
* This is the method that is called each time a client contact us.
*
- * @param clientVersion
- * the client version
* @param data
* the data sent by the client
*/
- protected void onRec(Version clientVersion, String data) {
- trace("<<< CLIENT (" + clientVersion + ")", data);
+ protected void onRec(String data) {
+ trace(">>> CLIENT", data);
}
/**
* This is the method that is called each time the forwarded server contact
* us.
*
- * @param serverVersion
- * the client version
* @param data
* the data sent by the client
*/
- protected void onSend(Version serverVersion, String data) {
- trace(">>> SERVER (" + serverVersion + ")", data);
+ protected void onSend(String data) {
+ trace("<<< SERVER", data);
+ }
+
+ @Override
+ protected ConnectActionClient getConnectionToMe()
+ throws UnknownHostException, IOException {
+ return new ConnectActionClientString(new Socket((String) null,
+ getPort()), key);
+ }
+
+ @Override
+ public void run() {
+ getTraceHandler().trace(
+ getName() + ": will forward to " + forwardToHost + ":"
+ + forwardToPort + " ("
+ + (forwardToKey != null ? "encrypted" : "plain text")
+ + ")");
+ super.run();
}
/**
@@ -175,78 +226,67 @@ public class ServerBridge extends Server {
* the data to trace
*/
private void trace(String prefix, String data) {
- getTraceHandler().trace(prefix + ": " + data.length() + " characters",
- 1);
+ int size = data == null ? 0 : data.length();
+ String ssize = StringUtils.formatNumber(size) + "bytes";
+
+ getTraceHandler().trace(prefix + ": " + ssize, 1);
if (getTraceHandler().getTraceLevel() >= 2) {
try {
- Object obj = new Importer().read(data).getValue();
- if (obj == null) {
- getTraceHandler().trace("NULL", 3);
- getTraceHandler().trace("NULL", 4);
- } else {
- getTraceHandler().trace("(" + obj.getClass() + ")", 3);
- getTraceHandler().trace("" + obj.toString(), 4);
+ while (data.startsWith("ZIP:") || data.startsWith("B64:")) {
+ if (data.startsWith("ZIP:")) {
+ data = StringUtils.unzip64s(data.substring(4));
+ } else if (data.startsWith("B64:")) {
+ data = StringUtils.unzip64s(data.substring(4));
+ }
}
- } catch (Exception e) {
- getTraceHandler().trace("(not an object)", 3);
- getTraceHandler().trace(data, 4);
- }
- getTraceHandler().trace("", 4);
- }
- }
-
- /**
- * Start a bridge between 2 servers.
- *
- * @param args
- * an array containing:
- *
- * - The bridge name
- * - The bridge port
- * - TRUE for a ssl bridge, FALSE for plain text
- * - The forward server host
- * - The forward server port
- * - TRUE for a ssl forward server, FALSE for plain text
- * - (optional) a trace level
- *
- */
- 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])\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");
- 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++]);
+ InputStream stream = new ByteArrayInputStream(
+ StringUtils.getBytes(data));
+ try {
+ Object obj = new Importer().read(stream).getValue();
+ if (obj == null) {
+ getTraceHandler().trace("NULL", 2);
+ getTraceHandler().trace("NULL", 3);
+ getTraceHandler().trace("NULL", 4);
+ } else {
+ if (obj.getClass().isArray()) {
+ getTraceHandler().trace(
+ "(" + obj.getClass() + ") with "
+ + Array.getLength(obj)
+ + "element(s)", 3);
+ } else {
+ getTraceHandler().trace("(" + obj.getClass() + ")",
+ 2);
+ }
+ getTraceHandler().trace("" + obj.toString(), 3);
+ getTraceHandler().trace(data, 4);
+ }
+ } finally {
+ stream.close();
+ }
+ } catch (NoSuchMethodException e) {
+ getTraceHandler().trace("(not an object)", 2);
+ getTraceHandler().trace(data, 3);
+ getTraceHandler().trace("", 4);
+ } catch (NoSuchFieldException e) {
+ getTraceHandler().trace(
+ "(incompatible: " + e.getMessage() + ")", 2);
+ getTraceHandler().trace(data, 3);
+ getTraceHandler().trace("", 4);
+ } catch (ClassNotFoundException e) {
+ getTraceHandler().trace(
+ "(unknown object: " + e.getMessage() + ")", 2);
+ getTraceHandler().trace(data, 3);
+ getTraceHandler().trace("", 4);
+ } catch (Exception e) {
+ getTraceHandler().trace(
+ "(decode error: " + e.getMessage() + ")", 2);
+ getTraceHandler().trace(data, 3);
+ getTraceHandler().trace("", 4);
}
- ServerBridge bridge = new ServerBridge(name, port, ssl, fhost,
- fport, fssl);
- bridge.setTraceHandler(new TraceHandler(true, true, traceLevel));
- bridge.run();
- } catch (Exception e) {
- tracer.error(e);
+ getTraceHandler().trace("", 2);
}
}
}