From e69e424aa205dce56cebda5babce30fe260b10f8 Mon Sep 17 00:00:00 2001
From: "r.bogacki" <r.bogacki@samsung.com>
Date: Tue, 1 Oct 2019 08:58:51 +0200
Subject: [PATCH] Enabled HTTPS for sdc-workflow-designer

-Enabled HTTPS for frontend and backend
-Updated paths and passwords for a certificates

Issue-ID: SDC-2479
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
Change-Id: Ibccdae478c047aac1a69192e3c257ea31dc39cac
---
 workflow-designer-be/pom.xml                       |   2 +-
 .../src/main/resources/application-dev.properties  |  14 ++++++-------
 .../src/main/resources/application.properties      |   8 +++----
 .../src/main/resources/assembly.xml                |  23 +++++++++++++++++++++
 .../src/main/resources/org.onap.sdc.p12            | Bin 4051 -> 0 bytes
 workflow-designer-init/src/main/docker/Dockerfile  |   2 +-
 workflow-designer-ui/docker/Dockerfile             |   6 ++++--
 workflow-designer-ui/docker/org.onap.sdc.p12       | Bin 0 -> 4459 bytes
 workflow-designer-ui/docker/org.onap.sdc.trust.jks | Bin 0 -> 1413 bytes
 workflow-designer-ui/docker/startup.sh             |  10 ++++++---
 10 files changed, 47 insertions(+), 18 deletions(-)
 create mode 100644 workflow-designer-be/src/main/resources/assembly.xml
 delete mode 100644 workflow-designer-be/src/main/resources/org.onap.sdc.p12
 create mode 100644 workflow-designer-ui/docker/org.onap.sdc.p12
 create mode 100644 workflow-designer-ui/docker/org.onap.sdc.trust.jks

diff --git a/workflow-designer-be/pom.xml b/workflow-designer-be/pom.xml
index d617b072..40b7074f 100644
--- a/workflow-designer-be/pom.xml
+++ b/workflow-designer-be/pom.xml
@@ -188,8 +188,8 @@
                                         <from>openjdk:8-jdk-alpine</from>
                                         <user>root</user>
                                         <assembly>
-                                            <descriptorRef>artifact</descriptorRef>
                                             <targetDir>/</targetDir>
+                                            <descriptor>${project.basedir}/src/main/resources/assembly.xml</descriptor>
                                         </assembly>
                                         <entryPoint>
                                             java ${JAVA_OPTIONS} -jar /${project.build.finalName}.jar
diff --git a/workflow-designer-be/src/main/resources/application-dev.properties b/workflow-designer-be/src/main/resources/application-dev.properties
index 98eda721..2fdd9076 100644
--- a/workflow-designer-be/src/main/resources/application-dev.properties
+++ b/workflow-designer-be/src/main/resources/application-dev.properties
@@ -1,5 +1,5 @@
 #/
-# Copyright © 2016-2018 European Support Limited
+# Copyright � 2016-2018 European Support Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@ server.servlet.context-path=/
 http.port=${HTTP_PORT:8080}
 
 server.port=${SERVER_PORT:8443}
-server.ssl.enabled=${SERVER_SSL_ENABLED:false}
-server.ssl.key-password=${SERVER_SSL_KEY_PASSWORD:}
-server.ssl.key-store=${SERVER_SSL_KEYSTORE_PATH:}
-server.ssl.key-store-type=${SERVER_SSL_KEYSTORE_TYPE:}
+server.ssl.enabled=${SERVER_SSL_ENABLED:true}
+server.ssl.key-password=${SERVER_SSL_KEY_PASSWORD:!ppJ.JvWn0hGh)oVF]([Kv)^}
+server.ssl.key-store=${SERVER_SSL_KEYSTORE_PATH:/etc/server-https-keystore/org.onap.sdc.p12}
+server.ssl.key-store-type=${SERVER_SSL_KEYSTORE_TYPE:PKCS12}
 
