X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fadmin_topics.py;h=7c98a34c14bc89bf88b551009b0f20d445ae7c00;hp=31937f9ed61b49a43592a6f8458cf970be403dec;hb=4015b4734a923c29c04bf9b30f5a06604dd2f0a4;hpb=339ed7893234f5876a8ef2a5316c8351671a5327 diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py index 31937f9..7c98a34 100644 --- a/osm_nbi/admin_topics.py +++ b/osm_nbi/admin_topics.py @@ -376,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) @@ -412,15 +412,15 @@ class UserTopicAuth(UserTopic): :return: None or raises EngineException """ users = self.auth.get_user_list() - admin_user = [user for user in users if user["name"] == "admin"][0] + admin_user = [user for user in users if user["username"] == "admin"][0] - if _id == admin_user["_id"] and edit_content["project_role_mappings"]: + if _id == admin_user["_id"] and "project_role_mappings" in edit_content.keys(): elem = { "project": "admin", "role": "system_admin" } if elem not in edit_content: - raise EngineException("You cannot remove system_admin role from admin user", + raise EngineException("You cannot remove system_admin role from admin user", http_code=HTTPStatus.FORBIDDEN) def check_conflict_on_del(self, session, _id, db_content): @@ -468,6 +468,23 @@ 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["_id"], "role": role["_id"]}) + + del content["projects"] + content["project_role_mappings"] = project_role_mappings + + return content + def new(self, rollback, session, indata=None, kwargs=None, headers=None): """ Creates a new entry into the authentication backend. @@ -489,7 +506,12 @@ class UserTopicAuth(UserTopic): content = self._validate_input_new(content, session["force"]) self.check_conflict_on_new(session, content) self.format_on_new(content, session["project_id"], make_public=session["public"]) - _id = self.auth.create_user(content["username"], content["password"]) + _id = self.auth.create_user(content["username"], content["password"])["_id"] + + if "project_role_mappings" in content.keys(): + for mapping in content["project_role_mappings"]: + self.auth.assign_role_to_user(_id, mapping["project"], mapping["role"]) + rollback.append({"topic": self.topic, "_id": _id}) del content["password"] # self._send_msg("create", content) @@ -508,7 +530,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: @@ -539,36 +561,28 @@ class UserTopicAuth(UserTopic): self.format_on_edit(content, indata) if "password" in content: - self.auth.change_password(content["name"], content["password"]) + self.auth.change_password(content["username"], 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 + mappings_to_remove = [mapping for mapping in original_mapping if mapping not in edit_mapping] - + mappings_to_add = [mapping for mapping in edit_mapping if mapping not in original_mapping] - + for mapping in mappings_to_remove: self.auth.remove_role_from_user( - user["name"], + _id, mapping["project"], mapping["role"] ) - + for mapping in mappings_to_add: self.auth.assign_role_to_user( - user["name"], + _id, mapping["project"], mapping["role"] ) @@ -587,7 +601,9 @@ class UserTopicAuth(UserTopic): if not filter_q: filter_q = {} - return self.auth.get_user_list(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): """ @@ -609,8 +625,8 @@ class UserTopicAuth(UserTopic): class ProjectTopicAuth(ProjectTopic): # topic = "projects" # topic_msg = "projects" - # schema_new = project_new_schema - # schema_edit = project_edit_schema + schema_new = project_new_schema + schema_edit = project_edit_schema def __init__(self, db, fs, msg, auth): ProjectTopic.__init__(self, db, fs, msg) @@ -641,7 +657,7 @@ class ProjectTopicAuth(ProjectTopic): """ projects = self.auth.get_project_list() current_project = [project for project in projects - if project["name"] == session["project_id"]][0] + if project["name"] in session["project_id"]][0] if _id == current_project["_id"]: raise EngineException("You cannot delete your own project", http_code=HTTPStatus.CONFLICT) @@ -719,6 +735,35 @@ class ProjectTopicAuth(ProjectTopic): return v return None + def edit(self, session, _id, indata=None, kwargs=None, content=None): + """ + Updates a project entry. + + :param session: contains "username", "admin", "force", "public", "project_id", "set_project" + :param _id: + :param indata: data to be inserted + :param kwargs: used to override the indata descriptor + :param content: + :return: _id: identity of the inserted data. + """ + indata = self._remove_envelop(indata) + + # Override descriptor with query string kwargs + if kwargs: + BaseTopic._update_input_with_kwargs(indata, kwargs) + try: + indata = self._validate_input_edit(indata, force=session["force"]) + + if not content: + content = self.show(session, _id) + self.check_conflict_on_edit(session, content, indata, _id=_id) + self.format_on_edit(content, indata) + + if "name" in indata: + self.auth.update_project(content["_id"], indata["name"]) + except ValidationError as e: + raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY) + class RoleTopicAuth(BaseTopic): topic = "roles_operations" @@ -742,18 +787,18 @@ class RoleTopicAuth(BaseTopic): :param role_definitions: role definition to test :return: None if ok, raises ValidationError exception on error """ - ignore_fields = ["_id", "name"] + ignore_fields = ["_id", "_admin", "name"] for role_def in role_definitions.keys(): if role_def in ignore_fields: continue - if role_def == ".": + if role_def == "root": if isinstance(role_definitions[role_def], bool): continue else: raise ValidationError("Operation authorization \".\" should be True/False.") - if role_def[-1] == ".": + if role_def[-1] == ":": raise ValidationError("Operation cannot end with \".\"") - + role_def_matches = [op for op in operations if op.startswith(role_def)] if len(role_def_matches) == 0: @@ -773,7 +818,7 @@ class RoleTopicAuth(BaseTopic): if self.schema_new: validate_input(input, self.schema_new) self.validate_role_definition(self.operations, input) - + return input def _validate_input_edit(self, input, force=False): @@ -787,7 +832,7 @@ class RoleTopicAuth(BaseTopic): if self.schema_edit: validate_input(input, self.schema_edit) self.validate_role_definition(self.operations, input) - + return input def check_conflict_on_new(self, session, indata): @@ -816,7 +861,7 @@ class RoleTopicAuth(BaseTopic): """ roles = self.auth.get_role_list() system_admin_role = [role for role in roles - if roles["name"] == "system_admin"][0] + if role["name"] == "system_admin"][0] if _id == system_admin_role["_id"]: raise EngineException("You cannot edit system_admin role", http_code=HTTPStatus.FORBIDDEN) @@ -832,7 +877,7 @@ class RoleTopicAuth(BaseTopic): """ roles = self.auth.get_role_list() system_admin_role = [role for role in roles - if roles["name"] == "system_admin"][0] + if role["name"] == "system_admin"][0] if _id == system_admin_role["_id"]: raise EngineException("You cannot delete system_admin role", http_code=HTTPStatus.FORBIDDEN) @@ -853,14 +898,13 @@ class RoleTopicAuth(BaseTopic): if not content["_admin"].get("created"): content["_admin"]["created"] = now content["_admin"]["modified"] = now - content[":"] = False - ignore_fields = ["_id", "_admin", "name"] - for role_def, value in content.items(): - if role_def in ignore_fields: - continue - content[role_def.replace(".", ":")] = value - del content[role_def] + if ":" in content.keys(): + content["root"] = content[":"] + del content[":"] + + if "root" not in content.keys(): + content["root"] = False @staticmethod def format_on_edit(final_content, edit_content): @@ -881,10 +925,14 @@ class RoleTopicAuth(BaseTopic): # Saving the role definition for role_def, value in edit_content.items(): - final_content[role_def.replace(".", ":")] = value - - if ":" not in final_content.keys(): - final_content[":"] = False + final_content[role_def] = 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 def format_on_show(content): @@ -895,12 +943,7 @@ class RoleTopicAuth(BaseTopic): :param definition: role definition to be processed """ - content_keys = list(content.keys()) - - for key in content_keys: - if ":" in key: - content[key.replace(":", ".")] = content[key] - del content[key] + content["_id"] = str(content["_id"]) def show(self, session, _id): """ @@ -910,8 +953,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["_id"] = _id + filter_db = {"_id": _id} role = self.db.get_one(self.topic, filter_db) new_role = dict(role) @@ -930,6 +972,14 @@ class RoleTopicAuth(BaseTopic): if not filter_q: filter_q = {} + if ":" in filter_q: + filter_q["root"] = filter_q[":"] + + for key in filter_q.keys(): + if key == "name": + continue + filter_q[key] = filter_q[key] in ["True", "true"] + roles = self.db.get_list(self.topic, filter_q) new_roles = [] @@ -979,8 +1029,7 @@ class RoleTopicAuth(BaseTopic): :return: dictionary with deleted item _id. It raises EngineException on error: not found, conflict, ... """ self.check_conflict_on_del(session, _id, None) - filter_q = self._get_project_filter(session) - filter_q["_id"] = _id + filter_q = {"_id": _id} if not dry_run: self.auth.delete_role(_id) v = self.db.del_one(self.topic, filter_q)