* ============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 javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.HttpHeaders;
import org.onap.aai.babel.config.BabelAuthConfig;
+import org.onap.aai.babel.logging.LogHelper;
import org.onap.aai.cl.api.Logger;
-import org.onap.aai.cl.eelf.LoggerFactory;
-
/**
* Public class for authentication and authorization operations. Authorization is applied according to user and role
*/
public class AAIMicroServiceAuth {
- private static Logger applicationLogger = LoggerFactory.getInstance().getLogger(AAIMicroServiceAuth.class);
+ private static final Logger applicationLogger = LogHelper.INSTANCE;
private BabelAuthConfig babelAuthConfig;
}
}
- /**
- * @param username
- * @param policyFunction
- * @return
- * @throws AAIAuthException
- */
- public boolean authorize(String username, String policyFunction) throws AAIAuthException {
- return AAIMicroServiceAuthCore.authorize(username, policyFunction);
- }
-
- /**
- * @param authUser
- * @param policyFunction
- * @return
- * @throws AAIAuthException
- */
- public String authenticate(String authUser, String policyFunction) throws AAIAuthException {
- if (authorize(authUser, policyFunction)) {
- return "OK";
- } else {
- return "AAI_9101";
- }
- }
-
/**
* @param headers
* @param req
}
String[] ps = apiPath.split("/");
- String authPolicyFunctionName = ps[0];
- if (ps.length > 1 && authPolicyFunctionName.matches("v\\d+")) {
- authPolicyFunctionName = ps[1];
- }
-
+ String authPolicyFunctionName = ps[ps.length - 1];
String cipherSuite = (String) req.getAttribute("javax.servlet.request.cipher_suite");
String authUser = null;
}
if (authUser != null) {
- return "OK".equals(authenticate(authUser.toLowerCase(), action.toString() + ":" + authPolicyFunctionName));
+ return AAIMicroServiceAuthCore.authorize(authUser.toLowerCase(),
+ action.toString() + ":" + authPolicyFunctionName);
} else {
return false;
}