From e3982f6c2a13c903947a66d89e1af1ccbb161e5f Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Fri, 20 Oct 2017 08:22:19 -0400 Subject: Role management; security vulnerabilities. Extend user/role management interface to allow role deletion. Add filters to defend against common web Javascript attacks. Drop Greensock code with unusable license. Use OParent in EPSDK web application. Issue: US324470, US342324, PORTAL-127 Change-Id: I3a10744fbbbdbda7c88d2b2e542e72e779c9b142 Signed-off-by: Christopher Lott (cl778h) --- ecomp-sdk/epsdk-app-os/README.md | 2 +- ecomp-sdk/epsdk-app-os/pom.xml | 130 +++------------------ .../onap/portalapp/filter/SecurityXssFilter.java | 130 +++++++++++++++++++++ .../epsdk-app-os/src/main/webapp/WEB-INF/web.xml | 10 +- 4 files changed, 153 insertions(+), 119 deletions(-) create mode 100644 ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java (limited to 'ecomp-sdk/epsdk-app-os') diff --git a/ecomp-sdk/epsdk-app-os/README.md b/ecomp-sdk/epsdk-app-os/README.md index 1ac4a142..d9d7fb68 100644 --- a/ecomp-sdk/epsdk-app-os/README.md +++ b/ecomp-sdk/epsdk-app-os/README.md @@ -21,7 +21,7 @@ Version 1.4.0, 2017 - PORTAL-90 Use approved ONAP license text - Portal-86 Remove application specific usages from tests and other files (rework) - Portal-104 Replaced the sql connector to maria db - +- Portal-127 Remove GreenSock license code from b2b library * Put new entries here * Version 1.3.0, 28 August 2017 diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml index 54bb65eb..469cf37a 100644 --- a/ecomp-sdk/epsdk-app-os/pom.xml +++ b/ecomp-sdk/epsdk-app-os/pom.xml @@ -4,142 +4,38 @@ - org.onap.portal.sdk + + + org.onap.portal.sdk + epsdk-project + 1.4.0-SNAPSHOT + + + epsdk-app-os - 1.4.0-SNAPSHOT + war ONAP Portal SDK Webapp for OpenSource ONAP Portal SDK Web Application for public release - - - UTF-8 - 1.4.0-SNAPSHOT - 4.2.0.RELEASE - 4.3.11.Final + + ${project.version} true true - - - onap-releases - ONAP - Release Repository - https://nexus.onap.org/content/repositories/releases - - - onap-staging - ONAP - Staging Repository - https://nexus.onap.org/content/repositories/staging - - - onap-snapshots - ONAP - Snapshot Repository - https://nexus.onap.org/content/repositories/snapshots - - - onap-public - ONAP public Repository - https://nexus.onap.org/content/groups/public - - - - - releases - ONAP - Release Repository - https://nexus.onap.org/content/repositories/releases - - - staging - ONAP - Staging Repository - https://nexus.onap.org/content/repositories/staging - - - snapshots - ONAP - Snapshot Repository - https://nexus.onap.org/content/repositories/snapshots - - + - - - - doclint-java8-disable - - [1.8,) - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - -Xdoclint:none - - - - - - + ${project.artifactId} - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17,) - - check - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java new file mode 100644 index 00000000..b3ebed73 --- /dev/null +++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java @@ -0,0 +1,130 @@ + +/*- + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ +package org.onap.portalapp.filter; + +import java.io.IOException; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; + +import org.apache.commons.lang.StringUtils; +import org.onap.portalapp.util.SecurityXssValidator; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; + +public class SecurityXssFilter implements Filter { + + private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SecurityXssFilter.class); + + private SecurityXssValidator validator = SecurityXssValidator.getInstance(); + + class SecurityRequestWrapper extends HttpServletRequestWrapper { + + public SecurityRequestWrapper(HttpServletRequest servletRequest) { + super(servletRequest); + } + + @Override + public String[] getParameterValues(String parameter) { + String[] values = super.getParameterValues(parameter); + + if (values == null) { + return null; + } + + int count = values.length; + String[] encodedValues = new String[count]; + for (int i = 0; i < count; i++) { + encodedValues[i] = stripXss(values[i]); + + } + + return encodedValues; + } + + private String stripXss(String value) { + + + return validator.stripXSS(value); + } + + @Override + public String getParameter(String parameter) { + String value = super.getParameter(parameter); + if (StringUtils.isNotBlank(value)) { + value = stripXss(value); + } + return value; + } + + @Override + public String getHeader(String name) { + String value = super.getHeader(name); + if (StringUtils.isNotBlank(value)) { + value = stripXss(value); + } + return value; + } + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } + + @Override + public void destroy() { + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException { + + try { + + chain.doFilter(new SecurityRequestWrapper((HttpServletRequest) request), response); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "doFilter() failed", e); + } + } + +} diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml index 0290f1fc..7441508a 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml +++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml @@ -10,8 +10,16 @@ - 7 + 30 COOKIE + + SecurityXssFilter + org.onap.portalapp.filtersss.SecurityXssFilter + + + SecurityXssFilter + /* + \ No newline at end of file -- cgit 1.2.3-korg