X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fauthconn_keystone.py;h=9f5e02c2efcd4e662f7ba42d0ebcb43bce9b41f8;hp=bb693815afc042b4d5bf561b4ea5f9f3739cb7f1;hb=d77ba6fb46f75d52475978e6e1272b2169edd56c;hpb=cf042d30e8b7a1a9cbd1b2064e83c5d20ffcec9b;ds=sidebyside diff --git a/osm_nbi/authconn_keystone.py b/osm_nbi/authconn_keystone.py index bb69381..9f5e02c 100644 --- a/osm_nbi/authconn_keystone.py +++ b/osm_nbi/authconn_keystone.py @@ -28,7 +28,8 @@ it for OSM. __author__ = "Eduardo Sousa " __date__ = "$27-jul-2018 23:59:59$" -from authconn import Authconn, AuthException, AuthconnOperationException, AuthconnNotFoundException +from authconn import Authconn, AuthException, AuthconnOperationException, AuthconnNotFoundException, \ + AuthconnConflictException import logging import requests @@ -77,13 +78,13 @@ class AuthconnKeystone(Authconn): self.sess = session.Session(auth=self.auth) self.keystone = client.Client(session=self.sess) - def authenticate(self, user, password, project=None, token=None): + def authenticate(self, user, password, project=None, token_info=None): """ - Authenticate a user using username/password or token, plus project + Authenticate a user using username/password or token_info, plus project :param user: user: name, id or None :param password: password or None :param project: name, id, or None. If None first found project will be used to get an scope token - :param token: previous token to obtain authorization + :param token_info: previous token_info to obtain authorization :return: the scoped token info or raises an exception. The token is a dictionary with: _id: token string id, username: username, @@ -112,8 +113,8 @@ class AuthconnKeystone(Authconn): password=password, user_domain_name=self.user_domain_name, project_domain_name=self.project_domain_name) - elif token: - unscoped_token = self.keystone.tokens.validate(token=token) + elif token_info: + unscoped_token = self.keystone.tokens.validate(token=token_info.get("_id")) else: raise AuthException("Provide credentials: username/password or Authorization Bearer token", http_code=HTTPStatus.UNAUTHORIZED) @@ -141,15 +142,18 @@ class AuthconnKeystone(Authconn): auth_token = { "_id": scoped_token.auth_token, + "id": scoped_token.auth_token, + "user_id": scoped_token.user_id, "username": scoped_token.username, "project_id": scoped_token.project_id, "project_name": scoped_token.project_name, "expires": scoped_token.expires.timestamp(), + "issued_at": scoped_token.issued.timestamp() } return auth_token except ClientException as e: - self.logger.exception("Error during user authentication using keystone. Method: basic: {}".format(e)) + # self.logger.exception("Error during user authentication using keystone. Method: basic: {}".format(e)) raise AuthException("Error during user authentication using Keystone: {}".format(e), http_code=HTTPStatus.UNAUTHORIZED) @@ -178,7 +182,7 @@ class AuthconnKeystone(Authconn): # # return new_token["auth_token"], project_names # except ClientException as e: - # self.logger.exception("Error during user authentication using keystone. Method: bearer: {}".format(e)) + # # self.logger.exception("Error during user authentication using keystone. Method: bearer: {}".format(e)) # raise AuthException("Error during user authentication using Keystone: {}".format(e), # http_code=HTTPStatus.UNAUTHORIZED) @@ -186,19 +190,35 @@ class AuthconnKeystone(Authconn): """ Check if the token is valid. - :param token: token to validate - :return: dictionary with information associated with the token. If the - token is not valid, returns None. + :param token: token id to be validated + :return: dictionary with information associated with the token: + "expires": + "_id": token_id, + "project_id": project_id, + "username": , + "roles": list with dict containing {name, id} + If the token is not valid an exception is raised. """ if not token: return try: token_info = self.keystone.tokens.validate(token=token) + ses = { + "_id": token_info["auth_token"], + "id": token_info["auth_token"], + "project_id": token_info["project"]["id"], + "project_name": token_info["project"]["name"], + "user_id": token_info["user"]["id"], + "username": token_info["user"]["name"], + "roles": token_info["roles"], + "expires": token_info.expires.timestamp(), + "issued_at": token_info.issued.timestamp() + } - return token_info + return ses except ClientException as e: - self.logger.exception("Error during token validation using keystone: {}".format(e)) + # self.logger.exception("Error during token validation using keystone: {}".format(e)) raise AuthException("Error during token validation using Keystone: {}".format(e), http_code=HTTPStatus.UNAUTHORIZED) @@ -214,7 +234,7 @@ class AuthconnKeystone(Authconn): return True except ClientException as e: - self.logger.exception("Error during token revocation using keystone: {}".format(e)) + # self.logger.exception("Error during token revocation using keystone: {}".format(e)) raise AuthException("Error during token revocation using Keystone: {}".format(e), http_code=HTTPStatus.UNAUTHORIZED) @@ -232,7 +252,7 @@ class AuthconnKeystone(Authconn): return project_names except ClientException as e: - self.logger.exception("Error during user project listing using keystone: {}".format(e)) + # self.logger.exception("Error during user project listing using keystone: {}".format(e)) raise AuthException("Error during user project listing using Keystone: {}".format(e), http_code=HTTPStatus.UNAUTHORIZED) @@ -252,7 +272,7 @@ class AuthconnKeystone(Authconn): return roles except ClientException as e: - self.logger.exception("Error during user role listing using keystone: {}".format(e)) + # self.logger.exception("Error during user role listing using keystone: {}".format(e)) raise AuthException("Error during user role listing using Keystone: {}".format(e), http_code=HTTPStatus.UNAUTHORIZED) @@ -272,7 +292,7 @@ class AuthconnKeystone(Authconn): # self.logger.exception("Error during user creation using keystone: {}".format(e)) raise AuthconnOperationException(e, http_code=HTTPStatus.CONFLICT) except ClientException as e: - self.logger.exception("Error during user creation using keystone: {}".format(e)) + # self.logger.exception("Error during user creation using keystone: {}".format(e)) raise AuthconnOperationException("Error during user creation using Keystone: {}".format(e)) def update_user(self, user, new_name=None, new_password=None): @@ -295,7 +315,7 @@ class AuthconnKeystone(Authconn): self.keystone.users.update(user_id, password=new_password, name=new_name) except ClientException as e: - self.logger.exception("Error during user password/name update using keystone: {}".format(e)) + # self.logger.exception("Error during user password/name update using keystone: {}".format(e)) raise AuthconnOperationException("Error during user password/name update using Keystone: {}".format(e)) def delete_user(self, user_id): @@ -316,7 +336,7 @@ class AuthconnKeystone(Authconn): return True except ClientException as e: - self.logger.exception("Error during user deletion using keystone: {}".format(e)) + # self.logger.exception("Error during user deletion using keystone: {}".format(e)) raise AuthconnOperationException("Error during user deletion using Keystone: {}".format(e)) def get_user_list(self, filter_q=None): @@ -361,26 +381,33 @@ class AuthconnKeystone(Authconn): return users except ClientException as e: - self.logger.exception("Error during user listing using keystone: {}".format(e)) + # self.logger.exception("Error during user listing using keystone: {}".format(e)) raise AuthconnOperationException("Error during user listing using Keystone: {}".format(e)) - def get_role_list(self): + def get_role_list(self, filter_q=None): """ Get role list. + :param filter_q: dictionary to filter role list by _id and/or name. :return: returns the list of roles. """ try: - roles_list = self.keystone.roles.list() + filter_name = None + if filter_q: + filter_name = filter_q.get("name") + roles_list = self.keystone.roles.list(name=filter_name) roles = [{ "name": role.name, "_id": role.id } for role in roles_list if role.name != "service"] + if filter_q and filter_q.get("_id"): + roles = [role for role in roles if filter_q["_id"] == role["_id"]] + return roles except ClientException as e: - self.logger.exception("Error during user role listing using keystone: {}".format(e)) + # self.logger.exception("Error during user role listing using keystone: {}".format(e)) raise AuthException("Error during user role listing using Keystone: {}".format(e), http_code=HTTPStatus.UNAUTHORIZED) @@ -393,11 +420,11 @@ class AuthconnKeystone(Authconn): """ try: result = self.keystone.roles.create(role) - return {"name": result.name, "_id": result.id} + return result.id except Conflict as ex: - self.logger.info("Duplicate entry: %s", str(ex)) + raise AuthconnConflictException(str(ex)) except ClientException as e: - self.logger.exception("Error during role creation using keystone: {}".format(e)) + # self.logger.exception("Error during role creation using keystone: {}".format(e)) raise AuthconnOperationException("Error during role creation using Keystone: {}".format(e)) def delete_role(self, role_id): @@ -408,18 +435,36 @@ class AuthconnKeystone(Authconn): :raises AuthconnOperationException: if role deletion failed. """ try: - roles = self.keystone.roles.list() - role_obj = [role for role in roles if role.id == role_id][0] - result, detail = self.keystone.roles.delete(role_obj) + result, detail = self.keystone.roles.delete(role_id) if result.status_code != 204: raise ClientException("error {} {}".format(result.status_code, detail)) return True except ClientException as e: - self.logger.exception("Error during role deletion using keystone: {}".format(e)) + # self.logger.exception("Error during role deletion using keystone: {}".format(e)) raise AuthconnOperationException("Error during role deletion using Keystone: {}".format(e)) + def update_role(self, role, new_name): + """ + Change the name of a role + :param role: role name or id to be changed + :param new_name: new name + :return: None + """ + try: + if is_valid_uuid(role): + role_id = role + else: + role_obj_list = self.keystone.roles.list(name=role) + if not role_obj_list: + raise AuthconnNotFoundException("Role '{}' not found".format(role)) + role_id = role_obj_list[0].id + self.keystone.roles.update(role_id, name=new_name) + except ClientException as e: + # self.logger.exception("Error during role update using keystone: {}".format(e)) + raise AuthconnOperationException("Error during role updating using Keystone: {}".format(e)) + def get_project_list(self, filter_q=None): """ Get all the projects. @@ -444,7 +489,7 @@ class AuthconnKeystone(Authconn): return projects except ClientException as e: - self.logger.exception("Error during user project listing using keystone: {}".format(e)) + # self.logger.exception("Error during user project listing using keystone: {}".format(e)) raise AuthException("Error during user project listing using Keystone: {}".format(e), http_code=HTTPStatus.UNAUTHORIZED) @@ -460,7 +505,7 @@ class AuthconnKeystone(Authconn): result = self.keystone.projects.create(project, self.project_domain_name) return result.id except ClientException as e: - self.logger.exception("Error during project creation using keystone: {}".format(e)) + # self.logger.exception("Error during project creation using keystone: {}".format(e)) raise AuthconnOperationException("Error during project creation using Keystone: {}".format(e)) def delete_project(self, project_id): @@ -481,7 +526,7 @@ class AuthconnKeystone(Authconn): return True except ClientException as e: - self.logger.exception("Error during project deletion using keystone: {}".format(e)) + # self.logger.exception("Error during project deletion using keystone: {}".format(e)) raise AuthconnOperationException("Error during project deletion using Keystone: {}".format(e)) def update_project(self, project_id, new_name): @@ -494,7 +539,7 @@ class AuthconnKeystone(Authconn): try: self.keystone.projects.update(project_id, name=new_name) except ClientException as e: - self.logger.exception("Error during project update using keystone: {}".format(e)) + # self.logger.exception("Error during project update using keystone: {}".format(e)) raise AuthconnOperationException("Error during project deletion using Keystone: {}".format(e)) def assign_role_to_user(self, user, project, role): @@ -533,7 +578,7 @@ class AuthconnKeystone(Authconn): self.keystone.roles.grant(role_obj, user=user_obj, project=project_obj) except ClientException as e: - self.logger.exception("Error during user role assignment using keystone: {}".format(e)) + # self.logger.exception("Error during user role assignment using keystone: {}".format(e)) raise AuthconnOperationException("Error during role '{}' assignment to user '{}' and project '{}' using " "Keystone: {}".format(role, user, project, e)) @@ -574,6 +619,6 @@ class AuthconnKeystone(Authconn): self.keystone.roles.revoke(role_obj, user=user_obj, project=project_obj) except ClientException as e: - self.logger.exception("Error during user role revocation using keystone: {}".format(e)) + # self.logger.exception("Error during user role revocation using keystone: {}".format(e)) raise AuthconnOperationException("Error during role '{}' revocation to user '{}' and project '{}' using " "Keystone: {}".format(role, user, project, e))