X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fauthentication%2FAafLurAndFish.java;h=5b4d7de553cc1ceccce9895c82c72c623e6f44a4;hb=4ceae077b532c790e909a61fe0aa52e8765c10bb;hp=b699a29dbda4e189056bc2b80ba0d751ef79be2b;hpb=4a0a3c6f656d35483b4918b6041ea0aea48f4e32;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/authentication/AafLurAndFish.java b/src/main/java/org/onap/dmaap/dbcapi/authentication/AafLurAndFish.java
index b699a29..5b4d7de 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/authentication/AafLurAndFish.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/authentication/AafLurAndFish.java
@@ -3,6 +3,7 @@
   * org.onap.dmaap
  * ================================================================================
  * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,8 +32,6 @@ import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.dmaap.dbcapi.aaf.AafLurService;
 import org.onap.dmaap.dbcapi.aaf.DmaapPerm;
-import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
-import org.onap.dmaap.dbcapi.server.Main;
 import org.onap.dmaap.dbcapi.util.DmaapConfig;
 
 
@@ -40,14 +39,14 @@ import org.onap.dmaap.dbcapi.util.DmaapConfig;
 
 public class AafLurAndFish implements ApiAuthorizationCheckInterface {
 	private AafLurService svc;
-	private static String api_namespace;
+	private static String apiNamespace;
+	private static final String ERROR="Error";
 	static final Logger logger = Logger.getLogger(AafLurAndFish.class);
 	
 	AafLurAndFish()  throws AuthenticationErrorException  {
 	
-		String[] args = new String[1];
 		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
-		api_namespace = p.getProperty( "ApiNamespace", "org.onap.dmaap-bc.api");
+		apiNamespace = p.getProperty( "ApiNamespace", "org.onap.dmaap-bc.api");
 
 		String cadiprop = p.getProperty( "cadi.properties", "/opt/app/osaaf/local/org.onap.dmaap-bc.props");
 		logger.info( "cadiprops in " + cadiprop );
@@ -61,13 +60,15 @@ public class AafLurAndFish implements ApiAuthorizationCheckInterface {
 			}
 		} catch ( IOException e ) {
 			logger.error( "Unable to load " + cadiprop );
+			logger.error(ERROR, e);
 			throw new AuthenticationErrorException( );
 		}
 		try {
 			PropAccess myAccess = new PropAccess( props );
 		
 			svc =  AafLurService.getInstance(myAccess);
-		} catch (APIException | CadiException | LocatorException e ) { 
+		} catch (APIException | CadiException | LocatorException e ) {
+			logger.error(ERROR, e);
 			logger.error( e.toString() );
 			throw new AuthenticationErrorException();
 		}
@@ -77,21 +78,30 @@ public class AafLurAndFish implements ApiAuthorizationCheckInterface {
 	public void check( String mechid, String pwd, DmaapPerm p ) throws AuthenticationErrorException {
 	
 		try {
-			boolean resp = svc.checkPerm( api_namespace, mechid, pwd, p );
-			if ( resp == false ) {
+			boolean resp = svc.checkPerm( apiNamespace, mechid, pwd, p );
+			boolean flag = false;
+			if ( resp == flag ) {
 				throw new AuthenticationErrorException();
 			}
 		} catch ( IOException | CadiException  e ) { 
+			logger.error(ERROR, e);
 			logger.error( e.toString() );
 			throw new AuthenticationErrorException();
 		}
 		
 	}
 	
-	   public static void main(String[] args) throws Exception {
+	 public static void main(String[] args) throws Exception {
 	        AafLurAndFish alaf = new AafLurAndFish();
 	        DmaapPerm p = new DmaapPerm( "org.onap.dmaap-bc.api.dmaap", "boot", "GET");
 	        
-	        alaf.check("demo@people.osaaf.org", "demo123456!", p);
+	        try {
+	        	alaf.check("mmanager@people.osaaf.org", "demo123456!", p);
+	        } catch (AuthenticationErrorException aee ) {
+	        	logger.error( "Check failed for: " + p.toJSON());
+	               	System.exit(-1);
+	        }
+	        logger.info( "Check succeeded for: " + p.toJSON() );
+	        
 	    }
 }