From efe43d10241bb2d2c05571c2583449f71a1a3da1 Mon Sep 17 00:00:00 2001 From: renealr Date: Wed, 27 Feb 2019 12:59:50 -0500 Subject: [PATCH] update cadi file location to be configurable update epsdk library to the release version add the cadi properties file for local testing add the keyFile for local testing Issue-ID: AAI-2196 Change-Id: I71cd681af8415f7b1874b27136cfe5a6b24e2760 Signed-off-by: renealr --- .../config/application.properties | 2 +- .../config/portal/cadi.properties | 29 ++++++++++++++++++++++ sparkybe-onap-application/config/portal/keyFile | 27 ++++++++++++++++++++ sparkybe-onap-application/pom.xml | 2 +- .../org/onap/aai/sparky/portal/PortalBean.java | 6 ++++- sparkybe-onap-service/pom.xml | 2 +- 6 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 sparkybe-onap-application/config/portal/cadi.properties create mode 100644 sparkybe-onap-application/config/portal/keyFile diff --git a/sparkybe-onap-application/config/application.properties b/sparkybe-onap-application/config/application.properties index 1c37fa7..c0616b5 100644 --- a/sparkybe-onap-application/config/application.properties +++ b/sparkybe-onap-application/config/application.properties @@ -16,7 +16,7 @@ spring.profiles.active=camel,ssl,fe-dev,oxm-schema-dev,gizmo,oxm-default # #spring.profiles.active=camel,http,fe-dev,oxm-schema-dev,resources,sync,oxm-override - +portal.cadiFileLocation=${CONFIG_HOME}/portal/cadi.properties searchservice.hostname=127.0.0.1 searchservice.port=30262 searchservice.client-cert=client-cert-onap.p12 diff --git a/sparkybe-onap-application/config/portal/cadi.properties b/sparkybe-onap-application/config/portal/cadi.properties new file mode 100644 index 0000000..68cee04 --- /dev/null +++ b/sparkybe-onap-application/config/portal/cadi.properties @@ -0,0 +1,29 @@ +# Configure AAF +aaf_locate_url=https://aaf-locate.onap:8095 +aaf_url=<%=https://aaf-locate.onap:8095/AAF_NS.service:2.0 + +# AAF Environment Designation + +#if you are running aaf service from a docker image you have to use aaf service IP and port number +aaf_id=aai@aai.onap.org +#Encrypt the password using AAF Jar +aaf_password=enc:xxYw1FqXU5UpianbPeH5Rezg0YfjzuwQrSiLcCmJGfz +#hostname=org.onap.aai. +csp_domain=PROD +# Add Absolute path to Keyfile +cadi_keyfile=${CONFIG_HOME}/portal/keyFile + +# This is required to accept Certificate Authentication from Certman certificates. +aaf_env=DEV + +# DEBUG prints off all the properties. Use to get started. +cadi_loglevel=DEBUG + +# Add Absolute path to truststore2018.jks +cadi_truststore=file:${CONFIG_HOME}/auth/truststoreONAPall.jks +# Note: This is the ONLY password that doesn't have to be encrypted. All Java's TrustStores are this passcode by default, because they are public certs +cadi_truststore_password=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0 + +# how to turn on SSL Logging +#javax.net.debug=ssl + diff --git a/sparkybe-onap-application/config/portal/keyFile b/sparkybe-onap-application/config/portal/keyFile new file mode 100644 index 0000000..921ce67 --- /dev/null +++ b/sparkybe-onap-application/config/portal/keyFile @@ -0,0 +1,27 @@ +77E_fh-8gTjeg8egAo-JgNkXYm1FGEBPMo44vKPgKyGCJj9Dn0xJqIBct2Ko35X4_HSU3wPq3I2q +YHIvJCjmzXTVu2zvu4rIGTlwycTtLGDkgPyhOYFytv4GgazbpSs9331MPUeVVrdpkDCQmjtHSB4m +DThhfEe2lkbZ35ljX3sVSf3JDy4ngRot0ktQwnnY4vxFdgVUl7LzVinXWgFLoqMyXmKh_bGw9aUH +VMgqFsF_YmqLZY5ZARAraeywktvrU5kXYh5SnfXoJy7XIk0TBjHKqO-1mW-TcIgS3_v6GIGkZnpq +e1FyE8cS21gTPFlc1KDoWUZE2yoEsQKJc4RFWfjid_mE6nckxym1TOsEn3G2_TlkZvliN_QMDB_c +RuFLDB9HCChm4YYHpSn-RBqtJFz29bMTHQX8VNVfZ_Zhh-4dWOlEfpSzJvAqm_boo-8y8YDGIusx +mvKyPXEKVCuBOljHaKhYg0d43nAXIFsssKpjmtQizA2L_TP1Mo_lDFIlCsPcRlHKTvzkTstEAhRj +JnepzA--olBMwBkPxjm1Y5XQBGZH72i_o4Hr7_NqHb9sP486I2Nd1-owjHkhacGrLO1oORnuBUxp +_SnaXYywe9tTz3BcfFupXSoDv4Sj7g9B53yPIWmjGggigidql3SNJsui6qOtwDHOejzEDFm23Lj7 +fXD6sb52U_ul9ahi4CoLTzpvMsPRYOqyRCk8K8FVBauZbG5D42oaFPn0S0rCSHOCU1TXbRdTF-Cs +I2R0pEHNgb33yx6vtInaTSYIQ5cxa3XDA_50AQearV5SuYSlp8dK0BkpVCKgvSQdTn-2WiaV_hvO +KzG7D2adT1kYY6TjYMXIaUiJ33y1XSNDG0s6r4NG5dNE6Jj7thdpnV-AAZoi0uZh1_bsHKLVmHRr +NCXAc6DZm1D4N9y5lOJwUprUlJisZXLFTQThGMRY5dtiY_eK9Xjj4FQygXXhuhFXHz2-e4YApORv +lXDcT29IZuuI1j26bxdNdhNr1wZsqqievBN6l6OQMiP21eIrxAUu1BEmiVOrfOzaEjxldDN2gFum +4-zf9gsQT9UT8KEuOje64wVeHr09JpWuddV9HOAMvqc6mKTWmvUv_QiLgtK_b39QccMrOfOA1usM +biRJ9wuTYIr584Q9CjHEcm5e2YufcbF-IDZ4IDui8gNXyYJuusTYdspeKzrtiLKfgI56ZWA3it9G +SOkN18YyUmhk7HFkx9qEifb4UEbUQPb0dyXBRotf-91c5CPkct-36uV4sZBA_AR1tX3-aRKKB_SQ +B0zaG-eaEdEqKv-ZYHqk23ZxiEsCX3ZdY7VSMWztE3_D5n8UgEl4et5LVfnjvU-arVVO93WUbXk0 +zi2QrOwytOZ0StAvFdF1nVwWllPg4EYcn8qLJIaaBRvLMlpHixtwRhltwJeMmJl3ExImOxNhVbhF +6LxVXW6JK8JfMIwb_TE4EShDBjemq76BojQOwrO4OAyPG7B5iUtefdY-Zu1EtjXPhrUgljI_A1tg +5_2WNjNTCT7Bvig3saFsIRi3cvgIcMAF2H7kJYw3UDvCFnx4LIom2u6vSeyatPxEOhRfpP0KvgEU +koM9DFJW7VWQ11mB_DcU2NoYHdFKFy_cM62kIvoRwZTADGryEtkLSWEDT8MLpVrGXP2RjSZ3HHqC +vVpVqQHC2VIqNKi2uHtYCiTEfj81Z0rCrnH3hYIRoOSe5W6m17xyb0RloG0G44uK0oNCfDYLwK0L +TJaBdWSIBYI__ISsKx8o8r-3XLtbwQPPhv4-LpGwJYd7sIcqnpTYAyNGSrbEM4ECzHCH9Hwf9Duy +cAQGWqXIbTV9i8ryw8OhcCZPTf3noPZyhzzdegiv6KNT-BBbxsgtDehtP-jvpd9eAhjlfUV_hoFJ +rBUVMFrIOEDnnItVqBDmnavRdhn6N9ObVjVMv_4inhkvtpBCEVxtVQT2kFuBmZvPu_uHHbXi7_g8 +SVs3AjJ2ya3pZraK6gH3IOYoGtTAH3rKl7XdTMjqWnUCbhepuJqeEOF-DhpsEW7Oo0Lqzbjg \ No newline at end of file diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml index 72dab6d..1916948 100644 --- a/sparkybe-onap-application/pom.xml +++ b/sparkybe-onap-application/pom.xml @@ -272,7 +272,7 @@ org.onap.portal.sdk epsdk-fw - 2.5.0-SNAPSHOT + 2.5.0 commons-logging diff --git a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/portal/PortalBean.java b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/portal/PortalBean.java index 4443443..63f1fe1 100644 --- a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/portal/PortalBean.java +++ b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/portal/PortalBean.java @@ -5,6 +5,7 @@ import javax.servlet.Filter; import org.onap.aai.sparky.security.filter.LoginFilter; import org.onap.portalsdk.core.onboarding.crossapi.CadiAuthFilter; import org.onap.portalsdk.core.onboarding.crossapi.PortalRestAPIProxy; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; @@ -17,6 +18,9 @@ public class PortalBean { private Filter loginFilter = new LoginFilter(); private Filter cadiAuthFilter = new CadiAuthFilter(); + + @Value("${portal.cadiFileLocation}") + private String cadiPropsLocation; /** * bind LoginFilter @@ -41,7 +45,7 @@ public class PortalBean { registration.setFilter(cadiAuthFilter); registration.addUrlPatterns("/*"); registration.setOrder(0); - registration.addInitParameter("cadi_prop_files","/opt/app/sparky/resources/portal/cadi.properties"); + registration.addInitParameter("cadi_prop_files",cadiPropsLocation); registration.addInitParameter("inlclude_url_endpoints","/api/v3/*"); registration.addInitParameter("exclude_url_endpoints","/api/v2/*"); diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml index 59c1257..c275719 100644 --- a/sparkybe-onap-service/pom.xml +++ b/sparkybe-onap-service/pom.xml @@ -278,7 +278,7 @@ some of the depedencies should probably have a scope of provided so they don't a org.onap.portal.sdk epsdk-fw - 2.5.0-SNAPSHOT + 2.5.0 commons-logging -- 2.16.6