From edb043b451b5026371e9ef3c7876c09fc49b7419 Mon Sep 17 00:00:00 2001 From: sblimkie Date: Tue, 5 Dec 2017 14:12:27 -0500 Subject: Rename some packages from openecomp to onap Couple packages were missed last time we went though this excersise. I also remove the checkstyle plugin from the child pom files, as it gets inherited from the parent pom automatically. Issue-ID: AAI-10 Change-Id: I599346dfd83c01f8818b9c3a3efb126e2d34b2fe Signed-off-by: sblimkie --- aai-auth/pom.xml | 19 +- .../src/main/java/org/onap/aaiauth/auth/Auth.java | 55 +++++ .../main/java/org/onap/aaiauth/auth/AuthCore.java | 223 +++++++++++++++++++++ .../java/org/onap/aaiauth/util/AuthConstants.java | 44 ++++ .../src/main/java/org/openecomp/auth/Auth.java | 55 ----- .../src/main/java/org/openecomp/auth/AuthCore.java | 223 --------------------- .../java/org/openecomp/util/AuthConstants.java | 44 ---- 7 files changed, 323 insertions(+), 340 deletions(-) create mode 100644 aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java create mode 100644 aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java create mode 100644 aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java delete mode 100644 aai-auth/src/main/java/org/openecomp/auth/Auth.java delete mode 100644 aai-auth/src/main/java/org/openecomp/auth/AuthCore.java delete mode 100644 aai-auth/src/main/java/org/openecomp/util/AuthConstants.java (limited to 'aai-auth') diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml index b6251fbb..b8769ddd 100644 --- a/aai-auth/pom.xml +++ b/aai-auth/pom.xml @@ -11,8 +11,7 @@ 1.2.0-SNAPSHOT - https://nexus.onap.org - google_checks.xml + https://nexus.onap.org @@ -67,20 +66,4 @@ - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - - checkstyle - - - - - - diff --git a/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java b/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java new file mode 100644 index 00000000..2a4a7531 --- /dev/null +++ b/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java @@ -0,0 +1,55 @@ +/** + * ============LICENSE_START======================================================= + * EcompAuth + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 Amdocs + * All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + */ +package org.onap.aaiauth.auth; + +import org.apache.http.cookie.Cookie; + +public class Auth { + + private AuthCore authCore; + + public Auth(String filename) throws Exception { + this.authCore = new AuthCore(filename); + } + + public boolean authBasic(String username, String authFunction) throws Exception { + return authCore.authorize(username, authFunction); + } + + public boolean authCookie(Cookie cookie, String authFunction, StringBuilder username) throws Exception { + return cookie != null && authCore.authorize(username.toString(), authFunction); + } + + /** + * Returns true if the user is allowed to access a function. + * @param authUser + * - String value of the user. + * @param authAction + * - String value of the function. + */ + public boolean validateRequest(String authUser, String authAction) throws Exception { + return authUser != null && authAction != null && authCore.authorize(authUser, authAction); + } +} diff --git a/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java b/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java new file mode 100644 index 00000000..a9d4ad54 --- /dev/null +++ b/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java @@ -0,0 +1,223 @@ +/** + * ============LICENSE_START======================================================= + * EcompAuth + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 Amdocs + * All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + */ +package org.onap.aaiauth.auth; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.onap.aaiauth.util.AuthConstants; + + +public class AuthCore { + + private String authFilename; + public ObjectMapper mapper; + + private enum HTTP_METHODS { + POST, GET, PUT, DELETE, PATCH + } + + public AuthCore(String filename) throws Exception { + this.authFilename = filename; + loadUsers(filename); + } + + private static boolean usersInitialized = false; + private static HashMap users; + + public String getConfigFile() { + return this.authFilename; + } + + /** + * Loads the auth file and caches a list of authorized users. + * @param authFilename + * - Absolute path of the file where authorized users are listed. + */ + public synchronized void loadUsers(String authFilename) throws Exception { + users = new HashMap<>(); + + mapper = new ObjectMapper(); // can reuse, share globally + JsonNode rootNode = mapper.readTree(new File(authFilename)); + JsonNode rolesNode = rootNode.path(AuthConstants.ROLES_NODE_PATH); + + for (JsonNode roleNode : rolesNode) { + String roleName = roleNode.path(AuthConstants.ROLE_NAME_PATH).asText(); + + AuthRole role = new AuthRole(); + JsonNode usersNode = roleNode.path(AuthConstants.USERS_NODE_PATH); + JsonNode functionsNode = roleNode.path(AuthConstants.FUNCTIONS_NODE_PATH); + for (JsonNode functionNode : functionsNode) { + String function = functionNode.path(AuthConstants.FUNCTION_NAME_PATH).asText(); + JsonNode methodsNode = functionNode.path(AuthConstants.METHODS_NODE_PATH); + boolean hasMethods = handleMethodNode(methodsNode, role, function); + + if (!hasMethods) { + // iterate the list from HTTP_METHODS + for (HTTP_METHODS meth : HTTP_METHODS.values()) { + String thisFunction = meth.toString() + ":" + function; + + role.addAllowedFunction(thisFunction); + } + } + } + + handleUserNode(usersNode, roleName, role); + } + + usersInitialized = true; + } + + private boolean handleMethodNode(JsonNode methodsNode, AuthRole role, String function) { + boolean hasMethods = false; + for (JsonNode methodNode : methodsNode) { + String methodName = methodNode.path(AuthConstants.METHOD_NAME_PATH).asText(); + hasMethods = true; + String thisFunction = methodName + ":" + function; + + role.addAllowedFunction(thisFunction); + } + return hasMethods; + } + + private void handleUserNode(JsonNode usersNode, String roleName, AuthRole role) { + for (JsonNode userNode : usersNode) { + // make the user lower case + String node = userNode.path(AuthConstants.USER_NODE_PATH).asText().toLowerCase(); + AuthUser user; + if (users.containsKey(node)) { + user = users.get(node); + } else { + user = new AuthUser(); + } + + user.setUser(node); + user.addRole(roleName, role); + users.put(node, user); + } + } + + public class AuthUser { + + public AuthUser() { + this.roles = new HashMap<>(); + } + + private String username; + private HashMap roles; + + public String getUser() { + return this.username; + } + + public Map getRoles() { + return this.roles; + } + + public void addRole(String roleName, AuthRole role) { + this.roles.put(roleName, role); + } + + /** + * Returns true if the user has permissions for the function, otherwise returns false. + * @param checkFunc + * - String value of the function. + */ + public boolean checkAllowed(String checkFunc) { + for (Map.Entry roleEntry : this.roles.entrySet()) { + AuthRole role = roleEntry.getValue(); + if (role.hasAllowedFunction(checkFunc)) { + // break out as soon as we find it + return true; + } + } + // we would have got positive confirmation had it been there + return false; + } + + public void setUser(String myuser) { + this.username = myuser; + } + } + + public static class AuthRole { + + public AuthRole() { + this.allowedFunctions = new ArrayList<>(); + } + + private List allowedFunctions; + + public void addAllowedFunction(String func) { + this.allowedFunctions.add(func); + } + + /** + * Remove the function from the user's list of allowed functions. + * @param delFunc + * - String value of the function. + */ + public void delAllowedFunction(String delFunc) { + if (this.allowedFunctions.contains(delFunc)) { + this.allowedFunctions.remove(delFunc); + } + } + + /** + * Returns true if the user has permissions to use the function, otherwise returns false. + * @param afunc + * - String value of the function. + */ + public boolean hasAllowedFunction(String afunc) { + return this.allowedFunctions.contains(afunc); + } + } + + /** + * Returns a hash-map of all users which have been loaded and initialized. + */ + public Map getUsers(String key) throws Exception { + if (!usersInitialized || (users == null)) { + loadUsers(this.authFilename); + } + return users; + } + + /** + * Returns true if the user is allowed to access a function. + * @param username + * - String value of user + * @param authFunction + * - String value of the function. + */ + public boolean authorize(String username, String authFunction) { + AuthUser user = users.get(username); + return user != null && user.checkAllowed(authFunction); + } +} diff --git a/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java b/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java new file mode 100644 index 00000000..9d8786c3 --- /dev/null +++ b/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java @@ -0,0 +1,44 @@ +/** + * ============LICENSE_START======================================================= + * EcompAuth + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 Amdocs + * All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + */ +package org.onap.aaiauth.util; + +public class AuthConstants { + + public static final String ROLES_NODE_PATH = "roles"; + + public static final String ROLE_NAME_PATH = "name"; + + public static final String USERS_NODE_PATH = "users"; + + public static final String FUNCTIONS_NODE_PATH = "functions"; + + public static final String FUNCTION_NAME_PATH = "name"; + + public static final String METHODS_NODE_PATH = "methods"; + + public static final String METHOD_NAME_PATH = "name"; + + public static final String USER_NODE_PATH = "username"; +} diff --git a/aai-auth/src/main/java/org/openecomp/auth/Auth.java b/aai-auth/src/main/java/org/openecomp/auth/Auth.java deleted file mode 100644 index cd6ef988..00000000 --- a/aai-auth/src/main/java/org/openecomp/auth/Auth.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * EcompAuth - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. - */ -package org.openecomp.auth; - -import org.apache.http.cookie.Cookie; - -public class Auth { - - private AuthCore authCore; - - public Auth(String filename) throws Exception { - this.authCore = new AuthCore(filename); - } - - public boolean authBasic(String username, String authFunction) throws Exception { - return authCore.authorize(username, authFunction); - } - - public boolean authCookie(Cookie cookie, String authFunction, StringBuilder username) throws Exception { - return cookie != null && authCore.authorize(username.toString(), authFunction); - } - - /** - * Returns true if the user is allowed to access a function. - * @param authUser - * - String value of the user. - * @param authAction - * - String value of the function. - */ - public boolean validateRequest(String authUser, String authAction) throws Exception { - return authUser != null && authAction != null && authCore.authorize(authUser, authAction); - } -} diff --git a/aai-auth/src/main/java/org/openecomp/auth/AuthCore.java b/aai-auth/src/main/java/org/openecomp/auth/AuthCore.java deleted file mode 100644 index f1712e78..00000000 --- a/aai-auth/src/main/java/org/openecomp/auth/AuthCore.java +++ /dev/null @@ -1,223 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * EcompAuth - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. - */ -package org.openecomp.auth; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.openecomp.util.AuthConstants; - - -public class AuthCore { - - private String authFilename; - public ObjectMapper mapper; - - private enum HTTP_METHODS { - POST, GET, PUT, DELETE, PATCH - } - - public AuthCore(String filename) throws Exception { - this.authFilename = filename; - loadUsers(filename); - } - - private static boolean usersInitialized = false; - private static HashMap users; - - public String getConfigFile() { - return this.authFilename; - } - - /** - * Loads the auth file and caches a list of authorized users. - * @param authFilename - * - Absolute path of the file where authorized users are listed. - */ - public synchronized void loadUsers(String authFilename) throws Exception { - users = new HashMap<>(); - - mapper = new ObjectMapper(); // can reuse, share globally - JsonNode rootNode = mapper.readTree(new File(authFilename)); - JsonNode rolesNode = rootNode.path(AuthConstants.ROLES_NODE_PATH); - - for (JsonNode roleNode : rolesNode) { - String roleName = roleNode.path(AuthConstants.ROLE_NAME_PATH).asText(); - - AuthRole role = new AuthRole(); - JsonNode usersNode = roleNode.path(AuthConstants.USERS_NODE_PATH); - JsonNode functionsNode = roleNode.path(AuthConstants.FUNCTIONS_NODE_PATH); - for (JsonNode functionNode : functionsNode) { - String function = functionNode.path(AuthConstants.FUNCTION_NAME_PATH).asText(); - JsonNode methodsNode = functionNode.path(AuthConstants.METHODS_NODE_PATH); - boolean hasMethods = handleMethodNode(methodsNode, role, function); - - if (!hasMethods) { - // iterate the list from HTTP_METHODS - for (HTTP_METHODS meth : HTTP_METHODS.values()) { - String thisFunction = meth.toString() + ":" + function; - - role.addAllowedFunction(thisFunction); - } - } - } - - handleUserNode(usersNode, roleName, role); - } - - usersInitialized = true; - } - - private boolean handleMethodNode(JsonNode methodsNode, AuthRole role, String function) { - boolean hasMethods = false; - for (JsonNode methodNode : methodsNode) { - String methodName = methodNode.path(AuthConstants.METHOD_NAME_PATH).asText(); - hasMethods = true; - String thisFunction = methodName + ":" + function; - - role.addAllowedFunction(thisFunction); - } - return hasMethods; - } - - private void handleUserNode(JsonNode usersNode, String roleName, AuthRole role) { - for (JsonNode userNode : usersNode) { - // make the user lower case - String node = userNode.path(AuthConstants.USER_NODE_PATH).asText().toLowerCase(); - AuthUser user; - if (users.containsKey(node)) { - user = users.get(node); - } else { - user = new AuthUser(); - } - - user.setUser(node); - user.addRole(roleName, role); - users.put(node, user); - } - } - - public class AuthUser { - - public AuthUser() { - this.roles = new HashMap<>(); - } - - private String username; - private HashMap roles; - - public String getUser() { - return this.username; - } - - public Map getRoles() { - return this.roles; - } - - public void addRole(String roleName, AuthRole role) { - this.roles.put(roleName, role); - } - - /** - * Returns true if the user has permissions for the function, otherwise returns false. - * @param checkFunc - * - String value of the function. - */ - public boolean checkAllowed(String checkFunc) { - for (Map.Entry roleEntry : this.roles.entrySet()) { - AuthRole role = roleEntry.getValue(); - if (role.hasAllowedFunction(checkFunc)) { - // break out as soon as we find it - return true; - } - } - // we would have got positive confirmation had it been there - return false; - } - - public void setUser(String myuser) { - this.username = myuser; - } - } - - public static class AuthRole { - - public AuthRole() { - this.allowedFunctions = new ArrayList<>(); - } - - private List allowedFunctions; - - public void addAllowedFunction(String func) { - this.allowedFunctions.add(func); - } - - /** - * Remove the function from the user's list of allowed functions. - * @param delFunc - * - String value of the function. - */ - public void delAllowedFunction(String delFunc) { - if (this.allowedFunctions.contains(delFunc)) { - this.allowedFunctions.remove(delFunc); - } - } - - /** - * Returns true if the user has permissions to use the function, otherwise returns false. - * @param afunc - * - String value of the function. - */ - public boolean hasAllowedFunction(String afunc) { - return this.allowedFunctions.contains(afunc); - } - } - - /** - * Returns a hash-map of all users which have been loaded and initialized. - */ - public Map getUsers(String key) throws Exception { - if (!usersInitialized || (users == null)) { - loadUsers(this.authFilename); - } - return users; - } - - /** - * Returns true if the user is allowed to access a function. - * @param username - * - String value of user - * @param authFunction - * - String value of the function. - */ - public boolean authorize(String username, String authFunction) { - AuthUser user = users.get(username); - return user != null && user.checkAllowed(authFunction); - } -} diff --git a/aai-auth/src/main/java/org/openecomp/util/AuthConstants.java b/aai-auth/src/main/java/org/openecomp/util/AuthConstants.java deleted file mode 100644 index e202615b..00000000 --- a/aai-auth/src/main/java/org/openecomp/util/AuthConstants.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * EcompAuth - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. - */ -package org.openecomp.util; - -public class AuthConstants { - - public static final String ROLES_NODE_PATH = "roles"; - - public static final String ROLE_NAME_PATH = "name"; - - public static final String USERS_NODE_PATH = "users"; - - public static final String FUNCTIONS_NODE_PATH = "functions"; - - public static final String FUNCTION_NAME_PATH = "name"; - - public static final String METHODS_NODE_PATH = "methods"; - - public static final String METHOD_NAME_PATH = "name"; - - public static final String USER_NODE_PATH = "username"; -} -- cgit 1.2.3-korg