From b4aa71e35ea1fc3898fc1577fd4c8f7a228f34ca Mon Sep 17 00:00:00 2001 From: Jakub Zieba Date: Mon, 10 Sep 2018 08:35:18 +0200 Subject: Use correct trust store Use correct trust store file in SSL configuration Fix for schema and data creation Change-Id: Ie5b329191779a75ea902f547f09b59b65f09f64c Issue-ID: VID-271 Signed-off-by: Jakub Zieba --- .../src/main/docker/assembly/assembly-for-plugin.xml | 1 + deliveries/src/main/docker/docker-files/Dockerfile | 5 +++-- deliveries/src/main/scripts/localize_system.sh | 4 ++-- .../java/org/onap/portalapp/conf/ExternalAppConfig.java | 2 ++ .../src/main/webapp/WEB-INF/cert/org.onap.vid.trust.jks | Bin 0 -> 1413 bytes .../src/main/webapp/WEB-INF/conf/system.properties | 4 ++-- 6 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 epsdk-app-onap/src/main/webapp/WEB-INF/cert/org.onap.vid.trust.jks diff --git a/deliveries/src/main/docker/assembly/assembly-for-plugin.xml b/deliveries/src/main/docker/assembly/assembly-for-plugin.xml index 27bcdb2c6..7639dda5a 100755 --- a/deliveries/src/main/docker/assembly/assembly-for-plugin.xml +++ b/deliveries/src/main/docker/assembly/assembly-for-plugin.xml @@ -36,6 +36,7 @@ org.onap.vid.jks + org.onap.vid.trust.jks ../epsdk-app-onap/src/main/webapp/WEB-INF/cert config diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile index 010318232..ddaa8615b 100755 --- a/deliveries/src/main/docker/docker-files/Dockerfile +++ b/deliveries/src/main/docker/docker-files/Dockerfile @@ -30,9 +30,7 @@ ENV VID_AAI_PORT 8443 ENV VID_APP_DISPLAY_NAME VID ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.onap.org:8080/onapportal/context ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080 -ENV VID_TRUSTSTORE_FILE ${ROOT_DIR}/etc/vid_keystore.jks ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins -ENV VID_TRUSTSTORE_PASS 5c84906b14912dbe96154e09b1e1db90e31f8dedb08e3e6c9f17da3f926cb67b33e4229cc1fe0f59c996d2e38b8ded42 ENV VID_MSO_USER InfraPortalClient ENV VID_MSO_PASS OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz ENV MSO_DME2_CLIENT_TIMEOUT 10000 @@ -74,10 +72,13 @@ ENV VID_MYSQL_PASS Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U ENV VID_KEYSTORE_FILENAME ${ROOT_DIR}/etc/org.onap.vid.jks ENV VID_KEYSTORE_PASSWORD Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +ENV VID_TRUSTSTORE_FILENAME ${ROOT_DIR}/etc/org.onap.vid.trust.jks +ENV VID_TRUSTSTORE_PASSWORD OBF:1dx01j0e1hs01t981mis1dws156s1ojc1qjc1zsx1pw31qob1qr71pyj1zst1qhy1ojq156i1dua1mm21tb61hvi1j0g1du2 ENV VID_TOMCAT_PATH /usr/local/tomcat/conf/ ENV CATALINA_OPTS "-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME}" ADD maven/config/org.onap.vid.jks ${VID_KEYSTORE_FILENAME} +ADD maven/config/org.onap.vid.trust.jks ${VID_TRUSTSTORE_FILENAME} ADD maven/config/server.xml ${VID_TOMCAT_PATH} ADD maven/scripts/*.sh /tmp/vid/ diff --git a/deliveries/src/main/scripts/localize_system.sh b/deliveries/src/main/scripts/localize_system.sh index f38121c1d..a739335be 100755 --- a/deliveries/src/main/scripts/localize_system.sh +++ b/deliveries/src/main/scripts/localize_system.sh @@ -35,8 +35,8 @@ sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \ -e 's,${MSO_DME2_SERVER_URL},'${MSO_DME2_SERVER_URL}',g' \ -e 's,${MSO_DME2_ENABLED},'${MSO_DME2_ENABLED}',g' \ -e 's,${MSO_POLLING_INTERVAL_MSECS},'${MSO_POLLING_INTERVAL_MSECS}',g' \ - -e 's,${VID_TRUSTSTORE_FILE},'${VID_TRUSTSTORE_FILE}',g' \ - -e 's/${VID_TRUSTSTORE_PASS}/'${VID_TRUSTSTORE_PASS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + -e 's,${VID_TRUSTSTORE_FILE},'${VID_TRUSTSTORE_FILENAME}',g' \ + -e 's/${VID_TRUSTSTORE_PASS}/'${VID_TRUSTSTORE_PASSWORD}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" exit 4 } diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java index 9cf5df548..0c6fba9a7 100644 --- a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java @@ -57,6 +57,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.PropertySource; @@ -180,6 +181,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable { */ @Bean // ANNOTATION COMMENTED OUT // APPLICATIONS REQUIRING QUARTZ SHOULD RESTORE ANNOTATION + @DependsOn("dataSourceInitializer") public SchedulerFactoryBean schedulerFactoryBean() throws Exception { SchedulerFactoryBean scheduler = new SchedulerFactoryBean(); scheduler.setTriggers(schedulerRegistryAdapter.getTriggers()); diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/cert/org.onap.vid.trust.jks b/epsdk-app-onap/src/main/webapp/WEB-INF/cert/org.onap.vid.trust.jks new file mode 100644 index 000000000..4caf7be65 Binary files /dev/null and b/epsdk-app-onap/src/main/webapp/WEB-INF/cert/org.onap.vid.trust.jks differ diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties index 087a5d54c..dc9eb43a2 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties @@ -194,10 +194,10 @@ mso.maxOpenedInstantiationRequests=20 mso.asyncPollingIntervalSeconds=1 refreshTimeInstantiationDashboard=10 -vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks +vid.truststore.filename=/opt/app/vid/etc/org.onap.vid.trust.jks +vid.truststore.passwd.x=OBF:1dx01j0e1hs01t981mis1dws156s1ojc1qjc1zsx1pw31qob1qr71pyj1zst1qhy1ojq156i1dua1mm21tb61hvi1j0g1du2 mso.dme2.client.timeout=30000 mso.dme2.client.read.timeout=120000 -vid.truststore.passwd.x=OBF:1wgg1wfq1uus1uui1x131x0r1x1v1x1j1uvo1uve1wg81wfi scheduler.create.new.vnf.change.instance=/v1/ChangeManagement/schedules/ scheduler.get.time.slots=/v1/ChangeManagement/schedules/ scheduler.server.url=http://BYO.scheduler:8989/scheduler -- cgit 1.2.3-korg