-sdc.be.protocol=${SDC_PROTOCOL:}
+sdc.be.protocol=${SDC_PROTOCOL:https}
 sdc.be.endpoint=${SDC_ENDPOINT:}
 sdc.be.external.user=${SDC_USER:}
 sdc.be.external.password=${SDC_PASSWORD:}
@@ -55,4 +55,4 @@ logging.file=${java.io.tmpdir}/application.log
 logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} - %msg%n
 
 # Logging pattern for file
-logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%
\ No newline at end of file
+logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%
diff --git a/workflow-designer-be/src/main/resources/application.properties b/workflow-designer-be/src/main/resources/application.properties
index e7224a75..44b048ac 100644
--- a/workflow-designer-be/src/main/resources/application.properties
+++ b/workflow-designer-be/src/main/resources/application.properties
@@ -18,11 +18,11 @@ http.port=${HTTP_PORT:8080}
 
 server.port=${SERVER_PORT:8443}
 server.ssl.enabled=${SERVER_SSL_ENABLED:true}
-server.ssl.key-password=${SERVER_SSL_KEY_PASSWORD:rTIS;B4kM]2GHcNK2c3B4&Ng}
-server.ssl.key-store=${SERVER_SSL_KEYSTORE_PATH:classpath:org.onap.sdc.p12}
-server.ssl.key-store-type=${SERVER_SSL_KEYSTORE_TYPE:PKCS12}
+server.ssl.key-password=${SERVER_SSL_KEY_PASSWORD:}
+server.ssl.key-store=${SERVER_SSL_KEYSTORE_PATH:}
+server.ssl.key-store-type=${SERVER_SSL_KEYSTORE_TYPE:}
 
-sdc.be.protocol=${SDC_PROTOCOL:https}
+sdc.be.protocol=${SDC_PROTOCOL:}
 sdc.be.endpoint=${SDC_ENDPOINT:}
 sdc.be.external.user=${SDC_USER:}
 sdc.be.external.password=${SDC_PASSWORD:}
diff --git a/workflow-designer-be/src/main/resources/assembly.xml b/workflow-designer-be/src/main/resources/assembly.xml
new file mode 100644
index 00000000..f8b802c4
--- /dev/null
+++ b/workflow-designer-be/src/main/resources/assembly.xml
@@ -0,0 +1,23 @@
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+    <id>sdc-wfd-be-files</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>${project.build.finalName}.jar</include>
+            </includes>
+            <directory>${project.build.directory}</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <includes>
+                <include>org.onap.sdc.p12</include>
+            </includes>
+            <directory>${project.basedir}/../workflow-designer-ui/docker</directory>
+            <outputDirectory>/etc/server-https-keystore</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/workflow-designer-be/src/main/resources/org.onap.sdc.p12 b/workflow-designer-be/src/main/resources/org.onap.sdc.p12
deleted file mode 100644
index ee000dc749f4f59091792e43f6566387f884a4fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4051
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

diff --git a/workflow-designer-init/src/main/docker/Dockerfile b/workflow-designer-init/src/main/docker/Dockerfile
index 399f216c..9db22839 100644
--- a/workflow-designer-init/src/main/docker/Dockerfile
+++ b/workflow-designer-init/src/main/docker/Dockerfile
@@ -6,4 +6,4 @@ COPY create_keyspaces.cql create_tables.cql start.sh ./
 
 RUN chmod 744 start.sh
 
-ENTRYPOINT ["./start.sh"]
\ No newline at end of file
+ENTRYPOINT ["./start.sh"]
diff --git a/workflow-designer-ui/docker/Dockerfile b/workflow-designer-ui/docker/Dockerfile
index 83e8d5ac..2a0ef24c 100644
--- a/workflow-designer-ui/docker/Dockerfile
+++ b/workflow-designer-ui/docker/Dockerfile
@@ -7,10 +7,12 @@ USER root
 
 ARG ARTIFACT
 
