summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java14
-rw-r--r--ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java8
2 files changed, 17 insertions, 5 deletions
diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java
index 0fdc14d2..143eb0fb 100644
--- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java
+++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java
@@ -2,7 +2,7 @@
* ============LICENSE_START==========================================
* ONAP Portal SDK
* ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2018 AT&T Intellectual Property. All rights reserved.
* ===================================================================
*
* Unless otherwise specified, all software contained herein is licensed
@@ -52,6 +52,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.onap.aaf.cadi.filter.CadiFilter;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
import org.onap.portalsdk.core.onboarding.util.AuthUtil;
import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
import org.onap.portalsdk.core.onboarding.util.PortalApiProperties;
@@ -61,11 +62,14 @@ public class CadiAuthFilter extends CadiFilter {
private static String include_url_endpoints ="";
private static String exclude_url_endpoints = "";
public static final String AUTHORIZATION = "Authorization";
+ private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(CadiAuthFilter.class);
public void init(FilterConfig filterConfig) throws ServletException {
super.init(filterConfig);
include_url_endpoints = filterConfig.getInitParameter("include_url_endpoints");
exclude_url_endpoints = filterConfig.getInitParameter("exclude_url_endpoints");
+ logger.debug(EELFLoggerDelegate.debugLogger, "inculde_url_endpoints values: "+ include_url_endpoints);
+ logger.debug(EELFLoggerDelegate.debugLogger, "exculde_url_endpoints values: "+ exclude_url_endpoints);
}
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
@@ -83,11 +87,13 @@ public class CadiAuthFilter extends CadiFilter {
Arrays.asList(excludeUrlEndPointString.split(",")));
ArrayList<String> includeUrlEndPointList = new ArrayList<String>(
Arrays.asList(includeUrlEndPointString.split(",")));
- if (excludeFilter(request, excludeUrlEndPointList))
+ if (excludeFilter(request, excludeUrlEndPointList)){
+ logger.debug(EELFLoggerDelegate.debugLogger, "Request excluded from cadifilter");
chain.doFilter(request, response);
- else if (includeFilter(request, includeUrlEndPointList))
+ }else if (includeFilter(request, includeUrlEndPointList)){
+ logger.debug(EELFLoggerDelegate.debugLogger, "Request is entering cadifilter");
super.doFilter(request, response, chain);
- else
+ }else
chain.doFilter(request, response);
}
}
diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java
index a7aa6765..14ad234f 100644
--- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java
+++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java
@@ -2,7 +2,7 @@
* ============LICENSE_START==========================================
* ONAP Portal SDK
* ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2018 AT&T Intellectual Property. All rights reserved.
* ===================================================================
*
* Unless otherwise specified, all software contained herein is licensed
@@ -142,6 +142,7 @@ public class AuthUtil {
str = decodeFunctionCode(instance);
finalInstanceList.add(str);
}
+ logger.debug(EELFLoggerDelegate.debugLogger, "List of AllInstances: "+ finalInstanceList);
return finalInstanceList;
}
@@ -185,6 +186,11 @@ public class AuthUtil {
if (!isauthorized)
isauthorized = matchPattern(requestUri, str);
}
+ logger.debug(EELFLoggerDelegate.debugLogger, "isAccessAllowed for the request uri: "+requestUri + "is"+ isauthorized);
+ if (isauthorized) {
+ logger.debug(EELFLoggerDelegate.debugLogger,
+ "Request is Authorized");
+ }
return isauthorized;
}
} \ No newline at end of file