X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Fbe%2Ffilters%2FGatewayFilter.java;h=fe9d96b9cdc4bdc4c650bf04a3d3540a6834d24f;hb=5f3e9912406897ee18c424b940881ce08d59bb44;hp=b675ec9a6e5508417eb41e146fd6e7cfc5eee73a;hpb=ddb9d5a7637b382be9ac7a96ad023a983c41c342;p=sdc.git diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/GatewayFilter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/GatewayFilter.java index b675ec9a6e..fe9d96b9cd 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/GatewayFilter.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/GatewayFilter.java @@ -20,8 +20,6 @@ package org.openecomp.sdc.be.filters; import java.io.IOException; -import java.util.List; -import java.util.stream.Stream; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -33,10 +31,8 @@ import javax.servlet.http.HttpServletResponse; import javax.ws.rs.WebApplicationException; import org.apache.http.HttpStatus; import org.openecomp.sdc.be.components.impl.exceptions.ComponentException; -import org.openecomp.sdc.be.config.Configuration; import org.openecomp.sdc.be.servlets.exception.ComponentExceptionMapper; import org.openecomp.sdc.common.api.FilterDecisionEnum; -import org.openecomp.sdc.common.log.wrappers.Logger; import org.openecomp.sdc.common.util.ThreadLocalsHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -44,16 +40,12 @@ import org.springframework.stereotype.Component; @Component("gatewayFilter") public class GatewayFilter implements Filter { - private static final Logger log = Logger.getLogger(GatewayFilter.class); - private Configuration.CookieConfig authCookieConf; - private Configuration config; @Autowired private ThreadLocalUtils threadLocalUtils; @Autowired private ComponentExceptionMapper componentExceptionMapper; - public GatewayFilter(org.openecomp.sdc.be.config.Configuration configuration) { - this.authCookieConf = configuration.getAuthCookie(); + public GatewayFilter() { } @Override @@ -65,11 +57,9 @@ public class GatewayFilter implements Filter { HttpServletRequest httpRequest = (HttpServletRequest) req; HttpServletResponse httpResponse = (HttpServletResponse) res; try { - if (isUrlFromWhiteList(httpRequest) || isConsumerBusinessLogic()) { - ThreadLocalsHolder.setApiType(FilterDecisionEnum.NA); - threadLocalUtils.setUserContextFromDB(httpRequest); - filterChain.doFilter(httpRequest, res); - } + ThreadLocalsHolder.setApiType(FilterDecisionEnum.NA); + threadLocalUtils.setUserContextFromDB(httpRequest); + filterChain.doFilter(httpRequest, res); } catch (ComponentException ce) { componentExceptionMapper.writeToResponse(ce, httpResponse); } catch (WebApplicationException we) { @@ -88,20 +78,6 @@ public class GatewayFilter implements Filter { httpResponse.setCharacterEncoding("UTF-8"); } - private boolean isUrlFromWhiteList(HttpServletRequest httpRequest) { - String pathInfo; - List excludedUrls = authCookieConf.getExcludedUrls(); - pathInfo = httpRequest.getPathInfo().toLowerCase(); - log.debug("SessionValidationFilter: white list validation -> PathInfo: {} ", pathInfo); - Stream stream = excludedUrls.stream(); - pathInfo.getClass(); - return stream.anyMatch(pathInfo::matches); - } - - private Boolean isConsumerBusinessLogic() { - return config.getConsumerBusinessLogic(); - } - @Override public void destroy() { }