/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 European Software Marketing Ltd.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 European Software Marketing Ltd.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* See the License for the specific language governing permissions and
* limitations under the License.
* ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.onap.aai.auth;
import java.util.TimerTask;
import java.util.concurrent.TimeUnit;
import org.onap.aai.babel.logging.ApplicationMsgs;
-import org.onap.aai.cl.api.Logger;
-import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.babel.logging.LogHelper;
-/**
- * Authentication and authorization by user and role.
- *
- */
+/** Authentication and authorization by user and role. */
public class AAIMicroServiceAuthCore {
- private static Logger applicationLogger = LoggerFactory.getInstance().getLogger(AAIMicroServiceAuthCore.class);
+ private static LogHelper applicationLogger = LogHelper.INSTANCE;
public static final String FILESEP =
(System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator");
public static final String APPCONFIG_DIR = (System.getProperty("CONFIG_HOME") == null)
- ? System.getProperty("AJSC_HOME") + FILESEP + "appconfig" : System.getProperty("CONFIG_HOME");
+ ? System.getProperty("APP_HOME") + FILESEP + "appconfig" : System.getProperty("CONFIG_HOME");
private static String appConfigAuthDir = APPCONFIG_DIR + FILESEP + "auth";
private static String defaultAuthFileName = appConfigAuthDir + FILESEP + "auth_policy.json";
}
public static synchronized void init(String authPolicyFile) throws AAIAuthException {
-
try {
policyAuthFileName = AAIMicroServiceAuthCore.getConfigFile(authPolicyFile);
} catch (IOException e) {
throw new AAIAuthException(e.getMessage());
}
if (policyAuthFileName == null) {
- throw new AAIAuthException("Auth policy file could not be found");
+ throw new AAIAuthException("Auth policy file could not be found" + System.getProperty("CONFIG_HOME") + APPCONFIG_DIR);
}
AAIMicroServiceAuthCore.reloadUsers();
public void setUser(String myuser) {
this.username = myuser;
}
-
}
public static class AAIAuthRole {