+COPY org.onap.sdc.p12 org.onap.sdc.trust.jks /etc/sdc-cert/
+
 ADD ${ARTIFACT} ${JETTY_BASE}/webapps/
-RUN chown -R jetty:jetty ${JETTY_BASE}/webapps
+RUN chown -R jetty:jetty ${JETTY_BASE}/webapps /etc/sdc-cert
 
 COPY startup.sh .
 RUN chmod 744 startup.sh
 
-ENTRYPOINT [ "./startup.sh" ]
\ No newline at end of file
+ENTRYPOINT [ "./startup.sh" ]
diff --git a/workflow-designer-ui/docker/org.onap.sdc.p12 b/workflow-designer-ui/docker/org.onap.sdc.p12
new file mode 100644
index 0000000000000000000000000000000000000000..d03ca1c91df02cdea125b3c0d5bb3852f95bcbe2
GIT binary patch
literal 4459
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
bz7F$MHOl5|w4P~Y2A>1P$x+czLbCq{!E$K2

literal 0
HcmV?d00001

diff --git a/workflow-designer-ui/docker/org.onap.sdc.trust.jks b/workflow-designer-ui/docker/org.onap.sdc.trust.jks
new file mode 100644
index 0000000000000000000000000000000000000000..d07ce1a66b1320df396c75a8dc20ccc75d666822
GIT binary patch
literal 1413
zcmb7DYdF&j9NvEy9k-3tEG9(Ga;X2T)f9~tIW8g1gklv|ZmA>pXY90vCb!(mTswpn
zi@D^!l-sPylTIFtqn?!G5?!Rsq33+)!})SP{GRuD-{1TEp5KS}mCwp&ArJ_3eSq(%
zbe8TD6nd5(<O8lt!CS?RJrIP)ZX#$7fgmU#3vmc!!HkMvPyh;5gcRJL?I@QBd7!F-
zqA|yg^H~)Dlo1fn1djw&6kt@ivI@f4&Dz=)uL>$}a3vME^D%1|yfUb`K@~KhR5x(D
zrYfEU?gfeXy?CM-$x~C6KmrK_{J->nUSmOb{P+%lfWTN#6a-{Jm7pvr0O>F<vs16F
zrDH<2KgwV{#O7YG!?@{tYM&B*U5>4&<2Be(De~xLE7J4iW^YEpEE;B2?UW1Hj4RD)
z%;n50_a@@bFPre@Ivsg!O-+n2^-*`nfdoU(2`2Gp-6xbM3arxb?ul=&cVX*I;fiYM
zP?67||2fKOoVX#U_1fcUzf_qqCEqX0#6!yc<G{WdzCjDh(YuM4pqZZPT+PSL?Blm_
zMio&98HwQ~zAKsUQsFHDdfbuHto#__VV{NWeidvb?sQuxy1U&q`9|EDJ8o<$J#?}0
zfz8!piSFgC!f5Wb&WtsbpK#)(%dp_OUil-d7P0-x&e)6dtjs8D1NsfiY|-XQXX-v}
zQ^ys7xZ~!|1<LPBDjbhaPD7OLgl|1Dezip1Rbq2@e^Bj6`7rI3GtA#{h)9}lTYR-p
z#>)Gw<su4Fkd8rfwj_^!9PAzJ%^?cnCNyZDk@-?WRh;r|B+Zbn+Ery-SrhuQ&VGR8
z4R1yFamnFmx=N+$Z-Oi<%z38e$h;BFBdlPoD5bUD)>9LdWR@)L7Z~?CIBr@w6(EU-
zW>96qJx?aH?5KtPah7Lluih&)7(QnLioAtS`;rcSn@lcnO1Sy{Fw*FH3n)wb(^9HN
zGS*7@P>nvo&q9q_V%qU)_lMf)QSM*j6yFSZ1>8BI4ut^_p!6(A2X)pXsDp%~;al9O
zghhuLsjHwf@>VAfA2a`M_E%7MV{HJ(fav)DHlQ{P8UU~cM}V+(0FfI4YD0jp7liX;
z4A)z+9zy^^*6m?bM;1EOkhKEn7Hy`-d%8DWklWS}#}h*g2zw+;xkIqr2!-GkbtN(~
zL%S$}>Co*X%Fv=E2j&Vg*_7R0+3j;HawGj_y%0w0968_R;?p6s#Y-QmyNYM~c@84~
zoR9axw7e+sR?<N)oo~$GlbuE#yw&Vyci}~0m&dnVj^y6Xzh^@){c7JQuIcc$sVFY+
z(#Y)JSrz}*O4Ma0s|~xzu4`^2={>$KOEqM_a!FAqM-~;9ElQq8#!LtHq++UG@RNBF
z!bjVqlZ>eL)lIDqN5!G~!26zh+o2q!EF$R>@u3#H&hbv+wF?O2*qDO@X0f<a!zkp3
zu}>56TVJzHJ;&h)K|~1sP={N3nmH%CosTLrmd7*M*6v2XycaKrr}4MoLXz31gXhn%
zv}9b}wY%jNXu@M<+!AgqM4C~y7Q{5y5~LGSwEH3&EpU2&m*gGQ5EAxG`OAFC7DvkN
zROr(*2HOHCuNg%^#d6=&2)Vvv*B6OH(Myl)<Hfw0V`C7Vd&LV^d>f`Q3>J29_yBF5
zXBC$B=|r4#^3sEHCvQV((vId^%c$Gk{K+wF_Kew2>2;K#BXSpV<E?hIe%ICUKv%z$
z0c<PD6q&hthD)>9{1Fo?ci>9|Y=h%zr9=_-;b_bi)LZnn*f+fSXD`lUHN!b0+y07W
T18T+c&BKA?ly-jDYJS2$H3(y=

literal 0
HcmV?d00001

diff --git a/workflow-designer-ui/docker/startup.sh b/workflow-designer-ui/docker/startup.sh
index 359e6aca..431a0cda 100644
--- a/workflow-designer-ui/docker/startup.sh
+++ b/workflow-designer-ui/docker/startup.sh
@@ -7,12 +7,16 @@ if [ "$HTTPS_ENABLED" = "true" ]
 then
     echo "enable ssl"
     if [ -z "$KEYSTORE_PATH" ]; then
+
+        keystore_pass="!ppJ.JvWn0hGh)oVF]([Kv)^"
+        truststore_pass="].][xgtze]hBhz*wy]}m#lf*"
+
         java -jar "${JETTY_HOME}/start.jar" --add-to-start=https,ssl \
             jetty.sslContext.keyStorePath=$KEYSTORE_PATH \
-            jetty.sslContext.keyStorePassword=$KEYSTORE_PASSWORD \
+            jetty.sslContext.keyStorePassword=${KEYSTORE_PASS:-$keystore_pass} \
             jetty.sslContext.keyStoreType=$KEYSTORE_TYPE \
             jetty.sslContext.trustStorePath=$TRUSTSTORE_PATH \
-            jetty.sslContext.trustStorePassword=$TRUSTSTORE_PASSWORD \
+            jetty.sslContext.trustStorePassword=${TRUSTSTORE_PASS:-$truststore_pass} \
             jetty.sslContext.trustStoreType=$TRUSTSTORE_TYPE \
      else
          echo "Using jetty default SSL"
@@ -22,4 +26,4 @@ else
     echo "no ssl required"
 fi
 
-java -DproxyTo=$BACKEND $JAVA_OPTIONS -jar $JETTY_HOME/start.jar
\ No newline at end of file
+java -DproxyTo=$BACKEND $JAVA_OPTIONS -jar $JETTY_HOME/start.jar
-- 
2.16.6