X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fadmin_topics.py;h=b0dc0877432eadbd717569208e57c74c574b7ec3;hb=44603906f6eeefb0546b9fa26cd0fb4a6e346c4a;hp=31937f9ed61b49a43592a6f8458cf970be403dec;hpb=339ed7893234f5876a8ef2a5316c8351671a5327;p=osm%2FNBI.git diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py index 31937f9..b0dc087 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) @@ -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,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) @@ -508,7 +529,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: @@ -541,31 +562,23 @@ 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 + 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"], + user["name"], mapping["project"], mapping["role"] ) - + for mapping in mappings_to_add: self.auth.assign_role_to_user( user["name"], @@ -587,7 +600,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 +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) @@ -742,7 +757,7 @@ 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 @@ -853,13 +868,20 @@ class RoleTopicAuth(BaseTopic): if not content["_admin"].get("created"): content["_admin"]["created"] = now content["_admin"]["modified"] = now - content[":"] = False + + if "." in content.keys(): + content["root"] = content["."] + del content["."] + + if "root" not in content.keys(): + content["root"] = False ignore_fields = ["_id", "_admin", "name"] - for role_def, value in content.items(): + content_keys = content.keys() + for role_def in content_keys: if role_def in ignore_fields: continue - content[role_def.replace(".", ":")] = value + content[role_def.replace(".", ":")] = content[role_def] del content[role_def] @staticmethod @@ -883,8 +905,12 @@ class RoleTopicAuth(BaseTopic): for role_def, value in edit_content.items(): final_content[role_def.replace(".", ":")] = value - if ":" not in final_content.keys(): - final_content[":"] = False + 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): @@ -897,6 +923,8 @@ class RoleTopicAuth(BaseTopic): """ content_keys = list(content.keys()) + content["_id"] = str(content["_id"]) + for key in content_keys: if ":" in key: content[key.replace(":", ".")] = content[key] @@ -910,8 +938,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 +957,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 = [] @@ -979,8 +1017,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)