#1626 WiP

Author: stonesmi

vuu/src/main/scala/org/finos/vuu/net/ws/WebSocketClient.scala

@@ -63,8 +63,6 @@ class WebSocketClient(url: String, port: Int)(implicit lifecycle: LifecycleConta
 
     })
 
-    //Thread.sleep(2000)
-
     ch = b.connect(uri.getHost, port).sync.channel
   }
 

vuu/src/test/resources/certs/cert.pem

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC3jCCAcYCCQDluS1n11toPDANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJH
+QjEOMAwGA1UECgwFVmVudXUxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0yMTAzMTgw
+OTUzMzVaFw0zMTAzMTYwOTUzMzVaMDExCzAJBgNVBAYTAkdCMQ4wDAYDVQQKDAVW
+ZW51dTESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAoXS+P4cOprmMIByOOD4+O69Qfnjmrh2Raq5DBHmEDObqF6mA2E+o
+SSRvPTdTsufK0tIKQM7iH8ot5P0+ydaVmaHHML7Bys3WYQNfCBm+MZRl79O7yiHX
+tZYtIiJoagiQ4IX19Q00tkaNPqsj5ANBfKVtzokRzXzw+BjZtZpBXWUeETJE4wGB
+5fSQCHMdA8pnblucqsMsmDhGYloH5sBPLIyu9wV/h6AunxhZ37cKlV3U6R8np1ov
+T2fW3fHj6LtrUceMiZKWWgM9NrcJyeSZrqtwWe4lS3VeGZbGG1EZ+oc0m4cbv9FI
+3pz47cK+NTRQq43JQERmA3Yb9G2xRNFTxQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQB5mMt5eJuwnttcIfv7CKpb9icdYQUsQwN76n33EBetwoBj4r0F2gvxVCUo+9p9
+QTWET7K/nnCxB5ToP031baKZBOU8vIwhAU4WT1Y04ydYLu7vWBCVS7Cp1cygeJ5Z
+3WufvWo8EEqRhAKYFKIj0bj9XP6yOOBSNlmQk5VRRMKLp9aqmT1rV6+IgS6RJQim
+heZVnEUuKkHo6HZygv3Pl6DMXzD+pawcfYh7HYf+70qzmKvfBZkDE8x74KvdQ21V
+7bYRiL+yglzpkYPcAdpUAoHEUwh4DuCcaDUdGgGCBzjh7QJNvel5HccpXSGbrezY
+wYfUHIkVCMlDIRYJJArHJChO
+-----END CERTIFICATE-----

