X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fadmin_topics.py;h=45c21025ddbe77ff2dc9a60c8d65051a1bd2aa8b;hp=b0dc0877432eadbd717569208e57c74c574b7ec3;hb=2bf65930958606064b41b9747dc22512e70523f7;hpb=44603906f6eeefb0546b9fa26cd0fb4a6e346c4a diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py index b0dc087..45c2102 100644 --- a/osm_nbi/admin_topics.py +++ b/osm_nbi/admin_topics.py @@ -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): @@ -560,7 +560,7 @@ 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: user = self.show(session, _id) original_mapping = user["project_role_mappings"] @@ -574,14 +574,14 @@ class UserTopicAuth(UserTopic): 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"] ) @@ -656,7 +656,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) @@ -761,12 +761,12 @@ class RoleTopicAuth(BaseTopic): 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)] @@ -788,7 +788,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): @@ -802,7 +802,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): @@ -831,7 +831,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) @@ -847,7 +847,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) @@ -868,22 +868,14 @@ class RoleTopicAuth(BaseTopic): if not content["_admin"].get("created"): content["_admin"]["created"] = now content["_admin"]["modified"] = now - - if "." in content.keys(): - content["root"] = content["."] - del content["."] - + + if ":" in content.keys(): + content["root"] = content[":"] + del content[":"] + if "root" not in content.keys(): content["root"] = False - 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): """ @@ -903,12 +895,12 @@ class RoleTopicAuth(BaseTopic): # Saving the role definition for role_def, value in edit_content.items(): - final_content[role_def.replace(".", ":")] = value - + 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 @@ -921,15 +913,8 @@ class RoleTopicAuth(BaseTopic): :param definition: role definition to be processed """ - content_keys = list(content.keys()) - content["_id"] = str(content["_id"]) - for key in content_keys: - if ":" in key: - content[key.replace(":", ".")] = content[key] - del content[key] - def show(self, session, _id): """ Get complete information on an topic @@ -957,16 +942,13 @@ 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] + if ":" in filter_q: + filter_q["root"] = filter_q[":"] - for key in keys: - filter_q[key.replace(".", ":")] = filter_q[key] - del filter_q[key] + 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 = []