Add the ability to secure an already established raw socket connection

tests/standalone/io/raw_secure_server_socket_test.dart

Index: tests/standalone/io/raw_secure_server_socket_test.dart
diff --git a/tests/standalone/io/raw_secure_server_socket_test.dart b/tests/standalone/io/raw_secure_server_socket_test.dart
index b12b87aee8f1fa21bc6add96fed47d60e2dee8a7..d9ec93b120dd5f2690e6958a2617c8e29ec0555a 100644
--- a/tests/standalone/io/raw_secure_server_socket_test.dart
+++ b/tests/standalone/io/raw_secure_server_socket_test.dart
@@ -133,14 +133,40 @@ void testServerListenAfterConnect() {
   });
 }
 
-void testSimpleReadWrite() {
-  // This test creates a server and a client connects. The client then
-  // writes and the server echos. When the server has finished its
-  // echo it half-closes. When the client gets the close event is
-  // closes fully.
+// This test creates a server and a client connects. The client then
+// writes and the server echos. When the server has finished its echo
+// it half-closes. When the client gets the close event is closes
+//

[Mads Ager (google), 2013/04/03 15:26:55]

Move 'fully.' up here and have the empty line after that?

[Søren Gjesse, 2013/04/19 05:17:09]

Done.

+// fully.
+// The test can be run in different configurations based on
+// the boolean arguments.
+//
+// listenSecure
+// When this argument is true a secure server is used. When this is false
+// a non-secure server is used and the connections are secured after beeing
+// connected.
+//
+// connectSecure
+// When this argument is true a secure client connection is used. When this
+// is false a non-secure client connection is used and the connection is
+// secured after being connected.
+//
+// handshakeBeforeSecure
+// When this argument is true some initial clear text handshake is done
+// between client and server before the connection is secured. This argument
+// only makes sense when both listenSecure and connectSecure are false.
+void testSimpleReadWrite(bool listenSecure,
+                         bool connectSecure,
+                         bool handshakeBeforeSecure) {
+  if (handshakeBeforeSecure == true &&
+      (listenSecure == true || connectSecure == true)) {
+    Expect.fails("Invalid arguments to testSimpleReadWrite");
+  }
+
   ReceivePort port = new ReceivePort();
 
   const messageSize = 1000;
+  const handshakeMessageSize = 100;
 
   List<int> createTestData() {
     List<int> data = new List<int>(messageSize);
@@ -150,6 +176,14 @@ void testSimpleReadWrite() {
     return data;
   }
 
+  List<int> createHandshakeTestData() {
+    List<int> data = new List<int>(handshakeMessageSize);
+    for (int i = 0; i < handshakeMessageSize; i++) {
+      data[i] = i & 0xff;
+    }
+    return data;
+  }
+
   void verifyTestData(List<int> data) {
     Expect.equals(messageSize, data.length);
     List<int> expected = createTestData();
@@ -158,90 +192,237 @@ void testSimpleReadWrite() {
     }
   }
 
-  RawSecureServerSocket.bind(SERVER_ADDRESS, 0, 5, CERTIFICATE).then((server) {
-    server.listen((client) {
-      int bytesRead = 0;
-      int bytesWritten = 0;
-      List<int> data = new List<int>(messageSize);
+  void verifyHandshakeTestData(List<int> data) {
+    Expect.equals(handshakeMessageSize, data.length);
+    List<int> expected = createHandshakeTestData();
+    for (int i = 0; i < handshakeMessageSize; i++) {
+      Expect.equals(expected[i], data[i]);
+    }
+  }
 
-      client.writeEventsEnabled = false;
-      client.listen((event) {
-        switch (event) {
-          case RawSocketEvent.READ:
-            Expect.isTrue(bytesWritten == 0);
-            Expect.isTrue(client.available() > 0);
-            var buffer = client.read();
-            if (buffer != null) {
-              data.setRange(bytesRead, buffer.length, buffer);
-              bytesRead += buffer.length;
-              for (var value in buffer) {
-                Expect.isTrue(value is int);
-                Expect.isTrue(value < 256 && value >= 0);
-              }
-            }
-            if (bytesRead == data.length) {
-              verifyTestData(data);
-              client.writeEventsEnabled = true;
-            }
-            break;
-          case RawSocketEvent.WRITE:
-            Expect.isFalse(client.writeEventsEnabled);
-            Expect.equals(bytesRead, data.length);
-            for (int i = bytesWritten; i < data.length; ++i) {
-              Expect.isTrue(data[i] is int);
-              Expect.isTrue(data[i] < 256 && data[i] >= 0);
-            }
-            bytesWritten += client.write(
-                data, bytesWritten, data.length - bytesWritten);
-            if (bytesWritten < data.length) {
-              client.writeEventsEnabled = true;
-            }
-            if (bytesWritten == data.length) {
-              client.shutdown(SocketDirection.SEND);
+  Future runServer(RawSocket client) {
+    var completer = new Completer();
+    int bytesRead = 0;
+    int bytesWritten = 0;
+    List<int> data = new List<int>(messageSize);
+    client.writeEventsEnabled = false;
+    var subscription;
+    subscription = client.listen((event) {
+      switch (event) {
+        case RawSocketEvent.READ:
+          Expect.isTrue(bytesWritten == 0);
+          Expect.isTrue(client.available() > 0);
+          var buffer = client.read();
+          if (buffer != null) {
+            data.setRange(bytesRead, buffer.length, buffer);
+            bytesRead += buffer.length;
+            for (var value in buffer) {
+              Expect.isTrue(value is int);
+              Expect.isTrue(value < 256 && value >= 0);
             }
-            break;
-          case RawSocketEvent.READ_CLOSED:
-            server.close();
-            break;
-          default: throw "Unexpected event $event";
-        }
-      });
+          }
+          if (bytesRead == data.length) {
+            verifyTestData(data);
+            client.writeEventsEnabled = true;
+          }
+          break;
+        case RawSocketEvent.WRITE:
+          Expect.isFalse(client.writeEventsEnabled);
+          Expect.equals(bytesRead, data.length);
+          for (int i = bytesWritten; i < data.length; ++i) {
+            Expect.isTrue(data[i] is int);
+            Expect.isTrue(data[i] < 256 && data[i] >= 0);
+          }
+          bytesWritten += client.write(
+              data, bytesWritten, data.length - bytesWritten);
+          if (bytesWritten < data.length) {
+            client.writeEventsEnabled = true;
+          }
+          if (bytesWritten == data.length) {
+            client.shutdown(SocketDirection.SEND);
+          }
+          break;
+        case RawSocketEvent.READ_CLOSED:
+          completer.complete(null);
+          break;
+        default: throw "Unexpected event $event";
+      }
+    });
+    return completer.future;
+  }
+
+  Future<RawSocket> runClient(RawSocket socket) {
+    var completer = new Completer();
+    int bytesRead = 0;
+    int bytesWritten = 0;
+    List<int> dataSent = createTestData();
+    List<int> dataReceived = new List<int>(dataSent.length);
+    socket.listen((event) {
+      switch (event) {
+        case RawSocketEvent.READ:
+          Expect.isTrue(socket.available() > 0);
+          var buffer = socket.read();
+          if (buffer != null) {
+            dataReceived.setRange(bytesRead, buffer.length, buffer);
+            bytesRead += buffer.length;
+          }
+          break;
+        case RawSocketEvent.WRITE:
+          Expect.isTrue(bytesRead == 0);
+          Expect.isFalse(socket.writeEventsEnabled);
+          bytesWritten += socket.write(
+              dataSent, bytesWritten, dataSent.length - bytesWritten);
+          if (bytesWritten < dataSent.length) {
+            socket.writeEventsEnabled = true;
+          }
+          break;
+        case RawSocketEvent.READ_CLOSED:
+          verifyTestData(dataReceived);
+          completer.complete(socket);
+          break;
+        default: throw "Unexpected event $event";
+      }
     });
+    return completer.future;
+  }
 
-    RawSecureSocket.connect(HOST_NAME, server.port).then((socket) {
-      int bytesRead = 0;
-      int bytesWritten = 0;
-      List<int> dataSent = createTestData();
-      List<int> dataReceived = new List<int>(dataSent.length);
-      socket.listen((event) {
-        switch (event) {
-          case RawSocketEvent.READ:
-            Expect.isTrue(socket.available() > 0);
-            var buffer = socket.read();
-            if (buffer != null) {
-              dataReceived.setRange(bytesRead, buffer.length, buffer);
-              bytesRead += buffer.length;
+  Future runServerHandshake(RawSocket client) {
+    var completer = new Completer();
+    int bytesRead = 0;
+    int bytesWritten = 0;
+    List<int> data = new List<int>(handshakeMessageSize);
+    client.writeEventsEnabled = false;
+    var subscription;
+    subscription = client.listen((event) {
+      switch (event) {
+        case RawSocketEvent.READ:
+          Expect.isTrue(bytesWritten == 0);
+          Expect.isTrue(client.available() > 0);
+          var buffer = client.read();
+          if (buffer != null) {
+            data.setRange(bytesRead, buffer.length, buffer);
+            bytesRead += buffer.length;
+            for (var value in buffer) {
+              Expect.isTrue(value is int);
+              Expect.isTrue(value < 256 && value >= 0);
             }
-            break;
-          case RawSocketEvent.WRITE:
-            Expect.isTrue(bytesRead == 0);
-            Expect.isFalse(socket.writeEventsEnabled);
-            bytesWritten += socket.write(
-                dataSent, bytesWritten, dataSent.length - bytesWritten);
-            if (bytesWritten < dataSent.length) {
-              socket.writeEventsEnabled = true;
+          }
+          if (bytesRead == data.length) {
+            verifyHandshakeTestData(data);
+            client.writeEventsEnabled = true;
+          }
+          break;
+        case RawSocketEvent.WRITE:
+          Expect.isFalse(client.writeEventsEnabled);
+          Expect.equals(bytesRead, data.length);
+          for (int i = bytesWritten; i < data.length; ++i) {
+            Expect.isTrue(data[i] is int);
+            Expect.isTrue(data[i] < 256 && data[i] >= 0);
+          }
+          bytesWritten += client.write(
+              data, bytesWritten, data.length - bytesWritten);
+          if (bytesWritten < data.length) {
+            client.writeEventsEnabled = true;
+          }
+          if (bytesWritten == data.length) {
+            subscription.cancel();
+            completer.complete(null);
+          }
+          break;
+        case RawSocketEvent.READ_CLOSED:
+          Expect.fail("Unexpected close");
+          break;
+        default: throw "Unexpected event $event";
+      }
+    });
+    return completer.future;
+  }
+
+  Future<RawSocket> runClientHandshake(RawSocket socket) {
+    var completer = new Completer();
+    int bytesRead = 0;
+    int bytesWritten = 0;
+    List<int> dataSent = createHandshakeTestData();
+    List<int> dataReceived = new List<int>(dataSent.length);
+    var subscription;
+    subscription = socket.listen((event) {
+      switch (event) {
+        case RawSocketEvent.READ:
+          Expect.isTrue(socket.available() > 0);
+          var buffer = socket.read();
+          if (buffer != null) {
+            dataReceived.setRange(bytesRead, buffer.length, buffer);
+            bytesRead += buffer.length;
+            if (bytesRead == dataSent.length) {
+              verifyHandshakeTestData(dataReceived);
+              subscription.cancel();
+              completer.complete(socket);
             }
-            break;
-          case RawSocketEvent.READ_CLOSED:
-            verifyTestData(dataReceived);
-            socket.close();
-            port.close();
-            break;
-          default: throw "Unexpected event $event";
-        }
+          }
+          break;
+        case RawSocketEvent.WRITE:
+          Expect.isTrue(bytesRead == 0);
+          Expect.isFalse(socket.writeEventsEnabled);
+          bytesWritten += socket.write(
+              dataSent, bytesWritten, dataSent.length - bytesWritten);
+          if (bytesWritten < dataSent.length) {
+            socket.writeEventsEnabled = true;
+          }
+          break;
+        case RawSocketEvent.READ_CLOSED:
+          Expect.fail("Unexpected close");
+          break;
+        default: throw "Unexpected event $event";
+      }
+    });
+    return completer.future;
+  }
+
+  Future<RawSecureSocket> connectClient(int port) {
+    if (connectSecure) {
+      return RawSecureSocket.connect(HOST_NAME, port);
+    } else if (!handshakeBeforeSecure) {
+      return RawSocket.connect(HOST_NAME, port).then((socket) {
+        return RawSecureSocket.secure(socket);
       });
+    } else {
+      return RawSocket.connect(HOST_NAME, port).then((socket) {
+        return runClientHandshake(socket).then((_) {
+          return RawSecureSocket.secure(socket);
+        });
+      });
+    }
+  }
+
+  serverReady(server) {
+    server.listen((client) {
+      if (listenSecure) {
+        runServer(client).then((_) => server.close());
+      } else if (!handshakeBeforeSecure) {
+        RawSecureSocket.secureServer(client, CERTIFICATE).then((client) {
+          runServer(client).then((_) => server.close());
+        });
+      } else {
+        runServerHandshake(client).then((_) {
+          RawSecureSocket.secureServer(client, CERTIFICATE).then((client) {
+            runServer(client).then((_) => server.close());
+          });
+        });
+      }
     });
-  });
+
+    connectClient(server.port).then(runClient).then((socket) {
+      socket.close();
+      port.close();
+    });
+  }
+
+  if (listenSecure) {
+    RawSecureServerSocket.bind(
+        SERVER_ADDRESS, 0, 5, CERTIFICATE).then(serverReady);
+  } else {
+    RawServerSocket.bind(SERVER_ADDRESS, 0, 5).then(serverReady);
+  }
 }
 
 main() {
@@ -258,5 +439,9 @@ main() {
   testSimpleConnectFail("not_a_nickname");
   testSimpleConnectFail("CN=notARealDistinguishedName");
   testServerListenAfterConnect();
-  testSimpleReadWrite();
+  testSimpleReadWrite(true, true, false);
+  testSimpleReadWrite(true, false, false);
+  testSimpleReadWrite(false, true, false);
+  testSimpleReadWrite(false, false, false);
+  testSimpleReadWrite(false, false, true);
 }