X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fadmin_topics.py;h=fd4d0e925e4ad9fefbc78c23868e0729bbe7f279;hp=ffe24fbacae57eb86031bb00c47ff6a8e63e7664;hb=c4650365704d7827e53280ca16f9bdb70bf9fcbb;hpb=db04d1ed5d5da9cb1a31c56984663f90d1bf998a diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py index ffe24fb..fd4d0e9 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): @@ -471,15 +471,15 @@ class UserTopicAuth(UserTopic): @staticmethod def format_on_show(content): """ - Modifies the content of the role information to separate the role + 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}) - + project_role_mappings.append({"project": project["_id"], "role": role["_id"]}) + del content["projects"] content["project_role_mappings"] = project_role_mappings @@ -506,7 +506,11 @@ 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"] + + 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) @@ -556,28 +560,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: user = self.show(session, _id) original_mapping = user["project_role_mappings"] edit_mapping = content["project_role_mappings"] - - 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"] ) @@ -620,8 +624,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) @@ -784,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): @@ -798,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): @@ -864,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): """ @@ -899,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 @@ -917,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 @@ -953,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 = []