From 53d13ff36532723582f55febce79de2282e46cde Mon Sep 17 00:00:00 2001 From: "Arul.Nambi" Date: Wed, 5 Dec 2018 13:41:57 -0500 Subject: Updating https certificate Issue-ID: AAI-1992 Change-Id: Ied8d4468dbd2f477595a5802d3c8e0b0789d13e8 Signed-off-by: Arul.Nambi --- .../config/application-ssl.properties | 7 +++-- .../config/application.properties | 2 +- .../config/auth/org.onap.aai.p12 | Bin 0 -> 4307 bytes .../config/auth/tomcat_keystore | Bin 2214 -> 0 bytes .../config/auth/truststoreONAPall.jks | Bin 0 -> 117990 bytes .../portal/BOOT-INF/classes/portal.properties | 29 ++++++++++++--------- sparkybe-onap-application/pom.xml | 2 +- 7 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 sparkybe-onap-application/config/auth/org.onap.aai.p12 delete mode 100644 sparkybe-onap-application/config/auth/tomcat_keystore create mode 100644 sparkybe-onap-application/config/auth/truststoreONAPall.jks diff --git a/sparkybe-onap-application/config/application-ssl.properties b/sparkybe-onap-application/config/application-ssl.properties index 04ff25b..f538c14 100644 --- a/sparkybe-onap-application/config/application-ssl.properties +++ b/sparkybe-onap-application/config/application-ssl.properties @@ -1,3 +1,6 @@ server.port = 8000 -server.ssl.key-store=file:${CONFIG_HOME}/auth/tomcat_keystore -server.ssl.key-store-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 \ No newline at end of file +server.ssl.key-store=file:${CONFIG_HOME}/auth/org.onap.aai.p12 +server.ssl.key-store-password=OBF:1x0v1g131lps1cix1rjb1n5p22691qab1hm51hfc1i2t1lmr1liz1hyx1hfq1hn51qcr22651n5t1rh31cgl1lu61g2f1x1r +server.ssl.enabled-protocols=TLSv1.1,TLSv1.2 +server.ssl.trust-store=file:${CONFIG_HOME}/auth/truststoreONAPall.jks +server.ssl.trust-store-password=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0 \ No newline at end of file diff --git a/sparkybe-onap-application/config/application.properties b/sparkybe-onap-application/config/application.properties index 02402b1..c49bf5a 100644 --- a/sparkybe-onap-application/config/application.properties +++ b/sparkybe-onap-application/config/application.properties @@ -9,7 +9,7 @@ spring.mvc.favicon.enabled=false # # Gizmo profile # -spring.profiles.active=camel,http,fe-dev,oxm-schema-dev,gizmo,oxm-override +spring.profiles.active=camel,ssl,fe-dev,oxm-schema-dev,gizmo,oxm-override # # Resources profile diff --git a/sparkybe-onap-application/config/auth/org.onap.aai.p12 b/sparkybe-onap-application/config/auth/org.onap.aai.p12 new file mode 100644 index 0000000..71cea3e Binary files /dev/null and b/sparkybe-onap-application/config/auth/org.onap.aai.p12 differ diff --git a/sparkybe-onap-application/config/auth/tomcat_keystore b/sparkybe-onap-application/config/auth/tomcat_keystore deleted file mode 100644 index 9eec841..0000000 Binary files a/sparkybe-onap-application/config/auth/tomcat_keystore and /dev/null differ diff --git a/sparkybe-onap-application/config/auth/truststoreONAPall.jks b/sparkybe-onap-application/config/auth/truststoreONAPall.jks new file mode 100644 index 0000000..ff844b1 Binary files /dev/null and b/sparkybe-onap-application/config/auth/truststoreONAPall.jks differ diff --git a/sparkybe-onap-application/config/portal/BOOT-INF/classes/portal.properties b/sparkybe-onap-application/config/portal/BOOT-INF/classes/portal.properties index ae86ac6..f823712 100644 --- a/sparkybe-onap-application/config/portal/BOOT-INF/classes/portal.properties +++ b/sparkybe-onap-application/config/portal/BOOT-INF/classes/portal.properties @@ -1,17 +1,19 @@ +################################################################################ +############################## Portal properties ############################### +################################################################################ + # Java class that implements the ECOMP role and user mgt API -portal.api.impl.class=org.openecomp.sparky.security.portal.PortalRestAPIServiceImpl +portal.api.impl.class = org.onap.aai.sparky.security.portal.PortalRestAPICentralServiceImpl + # Instance of ECOMP Portal where the app has been on-boarded -# ecomp_rest_url=http://ecomp.homer.att.com/ecompportal/auxapi # use insecure http for dev purposes to avoid self-signed certificate -ecomp_rest_url=<%= @ECOMP_REST_URL %> +ecomp_rest_url = https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/auxapi -### CSP-SSO # Standard global logon page -ecomp_redirect_url=<%= @ECOMP_REDIRECT_URL %> -# Test global logon page only accepts registered users -# ecomp_redirect_url=https://webtest.csp.att.com/ecompportal/ecompportal/process_csp -# CSP settings -csp_cookie_name=<%= @CSP_COOKIE_NAME %> +ecomp_redirect_url = https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm + +# Name of cookie to extract on login request +csp_cookie_name = EPService # Alternate values: DEVL, V_DEVL, V_PROD csp_gate_keeper_prod_key = PROD @@ -21,11 +23,12 @@ ueb_listeners_enable=false ueb_app_key=<%= @UEB_APP_KEY %> # Use this tag if the app is centralized -role_access_centralized = <%= @ROLE_ACCESS_CENTRALIZED %> +role_access_centralized = remote # Connection and Read timeout values -ext_req_connection_timeout = <%= @PORTAL_CONNECTION_TIMEOUT %> -ext_req_read_timeout = <%= @PORTAL_READ_TIMEOUT %> +ext_req_connection_timeout = 15000 +ext_req_read_timeout = 20000 #Add AAF namespace if the app is centralized -aaf_namespace = <%= @AAF_NAMESPACE %> +aaf_namespace = org.onap.aai + diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml index d342725..1670b96 100644 --- a/sparkybe-onap-application/pom.xml +++ b/sparkybe-onap-application/pom.xml @@ -392,7 +392,7 @@ - ${CONFIG_HOME}/portal/ + ${CONFIG_HOME}/portal/BOOT-INF/classes/ -- cgit 1.2.3-korg