From 44bd5e45483598fd413268088174edf5996c3f48 Mon Sep 17 00:00:00 2001 From: Cara Fisher Date: Thu, 7 Dec 2023 15:27:00 +0000 Subject: [PATCH 1/5] SLVUU-79: Create certs and keys for rootCA and layout server --- .../certs/layout-server-keystore.jks | Bin 0 -> 1406 bytes .../certs/layout-server-keystore.pfx | Bin 0 -> 1824 bytes .../main/resources/certs/layout-server.conf | 17 ++++++++++++++++ .../resources/certs/layout-server.conf.bak | 19 ++++++++++++++++++ .../main/resources/certs/layout-server.crt | 16 +++++++++++++++ .../main/resources/certs/layout-server.csr | 10 +++++++++ .../main/resources/certs/layout-server.key | 8 ++++++++ .../src/main/resources/certs/rootCA.crt | 12 +++++++++++ .../src/main/resources/certs/rootCA.csr | 8 ++++++++ .../src/main/resources/certs/rootCA.key | 8 ++++++++ .../src/main/resources/certs/rootCA.srl | 1 + 11 files changed, 99 insertions(+) create mode 100644 layout-server/src/main/resources/certs/layout-server-keystore.jks create mode 100644 layout-server/src/main/resources/certs/layout-server-keystore.pfx create mode 100644 layout-server/src/main/resources/certs/layout-server.conf create mode 100644 layout-server/src/main/resources/certs/layout-server.conf.bak create mode 100644 layout-server/src/main/resources/certs/layout-server.crt create mode 100644 layout-server/src/main/resources/certs/layout-server.csr create mode 100644 layout-server/src/main/resources/certs/layout-server.key create mode 100644 layout-server/src/main/resources/certs/rootCA.crt create mode 100644 layout-server/src/main/resources/certs/rootCA.csr create mode 100644 layout-server/src/main/resources/certs/rootCA.key create mode 100644 layout-server/src/main/resources/certs/rootCA.srl diff --git a/layout-server/src/main/resources/certs/layout-server-keystore.jks b/layout-server/src/main/resources/certs/layout-server-keystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..2ff48ecfbc631d7e99fd28d3ee4eb1f03ccbf36d GIT binary patch literal 1406 zcmezO_TO6u1_mY|W&~s2oW#of(h}X`)S|M~BA{rG%Od#(pwuyg#={0YY+TxGj4X^= zOoEJzERCB^-(L24!s)g4=_Y>R>IJJ=4&)>=^!zrxVN&9)>ha}**3yUWZjYvz#N|&a z_v|eEy>rHgE0O;mb2#4RSuXc|>Yk`2`7>|WiA-bN*L^7{{oCvfttZsfHj00Xd}KUz z{?+FTe;UM<%<42hrk<<2v54DuyT0tJ^$+c4T@&8X`$FiZj9ieEgA239K94;PKH%~wRU_&0DVj!QJhdHdY)KJVo1jJ+J;VmmI)l19F z%P-c;FG@F*HIQcG1RB})otKf5QH(DmHK)JfE7Xl#6!4F7NnVvMT|v+@BiswPkXm1ed-$@=xkUhFY;yL4}-=Iki0TW zV}n86!n7qR^oX1$5v|Wlw`cM+uTtyrs4SYjWby5LEZoRRgxQ0^z?DfM=!)5#yXs5K zly>=xUwF5HPa%uLHO)jmO)7td)Uw(c$C(rv+FnN9SkI?2pJ#qW`sy7=b>1|G?rbl< zU$Hq)$ literal 0 HcmV?d00001 diff --git a/layout-server/src/main/resources/certs/layout-server-keystore.pfx b/layout-server/src/main/resources/certs/layout-server-keystore.pfx new file mode 100644 index 0000000000000000000000000000000000000000..59a63dc3337654ec4861c98dda9f92d03867685f GIT binary patch literal 1824 zcmai#dpHvcAIFVt43oqpgisN)(IHYcw{{%4lrfj%R=JJb@0V;uA>+7T!pkxW5e~C4 zFNJonBiBQuRI6i$HRNu`dEWP_KhGb(=l6WS-#>oO^Zn!VLlA`(1OY+_BKQ>;qM3$C z+k^sy0aZkBKadD!9NIJl5ft`40#^}1Hx4ZiL4d&F!hKHw2&ZoX1VvaOG`>r5gaS~+ z#```V+i5x~C@3O;5C@C=@0uV4B!Ex^Lp;+kfLlU9fF@A#gHNPl-`!D3)0B%1vkAd{ z$wVNx{VjY!IL@&26ZH$)NR1gXR-xA(?%4O=`MUmAxeWmBG!I(_74U|z_iu|{4D4x} zZrCnChRAX$7I_~cgDhwm`PYNE;zi6ruf}p0l#^O85kl~qu)X3NuzTA7*z)+FoC$K9 z25AmC=?r-m7Qs{ffr;85_ML``EVC{r(EySuYa1-5S>?(G_7aJg@)PX>R(mge6=*&c$`psRQ-dI+G zy40k}9{*+EeJOaii-z#sOSaEBM$;2R#94g6LY}fs%@heQ^emQ2Nxo`UqP(X=G6>V- zujhE#Ol%@5J1pcl6_dW!PL_MeC<;1A8O zYM&|6hBNvHf*+sqD5mkFbQ$B`%}nK(H*zD3gS$4qIRcB)1{ht;2ziJ?dH}r8g`G@M z&P1hdFnt%&%}F%3YTEi{ctpx=i<0K3cuNIzZ}>^zyky+gNVowSEx71b-NAnGTR7mc zJpW)`+R3MP!#ap!46(+vDIAGSpT=2QX1W>Gir;`|$DbtlR`uxJ`bePT%%l#A4U0J| zjjk#6*4-DjtpK-uU+4U?b*+NZw^FR~DF$;xVt0EG%|*JMbp6jkozAI2zK8qe)|?oF z*-zYoUmuxg(L)BT7`S$+pY}bNe-xIf%s(~kI&CL)L_N3QSDQfNsNj5s#_J*eT8m_P zq2pzVCRw_jvG({{l?cp~`gmz>oxtXOX5@(mOlXVG(Af#%>|D z`C4ZEPr}$r>^+Et|Ee^tC`H!f3M|d?E+&$=tQ{KdG8Ub#ky{>lzFS00JxDReq=fH& zq4QCJGT~yJH+r({F4Z-1K-_Q56W5q=l4sk3Fl!VeH}>u9nKkcb@>BAGP0X=3w^$b0 zVLFgUL7$D%9qIMgU?q=w?8C|oL#?3lG}5^ts=0K&HwMq{mkc+8yz)^; zN`5;?bMg3Ez4Zjto9VWjh>Zr>v+2{as^vYFID;ulcjjtvy?*wfkRR9a0cV;?yTh{1 za>DSdWk&DvH!DLTofQ!MOZ};IRA#RU-7GA`Zl9dZ?xrJ<5}`!*>NI}kdu0B(+9>HD7E~!v)Ali>i1(((d(~Xe-!!G zazpCK$x7syirkw)@Q;?pK$zp+B1}^B&tIPRN4}p@r0gpF_1CJ;L5z?>j`oY@!q8$y zL&Z`d(06Vru!k;pp!qWKeH?qOm7I)+^OS;EQ0{pDs-G}P?l{sf=EtkojjHPQA+faL zDo&1y*UT|aVuXZEWF=A^q57>Ihzt@2l=e@QFp_a<$%bVc?Wt=0toBlX1wx<^NCfoT zZxIB51c1tUnoma<89hmR{c`1b>g?kV!;9%1x%MLaE%?jS=fPb3$ E8;yKNuK)l5 literal 0 HcmV?d00001 diff --git a/layout-server/src/main/resources/certs/layout-server.conf b/layout-server/src/main/resources/certs/layout-server.conf new file mode 100644 index 000000000..2ab79d26e --- /dev/null +++ b/layout-server/src/main/resources/certs/layout-server.conf @@ -0,0 +1,17 @@ +[ req ] +default_bits = 2048 +distinguished_name = req_distinguished_name +req_extensions = req_ext +prompt = no +[ req_distinguished_name ] +countryName = GB +organizationName = Layout Server +organizationalUnitName = local +commonName = localhost +[ req_ext ] +subjectAltName = @alt_names +[alt_names] +DNS.2 = 127.0.0.1 +DNS.3 = localhost +DNS.5 = IP:127.0.0.1 +DNS.6 = IP:localhost \ No newline at end of file diff --git a/layout-server/src/main/resources/certs/layout-server.conf.bak b/layout-server/src/main/resources/certs/layout-server.conf.bak new file mode 100644 index 000000000..a1fddf93b --- /dev/null +++ b/layout-server/src/main/resources/certs/layout-server.conf.bak @@ -0,0 +1,19 @@ +[ req ] +default_bits = 2048 +distinguished_name = req_distinguished_name +req_extensions = req_ext +prompt = no +[ req_distinguished_name ] +countryName = GB +organizationName = Layout Server +organizationalUnitName = local +commonName = vuu.server.local +[ req_ext ] +subjectAltName = @alt_names +[alt_names] +DNS.1 = vuu.server.local +DNS.2 = 127.0.0.1 +DNS.3 = localhost +DNS.4 = IP:vuu.server.local +DNS.5 = IP:127.0.0.1 +DNS.6 = IP:localhost \ No newline at end of file diff --git a/layout-server/src/main/resources/certs/layout-server.crt b/layout-server/src/main/resources/certs/layout-server.crt new file mode 100644 index 000000000..95242d95a --- /dev/null +++ b/layout-server/src/main/resources/certs/layout-server.crt @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIICmDCCAj6gAwIBAgIUXPzwnimuI58H7UqUylQ2EfDOySIwCgYIKoZIzj0EAwIw +YjELMAkGA1UEBhMCVUsxDjAMBgNVBAoMBUZJTk9TMQwwCgYDVQQLDANWdXUxFjAU +BgNVBAMMDXZ1dS5maW5vcy5vcmcxHTAbBgkqhkiG9w0BCQEWDmhlbHBAZmlub3Mu +b3JnMB4XDTIzMTIwNzE0MTUwMloXDTI0MTIwNjE0MTUwMlowSTELMAkGA1UEBhMC +R0IxFjAUBgNVBAoMDUxheW91dCBTZXJ2ZXIxDjAMBgNVBAsMBWxvY2FsMRIwEAYD +VQQDDAlsb2NhbGhvc3QwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATNlGLADRLX +Jdx6c+PV8yLUnY/h5iv2jsb8ccRUXUmEl2EBjPlnMGI4eaRB+uRUa19xMI+Lli40 +u0fIosOaxvbJo4HqMIHnMDsGA1UdEQQ0MDKCCTEyNy4wLjAuMYIJbG9jYWxob3N0 +ggxJUDoxMjcuMC4wLjGCDElQOmxvY2FsaG9zdDAdBgNVHQ4EFgQUDv/LU0k/RpSO +J7HgLLChHxT0kfgwgYgGA1UdIwSBgDB+oWakZDBiMQswCQYDVQQGEwJVSzEOMAwG +A1UECgwFRklOT1MxDDAKBgNVBAsMA1Z1dTEWMBQGA1UEAwwNdnV1LmZpbm9zLm9y +ZzEdMBsGCSqGSIb3DQEJARYOaGVscEBmaW5vcy5vcmeCFCrzpbdpDIOqJoxIeXKb +pKPb3gQLMAoGCCqGSM49BAMCA0gAMEUCIFLUNpzdJ6Q2IrpPF9DusA4gaghFZjQf +ZhpvqBqmfZjHAiEAhulZ2K8OJJ8Mn3hnq7jFLOyDVbmHc99+tyqb63gbiT0= +-----END CERTIFICATE----- diff --git a/layout-server/src/main/resources/certs/layout-server.csr b/layout-server/src/main/resources/certs/layout-server.csr new file mode 100644 index 000000000..c28e27cb7 --- /dev/null +++ b/layout-server/src/main/resources/certs/layout-server.csr @@ -0,0 +1,10 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIBUTCB+QIBADBJMQswCQYDVQQGEwJHQjEWMBQGA1UECgwNTGF5b3V0IFNlcnZl +cjEOMAwGA1UECwwFbG9jYWwxEjAQBgNVBAMMCWxvY2FsaG9zdDBZMBMGByqGSM49 +AgEGCCqGSM49AwEHA0IABM2UYsANEtcl3Hpz49XzItSdj+HmK/aOxvxxxFRdSYSX +YQGM+WcwYjh5pEH65FRrX3Ewj4uWLjS7R8iiw5rG9smgTjBMBgkqhkiG9w0BCQ4x +PzA9MDsGA1UdEQQ0MDKCCTEyNy4wLjAuMYIJbG9jYWxob3N0ggxJUDoxMjcuMC4w +LjGCDElQOmxvY2FsaG9zdDAKBggqhkjOPQQDAgNHADBEAiBq+AWf2aiEBWxpfVxe +beAjVE37i+V7G2QCPpReKXLuMQIgHsf9i1u5JIcNllJjcBJj8ZQLhXw/iEuLYO7R +ATGiQY0= +-----END CERTIFICATE REQUEST----- diff --git a/layout-server/src/main/resources/certs/layout-server.key b/layout-server/src/main/resources/certs/layout-server.key new file mode 100644 index 000000000..b7007fdba --- /dev/null +++ b/layout-server/src/main/resources/certs/layout-server.key @@ -0,0 +1,8 @@ +-----BEGIN EC PARAMETERS----- +BggqhkjOPQMBBw== +-----END EC PARAMETERS----- +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEINxy9ruNMu6a38RChB5rfaukMZ5Ks8QR+vR9YRzsMbi+oAoGCCqGSM49 +AwEHoUQDQgAEzZRiwA0S1yXcenPj1fMi1J2P4eYr9o7G/HHEVF1JhJdhAYz5ZzBi +OHmkQfrkVGtfcTCPi5YuNLtHyKLDmsb2yQ== +-----END EC PRIVATE KEY----- diff --git a/layout-server/src/main/resources/certs/rootCA.crt b/layout-server/src/main/resources/certs/rootCA.crt new file mode 100644 index 000000000..dcda98ea8 --- /dev/null +++ b/layout-server/src/main/resources/certs/rootCA.crt @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIBvzCCAWUCFCrzpbdpDIOqJoxIeXKbpKPb3gQLMAoGCCqGSM49BAMCMGIxCzAJ +BgNVBAYTAlVLMQ4wDAYDVQQKDAVGSU5PUzEMMAoGA1UECwwDVnV1MRYwFAYDVQQD +DA12dXUuZmlub3Mub3JnMR0wGwYJKoZIhvcNAQkBFg5oZWxwQGZpbm9zLm9yZzAe +Fw0yMzEyMDcxMzA4NDhaFw0yNDEyMDYxMzA4NDhaMGIxCzAJBgNVBAYTAlVLMQ4w +DAYDVQQKDAVGSU5PUzEMMAoGA1UECwwDVnV1MRYwFAYDVQQDDA12dXUuZmlub3Mu +b3JnMR0wGwYJKoZIhvcNAQkBFg5oZWxwQGZpbm9zLm9yZzBZMBMGByqGSM49AgEG +CCqGSM49AwEHA0IABOARq+B4mukOkmIvZFAhvE7ymDsbRMONpwa9qK0x4/Xp2HNg +r1cIeW4d5OLXMNOE4plxkGT3nvVkUr0GEgspElIwCgYIKoZIzj0EAwIDSAAwRQIh +AJbmrjy4+lSlLfdWw7daLRZzi6hvLg2+dNZA5aNSDMIZAiBeGi/pLKcYtNahlT6/ +k01bPqcFvC/iGC6HmnmlDG0y/w== +-----END CERTIFICATE----- diff --git a/layout-server/src/main/resources/certs/rootCA.csr b/layout-server/src/main/resources/certs/rootCA.csr new file mode 100644 index 000000000..02373f268 --- /dev/null +++ b/layout-server/src/main/resources/certs/rootCA.csr @@ -0,0 +1,8 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIBHDCBxAIBADBiMQswCQYDVQQGEwJVSzEOMAwGA1UECgwFRklOT1MxDDAKBgNV +BAsMA1Z1dTEWMBQGA1UEAwwNdnV1LmZpbm9zLm9yZzEdMBsGCSqGSIb3DQEJARYO +aGVscEBmaW5vcy5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATgEavgeJrp +DpJiL2RQIbxO8pg7G0TDjacGvaitMeP16dhzYK9XCHluHeTi1zDThOKZcZBk9571 +ZFK9BhILKRJSoAAwCgYIKoZIzj0EAwIDRwAwRAIgKY0il5E6wWj/nVlBa6NPsppT +V+SFZ6jAPbk0DlRkX+ACIFP3u5ve5TFd82GJ5/eqa92y9hGrIRMxvza5BAcQI27v +-----END CERTIFICATE REQUEST----- diff --git a/layout-server/src/main/resources/certs/rootCA.key b/layout-server/src/main/resources/certs/rootCA.key new file mode 100644 index 000000000..e42dece06 --- /dev/null +++ b/layout-server/src/main/resources/certs/rootCA.key @@ -0,0 +1,8 @@ +-----BEGIN EC PARAMETERS----- +BggqhkjOPQMBBw== +-----END EC PARAMETERS----- +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEIE1fbyWbvV9zt6hPZzO1+tttzeo9AMJbfz9CKaV2HLE1oAoGCCqGSM49 +AwEHoUQDQgAE4BGr4Hia6Q6SYi9kUCG8TvKYOxtEw42nBr2orTHj9enYc2CvVwh5 +bh3k4tcw04TimXGQZPee9WRSvQYSCykSUg== +-----END EC PRIVATE KEY----- diff --git a/layout-server/src/main/resources/certs/rootCA.srl b/layout-server/src/main/resources/certs/rootCA.srl new file mode 100644 index 000000000..1373155b7 --- /dev/null +++ b/layout-server/src/main/resources/certs/rootCA.srl @@ -0,0 +1 @@ +5CFCF09E29AE239F07ED4A94CA543611F0CEC922 From 82e650cf402eb76e79629ad4618787d67ec89daf Mon Sep 17 00:00:00 2001 From: Cara Fisher Date: Thu, 7 Dec 2023 15:27:27 +0000 Subject: [PATCH 2/5] SLVUU-79: Configure layout server to use SSL --- layout-server/src/main/resources/application.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/layout-server/src/main/resources/application.properties b/layout-server/src/main/resources/application.properties index afee88372..a49baf888 100644 --- a/layout-server/src/main/resources/application.properties +++ b/layout-server/src/main/resources/application.properties @@ -1,6 +1,13 @@ server.port=8081 server.servlet.contextPath=/api springdoc.swagger-ui.path=/swagger +# SSL +server.ssl.enabled=true +server.ssl.key-store-type=JKS +server.ssl.key-store=classpath:certs/layout-server-keystore.jks +server.ssl.key-store-password=password +server.ssl.key-alias=layout-server +# Database spring.datasource.url=jdbc:h2:mem:layoutdb;NON_KEYWORDS=GROUP,USER spring.datasource.driverClassName=org.h2.Driver spring.datasource.username=sa From 5254fd5f5339d3740131caf3dd358efd73590a64 Mon Sep 17 00:00:00 2001 From: Cara Fisher Date: Thu, 7 Dec 2023 15:27:49 +0000 Subject: [PATCH 3/5] SLVUU-79: Configure client to access layout server via HTTPs --- vuu-ui/scripts/esbuild.mjs | 4 ++-- vuu-ui/showcase/vite.config.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vuu-ui/scripts/esbuild.mjs b/vuu-ui/scripts/esbuild.mjs index 39ab88b92..639124967 100644 --- a/vuu-ui/scripts/esbuild.mjs +++ b/vuu-ui/scripts/esbuild.mjs @@ -25,8 +25,8 @@ export async function build(config) { define: { "process.env.NODE_ENV": `"${env}"`, "process.env.NODE_DEBUG": `false`, - "process.env.LOCAL": `true`, - "process.env.LAYOUT_BASE_URL": `"http://127.0.0.1:8081/api"`, + "process.env.LOCAL": `false`, + "process.env.LAYOUT_BASE_URL": `"https://localhost:8081/api"`, }, external, footer, diff --git a/vuu-ui/showcase/vite.config.js b/vuu-ui/showcase/vite.config.js index a54edf443..48ed1192b 100644 --- a/vuu-ui/showcase/vite.config.js +++ b/vuu-ui/showcase/vite.config.js @@ -8,8 +8,8 @@ export default defineConfig({ }, define: { "process.env.NODE_DEBUG": false, - "process.env.LOCAL": true, - "process.env.LAYOUT_BASE_URL": `"http://127.0.0.1:8081/api"`, + "process.env.LOCAL": false, + "process.env.LAYOUT_BASE_URL": `"https://localhost:8081/api"`, }, esbuild: { jsx: `automatic`, From 2e540ab3869df5f2f72ffbb2c93d8866914a28d9 Mon Sep 17 00:00:00 2001 From: Cara Fisher Date: Mon, 11 Dec 2023 14:17:38 +0000 Subject: [PATCH 4/5] SLVUU-79: Use mkcert certificates instead --- .../src/main/resources/application.properties | 6 +++--- .../certs/layout-server-keystore.jks | Bin 1406 -> 0 bytes .../certs/layout-server-keystore.pfx | Bin 1824 -> 0 bytes .../main/resources/certs/layout-server.conf | 17 ---------------- .../resources/certs/layout-server.conf.bak | 19 ------------------ .../main/resources/certs/layout-server.crt | 16 --------------- .../main/resources/certs/layout-server.csr | 10 --------- .../main/resources/certs/layout-server.key | 8 -------- .../src/main/resources/certs/localhost.p12 | Bin 0 -> 4343 bytes .../src/main/resources/certs/rootCA.crt | 12 ----------- .../src/main/resources/certs/rootCA.csr | 8 -------- .../src/main/resources/certs/rootCA.key | 8 -------- .../src/main/resources/certs/rootCA.srl | 1 - 13 files changed, 3 insertions(+), 102 deletions(-) delete mode 100644 layout-server/src/main/resources/certs/layout-server-keystore.jks delete mode 100644 layout-server/src/main/resources/certs/layout-server-keystore.pfx delete mode 100644 layout-server/src/main/resources/certs/layout-server.conf delete mode 100644 layout-server/src/main/resources/certs/layout-server.conf.bak delete mode 100644 layout-server/src/main/resources/certs/layout-server.crt delete mode 100644 layout-server/src/main/resources/certs/layout-server.csr delete mode 100644 layout-server/src/main/resources/certs/layout-server.key create mode 100644 layout-server/src/main/resources/certs/localhost.p12 delete mode 100644 layout-server/src/main/resources/certs/rootCA.crt delete mode 100644 layout-server/src/main/resources/certs/rootCA.csr delete mode 100644 layout-server/src/main/resources/certs/rootCA.key delete mode 100644 layout-server/src/main/resources/certs/rootCA.srl diff --git a/layout-server/src/main/resources/application.properties b/layout-server/src/main/resources/application.properties index a49baf888..44c7c8130 100644 --- a/layout-server/src/main/resources/application.properties +++ b/layout-server/src/main/resources/application.properties @@ -3,10 +3,10 @@ server.servlet.contextPath=/api springdoc.swagger-ui.path=/swagger # SSL server.ssl.enabled=true -server.ssl.key-store-type=JKS -server.ssl.key-store=classpath:certs/layout-server-keystore.jks +server.ssl.key-store-type=PKCS12 +server.ssl.key-store=classpath:certs/localhost.p12 server.ssl.key-store-password=password -server.ssl.key-alias=layout-server +server.ssl.key-alias=1 # Database spring.datasource.url=jdbc:h2:mem:layoutdb;NON_KEYWORDS=GROUP,USER spring.datasource.driverClassName=org.h2.Driver diff --git a/layout-server/src/main/resources/certs/layout-server-keystore.jks b/layout-server/src/main/resources/certs/layout-server-keystore.jks deleted file mode 100644 index 2ff48ecfbc631d7e99fd28d3ee4eb1f03ccbf36d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1406 zcmezO_TO6u1_mY|W&~s2oW#of(h}X`)S|M~BA{rG%Od#(pwuyg#={0YY+TxGj4X^= zOoEJzERCB^-(L24!s)g4=_Y>R>IJJ=4&)>=^!zrxVN&9)>ha}**3yUWZjYvz#N|&a z_v|eEy>rHgE0O;mb2#4RSuXc|>Yk`2`7>|WiA-bN*L^7{{oCvfttZsfHj00Xd}KUz z{?+FTe;UM<%<42hrk<<2v54DuyT0tJ^$+c4T@&8X`$FiZj9ieEgA239K94;PKH%~wRU_&0DVj!QJhdHdY)KJVo1jJ+J;VmmI)l19F z%P-c;FG@F*HIQcG1RB})otKf5QH(DmHK)JfE7Xl#6!4F7NnVvMT|v+@BiswPkXm1ed-$@=xkUhFY;yL4}-=Iki0TW zV}n86!n7qR^oX1$5v|Wlw`cM+uTtyrs4SYjWby5LEZoRRgxQ0^z?DfM=!)5#yXs5K zly>=xUwF5HPa%uLHO)jmO)7td)Uw(c$C(rv+FnN9SkI?2pJ#qW`sy7=b>1|G?rbl< zU$Hq)$ diff --git a/layout-server/src/main/resources/certs/layout-server-keystore.pfx b/layout-server/src/main/resources/certs/layout-server-keystore.pfx deleted file mode 100644 index 59a63dc3337654ec4861c98dda9f92d03867685f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1824 zcmai#dpHvcAIFVt43oqpgisN)(IHYcw{{%4lrfj%R=JJb@0V;uA>+7T!pkxW5e~C4 zFNJonBiBQuRI6i$HRNu`dEWP_KhGb(=l6WS-#>oO^Zn!VLlA`(1OY+_BKQ>;qM3$C z+k^sy0aZkBKadD!9NIJl5ft`40#^}1Hx4ZiL4d&F!hKHw2&ZoX1VvaOG`>r5gaS~+ z#```V+i5x~C@3O;5C@C=@0uV4B!Ex^Lp;+kfLlU9fF@A#gHNPl-`!D3)0B%1vkAd{ z$wVNx{VjY!IL@&26ZH$)NR1gXR-xA(?%4O=`MUmAxeWmBG!I(_74U|z_iu|{4D4x} zZrCnChRAX$7I_~cgDhwm`PYNE;zi6ruf}p0l#^O85kl~qu)X3NuzTA7*z)+FoC$K9 z25AmC=?r-m7Qs{ffr;85_ML``EVC{r(EySuYa1-5S>?(G_7aJg@)PX>R(mge6=*&c$`psRQ-dI+G zy40k}9{*+EeJOaii-z#sOSaEBM$;2R#94g6LY}fs%@heQ^emQ2Nxo`UqP(X=G6>V- zujhE#Ol%@5J1pcl6_dW!PL_MeC<;1A8O zYM&|6hBNvHf*+sqD5mkFbQ$B`%}nK(H*zD3gS$4qIRcB)1{ht;2ziJ?dH}r8g`G@M z&P1hdFnt%&%}F%3YTEi{ctpx=i<0K3cuNIzZ}>^zyky+gNVowSEx71b-NAnGTR7mc zJpW)`+R3MP!#ap!46(+vDIAGSpT=2QX1W>Gir;`|$DbtlR`uxJ`bePT%%l#A4U0J| zjjk#6*4-DjtpK-uU+4U?b*+NZw^FR~DF$;xVt0EG%|*JMbp6jkozAI2zK8qe)|?oF z*-zYoUmuxg(L)BT7`S$+pY}bNe-xIf%s(~kI&CL)L_N3QSDQfNsNj5s#_J*eT8m_P zq2pzVCRw_jvG({{l?cp~`gmz>oxtXOX5@(mOlXVG(Af#%>|D z`C4ZEPr}$r>^+Et|Ee^tC`H!f3M|d?E+&$=tQ{KdG8Ub#ky{>lzFS00JxDReq=fH& zq4QCJGT~yJH+r({F4Z-1K-_Q56W5q=l4sk3Fl!VeH}>u9nKkcb@>BAGP0X=3w^$b0 zVLFgUL7$D%9qIMgU?q=w?8C|oL#?3lG}5^ts=0K&HwMq{mkc+8yz)^; zN`5;?bMg3Ez4Zjto9VWjh>Zr>v+2{as^vYFID;ulcjjtvy?*wfkRR9a0cV;?yTh{1 za>DSdWk&DvH!DLTofQ!MOZ};IRA#RU-7GA`Zl9dZ?xrJ<5}`!*>NI}kdu0B(+9>HD7E~!v)Ali>i1(((d(~Xe-!!G zazpCK$x7syirkw)@Q;?pK$zp+B1}^B&tIPRN4}p@r0gpF_1CJ;L5z?>j`oY@!q8$y zL&Z`d(06Vru!k;pp!qWKeH?qOm7I)+^OS;EQ0{pDs-G}P?l{sf=EtkojjHPQA+faL zDo&1y*UT|aVuXZEWF=A^q57>Ihzt@2l=e@QFp_a<$%bVc?Wt=0toBlX1wx<^NCfoT zZxIB51c1tUnoma<89hmR{c`1b>g?kV!;9%1x%MLaE%?jS=fPb3$ E8;yKNuK)l5 diff --git a/layout-server/src/main/resources/certs/layout-server.conf b/layout-server/src/main/resources/certs/layout-server.conf deleted file mode 100644 index 2ab79d26e..000000000 --- a/layout-server/src/main/resources/certs/layout-server.conf +++ /dev/null @@ -1,17 +0,0 @@ -[ req ] -default_bits = 2048 -distinguished_name = req_distinguished_name -req_extensions = req_ext -prompt = no -[ req_distinguished_name ] -countryName = GB -organizationName = Layout Server -organizationalUnitName = local -commonName = localhost -[ req_ext ] -subjectAltName = @alt_names -[alt_names] -DNS.2 = 127.0.0.1 -DNS.3 = localhost -DNS.5 = IP:127.0.0.1 -DNS.6 = IP:localhost \ No newline at end of file diff --git a/layout-server/src/main/resources/certs/layout-server.conf.bak b/layout-server/src/main/resources/certs/layout-server.conf.bak deleted file mode 100644 index a1fddf93b..000000000 --- a/layout-server/src/main/resources/certs/layout-server.conf.bak +++ /dev/null @@ -1,19 +0,0 @@ -[ req ] -default_bits = 2048 -distinguished_name = req_distinguished_name -req_extensions = req_ext -prompt = no -[ req_distinguished_name ] -countryName = GB -organizationName = Layout Server -organizationalUnitName = local -commonName = vuu.server.local -[ req_ext ] -subjectAltName = @alt_names -[alt_names] -DNS.1 = vuu.server.local -DNS.2 = 127.0.0.1 -DNS.3 = localhost -DNS.4 = IP:vuu.server.local -DNS.5 = IP:127.0.0.1 -DNS.6 = IP:localhost \ No newline at end of file diff --git a/layout-server/src/main/resources/certs/layout-server.crt b/layout-server/src/main/resources/certs/layout-server.crt deleted file mode 100644 index 95242d95a..000000000 --- a/layout-server/src/main/resources/certs/layout-server.crt +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICmDCCAj6gAwIBAgIUXPzwnimuI58H7UqUylQ2EfDOySIwCgYIKoZIzj0EAwIw -YjELMAkGA1UEBhMCVUsxDjAMBgNVBAoMBUZJTk9TMQwwCgYDVQQLDANWdXUxFjAU -BgNVBAMMDXZ1dS5maW5vcy5vcmcxHTAbBgkqhkiG9w0BCQEWDmhlbHBAZmlub3Mu -b3JnMB4XDTIzMTIwNzE0MTUwMloXDTI0MTIwNjE0MTUwMlowSTELMAkGA1UEBhMC -R0IxFjAUBgNVBAoMDUxheW91dCBTZXJ2ZXIxDjAMBgNVBAsMBWxvY2FsMRIwEAYD -VQQDDAlsb2NhbGhvc3QwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATNlGLADRLX -Jdx6c+PV8yLUnY/h5iv2jsb8ccRUXUmEl2EBjPlnMGI4eaRB+uRUa19xMI+Lli40 -u0fIosOaxvbJo4HqMIHnMDsGA1UdEQQ0MDKCCTEyNy4wLjAuMYIJbG9jYWxob3N0 -ggxJUDoxMjcuMC4wLjGCDElQOmxvY2FsaG9zdDAdBgNVHQ4EFgQUDv/LU0k/RpSO -J7HgLLChHxT0kfgwgYgGA1UdIwSBgDB+oWakZDBiMQswCQYDVQQGEwJVSzEOMAwG -A1UECgwFRklOT1MxDDAKBgNVBAsMA1Z1dTEWMBQGA1UEAwwNdnV1LmZpbm9zLm9y -ZzEdMBsGCSqGSIb3DQEJARYOaGVscEBmaW5vcy5vcmeCFCrzpbdpDIOqJoxIeXKb -pKPb3gQLMAoGCCqGSM49BAMCA0gAMEUCIFLUNpzdJ6Q2IrpPF9DusA4gaghFZjQf -ZhpvqBqmfZjHAiEAhulZ2K8OJJ8Mn3hnq7jFLOyDVbmHc99+tyqb63gbiT0= ------END CERTIFICATE----- diff --git a/layout-server/src/main/resources/certs/layout-server.csr b/layout-server/src/main/resources/certs/layout-server.csr deleted file mode 100644 index c28e27cb7..000000000 --- a/layout-server/src/main/resources/certs/layout-server.csr +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIBUTCB+QIBADBJMQswCQYDVQQGEwJHQjEWMBQGA1UECgwNTGF5b3V0IFNlcnZl -cjEOMAwGA1UECwwFbG9jYWwxEjAQBgNVBAMMCWxvY2FsaG9zdDBZMBMGByqGSM49 -AgEGCCqGSM49AwEHA0IABM2UYsANEtcl3Hpz49XzItSdj+HmK/aOxvxxxFRdSYSX -YQGM+WcwYjh5pEH65FRrX3Ewj4uWLjS7R8iiw5rG9smgTjBMBgkqhkiG9w0BCQ4x -PzA9MDsGA1UdEQQ0MDKCCTEyNy4wLjAuMYIJbG9jYWxob3N0ggxJUDoxMjcuMC4w -LjGCDElQOmxvY2FsaG9zdDAKBggqhkjOPQQDAgNHADBEAiBq+AWf2aiEBWxpfVxe -beAjVE37i+V7G2QCPpReKXLuMQIgHsf9i1u5JIcNllJjcBJj8ZQLhXw/iEuLYO7R -ATGiQY0= ------END CERTIFICATE REQUEST----- diff --git a/layout-server/src/main/resources/certs/layout-server.key b/layout-server/src/main/resources/certs/layout-server.key deleted file mode 100644 index b7007fdba..000000000 --- a/layout-server/src/main/resources/certs/layout-server.key +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN EC PARAMETERS----- -BggqhkjOPQMBBw== ------END EC PARAMETERS----- ------BEGIN EC PRIVATE KEY----- -MHcCAQEEINxy9ruNMu6a38RChB5rfaukMZ5Ks8QR+vR9YRzsMbi+oAoGCCqGSM49 -AwEHoUQDQgAEzZRiwA0S1yXcenPj1fMi1J2P4eYr9o7G/HHEVF1JhJdhAYz5ZzBi -OHmkQfrkVGtfcTCPi5YuNLtHyKLDmsb2yQ== ------END EC PRIVATE KEY----- diff --git a/layout-server/src/main/resources/certs/localhost.p12 b/layout-server/src/main/resources/certs/localhost.p12 new file mode 100644 index 0000000000000000000000000000000000000000..be783c86016585a57d79a6c63f2cef6a3ab2d72a GIT binary patch literal 4343 zcmY+EbyO38*Zvud7%<9#fpm!E7%h!7(u|Oj2Bkwlx*LXwl)y$xcehB1!UXBjFmfPW zg0JWNe((2t-aqcS=YF31-2d(a4W~N62M|ERsj7)U+|jDh7hnJ}02xk|4-BWu`G+&0 z;ezF4S}JzYla1i`1nt#@Bz$Faw3xdcM%^%hzDgL0=1=tY)0o*_;CY8LR zWf`5(33m^vPD1EIU^ozs$coQ`JX;ljEeDVN%xtg`eWNtH5EbQAtZ;hny4bax!L`O; zK&F^sG2@!!ThG~Vay23*%Jyf=vo7g!H0HZORY?am!4oyQoIfHf2sz_@E{l_WP1?A>EFnjBK$c3!6*|O&A{?@4yjkCmzZ)GS4;G$g65aW#eEXXi=Do)?xITs(b3A>l44` zf*NHU;=?S)T!2%`k8As4f0r})2-5tqV`O)1fc$gXjwO6$qOVgvU8>Ko$D(HuuEZl; z=1y|#^9`IZKHU*WYz@#KMXf&l{imY)#-&Kw0GcqX7=|f{Nair$bzh+}<7DLao|oMz z&X(7{X7V&t#Yy2m#?b4YO1Wrla@N1ab746uGGfZ@Y;4VNv5j$}3_BkS2 zYOzdwa2|8RT^^REa2Kv52xqnZ0{l8uzvS`EY((W^Kxgo#IafVrqulft(5eNw8715y z;g92~_vC5nChBhrqV|NrjMA&E*XW0;giXxb4Q`{AX%;KW{}-rA^=hCMl;j7F6wO3NLAQm)06L zw92cE?1S^^K*!tY(cVe?xHZJZFAacjg9 z?q65Q3I+4rAf?U)FSwLV3)sgY9;V_hYFRHQC#<<8no_5{^JA6_gN`)PQIpv|pRa%U zf2j?#8U79xRh<4>u^)AH_OY+wO9SQNPVi@CX{ho$dZcap2Ja9GtGp*r)pF^0+}JTK zX={`$0x8Hu6|UN^R*j}qbcTymnP_P`F23;5N*6q@+lpb2NU)2{&%mTlsQyik)j|T! z6|{o$O(gU*4$AjLK&8Z->=!Btu_oHW>**q-8Wrc?-QR%-?UO6Ye%BqG^f0-belK^> ziDXw|HPWHNJ9>>;O9+bF5$_+Yl21vg{E#~ACxEn7AhD}QMCWLs;}?xw1~iU@w**C@ z)c=V~5JV8jh>s@-W%)0n6@&n344ho-m<7e4FsO)-gdkL0NE8}Qy7!+YVj^TXDdr!V z#RuU1Yd`<10H9n%r2m`Q03zrkAS49A%L4;uUmw>U->|xSs^qCP&*S5h;Dv^hW~O+? zZ1Dp;4|F5ESXtj-Z_+s0At8O&Z0~oMEGuEH3ziPip|eK&g0hoym9E)b86#1M6X{Y+ zY_2hj0MF0C0qT?TX{ldV*jSCwg<3?L){L-=nW4WbKgud1W>l^E-qY4a@Kq6F4wn@Q@>`l zedu5u+s$}~g{(FXd}whp0SDK;FYprTYTvwwe}tnRjXvqm_{A}oV-}!ciZ*i-rr)G$ zHib`jTXG=Z-NpU6ySa+4fpsh>R-Sy>xUPOBkHzZlG3Cuo-Z^0%+TuIy!# z)us3Ot4(jaV0@pkhiQi~FY7g_YIWs^I@R;onf7+AR!=u7F>exnH@Pr9+@^LydOzF) z7>2Y17QL!!Nv-f&_`t4yLbz)kL9s=V=~fS#5@G^0?#JJ%wK~AfCv9C=*J^N%+noCJ zikF_7eX*qj^S4FER6?$GAGD@GPg|C^p{bB3*dbExi+M=h1Q*awz6S8TJh*Fo%pAu@ z`Sqc9?RU+`Hdl{d&IWQDed<6551*{gZISn+o9eh#Y}p3oP`>FogTCE%f7_fjz%_n6Jsxz%f| ztT>7P`rO8J?TbOhnv;Uv$<$SEhJ**M+@qrrIs*Y@7N$;=>|dD{E8s0htPr!`4Q9<1Km;Q)#bpzgsj{k*!y6_q4iEW-|J zZ{AARSHMpwqO@b~0lVTF^-W{+2z`A`EBUN^g*m2wAylYj7qdSG}s z?0NvQTpDjNCy-8c+bJ~{<>*XOtBzZwsEG!r+@EaP+a}cZA&;$nvY@JtL6O`yMoZEU zd^mXsNBV;NUtwyzs`h*(L0*Ft%7b9)d9kh#i@TLdrLDyQ#h6m&BJF;I`JDQGfJg-K z_jK-EIxobon@}LQ|5|j~zr8(64JjEE%BY`9S9vl(k_!?$dr^8Ds_9|URIiuRp0w6& zAw*jAI9kDMhPE-VJaEdm?RlfL=LF}}$IA2i1-K?zYyS2{9$8Y7ZF!6;Wden)G{K66 zvG>j^`KpVspQr8p=;bCV5$gmsE0g@qmY#X|WbE%e?dfIs)=bK4# z8-MR3TRZ43_;9&cnHnVbixT^%;P)R(1n)M0W?CQ@Jw)Z04X>=EjHpfJ2a~WZPFGf4(6>N`Q`V0&Gbsm?&64RhiG`3q6|n zxkKQ5=kV~_e1&rg^djwP?4)N?+V-r4KZwF5Ex3^~K6c7c{P#wCPDcOZBsmJT`%$q& zW|XRZQag6I8c6A{TUaNOSch<3xKZYGHzX;i*Ij><7Ecjju`Mi2p_g5k(QTbWI`c;C zW;wmu1HB#W4^nQ0>%YQwyiiVu7jn!85V2-?Z5)F(nLh^v>RV^VF$}j9n5yHR>?e;+n~h9;-6c3{WKcSdoo388mhLH z!UWZNdhL>XzfTGL)U`{E?&>BbkuW%QeW#8>X6Al7dQMsN^hW^WC7`tUc3n!mnfu1}&sQnYbXVTB9|QFfgMsdJ@~oo@_Z+}!Ma=J8&l-v}$=OXA@I=j7Kzq)=C`a>+2s4G=E36)u z)ZJ{79@T3do;M{H>C09}5Kwk-=f1P`6reS5SoABQAWX3WP=Rn^o?2eeN={Q#gMV84 zW73izBu8n|Ks-Eu2;(VhMq00Ai#gq(>G!Z4>v9;f@rn{sMuw;qpI+$aRR|X}Zdf$o zrIpHD*jZ!M%PSE3_tZX-SH}|mujiH!BBniHvGF{iRojJ4VoqOe~ks(HehmJK=4EhIT&n zgoik?GN9ij%KhNem%naoexFd|NV1Xf5bV9?T%grrlvG_d5yPK@YGb!tcSGwSZhaf1 zNt53B+7)zbu8O4&zqebS%%~^}qVqg5MByGen2T{my`*x6q} z!lDry&4J=A*nkp6DT(DAPySpjg}Kt-5cbh2M`hox8N4JKPP}JTFo+G?i~UkJbvq0R z96936R2POAYUd`()xBk0+2I{gB0670!+W3Ly^ckCTB%iq>GmXrWp=Bzb`~b?Q=@O4 z+JofF?l_sPSucKK3#C>C3UG~`FVwEI$c;!H{rjd}_0E?3s%2OBjqx3JTC#huoDEC+ zh|X@=-rF&R?J3h0Re3Xc%PHz`{AE=nP^q5&+o0cSDL!~pQ}h*``AD{}VowQ{G@>>> z@}gQTppz_}(vsI&flM+&Nl_Rd0nK^VY3sA7&K5Vi%r3XbU@^aB8J8&FI>jqyb+Px!k8cEsC-z!BUR?txRvWSR6M9kkM>P zDcQaFZEFB3d>bM-$SfnJ^~8baD1`D^c_9WqYjf1auW_W%TS!&#={rlh)Ni~B&E-tR zvz(rIzWK6sV`3fyJUYo9$D>a?DV+J1oZ#zDgt^Q8?Dl}n>XC(hA9Crx;$$;M&blja zn4wZo7AS~_kcWZ*{}CY`5aKT`dGFGC?kCz~!=1j4ZuO~+w>S`j&SIk5N?Rw<-om;W PbnMz&ifHHJ0|5U6Iz31e literal 0 HcmV?d00001 diff --git a/layout-server/src/main/resources/certs/rootCA.crt b/layout-server/src/main/resources/certs/rootCA.crt deleted file mode 100644 index dcda98ea8..000000000 --- a/layout-server/src/main/resources/certs/rootCA.crt +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBvzCCAWUCFCrzpbdpDIOqJoxIeXKbpKPb3gQLMAoGCCqGSM49BAMCMGIxCzAJ -BgNVBAYTAlVLMQ4wDAYDVQQKDAVGSU5PUzEMMAoGA1UECwwDVnV1MRYwFAYDVQQD -DA12dXUuZmlub3Mub3JnMR0wGwYJKoZIhvcNAQkBFg5oZWxwQGZpbm9zLm9yZzAe -Fw0yMzEyMDcxMzA4NDhaFw0yNDEyMDYxMzA4NDhaMGIxCzAJBgNVBAYTAlVLMQ4w -DAYDVQQKDAVGSU5PUzEMMAoGA1UECwwDVnV1MRYwFAYDVQQDDA12dXUuZmlub3Mu -b3JnMR0wGwYJKoZIhvcNAQkBFg5oZWxwQGZpbm9zLm9yZzBZMBMGByqGSM49AgEG -CCqGSM49AwEHA0IABOARq+B4mukOkmIvZFAhvE7ymDsbRMONpwa9qK0x4/Xp2HNg -r1cIeW4d5OLXMNOE4plxkGT3nvVkUr0GEgspElIwCgYIKoZIzj0EAwIDSAAwRQIh -AJbmrjy4+lSlLfdWw7daLRZzi6hvLg2+dNZA5aNSDMIZAiBeGi/pLKcYtNahlT6/ -k01bPqcFvC/iGC6HmnmlDG0y/w== ------END CERTIFICATE----- diff --git a/layout-server/src/main/resources/certs/rootCA.csr b/layout-server/src/main/resources/certs/rootCA.csr deleted file mode 100644 index 02373f268..000000000 --- a/layout-server/src/main/resources/certs/rootCA.csr +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIBHDCBxAIBADBiMQswCQYDVQQGEwJVSzEOMAwGA1UECgwFRklOT1MxDDAKBgNV -BAsMA1Z1dTEWMBQGA1UEAwwNdnV1LmZpbm9zLm9yZzEdMBsGCSqGSIb3DQEJARYO -aGVscEBmaW5vcy5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATgEavgeJrp -DpJiL2RQIbxO8pg7G0TDjacGvaitMeP16dhzYK9XCHluHeTi1zDThOKZcZBk9571 -ZFK9BhILKRJSoAAwCgYIKoZIzj0EAwIDRwAwRAIgKY0il5E6wWj/nVlBa6NPsppT -V+SFZ6jAPbk0DlRkX+ACIFP3u5ve5TFd82GJ5/eqa92y9hGrIRMxvza5BAcQI27v ------END CERTIFICATE REQUEST----- diff --git a/layout-server/src/main/resources/certs/rootCA.key b/layout-server/src/main/resources/certs/rootCA.key deleted file mode 100644 index e42dece06..000000000 --- a/layout-server/src/main/resources/certs/rootCA.key +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN EC PARAMETERS----- -BggqhkjOPQMBBw== ------END EC PARAMETERS----- ------BEGIN EC PRIVATE KEY----- -MHcCAQEEIE1fbyWbvV9zt6hPZzO1+tttzeo9AMJbfz9CKaV2HLE1oAoGCCqGSM49 -AwEHoUQDQgAE4BGr4Hia6Q6SYi9kUCG8TvKYOxtEw42nBr2orTHj9enYc2CvVwh5 -bh3k4tcw04TimXGQZPee9WRSvQYSCykSUg== ------END EC PRIVATE KEY----- diff --git a/layout-server/src/main/resources/certs/rootCA.srl b/layout-server/src/main/resources/certs/rootCA.srl deleted file mode 100644 index 1373155b7..000000000 --- a/layout-server/src/main/resources/certs/rootCA.srl +++ /dev/null @@ -1 +0,0 @@ -5CFCF09E29AE239F07ED4A94CA543611F0CEC922 From f4e1cc409c4a5f24877221f3072038e5d7778ce0 Mon Sep 17 00:00:00 2001 From: Cara Fisher Date: Mon, 11 Dec 2023 14:17:57 +0000 Subject: [PATCH 5/5] SLVUU-79: Automatically redirect HTTP to HTTPS --- layout-server/pom.xml | 4 ++++ .../layoutserver/{ => config}/CorsConfig.java | 2 +- .../layoutserver/config/SecurityConfig.java | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) rename layout-server/src/main/java/org/finos/vuu/layoutserver/{ => config}/CorsConfig.java (94%) create mode 100644 layout-server/src/main/java/org/finos/vuu/layoutserver/config/SecurityConfig.java diff --git a/layout-server/pom.xml b/layout-server/pom.xml index 9ae3cf8e5..c4d32d48b 100644 --- a/layout-server/pom.xml +++ b/layout-server/pom.xml @@ -39,6 +39,10 @@ org.springframework.boot spring-boot-starter-data-jpa + + org.springframework.boot + spring-boot-starter-security + com.h2database h2 diff --git a/layout-server/src/main/java/org/finos/vuu/layoutserver/CorsConfig.java b/layout-server/src/main/java/org/finos/vuu/layoutserver/config/CorsConfig.java similarity index 94% rename from layout-server/src/main/java/org/finos/vuu/layoutserver/CorsConfig.java rename to layout-server/src/main/java/org/finos/vuu/layoutserver/config/CorsConfig.java index 5637db23f..547dd4054 100644 --- a/layout-server/src/main/java/org/finos/vuu/layoutserver/CorsConfig.java +++ b/layout-server/src/main/java/org/finos/vuu/layoutserver/config/CorsConfig.java @@ -1,4 +1,4 @@ -package org.finos.vuu.layoutserver; +package org.finos.vuu.layoutserver.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; diff --git a/layout-server/src/main/java/org/finos/vuu/layoutserver/config/SecurityConfig.java b/layout-server/src/main/java/org/finos/vuu/layoutserver/config/SecurityConfig.java new file mode 100644 index 000000000..8c27e53cf --- /dev/null +++ b/layout-server/src/main/java/org/finos/vuu/layoutserver/config/SecurityConfig.java @@ -0,0 +1,19 @@ +package org.finos.vuu.layoutserver.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.web.SecurityFilterChain; + +@Configuration +@EnableWebSecurity +public class SecurityConfig { + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.requiresChannel().anyRequest().requiresSecure(); + return http.build(); + } + +}