X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectAction.java;h=be987083c5e54e3db1228f563b4ba1bf322a8918;hb=9fb03c36d7d48a3009e3a83b6cd14fe2a8eea1ad;hp=39417a77fca5c7671afd7d932d12cc22d4115397;hpb=d9e2136bc52c2b7661698614016d864cfa8b350b;p=nikiroo-utils.git diff --git a/src/be/nikiroo/utils/serial/server/ConnectAction.java b/src/be/nikiroo/utils/serial/server/ConnectAction.java index 39417a7..be98708 100644 --- a/src/be/nikiroo/utils/serial/server/ConnectAction.java +++ b/src/be/nikiroo/utils/serial/server/ConnectAction.java @@ -8,6 +8,7 @@ import java.net.Socket; import javax.net.ssl.SSLException; +import be.nikiroo.utils.CryptUtils; import be.nikiroo.utils.Version; import be.nikiroo.utils.serial.Exporter; import be.nikiroo.utils.serial.Importer; @@ -27,11 +28,16 @@ abstract class ConnectAction { private Version version; private Version clientVersion; + private CryptUtils crypt; + private Object lock = new Object(); private BufferedReader in; private OutputStreamWriter out; private boolean contentToSend; + private long bytesReceived; + private long bytesSent; + /** * Method that will be called when an action is performed on either the * client or server this {@link ConnectAction} represent. @@ -62,7 +68,8 @@ abstract class ConnectAction { * Handler called when an unexpected error occurs in the code. * * @param e - * the exception that occurred + * the exception that occurred, SSLException usually denotes a + * crypt error */ abstract protected void onError(Exception e); @@ -74,12 +81,19 @@ abstract class ConnectAction { * @param server * TRUE for a server action, FALSE for a client action (will * impact the process) + * @param key + * an optional key to encrypt all the communications (if NULL, + * everything will be sent in clear text) * @param version * the version of this client-or-server */ - protected ConnectAction(Socket s, boolean server, Version version) { + protected ConnectAction(Socket s, boolean server, String key, + Version version) { this.s = s; this.server = server; + if (key != null) { + crypt = new CryptUtils(key); + } if (version == null) { this.version = new Version(); @@ -99,18 +113,43 @@ abstract class ConnectAction { return version; } + /** + * The total amount of bytes received. + * + * @return the amount of bytes received + */ + public long getBytesReceived() { + return bytesReceived; + } + + /** + * The total amount of bytes sent. + * + * @return the amount of bytes sent + */ + public long getBytesSent() { + return bytesSent; + } + /** * Actually start the process (this is synchronous). */ public void connect() { try { - in = new BufferedReader( - new InputStreamReader(s.getInputStream(), "UTF-8")); + in = new BufferedReader(new InputStreamReader(s.getInputStream(), + "UTF-8")); try { out = new OutputStreamWriter(s.getOutputStream(), "UTF-8"); try { if (server) { - String line = in.readLine(); + String line; + try { + line = readLine(in); + } catch (SSLException e) { + out.write("Unauthorized\n"); + throw e; + } + if (line != null && line.startsWith("VERSION ")) { // "VERSION client-version" (VERSION 1.0.0) Version clientVersion = new Version( @@ -142,20 +181,6 @@ abstract class ConnectAction { in = null; } } catch (Exception e) { - if (e instanceof SSLException) { - String ciphers = ""; - for (String cipher : Server.getAnonCiphers()) { - if (!ciphers.isEmpty()) { - ciphers += ", "; - } - ciphers += cipher; - } - - e = new SSLException( - "SSL error (available SSL ciphers: " + ciphers + ")", - e); - } - onError(e); } finally { try { @@ -188,12 +213,11 @@ abstract class ConnectAction { * @throws ClassNotFoundException * if a class described in the serialised data cannot be found */ - protected Object sendObject(Object data) - throws IOException, NoSuchFieldException, NoSuchMethodException, - ClassNotFoundException { + protected Object sendObject(Object data) throws IOException, + NoSuchFieldException, NoSuchMethodException, ClassNotFoundException { synchronized (lock) { - String rep = sendString( - new Exporter().append(data).toString(true, true)); + String rep = sendString(new Exporter().append(data).toString(true, + true)); if (rep != null) { return new Importer().read(rep).getValue(); } @@ -226,9 +250,9 @@ abstract class ConnectAction { * @throws java.lang.NullPointerException * if the counter part has no data to send */ - protected Object recObject() - throws IOException, NoSuchFieldException, NoSuchMethodException, - ClassNotFoundException, java.lang.NullPointerException { + protected Object recObject() throws IOException, NoSuchFieldException, + NoSuchMethodException, ClassNotFoundException, + java.lang.NullPointerException { String str = recString(); if (str == null) { throw new NullPointerException("No more data available"); @@ -249,11 +273,12 @@ abstract class ConnectAction { * * @throws IOException * in case of I/O error + * @throws SSLException + * in case of crypt error */ protected String sendString(String line) throws IOException { synchronized (lock) { - out.write(line); - out.write("\n"); + writeLine(out, line); if (server) { out.flush(); @@ -278,6 +303,8 @@ abstract class ConnectAction { * * @throws IOException * in case of I/O error + * @throws SSLException + * in case of crypt error */ protected String recString() throws IOException { synchronized (lock) { @@ -287,10 +314,62 @@ abstract class ConnectAction { contentToSend = false; } - return in.readLine(); + return readLine(in); } return null; } } + + /** + * Read a possibly encrypted line. + * + * @param in + * the stream to read from + * @return the unencrypted line + * + * + * @throws IOException + * in case of I/O error + * @throws SSLException + * in case of crypt error + */ + private String readLine(BufferedReader in) throws IOException { + String line = in.readLine(); + if (line != null) { + bytesReceived += line.length(); + if (crypt != null) { + line = crypt.decrypt64s(line, false); + } + } + + return line; + } + + /** + * Write a line, possible encrypted. + * + * @param out + * the stream to write to + * @param line + * the line to write + * @throws IOException + * in case of I/O error + * @throws SSLException + * in case of crypt error + */ + private void writeLine(OutputStreamWriter out, String line) + throws IOException { + if (crypt == null) { + out.write(line); + bytesSent += line.length(); + } else { + // TODO: how NOT to create so many big Strings? + String b64 = crypt.encrypt64(line, false); + out.write(b64); + bytesSent += b64.length(); + } + out.write("\n"); + bytesSent++; + } } \ No newline at end of file