X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fadmin_topics.py;h=bc2c7d93e76fbdad0afa8b3e90108bbb39b321fa;hp=d894a09aab5663569c2b32e43f84188449b4a447;hb=f269fa5cd7c46515aab49ad8af6da7e918afa592;hpb=65ca36d13f895d0a361d59a5962029d6e3ef7a99 diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py index d894a09..bc2c7d9 100644 --- a/osm_nbi/admin_topics.py +++ b/osm_nbi/admin_topics.py @@ -64,7 +64,14 @@ class UserTopic(BaseTopic): fail_on_more=False): raise EngineException("project '{}' does not exist".format(p), HTTPStatus.CONFLICT) - def check_conflict_on_del(self, session, _id): + def check_conflict_on_del(self, session, _id, db_content): + """ + Check if deletion can be done because of dependencies if it is not force. To override + :param session: contains "username", "admin", "force", "public", "project_id", "set_project" + :param _id: internal _id + :param db_content: The database content of this item _id + :return: None if ok or raises EngineException with the conflict + """ if _id == session["username"]: raise EngineException("You cannot delete your own user", http_code=HTTPStatus.CONFLICT) @@ -77,6 +84,13 @@ class UserTopic(BaseTopic): content["_admin"]["salt"] = salt if content.get("password"): content["password"] = sha256(content["password"].encode('utf-8') + salt.encode('utf-8')).hexdigest() + if content.get("project_role_mappings"): + projects = [mapping[0] for mapping in content["project_role_mappings"]] + + if content.get("projects"): + content["projects"] += projects + else: + content["projects"] = projects @staticmethod def format_on_edit(final_content, edit_content): @@ -144,7 +158,14 @@ class ProjectTopic(BaseTopic): # Removed so that the UUID is kept, to allow Project Name modification # content["_id"] = content["name"] - def check_conflict_on_del(self, session, _id): + def check_conflict_on_del(self, session, _id, db_content): + """ + Check if deletion can be done because of dependencies if it is not force. To override + :param session: contains "username", "admin", "force", "public", "project_id", "set_project" + :param _id: internal _id + :param db_content: The database content of this item _id + :return: None if ok or raises EngineException with the conflict + """ if _id in session["project_id"]: raise EngineException("You cannot delete your own project", http_code=HTTPStatus.CONFLICT) if session["force"]: @@ -355,8 +376,8 @@ class SdnTopic(BaseTopic): class UserTopicAuth(UserTopic): # topic = "users" # topic_msg = "users" - # schema_new = user_new_schema - # schema_edit = user_edit_schema + schema_new = user_new_schema + schema_edit = user_edit_schema def __init__(self, db, fs, msg, auth): UserTopic.__init__(self, db, fs, msg) @@ -373,6 +394,10 @@ class UserTopicAuth(UserTopic): username = indata.get("username") user_list = list(map(lambda x: x["username"], self.auth.get_user_list())) + if "projects" in indata.keys(): + raise EngineException("Format invalid: the keyword \"projects\" is not allowed for Keystone", + HTTPStatus.BAD_REQUEST) + if username in user_list: raise EngineException("username '{}' exists".format(username), HTTPStatus.CONFLICT) @@ -398,12 +423,12 @@ class UserTopicAuth(UserTopic): raise EngineException("You cannot remove system_admin role from admin user", http_code=HTTPStatus.FORBIDDEN) - def check_conflict_on_del(self, session, _id): + def check_conflict_on_del(self, session, _id, db_content): """ Check if deletion can be done because of dependencies if it is not force. To override - :param session: contains "username", "admin", "force", "public", "project_id", "set_project" :param _id: internal _id + :param db_content: The database content of this item _id :return: None if ok or raises EngineException with the conflict """ if _id == session["username"]: @@ -443,6 +468,21 @@ class UserTopicAuth(UserTopic): else: final_content["project_role_mappings"] = edit_content["project_role_mappings"] + @staticmethod + def format_on_show(content): + """ + Modifies the content of the role information to separate the role + metadata from the role definition. + """ + project_role_mappings = [] + + for project in content["projects"]: + for role in project["roles"]: + project_role_mappings.append({"project": project, "role": role}) + + del content["projects"] + content["project_role_mappings"] = project_role_mappings + def new(self, rollback, session, indata=None, kwargs=None, headers=None): """ Creates a new entry into the authentication backend. @@ -483,7 +523,7 @@ class UserTopicAuth(UserTopic): users = [user for user in self.auth.get_user_list() if user["_id"] == _id] if len(users) == 1: - return users[0] + return self.format_on_show(users[0]) elif len(users) > 1: raise EngineException("Too many users found", HTTPStatus.CONFLICT) else: @@ -516,17 +556,9 @@ class UserTopicAuth(UserTopic): if "password" in content: self.auth.change_password(content["name"], content["password"]) else: - users = self.auth.get_user_list() - user = [user for user in users if user["_id"] == content["_id"]][0] - original_mapping = [] + user = self.show(session, _id) + original_mapping = user["project_role_mappings"] edit_mapping = content["project_role_mappings"] - - for project in user["projects"]: - for role in project["roles"]: - original_mapping += { - "project": project["name"], - "role": role["name"] - } mappings_to_remove = [mapping for mapping in original_mapping if mapping not in edit_mapping] @@ -559,7 +591,12 @@ class UserTopicAuth(UserTopic): :param filter_q: filter of data to be applied :return: The list, it can be empty if no one match the filter. """ - return self.auth.get_user_list() + if not filter_q: + filter_q = {} + + users = [self.format_on_show(user) for user in self.auth.get_user_list(filter_q)] + + return users def delete(self, session, _id, dry_run=False): """ @@ -571,7 +608,7 @@ class UserTopicAuth(UserTopic): :param dry_run: make checking but do not delete :return: dictionary with deleted item _id. It raises EngineException on error: not found, conflict, ... """ - self.check_conflict_on_del(session, _id) + self.check_conflict_on_del(session, _id, None) if not dry_run: v = self.auth.delete_user(_id) return v @@ -602,12 +639,13 @@ class ProjectTopicAuth(ProjectTopic): if project in project_list: raise EngineException("project '{}' exists".format(project), HTTPStatus.CONFLICT) - def check_conflict_on_del(self, session, _id): + def check_conflict_on_del(self, session, _id, db_content): """ Check if deletion can be done because of dependencies if it is not force. To override :param session: contains "username", "admin", "force", "public", "project_id", "set_project" :param _id: internal _id + :param db_content: The database content of this item _id :return: None if ok or raises EngineException with the conflict """ projects = self.auth.get_project_list() @@ -670,7 +708,10 @@ class ProjectTopicAuth(ProjectTopic): :param filter_q: filter of data to be applied :return: The list, it can be empty if no one match the filter. """ - return self.auth.get_project_list() + if not filter_q: + filter_q = {} + + return self.auth.get_project_list(filter_q) def delete(self, session, _id, dry_run=False): """ @@ -681,7 +722,7 @@ class ProjectTopicAuth(ProjectTopic): :param dry_run: make checking but do not delete :return: dictionary with deleted item _id. It raises EngineException on error: not found, conflict, ... """ - self.check_conflict_on_del(session, _id) + self.check_conflict_on_del(session, _id, None) if not dry_run: v = self.auth.delete_project(_id) return v @@ -710,9 +751,15 @@ class RoleTopicAuth(BaseTopic): :param role_definitions: role definition to test :return: None if ok, raises ValidationError exception on error """ + ignore_fields = ["_id", "_admin", "name"] for role_def in role_definitions.keys(): - if role_def == ".": + if role_def in ignore_fields: continue + if role_def == ".": + if isinstance(role_definitions[role_def], bool): + continue + else: + raise ValidationError("Operation authorization \".\" should be True/False.") if role_def[-1] == ".": raise ValidationError("Operation cannot end with \".\"") @@ -721,6 +768,9 @@ class RoleTopicAuth(BaseTopic): if len(role_def_matches) == 0: raise ValidationError("No matching operation found.") + if not isinstance(role_definitions[role_def], bool): + raise ValidationError("Operation authorization {} should be True/False.".format(role_def)) + def _validate_input_new(self, input, force=False): """ Validates input user content for a new entry. @@ -731,8 +781,8 @@ class RoleTopicAuth(BaseTopic): """ if self.schema_new: validate_input(input, self.schema_new) - if "definition" in input and input["definition"]: - self.validate_role_definition(self.operations, input["definition"]) + self.validate_role_definition(self.operations, input) + return input def _validate_input_edit(self, input, force=False): @@ -745,8 +795,8 @@ class RoleTopicAuth(BaseTopic): """ if self.schema_edit: validate_input(input, self.schema_edit) - if "definition" in input and input["definition"]: - self.validate_role_definition(self.operations, input["definition"]) + self.validate_role_definition(self.operations, input) + return input def check_conflict_on_new(self, session, indata): @@ -780,12 +830,13 @@ class RoleTopicAuth(BaseTopic): if _id == system_admin_role["_id"]: raise EngineException("You cannot edit system_admin role", http_code=HTTPStatus.FORBIDDEN) - def check_conflict_on_del(self, session, _id): + def check_conflict_on_del(self, session, _id, db_content): """ Check if deletion can be done because of dependencies if it is not force. To override :param session: contains "username", "admin", "force", "public", "project_id", "set_project" :param _id: internal _id + :param db_content: The database content of this item _id :return: None if ok or raises EngineException with the conflict """ roles = self.auth.get_role_list() @@ -811,19 +862,21 @@ class RoleTopicAuth(BaseTopic): if not content["_admin"].get("created"): content["_admin"]["created"] = now content["_admin"]["modified"] = now - content["root"] = False - - # Saving the role definition - if "definition" in content and content["definition"]: - for role_def, value in content["definition"].items(): - if role_def == ".": - content["root"] = value - else: - content[role_def.replace(".", ":")] = value + + if "." in content.keys(): + content["root"] = content["."] + del content["."] + + if "root" not in content.keys(): + content["root"] = False - # Cleaning undesired values - if "definition" in content: - del content["definition"] + ignore_fields = ["_id", "_admin", "name"] + content_keys = content.keys() + for role_def in content_keys: + if role_def in ignore_fields: + continue + content[role_def.replace(".", ":")] = content[role_def] + del content[role_def] @staticmethod def format_on_edit(final_content, edit_content): @@ -843,14 +896,14 @@ class RoleTopicAuth(BaseTopic): del final_content[key] # Saving the role definition - if "definition" in edit_content and edit_content["definition"]: - for role_def, value in edit_content["definition"].items(): - if role_def == ".": - final_content["root"] = value - else: - final_content[role_def.replace(".", ":")] = value - - if "root" not in final_content: + for role_def, value in edit_content.items(): + final_content[role_def.replace(".", ":")] = value + + if ":" in final_content.keys(): + final_content["root"] = final_content[":"] + del final_content[":"] + + if "root" not in final_content.keys(): final_content["root"] = False @staticmethod @@ -862,21 +915,14 @@ class RoleTopicAuth(BaseTopic): :param definition: role definition to be processed """ - ignore_fields = ["_admin", "_id", "name", "root"] content_keys = list(content.keys()) - definition = dict(content) - + + content["_id"] = str(content["_id"]) + for key in content_keys: - if key in ignore_fields: - del definition[key] - if ":" not in key: + if ":" in key: + content[key.replace(":", ".")] = content[key] del content[key] - continue - definition[key.replace(":", ".")] = definition[key] - del definition[key] - del content[key] - - content["definition"] = definition def show(self, session, _id): """ @@ -886,7 +932,7 @@ class RoleTopicAuth(BaseTopic): :param _id: server internal id :return: dictionary, raise exception if not found. """ - filter_db = self._get_project_filter(session, write=False, show_all=True) + filter_db = self._get_project_filter(session) filter_db["_id"] = _id role = self.db.get_one(self.topic, filter_db) @@ -906,6 +952,17 @@ class RoleTopicAuth(BaseTopic): if not filter_q: filter_q = {} + if "root" in filter_q: + filter_q[":"] = filter_q["root"] + del filter_q["root"] + + if len(filter_q) > 0: + keys = [key for key in filter_q.keys() if "." in key] + + for key in keys: + filter_q[key.replace(".", ":")] = filter_q[key] + del filter_q[key] + roles = self.db.get_list(self.topic, filter_q) new_roles = [] @@ -954,8 +1011,8 @@ class RoleTopicAuth(BaseTopic): :param dry_run: make checking but do not delete :return: dictionary with deleted item _id. It raises EngineException on error: not found, conflict, ... """ - self.check_conflict_on_del(session, _id) - filter_q = self._get_project_filter(session, write=True, show_all=True) + self.check_conflict_on_del(session, _id, None) + filter_q = self._get_project_filter(session) filter_q["_id"] = _id if not dry_run: self.auth.delete_role(_id) @@ -978,7 +1035,7 @@ class RoleTopicAuth(BaseTopic): # Override descriptor with query string kwargs if kwargs: - BaseTopic._update_input_with_kwargs(indata, kwargs) + self._update_input_with_kwargs(indata, kwargs) try: indata = self._validate_input_edit(indata, force=session["force"])