From: Smokowski, Steve (ss835w) <ss835w@us.att.com>
Date: Tue, 27 Nov 2018 18:02:13 +0000 (-0500)
Subject: Update URL Logic
X-Git-Tag: 2.1.9~105^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=43572325dfda87c7c3d4725c9c33722cf5072de0;p=aaf%2Fauthz.git

Update URL Logic

Update logic to fetch the path of request

Issue-ID: AAF-645


Change-Id: I4ba4f3623adc14add20555f3c50e4e81376689d7
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
---

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiApiEnforcementFilter.java b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiApiEnforcementFilter.java
index 495131b9..e32b30d0 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiApiEnforcementFilter.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiApiEnforcementFilter.java
@@ -98,7 +98,11 @@ public class CadiApiEnforcementFilter implements Filter {
 	public void doFilter(ServletRequest req, ServletResponse resp, FilterChain fc) throws IOException, ServletException {
 		HttpServletRequest hreq = (HttpServletRequest)req;
 		final String meth = hreq.getMethod();
-		final String path = hreq.getContextPath()+hreq.getPathInfo();
+		String path = hreq.getContextPath()+hreq.getPathInfo();
+		
+		if(path == null || path.isEmpty() || "null".equals(path))
+			path = hreq.getRequestURI().substring(hreq.getContextPath().length());
+		
 		List<String> list = publicPaths.get(meth);
 		if(list!=null) {
 			for( String p : publicPaths.get(meth)) {