…src/main/resources/certs/certificate.p12 …src/test/resources/certs/certificate.p12example/main/src/main/resources/certs/certificate.p12 renamed to vuu/src/test/resources/certs/certificate.p12 example/main/src/main/resources/certs/certificate.p12 renamed to vuu/src/test/resources/certs/certificate.p12

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQChdL4/hw6muYwg
+HI44Pj47r1B+eOauHZFqrkMEeYQM5uoXqYDYT6hJJG89N1Oy58rS0gpAzuIfyi3k
+/T7J1pWZoccwvsHKzdZhA18IGb4xlGXv07vKIde1li0iImhqCJDghfX1DTS2Ro0+
+qyPkA0F8pW3OiRHNfPD4GNm1mkFdZR4RMkTjAYHl9JAIcx0DymduW5yqwyyYOEZi
+WgfmwE8sjK73BX+HoC6fGFnftwqVXdTpHyenWi9PZ9bd8ePou2tRx4yJkpZaAz02
+twnJ5Jmuq3BZ7iVLdV4ZlsYbURn6hzSbhxu/0UjenPjtwr41NFCrjclARGYDdhv0
+bbFE0VPFAgMBAAECggEBAIa5QZ8E9YbNwU1yRoJL/eYTzhkajXKwnYzlSGrNcxDJ
+BoEkIa1eGtCdpGzyY9cfb7EnLwMRHsLkFBPF9cS6WC7QPcRBCLhPthlRlNTPllMM
+v1q11Tc/sh2F6LdY+sOvziRr4+bNVDTc/jNS3yn+RYDbEZuL6N0M6o47Pj85Ll3d
+FNHQf/4JHm8H2CpKzumnBeSQoo+gVgd/cY/WL52SuMYwjOWmEsSR1TTn/mp2128u
+0f4CcZ+OlqqI1u3T05V1wCHVkqZiuK4Uz7kjo4TPtNb7QKd8G2MhRxAhu8zoQflY
+T6TEwjw0vCicJAmDuNO6b8MsPpfyfpjH5Ne985bGPwECgYEA1g1SHbnKNSzfa+o2
+2ZuTBNgb0gueRpMH4SkvfrMTmPXbArWiRt0YYJp5D6/1ZTT/cnBtC4ob9bkk2Gi7
+QSsVYkFvn9kwHoF/dNPGG7NALf8uld6izMYuWsaZXGJFv7wV57gqsD13bLyrOypp
+c6xRkMgvlU68g/HYa1jwj8gG0iUCgYEAwRjB21ACWjHqDI+yDD2nj1K0kLHDFI2J
+yLQk8vZWzKknftFs/m/+OSZxh2MpBxV1MhdhIol0T7Iu4FqqxX0RobQMhDGgzIka
+pG8/Gqu3Xz+y0iLaKG3GOI/24zoWhvrhkkJvjWNA42ank9k9UtnpoieQkKtQ5PJO
+Kov9dPquOSECgYEAiZQ4QmjnAfScidUZehZXkZaBkyjqizv3pY3+O/ZH01m6cexi
+qB91iqnew+l51ZoR0fFW9ULIo9BjUUFHkiRp8yRR5bEID6N2U5XGUImO58GLpMJb
+azi6FJhvfASiBhGTFsO1lF99ggNmH3osGzAXoPI6O0JHQptQWfbpb9DGKY0CgYBU
+sA39qNaPRkr3HWKiWbwOcOB+gWgksHrYiqGV6ZJiCmInDaS25tlhqUmrbkMFN1UC
+Fhzk79ISTfyfK0Swfszn1baTl8yFSDBmI+BSSzOOU7qSzPRPPO3tyr4mJEjTBF9A
+LWENapV/5nririlmF+qO0rllqa097EN6B5Gu527X4QKBgGuqnOeiy8UVpTRcN6OL
+h5RRS10utpQcpU1nJHx1Us23As0LJXV+CZuFGNWVnR0GLFABKNBZMV7ZqPHxwmr0
+WBhvxP1xOwCUsla1Cg/dEG+J1q7dPyVfXFK0813Rb5S9omnrQolTczbEh2LnF3RE
+JJmkkwWfm/jOTEl8F3iJQLQN
+-----END PRIVATE KEY-----

vuu/src/test/resources/certs/key.pem

