diff --git a/http/src/test/resources/test-jupyter-server.p12 b/http/src/test/resources/test-jupyter-server.p12 index 4fb802caa4..9cf4c1e0c5 100644 Binary files a/http/src/test/resources/test-jupyter-server.p12 and b/http/src/test/resources/test-jupyter-server.p12 differ diff --git a/http/src/test/resources/test-rootCA.pem b/http/src/test/resources/test-rootCA.pem index 882c5f5e1a..a0e28be2b6 100644 --- a/http/src/test/resources/test-rootCA.pem +++ b/http/src/test/resources/test-rootCA.pem @@ -1,17 +1,30 @@ -----BEGIN CERTIFICATE----- -MIICpDCCAYwCCQCKel+b9I9knDANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDDAls -b2NhbGhvc3QwHhcNMjExMDA0MTc1ODMyWhcNMjUxMTEyMTc1ODMyWjAUMRIwEAYD -VQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDL -jThIR4jFRxcpblSd/E/dfjxPa/nG44ST7X9txF9R0QrPa0sbqV6nv0ksORTINlgn -8twOvwNg2Ib6tO5gHYTymDv07tD2/5OyrxQObApj+Gb76x3dGL5aJTylaCQB3paW -LtEtqNEKA8QSnzXhkNiP3NCMlXT0oUZB9v2FWCEA81/feTZLR+tGl8NLitP32XLE -+ALQiI3LeZP3td6SaET1bqKhsl1dkhSKwQdduUTdZDrL+FPqgwfWOh84IQ6d+QnC -TDlPvv+4gFuaLS1+RcCL4YSlya4x/G28XEB9FwmjCqi37qtY9kcq0DuUrlweU4Lb -vqxTDdv/NRuYGuJXeIv1AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEiBdShMAwzJ -rfaDbg/AFkU1AkVADXOO1qvzk2/DucgPigAUQt/g30oaqbhUTpoQ77uR+6+o6wn7 -Qdp1BNokUyuCwW4eSgAQkiAAclVDg0bAFyxicEfA7pxRmltY6NVi6YPKDLQGMD1R -EUklAGABLfHZM5Z0cQUlUOgkITS3N/54uYu6w1sHNc472FQfLD2OUorENBbxZFaZ -CSBiQUvOz4i0LlqIk2gRmqrW7G+gyb86M++yamdQIyn2zqvFEtTsVZrI+WBSL5Ao -UHp3fsW+iLjOcnyGTfG/bJ4ZoREL20dSCsTi6Icpcr3RKMBcd9MEVBBCktS0wU3W -gcEmt0uIXpc= +MIIFPDCCAyQCCQCLV7vvQ5zf5TANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJV +UzELMAkGA1UECAwCQ0ExDjAMBgNVBAcMBUxvY2FsMRAwDgYDVQQKDAdUZXN0T3Jn +MQswCQYDVQQLDAJDSTEVMBMGA1UEAwwMVGVzdCBSb290IENBMB4XDTI1MTExMzE1 +MzEwN1oXDTM1MTExMTE1MzEwN1owYDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNB +MQ4wDAYDVQQHDAVMb2NhbDEQMA4GA1UECgwHVGVzdE9yZzELMAkGA1UECwwCQ0kx +FTATBgNVBAMMDFRlc3QgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC +AgoCggIBAKUla2k/c2+ibisM9o6UTL2FcHajRXHCi/2JAShfRkqONOU+h1XQx9tD +kX6ZTfawIGY5QlScR+vPoYJXrtOqAUtjc8Jze+8srrsmU7clpU/KFh2mOh/XGg/c +CYdw4H4u2g5u1deVKRcVkpSwNAmwZkSYGEc/SKoZdmLG63lF9OO/7Q18coaJcR3j +fuLgWtOsS7Ue2o+t8y+WwVjGbN6MI2gt4nFvLgrt7OqW0s/7aroZFOvBPVBX0Vy3 +sLvTZ+qle48p+j6ZyjOBsdO2PzRClFhdau8KnJhZEyVrc0OU8LPht0geTGlnKX32 +VNDw7HNPCwNAFIdaym1leuGeijVra47SgkCJe8e+23P1xWLgASRTIK37wJoDL3Mm +//tQQSYs66Of9WhFR6siDE8SeoiuBzDhTXEoatrQMXXxw8L8Jc//ABcM+qM6WkfQ +/+xfhlqh2MUakoKwK3Kp4ZxrmUPbNfWZ+d6FfXpU18z/h2XxTKAzAmLD4wih6fDt +tcuPIvzWKuj79ygGep9mUGwSrJzQ2Z127vC7gjcl95ScXfz0mVNkdsx3GSGs16GE +CdD8o0e0tNzdjFwTuYWqyBQaeOFoyWeW250CqlfcYXLTwUf01n4XkEoa05QV6esb +A68i1z5HFTRESNElEsmYFs1uyXl4l8vBwUrs8A3OqJcTZm27i0bFAgMBAAEwDQYJ +KoZIhvcNAQELBQADggIBAIAspRM3DNFPq3j2Yp+NRlyDwT31p3JZkbMbdjNfnB77 +oFUFX7XLGrD/75sq6sH2a7QefGP/Lz9AS1vI2JN9Qt2+P7qvxAuBhiDrVEVMQuOO +tqjJhSjwserl0lKTquyRqvuSkdRxyYkCOcxDTPcMprQrnnTAHsrp7zr9tRLseQRN +iMqXoKyuh7LKVS1ic//cCmtm9Z58JjnXGRQH3V6a4N757Ht6TKGaY0PhorQtRCqk +sXiiP1ggSzxnfkjHAyMMaApNEtOhP/CfJUL27+BRr/5k3kL3Xk2MPfgWMl73tPiG +p3jCo0lekTBC9or9C/MHwniVaQ++QaVWcvpfNFAHxIy4Z/9jABnQWBjcMDm0pT35 +IdrMI2goEInLGjoANFAxkY5lhQxCkBcHsb/yGLVGvGzEji3FwNVaFPA99i32l36Z +CrMxe8TzwDsqx7kEZw4c/7txivxbe/W6rXWyRORxr1eRcE7cCopfOqsS84sv8qgd +OWO1ZpB8+7esZfpYmf4ir4s/4R8I5idxU44E//AksfgLD36AWWZGH1Fsew0GppOs +TZ9+vy/kN1sGHvBDd7KsYROULl467qtOk0kBMI83Y/yahXL/OlB47u6cgxm2dsG5 +EHpt8Fgno4Sau3KDF+mdXXrOkcfMXyWDEMJ6DGXs6QkN/pwjOCq4JrOGgY+nwM4t -----END CERTIFICATE----- diff --git a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/service/TestProxy.scala b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/service/TestProxy.scala index 9142a57571..4fdbde8784 100644 --- a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/service/TestProxy.scala +++ b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/service/TestProxy.scala @@ -54,9 +54,14 @@ trait TestProxy { this: ScalaFutures => val sslContext: SSLContext = SSLContext.getInstance("TLS") sslContext.init(keyManagerFactory.getKeyManagers, tmf.getTrustManagers, new SecureRandom) - val https: HttpsConnectionContext = ConnectionContext.https(sslContext) - - serverBinding = Http().bindAndHandle(backendRoute, "0.0.0.0", proxyConfig.proxyPort, https).futureValue + val https: HttpsConnectionContext = ConnectionContext.httpsServer(sslContext) + + // serverBinding = Http().bindAndHandle(backendRoute, "0.0.0.0", proxyConfig.proxyPort, https).futureValue + serverBinding = Http() + .newServerAt("0.0.0.0", proxyConfig.proxyPort) + .enableHttps(https) + .bindFlow(Route.toFlow(backendRoute)) + .futureValue } def shutdownProxyServer() = {