From 428150834ee60899b9a8da019bae3c8bf009adf1 Mon Sep 17 00:00:00 2001 From: rb7147 Date: Mon, 4 Dec 2017 16:45:55 -0500 Subject: Upgraded the latest ONAP SDK Upgraded latest ONAP SDK Code. Change-Id: I669d6cfcefe068b1e4c078889d7d6c77ce788e2e Issue-ID: POLICY-432 Signed-off-by: rb7147 --- .../src/main/webapp/WEB-INF/conf/system.properties | 38 +++++++++++----------- .../src/main/webapp/WEB-INF/defs/definitions.xml | 10 ++++-- .../webapp/WEB-INF/fusion/conf/fusion.properties | 9 +++-- .../webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp | 33 ++++--------------- .../fusion/orm/RNoteBookIntegration.hbm.xml | 2 +- ONAP-SDK-APP/src/main/webapp/WEB-INF/jsp/login.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/login_external.jsp | 2 +- ONAP-SDK-APP/src/main/webapp/WEB-INF/web.xml | 10 +++++- 8 files changed, 50 insertions(+), 56 deletions(-) (limited to 'ONAP-SDK-APP/src/main/webapp/WEB-INF') diff --git a/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties b/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties index aa8ee1476..64f9f65c6 100644 --- a/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties +++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties @@ -1,4 +1,4 @@ -# Properties read by ONAP Core library, onapSDK-core.jar +# Properties read by ONAP Core library, epsdk-core.jar ########################################################################## # The following properties should NOT be changed by partner applications. @@ -20,53 +20,53 @@ user_name = fullName decryption_key = AGLDdG4D04BKm2IxIWEr8o== ########################################################################## -# The following properties MAY require changes by partner applications. +# The following properties REQUIRE changes by partner applications. ########################################################################## + + #Mysql -db.driver = org.mariadb.jdbc.Driver +db.driver = org.mariadb.jdbc.Driver db.connectionURL = jdbc:mariadb://localhost:3306/onap_sdk db.userName = policy_user db.password = policy_user +db.encrypt_flag = false db.hib.dialect = org.hibernate.dialect.MySQLDialect db.min_pool_size = 5 db.max_pool_size = 10 +#db.test_connection_on_checkout = false +#db.preferred_test_query = SELECT 1 from FN_USER + hb.dialect = org.hibernate.dialect.MySQLDialect # SQL statements are logged to stdout hb.show_sql = true hb.idle_connection_test_period = 3600 -app_display_name = EP SDK App +app_display_name = ONAP Policy +# license file area files_path = /tmp #element map files -element_map_file_path = /tmp +element_map_file_path = app/fusionapp/files/ element_map_icon_path = app/fusionapp/icons/ #Cron Schedules have 6 required fields and 1 optional field: # Seconds Minutes Hours Day-of-Month Month Day-of-Week Year log_cron = 0 0/1 * * * ?; -mylogins_feed_cron = 0 0/60 * * * ?; #sessiontimeout_feed_cron = 0 * * * * ? * -my_login_feed_output_dir = /tmp/MyLogins - -# ONAP Portal Shared Context REST API URL -ecomp_shared_context_rest_url= todo_shared_context_url # Link shown in Help menu -contact_us_link = todo_Contact_link +contact_us_link = https://wiki.onap.org/display/DW/Portal -# Camunda cockpit link -camunda_cockpit_link = todo_camunda_link # An Unique 128-bit value defined to identify a specific version # of an application deployed on a specific virtual machine. # This value must be generated and updated by the application # which is using the ONAP SDK at the time of its deployment. # Online Unique UUID generator - https://www.uuidgenerator.net/ -instance_uuid=8da691c9-987d-43ed-a358-00ac2f35685d - -# R Cloud feature -guard_notebook_url=todo_guard_url +instance_uuid=8a3a3721-bca6-4140-92a3-5b1ad1b0df83 # Application base URL has the host and app context only; a proper prefix of the on-boarded URL. -# Only required for applications using WebJunction or FE/BE separation. For example: -# app_base_url = todo_App_base_url +# Only required for applications using FE/BE separation. For example: +# app_base_url = https://www.onap.org/app_context/ + +#authenticate user server +authenticate_user_server=http://todo_enter_auth_server_hostname:8383/openid-connect-server-webapp/allUsers \ No newline at end of file diff --git a/ONAP-SDK-APP/src/main/webapp/WEB-INF/defs/definitions.xml b/ONAP-SDK-APP/src/main/webapp/WEB-INF/defs/definitions.xml index b2391b562..2f4a91408 100644 --- a/ONAP-SDK-APP/src/main/webapp/WEB-INF/defs/definitions.xml +++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/defs/definitions.xml @@ -3,12 +3,16 @@ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" "http://tiles.apache.org/dtds/tiles-config_3_0.dtd"> - + + diff --git a/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/conf/fusion.properties index 7140d35fb..8ce8cc95a 100644 --- a/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/conf/fusion.properties +++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/conf/fusion.properties @@ -1,7 +1,11 @@ # login settings login_method_backdoor = backdoor login_method_attribute_name = login_method -login_method_csp = csp + +# These properties will be removed after SingleSignOnController is cleaned +authentication_mechanism = BOTH +login_method_csp = csp +login_method_web_junction = web_junction #login message login.error.hrid.empty = Login failed, please contact system administrator. @@ -11,9 +15,8 @@ login.error.user.inactive = Account is disabled, please contact system administr # User Session settings user_attribute_name = user roles_attribute_name = roles -role_functions_attribute_name = role_functions -authentication_mechanism = BOTH role_function_list = role_function_list +role_functions_attribute_name = role_functions # Import-user LDAP settings post_initial_context_factory = com.sun.jndi.ldap.LdapCtxFactory diff --git a/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp index edb040504..0d62c7865 100644 --- a/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp +++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp @@ -20,35 +20,15 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ page isELIgnored="false"%> -<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> -<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties"%> -<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants"%> -<%@ page import="org.openecomp.portalsdk.core.domain.MenuData"%> +<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%> +<%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiProperties"%> +<%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiConstants"%> +<%@ page import="org.onap.portalsdk.core.domain.MenuData"%> - - - @@ -57,7 +37,7 @@ <% String contactUsLink = SystemProperties.getProperty(SystemProperties.CONTACT_US_LINK); - String redirectUrl = PortalApiProperties.getProperty(PortalApiConstants.ONAP_REDIRECT_URL); + String redirectUrl = PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL); String portalUrl = redirectUrl.substring(0, redirectUrl.lastIndexOf('/')) + "/process_csp"; String getAccessLink = redirectUrl.substring(0, redirectUrl.lastIndexOf('/')) + "/get_access"; %> @@ -83,8 +63,7 @@
  • - - ONAP Portal +
  • diff --git a/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml index 984e2369b..3d9a5e455 100644 --- a/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml +++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml @@ -23,7 +23,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - + diff --git a/ONAP-SDK-APP/src/main/webapp/WEB-INF/jsp/login.jsp b/ONAP-SDK-APP/src/main/webapp/WEB-INF/jsp/login.jsp index 2d6c95115..0ecb69609 100644 --- a/ONAP-SDK-APP/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/jsp/login.jsp @@ -17,7 +17,7 @@ limitations under the License. ================================================================================ --%> -<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%> <% // Name is defined by app; do not throw if missing diff --git a/ONAP-SDK-APP/src/main/webapp/WEB-INF/jsp/login_external.jsp b/ONAP-SDK-APP/src/main/webapp/WEB-INF/jsp/login_external.jsp index cb980c625..3671d2969 100644 --- a/ONAP-SDK-APP/src/main/webapp/WEB-INF/jsp/login_external.jsp +++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/jsp/login_external.jsp @@ -17,7 +17,7 @@ limitations under the License. ================================================================================ --%> -<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%> <% // Name is defined by app; do not throw if missing diff --git a/ONAP-SDK-APP/src/main/webapp/WEB-INF/web.xml b/ONAP-SDK-APP/src/main/webapp/WEB-INF/web.xml index 31b096049..a576f61f5 100644 --- a/ONAP-SDK-APP/src/main/webapp/WEB-INF/web.xml +++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/web.xml @@ -10,8 +10,16 @@ - 7 + 30 COOKIE + + SecurityXssFilter + org.onap.portalapp.filter.SecurityXssFilter + + + SecurityXssFilter + /* + \ No newline at end of file -- cgit 1.2.3-korg