X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FAuthorizationFilter.java;h=64aeea7062280b9f3c3ea44c51715ae6d548a540;hb=682f1965193e672620bc8766fec6bcb2648aa8e5;hp=9dafb55974e77eabaa80acbaf4d3d72c8ae82c26;hpb=bf1c4acfaa70c7b3ac5f205b3d13c29d8b52c776;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/resources/AuthorizationFilter.java b/src/main/java/org/onap/dmaap/dbcapi/resources/AuthorizationFilter.java
index 9dafb55..64aeea7 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/resources/AuthorizationFilter.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/resources/AuthorizationFilter.java
@@ -20,44 +20,50 @@
 
 package org.onap.dmaap.dbcapi.resources;
 
-import java.io.IOException;
-
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
 
 import org.apache.log4j.Logger;
 import org.onap.dmaap.dbcapi.authentication.AuthenticationErrorException;
 import org.onap.dmaap.dbcapi.service.ApiService;
+import org.onap.dmaap.dbcapi.util.DmaapConfig;
 
 
 @Authorization
 public class AuthorizationFilter implements ContainerRequestFilter   {
-	
-	private Logger logger = Logger.getLogger(AuthorizationFilter.class.getName());
-	
+
+	private static final String AAF_CADI_FLAG = "enableCADI";
+	private final Logger logger = Logger.getLogger(AuthorizationFilter.class.getName());
+	private final ResponseBuilder responseBuilder = new ResponseBuilder();
+	private final boolean isCadiEnabled;
+
+
+	public AuthorizationFilter() {
+		DmaapConfig dmaapConfig = (DmaapConfig) DmaapConfig.getConfig();
+		String flag = dmaapConfig.getProperty(AAF_CADI_FLAG, "false");
+		isCadiEnabled = "true".equalsIgnoreCase(flag);
+	}
+
 	@Override
-	public void filter(ContainerRequestContext requestContext)
-			throws IOException {
-
-		ApiService apiResp = new ApiService()
-			.setAuth( requestContext.getHeaderString("Authorization") )
-			.setUriPath(requestContext.getUriInfo().getPath())
-			.setHttpMethod( requestContext.getMethod() )
-			.setRequestId( requestContext.getHeaderString("X-ECOMP-RequestID") );
-		
-		try {
-			apiResp.checkAuthorization();
-		} catch ( AuthenticationErrorException ae ) {
-			logger.error("Error", ae);
-			requestContext.abortWith( apiResp.unauthorized( apiResp.getErr().getMessage() ) );
-			return ;
-		} catch ( Exception e ) {
-			logger.error("Error", e);
-			requestContext.abortWith( apiResp.unavailable() ); 
-			return;
-		}
-		
+	public void filter(ContainerRequestContext requestContext) {
 
+		if(!isCadiEnabled) {
+			ApiService apiResp = new ApiService()
+				.setAuth(requestContext.getHeaderString("Authorization"))
+				.setUriPath(requestContext.getUriInfo().getPath())
+				.setHttpMethod(requestContext.getMethod())
+				.setRequestId(requestContext.getHeaderString("X-ECOMP-RequestID"));
+
+			try {
+				apiResp.checkAuthorization();
+			} catch (AuthenticationErrorException ae) {
+				logger.error("Error", ae);
+				requestContext.abortWith(responseBuilder.unauthorized(apiResp.getErr().getMessage()));
+			} catch (Exception e) {
+				logger.error("Error", e);
+				requestContext.abortWith(responseBuilder.unavailable());
+			}
+		}
 	}
 
 }