From: vasraz Date: Thu, 21 Oct 2021 16:32:16 +0000 (+0100) Subject: Fix critical cross site scripting X-Git-Tag: 1.10.0~36 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b08ac296b31f001c946b1371f213ac302ff9c12e;p=sdc.git Fix critical cross site scripting Change-Id: I66a220f71a2e950055107a725191b46bcbe8c6a6 Signed-off-by: Vasyl Razinkov Issue-ID: SDC-3607 Issue-ID: SDC-3755 --- diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/user/UserBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/user/UserBusinessLogic.java index f90440011d..62232beaf5 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/user/UserBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/user/UserBusinessLogic.java @@ -33,6 +33,7 @@ import java.util.stream.Collectors; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.tinkerpop.gremlin.structure.Edge; +import org.onap.portalsdk.core.onboarding.util.CipherUtil; import org.openecomp.sdc.be.components.impl.exceptions.ByActionStatusComponentException; import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.dao.utils.UserStatusEnum; @@ -68,6 +69,7 @@ public class UserBusinessLogic { } public User getUser(String userId, boolean inTransaction) { + userId = decryptUserId(userId); Either result = userAdminOperation.getUserData(userId, inTransaction); if (result.isRight()) { handleUserAccessAuditing(userId, result.right().value()); @@ -81,7 +83,19 @@ public class UserBusinessLogic { return user; } + private String decryptUserId(final String userId) { + if (StringUtils.isNotEmpty(userId)) { + try { + return CipherUtil.decryptPKC(userId); + } catch (final Exception e) { + return userId; + } + } + return userId; + } + public User getUser(String userId) { + userId = decryptUserId(userId); UserContext userContext = ThreadLocalsHolder.getUserContext(); if (Objects.isNull(userContext) || Objects.isNull(userContext.getUserId())) { log.info("USER_NOT_FOUND, user=" + userId); @@ -106,6 +120,7 @@ public class UserBusinessLogic { } public boolean hasActiveUser(String userId) { + userId = decryptUserId(userId); UserContext userContext = ThreadLocalsHolder.getUserContext(); if (Objects.isNull(userContext) || Objects.isNull(userContext.getUserId())) { handleUserAccessAuditing(userId, ActionStatus.USER_NOT_FOUND); diff --git a/catalog-be/src/main/resources/scripts/sdcBePy/users/data/users.json b/catalog-be/src/main/resources/scripts/sdcBePy/users/data/users.json index 9ce2be4dd3..ed3adafe66 100755 --- a/catalog-be/src/main/resources/scripts/sdcBePy/users/data/users.json +++ b/catalog-be/src/main/resources/scripts/sdcBePy/users/data/users.json @@ -6,13 +6,6 @@ "role": "ADMIN", "email": "demo@openecomp.org" }, - { - "userId": "op0001", - "firstName": "Oper", - "lastName": "P", - "role": "OPS", - "email": "op0001@openecomp.org" - }, { "userId": "gv0001", "firstName": "Giuseppe", diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/PortalServlet.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/PortalServlet.java index 6378b996cf..228f65db85 100644 --- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/PortalServlet.java +++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/PortalServlet.java @@ -113,7 +113,7 @@ public class PortalServlet extends HttpServlet { * @throws IOException */ private void addRequestHeadersUsingWebseal(final HttpServletRequest request, final HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException, CipherUtilException { response.setContentType("text/html"); // Create new request object to dispatch MutableHttpServletRequest mutableRequest = new MutableHttpServletRequest(request); @@ -170,7 +170,6 @@ public class PortalServlet extends HttpServlet { getValueFromCookie(request, Constants.HTTP_CSP_FIRSTNAME); getValueFromCookie(request, Constants.HTTP_CSP_LASTNAME); //To be fixed - //addAuthCookie(response, userId, firstNameFromCookie, lastNameFromCookie); RequestDispatcher rd = request.getRequestDispatcher("index.html"); rd.forward(mutableRequest, response); @@ -180,7 +179,7 @@ public class PortalServlet extends HttpServlet { } boolean addAuthCookie(HttpServletResponse response, String userId, String firstName, String lastName) throws IOException { - boolean isBuildCookieCompleted = true; + boolean isBuildCookieCompleted = false; Cookie authCookie = null; Configuration.CookieConfig confCookie = ConfigurationManager.getConfigurationManager().getConfiguration().getAuthCookie(); //create authentication and send it to encryption @@ -188,9 +187,9 @@ public class PortalServlet extends HttpServlet { try { AuthenticationCookie authenticationCookie = new AuthenticationCookie(userId, firstName, lastName); String cookieAsJson = RepresentationUtils.toRepresentation(authenticationCookie); - encryptedCookie = org.onap.sdc.security.CipherUtil.encryptPKC(cookieAsJson, confCookie.getSecurityKey()); + encryptedCookie = CipherUtil.encryptPKC(cookieAsJson, confCookie.getSecurityKey()); + isBuildCookieCompleted = true; } catch (Exception e) { - isBuildCookieCompleted = false; log.error(" Cookie Encryption failed ", e); } authCookie = new Cookie(confCookie.getCookieName(), encryptedCookie); @@ -243,12 +242,13 @@ public class PortalServlet extends HttpServlet { * @param request * @param headers */ - private void addCookies(final HttpServletResponse response, final HttpServletRequest request, final String[] headers) { + private void addCookies(final HttpServletResponse response, final HttpServletRequest request, final String[] headers) + throws CipherUtilException { for (var i = 0; i < headers.length; i++) { final var currHeader = ValidationUtils.sanitizeInputString(headers[i]); final var headerValue = ValidationUtils.sanitizeInputString(request.getHeader(currHeader)); if (headerValue != null) { - final var cookie = new Cookie(currHeader, headerValue); + final var cookie = new Cookie(currHeader, CipherUtil.encryptPKC(headerValue)); cookie.setSecure(true); response.addCookie(cookie); } diff --git a/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/PortalServletTest.java b/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/PortalServletTest.java index b31b2f970e..11a4aecede 100644 --- a/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/PortalServletTest.java +++ b/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/PortalServletTest.java @@ -55,14 +55,14 @@ import org.openecomp.sdc.fe.config.ConfigurationManager; class PortalServletTest extends JerseyTest { - private final static HttpServletRequest request = Mockito.mock(HttpServletRequest.class); - private final static HttpSession httpSession = Mockito.mock(HttpSession.class); - private final static ServletContext servletContext = Mockito.mock(ServletContext.class); - private final static ConfigurationManager configurationManager = Mockito.mock(ConfigurationManager.class); - private final static Configuration configuration = Mockito.mock(Configuration.class); - private final static HttpServletResponse response = Mockito.spy(HttpServletResponse.class); - private final static RequestDispatcher rd = Mockito.spy(RequestDispatcher.class); - final static Configuration.CookieConfig cookieConfiguration = Mockito.mock(Configuration.CookieConfig.class); + private static final HttpServletRequest request = Mockito.mock(HttpServletRequest.class); + private static final HttpSession httpSession = Mockito.mock(HttpSession.class); + private static final ServletContext servletContext = Mockito.mock(ServletContext.class); + private static final ConfigurationManager configurationManager = Mockito.mock(ConfigurationManager.class); + private static final Configuration configuration = Mockito.mock(Configuration.class); + private static final HttpServletResponse response = Mockito.spy(HttpServletResponse.class); + private static final RequestDispatcher rd = Mockito.spy(RequestDispatcher.class); + private static final Configuration.CookieConfig cookieConfiguration = Mockito.mock(Configuration.CookieConfig.class); @SuppressWarnings("serial") @BeforeAll diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 77b90a78cd..57d5e8b458 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -1,515 +1,520 @@ - - 4.0.0 - - org.openecomp.sdc.be - catalog-model - - - org.openecomp.sdc - sdc-main - 1.10.0-SNAPSHOT - - - - 4.0.3 - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - - - org.openecomp.sdc - common-app-api - ${project.version} - provided - - - com.fasterxml.jackson.core - jackson-core - - - - - - org.openecomp.sdc.be - common-be - ${project.version} - provided - - - org.springframework - spring-core - - - com.fasterxml.jackson.core - jackson-databind - - - - - - ch.qos.logback - logback-classic - ${logback.version} - provided - - - com.google.code.bean-matchers - bean-matchers - ${bean-matcher.version} - test - - - - ch.qos.logback - logback-core - ${logback.version} - provided - - - - - org.openecomp.sdc.be - catalog-dao - ${project.version} - provided - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - - - - - com.google.guava - guava - ${guava.version} - provided - - - - org.functionaljava - functionaljava - ${functionaljava.version} - provided - - - - - - org.springframework - spring-core - ${spring.version} - provided - - - - org.springframework - spring-beans - ${spring.version} - provided - - - - org.springframework - spring-context - ${spring.version} - provided - - - org.springframework - spring-expression - - - org.springframework - spring-core - - - - - - javax.validation - validation-api - ${javax.validation.version} - - - - org.hibernate.validator - hibernate-validator - ${hibernate.validator.version} - - - - - com.google.code.gson - gson - ${gson.version} - provided - - - - org.janusgraph - janusgraph-core - ${janusgraph.version} - provided - - - gremlin-groovy - org.apache.tinkerpop - - - org.json - json - - - slf4j-log4j12 - org.slf4j - - - commons-collections - commons-collections - - - groovy - org.codehaus.groovy - - - org.apache.thrift - libthrift - - - commons-io - commons-io - - - commons-codec - commons-codec - - - dom4j - dom4j - - - - - - org.janusgraph - janusgraph-cassandra - ${janusgraph.version} - provided - - - slf4j-log4j12 - org.slf4j - - - org.apache.thrift - libthrift - - - org.codehaus.jackson - jackson-mapper-asl - - - commons-codec - commons-codec - - - org.hibernate - hibernate-validator - - - org.apache.cassandra - cassandra-all - - - - - - org.apache.commons - commons-lang3 - ${lang3.version} - provided - - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - provided - - - commons-codec - commons-codec - - - - - - org.apache.httpcomponents - httpcore - ${httpcore.version} - provided - - - - - com.datastax.cassandra - cassandra-driver-core - ${cassandra.driver.version} - provided - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.datastax.cassandra - cassandra-driver-mapping - ${cassandra.driver.version} - provided - - - - - org.hamcrest - hamcrest - ${hamcrest.version} - test - - - - org.hamcrest - hamcrest-library - ${hamcrest.version} - test - - - - org.junit.jupiter - junit-jupiter - ${junitJupiter.version} - test - - - - org.mockito - mockito-junit-jupiter - ${mockitoJupiter.version} - test - - - - org.assertj - assertj-core - test - - - - org.springframework - spring-test - ${spring.version} - test - - - - org.aspectj - aspectjrt - ${aspectj.version} - test - - - - org.aspectj - aspectjweaver - ${aspectj.version} - test - - - - org.springframework - spring-web - ${spring.version} - test - - - org.springframework - spring-core - - - - - - org.springframework - spring-tx - test - ${spring.version} - - - org.springframework - spring-core - - - - - - org.springframework - spring-expression - test - ${spring.version} - - - - org.apache.commons - commons-jci-core - ${commons-jci-core.version} - test - - - commons-io - commons-io - - - - - - org.awaitility - awaitility - ${awaitility.version} - test - - - - org.codehaus.groovy - groovy - - - - io.netty - netty-all - - - org.apache.commons - commons-collections4 - ${commons.collections.version} - - - - io.netty - netty-handler - - - org.projectlombok - lombok - ${lombok.version} - - - joda-time - joda-time - ${joda.time.version} - - - org.openecomp.sdc.core - openecomp-tosca-lib - ${project.version} - - - com.fasterxml.jackson.core - jackson-core - - - org.springframework - spring-core - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.vdurmont - semver4j - 3.1.0 - - - - com.googlecode.jmapper-framework - jmapper-core - ${jMapper.version} - - - com.thoughtworks.xstream - xstream - - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - com.github.sylvainlaurent.maven - yaml-json-validator-maven-plugin - - - validate - validate - - validate - - - - - - src/main/resources/**/*.y*ml - src/test/resources/**/*.y*ml - - - - - src/main/resources/**/*.json - src/test/resources/**/*.json - - - - ${skipYamlJsonValidator} - - - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + 4.0.0 + + org.openecomp.sdc.be + catalog-model + + + org.openecomp.sdc + sdc-main + 1.10.0-SNAPSHOT + + + + 4.0.3 + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + + org.openecomp.sdc + common-app-api + ${project.version} + provided + + + com.fasterxml.jackson.core + jackson-core + + + + + + org.openecomp.sdc.be + common-be + ${project.version} + provided + + + org.springframework + spring-core + + + com.fasterxml.jackson.core + jackson-databind + + + + + + ch.qos.logback + logback-classic + ${logback.version} + provided + + + com.google.code.bean-matchers + bean-matchers + ${bean-matcher.version} + test + + + + ch.qos.logback + logback-core + ${logback.version} + provided + + + + + org.openecomp.sdc.be + catalog-dao + ${project.version} + provided + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + + + + com.google.guava + guava + ${guava.version} + provided + + + + org.functionaljava + functionaljava + ${functionaljava.version} + provided + + + + + + org.springframework + spring-core + ${spring.version} + provided + + + + org.springframework + spring-beans + ${spring.version} + provided + + + + org.springframework + spring-context + ${spring.version} + provided + + + org.springframework + spring-expression + + + org.springframework + spring-core + + + + + + javax.validation + validation-api + ${javax.validation.version} + + + + org.hibernate.validator + hibernate-validator + ${hibernate.validator.version} + + + + + com.google.code.gson + gson + ${gson.version} + provided + + + + org.janusgraph + janusgraph-core + ${janusgraph.version} + provided + + + gremlin-groovy + org.apache.tinkerpop + + + org.json + json + + + slf4j-log4j12 + org.slf4j + + + commons-collections + commons-collections + + + groovy + org.codehaus.groovy + + + org.apache.thrift + libthrift + + + commons-io + commons-io + + + commons-codec + commons-codec + + + dom4j + dom4j + + + + + + org.janusgraph + janusgraph-cassandra + ${janusgraph.version} + provided + + + slf4j-log4j12 + org.slf4j + + + org.apache.thrift + libthrift + + + org.codehaus.jackson + jackson-mapper-asl + + + commons-codec + commons-codec + + + org.hibernate + hibernate-validator + + + org.apache.cassandra + cassandra-all + + + + + + org.apache.commons + commons-lang3 + ${lang3.version} + provided + + + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + provided + + + commons-codec + commons-codec + + + + + + org.apache.httpcomponents + httpcore + ${httpcore.version} + provided + + + + + com.datastax.cassandra + cassandra-driver-core + ${cassandra.driver.version} + provided + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.datastax.cassandra + cassandra-driver-mapping + ${cassandra.driver.version} + provided + + + + + org.hamcrest + hamcrest + ${hamcrest.version} + test + + + + org.hamcrest + hamcrest-library + ${hamcrest.version} + test + + + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + + + + org.assertj + assertj-core + test + + + + org.springframework + spring-test + ${spring.version} + test + + + + org.aspectj + aspectjrt + ${aspectj.version} + test + + + + org.aspectj + aspectjweaver + ${aspectj.version} + test + + + + org.springframework + spring-web + ${spring.version} + test + + + org.springframework + spring-core + + + + + + org.springframework + spring-tx + test + ${spring.version} + + + org.springframework + spring-core + + + + + + org.springframework + spring-expression + test + ${spring.version} + + + + org.apache.commons + commons-jci-core + ${commons-jci-core.version} + test + + + commons-io + commons-io + + + + + + org.awaitility + awaitility + ${awaitility.version} + test + + + + org.codehaus.groovy + groovy + + + + io.netty + netty-all + + + org.apache.commons + commons-collections4 + ${commons.collections.version} + + + + io.netty + netty-handler + + + org.projectlombok + lombok + ${lombok.version} + + + joda-time + joda-time + ${joda.time.version} + + + org.openecomp.sdc.core + openecomp-tosca-lib + ${project.version} + + + com.fasterxml.jackson.core + jackson-core + + + org.springframework + spring-core + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.vdurmont + semver4j + 3.1.0 + + + + com.googlecode.jmapper-framework + jmapper-core + ${jMapper.version} + + + com.thoughtworks.xstream + xstream + + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + com.github.sylvainlaurent.maven + yaml-json-validator-maven-plugin + + + validate + validate + + validate + + + + + + src/main/resources/**/*.y*ml + src/test/resources/**/*.y*ml + + + + + src/main/resources/**/*.json + src/test/resources/**/*.json + + + + ${skipYamlJsonValidator} + + + + + + diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index f411fdafa0..8dbed601e5 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -42,6 +42,10 @@ org.springframework spring-core + + org.onap.portal.sdk + epsdk-fw + diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 1056fbd4c9..d0eebdba5d 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -290,6 +290,12 @@ limitations under the License. ${spring.version} test + + org.onap.portal.sdk + epsdk-fw + ${ecomp.version} + test + @@ -435,6 +441,7 @@ limitations under the License. ${verbose} ${docker.api.version} true + true onap/sdc-cassandra:${it.docker.version} @@ -524,7 +531,7 @@ limitations under the License. sdc-cassandra-onboard-init - sdc-cassandra + sdc-cassandra-init ${project.version} @@ -557,7 +564,7 @@ limitations under the License. onap/sdc-onboard-backend:${it.docker.version} sdc-onboard-backend - + sdc-cassandra-onboard-init @@ -738,9 +745,6 @@ limitations under the License. onap/sdc-simulator:${it.docker.version} sdc-simulator - - sdc-frontend - -Xmx128m -Xms128m -Xss1m @@ -761,13 +765,15 @@ limitations under the License. 8080 8443 + 5000 - 8285:8080 + 8285:8080 8286:8443 + 5000:5000 custom @@ -821,32 +827,32 @@ limitations under the License. - - onap/org.onap.sdc.sdc-helm-validator:${it.helm-validator.version} - helm-validator - - ${it.helm-validator.disabled} - helm-validator - - - - helm-validator - direct - - 8080 - - - - - 8085:8080 - - - custom - sdc-network + + onap/org.onap.sdc.sdc-helm-validator:${it.helm-validator.version} helm-validator - - - + + ${it.helm-validator.disabled} + helm-validator + + + + helm-validator + direct + + 8080 + + + + + 8085:8080 + + + custom + sdc-network + helm-validator + + + diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 3dcdee54c2..cf8ca1abeb 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -66,7 +66,6 @@ 2.2.6 3.0.1-b06 1 - 2.5 ${jackson.version} ${jackson.version} 1.58 diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml index 9f735fe857..8765d6618c 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml @@ -25,7 +25,7 @@ javax.servlet - servlet-api + javax.servlet-api ${javax.servlet.version} provided diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml index 00f9be18ef..13b31e403f 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml @@ -71,7 +71,7 @@ javax.servlet - servlet-api + javax.servlet-api ${javax.servlet.version} provided diff --git a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml index 30b50a9795..494b9aac57 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml @@ -63,7 +63,7 @@ javax.servlet javax.servlet-api - 3.1.0 + ${javax.servlet.version} diff --git a/pom.xml b/pom.xml index e0d54945d4..9a038bddc0 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ Modifications copyright (c) 2018-2019 Nokia 4.1.66.Final 3.1.0 2.26.3 - 2.6.0 + 3.4.0 4.3.1.0 2.1.8 1.18.20 @@ -72,6 +72,7 @@ Modifications copyright (c) 2018-2019 Nokia 4.1 2.1.1 2.0.1.Final + 4.0.1 9.4.41.v20210516 3.4.4 diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index 3ffc974c74..d3de8039b4 100755 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -27,9 +27,9 @@ OS_USER="onap" # Java Options: -BE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=4000,server=y,suspend=n -Xmx1536m -Xms1536m" -FE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=6000,server=y,suspend=n -Xmx256m -Xms256m" -ONBOARD_BE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=4001,server=y,suspend=n -Xmx1g -Xms1g" +BE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=*:4000,server=y,suspend=n -Xmx1536m -Xms1536m" +FE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=*:6000,server=y,suspend=n -Xmx256m -Xms256m" +ONBOARD_BE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=*:4001,server=y,suspend=n -Xmx1g -Xms1g" SIM_JAVA_OPTIONS=" -Xmx128m -Xms128m -Xss1m -Dlog4j.configuration=file:///${JETTY_BASE}/config/sdc-simulator/log4j2.properties" API_TESTS_JAVA_OPTIONS="-Xmx512m -Xms512m" UI_TESTS_JAVA_OPTIONS="-Xmx1024m -Xms1024m" diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index 02f2bdc22c..e9801c9402 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -1,273 +1,282 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - 4.0.0 - webseal-simulator - war + 4.0.0 + webseal-simulator + war - - org.openecomp.sdc - sdc-main - 1.10.0-SNAPSHOT - ../../ - + + org.openecomp.sdc + sdc-main + 1.10.0-SNAPSHOT + ../../ + - - yyyyMMdd'T'HHmmss'Z' - https://nexus.onap.org - UTF-8 - true - + + yyyyMMdd'T'HHmmss'Z' + https://nexus.onap.org + UTF-8 + true + - - - javax.servlet - servlet-api - 2.5 - compile - + + + javax.servlet + javax.servlet-api + ${javax.servlet.version} + - - org.apache.httpcomponents - httpclient - ${httpclient.version} - + + org.apache.httpcomponents + httpclient + ${httpclient.version} + - - commons-logging - commons-logging-api - 1.0.4 - + + commons-logging + commons-logging-api + 1.0.4 + - - commons-io - commons-io - ${commons.io.version} - + + commons-io + commons-io + ${commons.io.version} + - - commons-codec - commons-codec - ${commons-codec} - compile - + + commons-codec + commons-codec + ${commons-codec} + compile + - - org.eclipse.jetty - jetty-proxy - ${jetty.version} - compile - - - org.eclipse.jetty - jetty-http - - - + + org.eclipse.jetty + jetty-proxy + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-http + + + - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - compile - - - org.eclipse.jetty - jetty-http - - - + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + compile + + + org.eclipse.jetty + jetty-http + + + - - - com.typesafe - config - 1.0.2 - compile - - - org.openecomp.sdc - openecomp-sdc-logging-api - ${project.version} - + + + com.typesafe + config + 1.0.2 + compile + + + org.openecomp.sdc + openecomp-sdc-logging-api + ${project.version} + + + org.powermock + powermock-module-junit4 + + + + - - - WSSimulator-${project.version} - - - com.github.sylvainlaurent.maven - yaml-json-validator-maven-plugin - - - validate - validate - - validate - - - - - - src/main/resources/**/*.y*ml - src/test/resources/**/*.y*ml - - - - - src/main/resources/**/*.json - src/test/resources/**/*.json - - - - ${skipYamlJsonValidator} - - - - - - + + WSSimulator-${project.version} + + + com.github.sylvainlaurent.maven + yaml-json-validator-maven-plugin + + + validate + validate + + validate + + + + + + src/main/resources/**/*.y*ml + src/test/resources/**/*.y*ml + + + + + src/main/resources/**/*.json + src/test/resources/**/*.json + + + + ${skipYamlJsonValidator} + + + + + + - - - - ecomp-releases - Release Repository - ${nexus.proxy}/content/repositories/releases/ - - - ecomp-snapshots - Snapshots Repository - ${nexus.proxy}/content/repositories/snapshots/ - - - ecomp-public - Public Repository - ${nexus.proxy}/content/repositories/public/ - - - + + + + ecomp-releases + Release Repository + ${nexus.proxy}/content/repositories/releases/ + + + ecomp-snapshots + Snapshots Repository + ${nexus.proxy}/content/repositories/snapshots/ + + + ecomp-public + Public Repository + ${nexus.proxy}/content/repositories/public/ + + + - - - docker - - false - - - + + + docker + + false + + + - - maven-clean-plugin - 3.0.0 - - - clean-static-files - clean - - clean - - - - - ${project.basedir}/sdc-simulator - - *.war - - false - - - - - - + + maven-clean-plugin + 3.0.0 + + + clean-static-files + clean + + clean + + + + + ${project.basedir}/sdc-simulator + + *.war + + false + + + + + + - - maven-resources-plugin - - - copy-resources-simulator - verify - - copy-resources - - - ${project.basedir}/sdc-simulator - - - ${project.basedir}/target - - WSSimulator*.war - - - - - - - + + maven-resources-plugin + + + copy-resources-simulator + verify + + copy-resources + + + ${project.basedir}/sdc-simulator + + + + ${project.basedir}/target + + WSSimulator*.war + + + + + + + - - io.fabric8 - docker-maven-plugin - - ${verbose} - ${docker.api.version} - nexus3.onap.org:10001 - - - docker - docker - - - - - - onap/sdc-simulator - sdc-simulator - - try - ${basedir}${file.separator}sdc-simulator - - latest - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} - - - - - - - - clean-images - pre-clean - - remove - - - - generate-images - install - - build - - - - push-images - deploy - - push - - - - - - - - + + io.fabric8 + docker-maven-plugin + + ${verbose} + ${docker.api.version} + nexus3.onap.org:10001 + + + docker + docker + + + + + + onap/sdc-simulator + sdc-simulator + + try + ${basedir}${file.separator}sdc-simulator + + + latest + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} + + + + + + + + + clean-images + pre-clean + + remove + + + + generate-images + install + + build + + + + push-images + deploy + + push + + + + + + + + diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/templates/default/SDC-Simulator-webseal.conf.erb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/templates/default/SDC-Simulator-webseal.conf.erb index 4cdd4fbfba..f6e634481f 100644 --- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/templates/default/SDC-Simulator-webseal.conf.erb +++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/templates/default/SDC-Simulator-webseal.conf.erb @@ -10,14 +10,6 @@ lastName="Santana" role="Designer" email="csantana@sdc.com" - }, - { - userId="op0001" - password="123123a" - firstName="Aretha" - lastName="Franklin" - role="Ops" - email="afranklin@sdc.com" }, { userId="jh0003" @@ -34,14 +26,6 @@ lastName="Depp" role="Tester" email="tester@sdc.com" - }, - { - userId="gv0001" - password="123123a" - firstName="David" - lastName="Shadmi" - role="Governor" - email="governor@sdc.com" } ] } diff --git a/utils/webseal-simulator/sdc-simulator/startup.sh b/utils/webseal-simulator/sdc-simulator/startup.sh index e8774be9f0..49fdf3ef16 100644 --- a/utils/webseal-simulator/sdc-simulator/startup.sh +++ b/utils/webseal-simulator/sdc-simulator/startup.sh @@ -1,14 +1,13 @@ #!/bin/sh JAVA_OPTIONS=" $JAVA_OPTIONS \ - -Xdebug -agentlib:jdwp=transport=dt_socket,address=5000,server=y,suspend=n -Xmx128m -Xms128m -Xss1m \ - -Dconfig.home=$JETTY_BASE/config/sdc-simulator \ - -Dlog.home=$JETTY_BASE/logs \ - -Dlogback.configurationFile=$JETTY_BASE/config/sdc-simulator/logback.xml \ - -Djavax.net.ssl.trustStore=$JETTY_BASE/etc/org.onap.sdc.trust.jks \ - -Djavax.net.ssl.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0 \ - -Djetty.console-capture.dir=$JETTY_BASE/logs" - + -Xdebug -agentlib:jdwp=transport=dt_socket,address=*:5000,server=y,suspend=n -Xmx128m -Xms128m -Xss1m \ + -Dconfig.home=$JETTY_BASE/config/sdc-simulator \ + -Dlog.home=$JETTY_BASE/logs \ + -Dlogback.configurationFile=$JETTY_BASE/config/sdc-simulator/logback.xml \ + -Djavax.net.ssl.trustStore=$JETTY_BASE/etc/org.onap.sdc.trust.jks \ + -Djavax.net.ssl.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0 \ + -Djetty.console-capture.dir=$JETTY_BASE/logs" cd $JETTY_BASE/chef-solo chef-solo -c solo.rb -E ${ENVNAME} @@ -16,4 +15,3 @@ chef-solo -c solo.rb -E ${ENVNAME} cd $JETTY_HOME java $JAVA_OPTIONS -jar "${JETTY_HOME}/start.jar" - diff --git a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/Login.java b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/Login.java index 3d4e772006..32d8c2916d 100644 --- a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/Login.java +++ b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/Login.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file 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. @@ -20,149 +20,137 @@ package org.openecomp.sdc.webseal.simulator; -import org.openecomp.sdc.webseal.simulator.conf.Conf; - -import javax.servlet.ServletConfig; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Collection; +import java.util.Iterator; import javax.servlet.ServletException; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Collection; -import java.util.Iterator; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; +import org.openecomp.sdc.webseal.simulator.conf.Conf; public class Login extends HttpServlet { - private static final long serialVersionUID = 1L; - - @Override - public void init(final ServletConfig config) throws ServletException { - super.init(config); - } - - @Override - protected void doGet(final HttpServletRequest request, final HttpServletResponse response) - throws ServletException, IOException { - - if (null != request.getParameter("userId")) { - doPost(request, response); - return; - } - System.out.println("about to build login page"); - response.setContentType("text/html"); - PrintWriter writer = response.getWriter(); - - Collection allUsers = Conf.getInstance().getUsers().values(); - writer.println(""); - - writer.println(""); - writer.println(""); - writer.println(""); - - writer.println(""); - - writer.println("

Webseal simulator

"); - writer.println("

Login:

"); - - writer.println("
"); - writer.println("
User id:
"); - writer.println(" "); - writer.println("
"); - - writer.println("
Password:
"); - writer.println(" "); - writer.println("
"); - - writer.println(" "); - writer.println(" "); - writer.println("
"); - - writer.println("
"); - writer.println("

Quick links:

"); - writer.println(""); - writer.println(""); - writer.println(""); - writer.println(""); - writer.println(""); - writer.println(""); - writer.println(""); - Iterator iterator = allUsers.iterator(); - while (iterator.hasNext()) { - User user = iterator.next(); - writer.println(""); - writer.println(""); - writer.println(""); - writer.println(""); - writer.println(""); - writer.println(""); - } - writer.println("
full nameuser idroleaction
" + user.getUserRef() + "" + user.getUserId() + "" + user.getRole() + "" + user.getUserCreateRef() + "
"); - - writer.println("Create All"); - writer.println("
"); - - writer.println(""); - writer.println(""); - - } - - public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - String userId = request.getParameter("userId"); - String password = request.getParameter("password"); - request.setAttribute("message", "OK"); - - System.out.println("Login -> doPost userId=" + userId); - User user = getUser(userId, password); - if (user == null) { - response.sendError(500, "ERROR: userId or password incorrect"); -// doGet(request, response); - } else { - System.out.println("Login -> doPost redirect to /sdc1 (to proxy)"); - Cookie cookieUser = new Cookie("HTTP_IV_USER", user.getUserId()); - Cookie cookieUserId = new Cookie("USER_ID", user.getUserId()); - Cookie cookieFirstName = new Cookie("HTTP_CSP_FIRSTNAME", user.getFirstName()); - Cookie cookieEmail = new Cookie("HTTP_CSP_EMAIL", user.getEmail()); - Cookie cookieLastName = new Cookie("HTTP_CSP_LASTNAME", user.getLastName()); - Cookie cookieRemoteAddress = new Cookie("HTTP_IV_REMOTE_ADDRESS", "0.0.0.0"); - Cookie cookieWsType = new Cookie("HTTP_CSP_WSTYPE", "Intranet"); - response.addCookie(cookieUser); - response.addCookie(cookieUserId); - response.addCookie(cookieFirstName); - response.addCookie(cookieEmail); - response.addCookie(cookieLastName); - response.addCookie(cookieRemoteAddress); - response.addCookie(cookieWsType); - response.addCookie(new Cookie(Conf.getInstance().getPortalCookieName(), "portal")); - response.sendRedirect("/sdc1"); - } - - } - - private User getUser(String userId, String password) { - User user = Conf.getInstance().getUsers().get(userId); - if (user == null) { - return null; - } - if (!password.equals(user.getPassword())) { - return null; - } - return user; - } - - @Override - public String getServletInfo() { - return "Http Proxy Servlet"; - } + private static final long serialVersionUID = 1L; + private static final Logger logger = LoggerFactory.getLogger(Login.class); + + @Override + protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { + + if (null != request.getParameter("userId")) { + doPost(request, response); + return; + } + logger.info("about to build login page"); + response.setContentType("text/html"); + PrintWriter writer = response.getWriter(); + + Collection allUsers = Conf.getInstance().getUsers().values(); + writer.println(""); + + writer.println(""); + writer.println(""); + writer.println(""); + + writer.println(""); + + writer.println("

Webseal simulator

"); + writer.println("

Login:

"); + + writer.println("
"); + writer.println("
User id:
"); + writer.println(" "); + writer.println("
"); + + writer.println("
Password:
"); + writer.println(" "); + writer.println("
"); + + writer.println(" "); + writer.println(" "); + writer.println("
"); + + writer.println("
"); + writer.println("

Quick links:

"); + writer.println(""); + writer.println(""); + writer.println(""); + writer.println(""); + writer.println(""); + writer.println(""); + writer.println(""); + Iterator iterator = allUsers.iterator(); + while (iterator.hasNext()) { + User user = iterator.next(); + writer.println(""); + writer.println(""); + writer.println(""); + writer.println(""); + writer.println(""); + writer.println(""); + } + writer.println("
full nameuser idroleaction
" + user.getUserRef() + "" + user.getUserId() + "" + user.getRole() + "" + user.getUserCreateRef() + "
"); + + writer.println("Create All"); + writer.println("
"); + + writer.println(""); + writer.println(""); + + } + + @Override + public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + String userId = request.getParameter("userId"); + String password = request.getParameter("password"); + request.setAttribute("message", "OK"); + + logger.info("Login -> doPost userId={}", userId); + User user = getUser(userId, password); + if (user == null) { + response.sendError(500, "ERROR: userId or password incorrect"); + } else { + logger.info("Login -> doPost redirect to /sdc1 (to proxy)"); + response.addCookie(new Cookie("HTTP_IV_USER", user.getUserId())); + response.addCookie(new Cookie("USER_ID", user.getUserId())); + response.addCookie(new Cookie("HTTP_CSP_FIRSTNAME", user.getFirstName())); + response.addCookie(new Cookie("HTTP_CSP_EMAIL", user.getEmail())); + response.addCookie(new Cookie("HTTP_CSP_LASTNAME", user.getLastName())); + response.addCookie(new Cookie("HTTP_IV_REMOTE_ADDRESS", "0.0.0.0")); + response.addCookie(new Cookie("HTTP_CSP_WSTYPE", "Intranet")); + response.addCookie(new Cookie(Conf.getInstance().getPortalCookieName(), "portal")); + response.sendRedirect("/sdc1"); + } + + } + + private User getUser(String userId, String password) { + User user = Conf.getInstance().getUsers().get(userId); + if (user == null) { + return null; + } + if (!password.equals(user.getPassword())) { + return null; + } + return user; + } + + @Override + public String getServletInfo() { + return "Http Proxy Servlet"; + } } diff --git a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java index ea4203dcc1..51d6796c4c 100644 --- a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java +++ b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file 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. @@ -20,8 +20,43 @@ package org.openecomp.sdc.webseal.simulator; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLEncoder; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.zip.GZIPInputStream; +import javax.net.ssl.SSLContext; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletInputStream; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import lombok.AllArgsConstructor; +import lombok.Getter; import org.apache.http.Header; -import org.apache.http.client.methods.*; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpDelete; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.client.methods.HttpRequestBase; +import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; import org.apache.http.conn.socket.ConnectionSocketFactory; @@ -35,54 +70,31 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.ssl.SSLContextBuilder; -import org.openecomp.sdc.logging.api.Logger; -import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.webseal.simulator.conf.Conf; -import javax.net.ssl.SSLContext; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLEncoder; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.util.*; -import java.util.stream.Collectors; -import java.util.zip.GZIPInputStream; - public class SdcProxy extends HttpServlet { private static final long serialVersionUID = 1L; - private static URL url; + private static final Set RESERVED_HEADERS = + Arrays.stream(ReservedHeaders.values()).map(ReservedHeaders::getValue).collect(Collectors.toSet()); + private static final String USER_ID = "USER_ID"; + private static final String HTTP_IV_USER = "HTTP_IV_USER"; + private static final String SDC1 = "/sdc1"; + private static final String ONBOARDING = "/onboarding/"; + private static final String SCRIPTS = "/scripts"; + private static final String STYLES = "/styles"; + private static final String LANGUAGES = "/languages"; + private static final String CONFIGURATIONS = "/configurations"; + private URL url; private CloseableHttpClient httpClient; private Conf conf; - private final String SDC1 = "/sdc1"; - private final String ONBOARDING = "/onboarding/"; - private final String SCRIPTS = "/scripts"; - private final String STYLES = "/styles"; - private final String LANGUAGES = "/languages"; - private final String CONFIGURATIONS = "/configurations"; - private static final Set RESERVED_HEADERS = Arrays.stream(ReservedHeaders.values()).map(h -> h.getValue()).collect(Collectors.toSet()); - - private static final Logger logger = LoggerFactory.getLogger(SdcProxy.class); + @Override public void init(ServletConfig config) throws ServletException { super.init(config); conf = Conf.getInstance(); try { - String feHost = conf.getFeHost(); - url = new URL(feHost); + url = new URL(conf.getFeHost()); } catch (MalformedURLException me) { throw new ServletException("Proxy URL is invalid", me); } @@ -94,10 +106,12 @@ public class SdcProxy extends HttpServlet { } } + @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { proxy(request, response, MethodEnum.GET); } + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String userId = request.getParameter("userId"); @@ -105,7 +119,7 @@ public class SdcProxy extends HttpServlet { // Already sign-in if (userId == null) { - userId = request.getHeader("USER_ID"); + userId = request.getHeader(USER_ID); } System.out.println("SdcProxy -> doPost userId=" + userId); @@ -117,25 +131,25 @@ public class SdcProxy extends HttpServlet { view.forward(mutableRequest, response); } else { System.out.println("SdcProxy -> doPost going to doGet"); - request.setAttribute("HTTP_IV_USER", userId); + request.setAttribute(HTTP_IV_USER, userId); proxy(request, response, MethodEnum.POST); } } + @Override public void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { proxy(request, response, MethodEnum.PUT); } + @Override public void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { proxy(request, response, MethodEnum.DELETE); } - private synchronized void proxy(HttpServletRequest request, HttpServletResponse response, MethodEnum methodEnum) throws IOException, UnsupportedEncodingException { + private synchronized void proxy(HttpServletRequest request, HttpServletResponse response, MethodEnum methodEnum) throws IOException { Map requestParameters = request.getParameterMap(); String userIdHeader = getUseridFromRequest(request); - User user = getUser(userIdHeader); - // new request - forward to login page if (userIdHeader == null) { System.out.print("Going to login"); @@ -143,17 +157,19 @@ public class SdcProxy extends HttpServlet { return; } + final User user = getUser(userIdHeader); + String uri = getUri(request, requestParameters); HttpRequestBase httpMethod = createHttpMethod(request, methodEnum, uri); addHeadersToMethod(httpMethod, user, request); - try (CloseableHttpResponse closeableHttpResponse = httpClient.execute(httpMethod)){; + try (CloseableHttpResponse closeableHttpResponse = httpClient.execute(httpMethod)) { response.setStatus(closeableHttpResponse.getStatusLine().getStatusCode()); if (request.getRequestURI().indexOf(".svg") > -1) { response.setContentType("image/svg+xml"); } - if(closeableHttpResponse.getEntity() != null) { + if (closeableHttpResponse.getEntity() != null) { InputStream responseBodyStream = closeableHttpResponse.getEntity().getContent(); Header contentEncodingHeader = closeableHttpResponse.getLastHeader("Content-Encoding"); if (contentEncodingHeader != null && contentEncodingHeader.getValue().equalsIgnoreCase("gzip")) { @@ -194,8 +210,7 @@ public class SdcProxy extends HttpServlet { suffix = alignUrlProxy(suffix); } StringBuilder query = alignUrlParameters(requestParameters); - String uri = String.format("%s%s", new Object[]{this.url.toString() + suffix, query.toString()}); - return uri; + return String.format("%s%s", url.toString() + suffix, query.toString()); } private HttpRequestBase createHttpMethod(HttpServletRequest request, MethodEnum methodEnum, String uri) throws IOException { @@ -228,20 +243,20 @@ public class SdcProxy extends HttpServlet { private ContentType getContentType(HttpServletRequest request) { String contentTypeStr = request.getContentType(); - if (contentTypeStr == null ){ - contentTypeStr = request.getHeader("contentType"); - } + if (contentTypeStr == null) { + contentTypeStr = request.getHeader("contentType"); + } ContentType contentType = ContentType.parse(contentTypeStr); return ContentType.create(contentType.getMimeType()); } private String getUseridFromRequest(HttpServletRequest request) { - String userIdHeader = request.getHeader("USER_ID"); + String userIdHeader = request.getHeader(USER_ID); if (userIdHeader != null) { return userIdHeader; } - Object o = request.getAttribute("HTTP_IV_USER"); + Object o = request.getAttribute(HTTP_IV_USER); if (o != null) { return o.toString(); } @@ -249,7 +264,7 @@ public class SdcProxy extends HttpServlet { if (cookies != null) { for (int i = 0; i < cookies.length; ++i) { - if (cookies[i].getName().equals("USER_ID")) { + if (cookies[i].getName().equals(USER_ID)) { userIdHeader = cookies[i].getValue(); } } @@ -257,7 +272,7 @@ public class SdcProxy extends HttpServlet { return userIdHeader; } - private static void addHeadersToMethod(HttpUriRequest proxyMethod, User user, HttpServletRequest request) { + private void addHeadersToMethod(HttpUriRequest proxyMethod, User user, HttpServletRequest request) { proxyMethod.setHeader(ReservedHeaders.HTTP_IV_USER.name(), user.getUserId()); proxyMethod.setHeader(ReservedHeaders.USER_ID.name(), user.getUserId()); @@ -266,19 +281,19 @@ public class SdcProxy extends HttpServlet { proxyMethod.setHeader(ReservedHeaders.HTTP_CSP_LASTNAME.name(), user.getLastName()); proxyMethod.setHeader(ReservedHeaders.HTTP_IV_REMOTE_ADDRESS.name(), "0.0.0.0"); proxyMethod.setHeader(ReservedHeaders.HTTP_CSP_WSTYPE.name(), "Intranet"); - proxyMethod.setHeader(ReservedHeaders.HTTP_CSP_EMAIL.name(), "me@mail.com"); - - Enumeration headerNames = request.getHeaderNames(); - while (headerNames.hasMoreElements()) { - String headerName = headerNames.nextElement(); - if (!RESERVED_HEADERS.contains(headerName)) { - Enumeration headers = request.getHeaders(headerName); - while (headers.hasMoreElements()) { - String headerValue = headers.nextElement(); - proxyMethod.setHeader(headerName, headerValue); - } - } - } + proxyMethod.setHeader(ReservedHeaders.HTTP_CSP_EMAIL.name(), "me@mail.com"); + + Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()) { + String headerName = headerNames.nextElement(); + if (!RESERVED_HEADERS.contains(headerName)) { + Enumeration headers = request.getHeaders(headerName); + while (headers.hasMoreElements()) { + String headerValue = headers.nextElement(); + proxyMethod.setHeader(headerName, headerValue); + } + } + } } private String alignUrlProxy(String requestURI) { @@ -301,19 +316,16 @@ public class SdcProxy extends HttpServlet { return SDC1 + requestURI; } - private static StringBuilder alignUrlParameters(Map requestParameters) throws UnsupportedEncodingException { - StringBuilder query = new StringBuilder(); - for (String name : requestParameters.keySet()) { - for (String value : (String[]) requestParameters.get(name)) { + private StringBuilder alignUrlParameters(Map requestParameters) throws UnsupportedEncodingException { + final var query = new StringBuilder(); + for (final Entry entry : requestParameters.entrySet()) { + for (final String value : entry.getValue()) { if (query.length() == 0) { query.append("?"); } else { query.append("&"); } - name = URLEncoder.encode(name, "UTF-8"); - value = URLEncoder.encode(value, "UTF-8"); - - query.append(String.format("&%s=%s", new Object[]{name, value})); + query.append(String.format("&%s=%s", URLEncoder.encode(entry.getKey(), "UTF-8"), URLEncoder.encode(value, "UTF-8"))); } } return query; @@ -327,38 +339,36 @@ public class SdcProxy extends HttpServlet { outputStream.flush(); } + @Override public String getServletInfo() { return "Http Proxy Servlet"; } - enum ReservedHeaders { - HTTP_IV_USER("HTTP_IV_USER"), USER_ID("USER_ID"), HTTP_CSP_FIRSTNAME("HTTP_CSP_FIRSTNAME"), HTTP_CSP_EMAIL("HTTP_CSP_EMAIL"), HTTP_CSP_LASTNAME("HTTP_CSP_LASTNAME"), HTTP_IV_REMOTE_ADDRESS("HTTP_IV_REMOTE_ADDRESS"), HTTP_CSP_WSTYPE("HTTP_CSP_WSTYPE"), HOST("Host"), CONTENTLENGTH("Content-Length"); - - private String value; - - ReservedHeaders(String value) { - this.value = value; - } - - public String getValue() { - return value; - } - } - - - private static CloseableHttpClient buildRestClient() throws NoSuchAlgorithmException, KeyStoreException { - SSLContextBuilder builder = new SSLContextBuilder(); + private CloseableHttpClient buildRestClient() throws NoSuchAlgorithmException, KeyStoreException { + final var builder = new SSLContextBuilder(); builder.loadTrustMaterial(null, new TrustSelfSignedStrategy()); SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(SSLContext.getDefault(), - NoopHostnameVerifier.INSTANCE); + NoopHostnameVerifier.INSTANCE); Registry registry = RegistryBuilder.create() - .register("http", new PlainConnectionSocketFactory()) - .register("https", sslsf) - .build(); + .register("http", new PlainConnectionSocketFactory()) + .register("https", sslsf) + .build(); PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager(registry); return HttpClients.custom() - .setSSLSocketFactory(sslsf) - .setConnectionManager(cm) - .build(); + .setSSLSocketFactory(sslsf) + .setConnectionManager(cm) + .build(); + } + + @AllArgsConstructor + @Getter + enum ReservedHeaders { + HTTP_IV_USER(SdcProxy.HTTP_IV_USER), USER_ID(SdcProxy.USER_ID), HTTP_CSP_FIRSTNAME("HTTP_CSP_FIRSTNAME"), HTTP_CSP_EMAIL( + "HTTP_CSP_EMAIL"), HTTP_CSP_LASTNAME("HTTP_CSP_LASTNAME"), HTTP_IV_REMOTE_ADDRESS("HTTP_IV_REMOTE_ADDRESS"), HTTP_CSP_WSTYPE( + "HTTP_CSP_WSTYPE"), HOST("Host"), CONTENTLENGTH("Content-Length"); + + private final String value; + } + } diff --git a/utils/webseal-simulator/src/main/resources/webseal.conf b/utils/webseal-simulator/src/main/resources/webseal.conf index 7065725ab1..c711a73113 100644 --- a/utils/webseal-simulator/src/main/resources/webseal.conf +++ b/utils/webseal-simulator/src/main/resources/webseal.conf @@ -10,14 +10,6 @@ role="Designer" email="csantana@sdc.com" }, - { - userId="op0001" - password="123123a" - firstName="Aretha" - lastName="Franklin" - role="Ops" - email="afranklin@sdc.com" - }, { userId="jh0003" password="123123a" @@ -34,14 +26,6 @@ role="Tester" email="tester@sdc.com" }, - { - userId="gv0001" - password="123123a" - firstName="David" - lastName="Shadmi" - role="Governor" - email="governor@sdc.com" - }, { userId="pm0001" password="123123a" diff --git a/utils/webseal-simulator/src/main/webapp/login.html b/utils/webseal-simulator/src/main/webapp/login.html index 2f6a324fcf..4d9eccb670 100644 --- a/utils/webseal-simulator/src/main/webapp/login.html +++ b/utils/webseal-simulator/src/main/webapp/login.html @@ -1,5 +1,5 @@ - - + + + +Login page Login - -
- UserId:
- -
- PASSWORD:
- -

- - -