X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fadmin_topics.py;h=968788aea07fe9148a08d135ddcde0931a255193;hp=fd4d0e925e4ad9fefbc78c23868e0729bbe7f279;hb=c768937d5bb7b31e827aca36c9ab8c3cf1fdb34b;hpb=b6a5819d7daefde450ab263a4a57a6d173255ee0;ds=sidebyside diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py index fd4d0e9..968788a 100644 --- a/osm_nbi/admin_topics.py +++ b/osm_nbi/admin_topics.py @@ -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)] @@ -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)