Fix Bath config issue

[aaf/authz.git] / cadi / core / src / main / java / org / onap / aaf / cadi / config / Config.java

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
index a66b688..c4634cf 100644 (file)
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
@@ -71,8 +71,11 @@ public class Config {
        // As of 1.0.2, these have had the dots removed so as to be compatible with JavaBean style
        // configurations as well as property list style.
        public static final String HOSTNAME = "hostname";
+       public static final String CADI_REGISTRATION_HOSTNAME = "cadi_registration_hostname";
        public static final String CADI_PROP_FILES = "cadi_prop_files"; // Additional Properties files (separate with ;)
        public static final String CADI_LOGLEVEL = "cadi_loglevel";
+       public static final String CADI_LOGDIR = "cadi_log_dir";
+       public static final String CADI_ETCDIR = "cadi_etc_dir";
        public static final String CADI_LOGNAME = "cadi_logname";
        public static final String CADI_KEYFILE = "cadi_keyfile";
        public static final String CADI_KEYSTORE = "cadi_keystore";
@@ -82,6 +85,7 @@ public class Config {
        public static final String CADI_LATITUDE = "cadi_latitude";
        public static final String CADI_LONGITUDE = "cadi_longitude";
 
+
        public static final String CADI_KEY_PASSWORD = "cadi_key_password";
        public static final String CADI_TRUSTSTORE = "cadi_truststore";
        public static final String CADI_TRUSTSTORE_PASSWORD = "cadi_truststore_password";
@@ -138,7 +142,7 @@ public class Config {
        public static final String AAF_APPPASS = "aaf_password";
        public static final String AAF_LUR_CLASS = "aaf_lur_class";
        public static final String AAF_TAF_CLASS = "aaf_taf_class";
-       public static final String AAF_TAF_CLASS_DEF = "org.osaaf.cadi.aaf.v2_0.AAFTaf";
+       public static final String AAF_TAF_CLASS_DEF = "org.onap.aaf.cadi.aaf.v2_0.AAFTaf";
        public static final String AAF_CONNECTOR_CLASS = "aaf_connector_class";
        public static final String AAF_LOCATOR_CLASS = "aaf_locator_class";
        public static final String AAF_CONN_TIMEOUT = "aaf_conn_timeout";
@@ -380,7 +384,13 @@ public class Config {
                        /////////////////////////////////////////////////////
                        if(!hasOAuthDirectTAF) {
                                String oauth_token_url = logProp(access,Config.AAF_OAUTH2_TOKEN_URL,null);
-                               if(additionalTafLurs!=null && additionalTafLurs.length>0 && additionalTafLurs[0].getClass().getName().equals("org.osaaf.authz.oauth.OAuthDirectTAF")) {
+                               Class<?> oadtClss;
+                               try {
+                                       oadtClss = Class.forName("org.osaaf.authz.oauth.OAuthDirectTAF");
+                               } catch (ClassNotFoundException e1) {
+                                       oadtClss = null;
+                               }
+                               if(additionalTafLurs!=null && additionalTafLurs.length>0 && (oadtClss!=null && additionalTafLurs[0].getClass().isAssignableFrom(oadtClss))) {
                                        htlist.add((HttpTaf)additionalTafLurs[0]);
                                        String array[] = new String[additionalTafLurs.length-1];
                                        if(array.length>0) {
@@ -428,9 +438,17 @@ public class Config {
                                if(additional instanceof HttpTaf) {
                                        htlist.add((HttpTaf)additional);
                                        access.printf(Level.INIT,"%s Authentication is enabled",additional.getClass().getSimpleName());
-                               } else if(hasOAuthDirectTAF && additional.getClass().getSimpleName().equals("DirectAAFUserPass")) {
-                                       htlist.add(new BasicHttpTaf(access, (CredVal)additional , basic_realm, userExp, basic_warn));
-                                       access.printf(Level.INIT,"Direct BasicAuth Authentication is enabled",additional.getClass().getSimpleName());
+                               } else if(hasOAuthDirectTAF) {
+                                       Class<?> daupCls;
+                                       try {
+                                               daupCls = Class.forName("org.onap.aaf.auth.direct.DirectAAFUserPass");
+                                       } catch (ClassNotFoundException e) {
+                                               daupCls = null;
+                                       }
+                                       if(daupCls != null && additional.getClass().isAssignableFrom(daupCls)) {
+                                               htlist.add(new BasicHttpTaf(access, (CredVal)additional , basic_realm, userExp, basic_warn));
+                                               access.printf(Level.INIT,"Direct BasicAuth Authentication is enabled",additional.getClass().getSimpleName());
+                                       }
                                }
                        }
                }
@@ -459,7 +477,7 @@ public class Config {
        public static String logProp(Access access,String tag, String def) {
                String rv = access.getProperty(tag, def);
                if(rv == null) {
-                       access.log(Level.INIT,tag,"is not set");
+                       access.log(Level.INIT,tag,"is not explicitly set");
                } else {
                        access.log(Level.INIT,tag,"is set to",rv);
                }