From: rb7147 Date: Thu, 19 Oct 2017 19:15:48 +0000 (-0400) Subject: Resolved the License issue in Policy X-Git-Tag: v1.1.0~23 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=33f0e2b71ead3a57e90832dcac89168c79609587 Resolved the License issue in Policy Updated epsdk version from 1.1.0 to 1.3.1 to resolve the flexslider. Added Exclusions to resolve the mysql and iText. Issue-ID: POLICY-355 Change-Id: Iffb052bee37aa3c10f634db1b5bdb2985e9f176b Signed-off-by: rb7147 --- diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index e6ef8ed1e..04f933930 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -31,7 +31,7 @@ UTF-8 - 1.1.0 + 1.3.1 4.2.0.RELEASE 4.3.11.Final @@ -108,8 +108,11 @@ - org.openecomp.ecompsdkos + org.onap.portal.sdk epsdk-app-overlay + + static/fusion/raptor/uigrid/vfs_fonts.js + org.onap.policy.engine @@ -149,7 +152,7 @@ war - org.openecomp.ecompsdkos + org.onap.portal.sdk epsdk-core @@ -162,7 +165,7 @@ classes - org.openecomp.ecompsdkos + org.onap.portal.sdk epsdk-core @@ -180,25 +183,31 @@ - org.openecomp.ecompsdkos + org.onap.portal.sdk epsdk-app-overlay ${epsdk.version} war - org.openecomp.ecompsdkos + org.onap.portal.sdk epsdk-app-common ${epsdk.version} jar - org.openecomp.ecompsdkos + org.onap.portal.sdk epsdk-core ${epsdk.version} + + + mysql + mysql-connector-java + + - org.openecomp.ecompsdkos + org.onap.portal.sdk epsdk-analytics ${epsdk.version} @@ -209,7 +218,7 @@ - org.openecomp.ecompsdkos + org.onap.portal.sdk epsdk-workflow ${epsdk.version} diff --git a/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java index 567fbb7cf..3b38f1d8e 100644 --- a/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java +++ b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java @@ -26,10 +26,10 @@ import javax.servlet.http.HttpServletResponse; import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; import org.openecomp.portalsdk.core.auth.LoginStrategy; +import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException; import org.openecomp.portalsdk.core.onboarding.util.CipherUtil; -import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants; -import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties; +import org.openecomp.portalsdk.core.util.SystemProperties; import org.springframework.web.servlet.ModelAndView; public class LoginStrategyImpl extends LoginStrategy { @@ -58,23 +58,21 @@ public class LoginStrategyImpl extends LoginStrategy { } private static String getUserIdFromCookie(HttpServletRequest request) throws PortalAPIException { - String userId = ""; - Cookie[] cookies = request.getCookies(); - Cookie userIdcookie = null; - if (cookies != null) - for (Cookie cookie : cookies) - if (cookie.getName().equals(USER_ID)) - userIdcookie = cookie; - if (userIdcookie != null) { - try { - userId = CipherUtil.decrypt(userIdcookie.getValue(), - PortalApiProperties.getProperty(PortalApiConstants.Decryption_Key)); - } catch (Exception e) { - throw new PortalAPIException(e); - } - } - return userId; - + String userId = ""; + Cookie userIdCookie = getCookie(request, USER_ID); + if (userIdCookie != null) { + final String cookieValue = userIdCookie.getValue(); + if (!SystemProperties.containsProperty(SystemProperties.Decryption_Key)) + throw new IllegalStateException("Failed to find property " + SystemProperties.Decryption_Key); + final String decryptionKey = SystemProperties.getProperty(SystemProperties.Decryption_Key); + try { + userId = CipherUtil.decrypt(cookieValue, decryptionKey); + LOGGER.debug("getUserIdFromCookie: decrypted as {}" +userId); + } catch (Exception e) { + LOGGER.error("Exception Occured in getUserIdFromCookie" + e); + } + } + return userId; } private static boolean isLoginCookieExist(HttpServletRequest request) { diff --git a/ONAP-SDK-APP/src/main/resources/portal.properties b/ONAP-SDK-APP/src/main/resources/portal.properties index 30cbf0fff..1f2336d7b 100644 --- a/ONAP-SDK-APP/src/main/resources/portal.properties +++ b/ONAP-SDK-APP/src/main/resources/portal.properties @@ -27,11 +27,6 @@ portal.api.prefix = /api max.idle.time = 5 user.attribute.name = user_attribute -# CSP settings -csp_cookie_name = attESSec -csp_gate_keeper_prod_key = PROD -testing=testing - #Use REST API instead of UEB to fetch the functional menu data use_rest_for_functional_menu=true diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 5adb5d169..aea0afc24 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 1.1.0 + 1.3.1 4.2.0.RELEASE 4.3.11.Final true @@ -59,9 +59,15 @@ - org.openecomp.ecompsdkos + org.onap.portal.sdk epsdk-core ${epsdk.version} + + + mysql + mysql-connector-java + + diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index effaf5b9d..df846eec7 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -102,6 +102,10 @@ com.google.guava guava + + com.lowagie + itext + diff --git a/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties index eaee63f60..4c95afbcc 100644 --- a/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties +++ b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties @@ -28,11 +28,6 @@ portal.api.prefix = /api max.idle.time = 5 user.attribute.name = user_attribute -# CSP settings -csp_cookie_name = attESSec -csp_gate_keeper_prod_key = PROD -testing=testing - #Use REST API instead of UEB to fetch the functional menu data use_rest_for_functional_menu=true