@@ -18,7 +18,11 @@ import scala.jdk.CollectionConverters.SetHasAsJava
 
 class VuuHttp2ServerTest extends AnyFeatureSpec with AwaitilitySupport with Matchers with StrictLogging {
 
-  val portCounter = new AtomicInteger(31820)
+  private val certPath: String = getClass.getClassLoader.getResource("certs/cert.pem").getPath
+  private val keyPath: String = getClass.getClassLoader.getResource("certs/key.pem").getPath
+  private val pkcsPath: String = getClass.getClassLoader.getResource("certs/certificate.p12").getPath
+  private val portCounter = new AtomicInteger(31820)
+  private val pkcsPassword = "changeit"
 
   Feature("Check we can start the HTTP2 Server with various configurations") {
 
@@ -43,9 +47,7 @@ class VuuHttp2ServerTest extends AnyFeatureSpec with AwaitilitySupport with Matc
       val port = portCounter.getAndIncrement()
 
       val config = VuuHttp2ServerOptions()
-        .withSsl(VuuSSLByCertAndKey(
-          certPath = "example/main/src/main/resources/certs/cert.pem",
-          keyPath = "example/main/src/main/resources/certs/key.pem"))
+        .withSsl(VuuSSLByCertAndKey(certPath, keyPath))
         .withPort(port)
 
       val webServer = createAndStartWebServer(config)
@@ -61,9 +63,7 @@ class VuuHttp2ServerTest extends AnyFeatureSpec with AwaitilitySupport with Matc
       val port = portCounter.getAndIncrement()
 
       val config = VuuHttp2ServerOptions()
-        .withSsl(VuuSSLByPKCS(
-          pkcsPath = "example/main/src/main/resources/certs/certificate.p12",
-          pkcsPassword = "changeit"))
+        .withSsl(VuuSSLByPKCS(pkcsPath, pkcsPassword))
         .withPort(port)
 
       val webServer = createAndStartWebServer(config)
@@ -80,8 +80,8 @@ class VuuHttp2ServerTest extends AnyFeatureSpec with AwaitilitySupport with Matc
 
       val config = VuuHttp2ServerOptions()
         .withSsl(VuuSSLByPKCS(
-          pkcsPath = "example/main/src/main/resources/certs/certificate.p12",
-          pkcsPassword = "changeit",
+          pkcsPath,
+          pkcsPassword,
           cipherSuite = VuuSSLCipherSuiteOptions()
             .withCiphers(List("TLS_AES_256_GCM_SHA384"))
             .withProtocols(List("TLSv1.3"))))
@@ -99,10 +99,11 @@ class VuuHttp2ServerTest extends AnyFeatureSpec with AwaitilitySupport with Matc
 
       val port = portCounter.getAndIncrement()
 
+
       val config = VuuHttp2ServerOptions()
         .withSsl(VuuSSLByPKCS(
-          pkcsPath = "example/main/src/main/resources/certs/certificate.p12",
-          pkcsPassword = "changeit",
+          pkcsPath,
+          pkcsPassword,
           cipherSuite = VuuSSLCipherSuiteOptions()
             .withCiphers(List("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"))
             .withProtocols(List("TLSv1.2"))))

vuu/src/test/scala/org/finos/vuu/net/http/VuuHttp2ServerTest.scala

@@ -17,7 +17,11 @@ import java.util.concurrent.atomic.AtomicInteger
 
 class WebSocketServerTest extends AnyFeatureSpec with Matchers with StrictLogging {
 
-  val portCounter = new AtomicInteger(31820)
+  private val certPath: String = getClass.getClassLoader.getResource("certs/cert.pem").getPath
+  private val keyPath: String = getClass.getClassLoader.getResource("certs/key.pem").getPath
+  private val pkcsPath: String = getClass.getClassLoader.getResource("certs/certificate.p12").getPath
+  private val portCounter = new AtomicInteger(31820)
+  private val pkcsPassword = "changeit"
 
   Feature("Check we can start the WebSocketServer with various configurations") {
 
@@ -63,9 +67,7 @@ class WebSocketServerTest extends AnyFeatureSpec with Matchers with StrictLoggin
         VuuWebSocketOptions()
           .withUri("websocket")
           .withSsl(
-            VuuSSLByCertAndKey(
-              certPath = "example/main/src/main/resources/certs/cert.pem",
-              keyPath = "example/main/src/main/resources/certs/key.pem"))
+            VuuSSLByCertAndKey(certPath, keyPath))
           .withWsPort(wsPort),
         VuuSecurityOptions()
       )
@@ -93,9 +95,7 @@ class WebSocketServerTest extends AnyFeatureSpec with Matchers with StrictLoggin
         VuuWebSocketOptions()
           .withUri("websocket")
           .withSsl(
-            VuuSSLByPKCS(
-              pkcsPath = "example/main/src/main/resources/certs/certificate.p12",
-              pkcsPassword = "changeit"))
+            VuuSSLByPKCS(pkcsPath, pkcsPassword))
           .withWsPort(wsPort),
         VuuSecurityOptions()
       )
@@ -124,8 +124,8 @@ class WebSocketServerTest extends AnyFeatureSpec with Matchers with StrictLoggin
           .withUri("websocket")
           .withSsl(
             VuuSSLByCertAndKey(
-              certPath = "example/main/src/main/resources/certs/cert.pem",
-              keyPath = "example/main/src/main/resources/certs/key.pem",
+              certPath,
+              keyPath,
               cipherSuite = VuuSSLCipherSuiteOptions()
                 .withCiphers(List("TLS_AES_256_GCM_SHA384"))
                 .withProtocols(List("TLSv1.3"))
@@ -159,8 +159,8 @@ class WebSocketServerTest extends AnyFeatureSpec with Matchers with StrictLoggin
           .withUri("websocket")
           .withSsl(
             VuuSSLByCertAndKey(
-              certPath = "example/main/src/main/resources/certs/cert.pem",
-              keyPath = "example/main/src/main/resources/certs/key.pem",
+              certPath,
+              keyPath,
               cipherSuite = VuuSSLCipherSuiteOptions()
                 .withCiphers(List("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"))
                 .withProtocols(List("TLSv1.2"))