X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fadmin_topics.py;h=bc2c7d93e76fbdad0afa8b3e90108bbb39b321fa;hp=07f18da6c6728593e2d81aefb3b48427af33b401;hb=f269fa5cd7c46515aab49ad8af6da7e918afa592;hpb=37de09105822b2b4db8b0ebac1ec5994af5d0fd9;ds=sidebyside diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py index 07f18da..bc2c7d9 100644 --- a/osm_nbi/admin_topics.py +++ b/osm_nbi/admin_topics.py @@ -84,6 +84,13 @@ class UserTopic(BaseTopic): content["_admin"]["salt"] = salt if content.get("password"): content["password"] = sha256(content["password"].encode('utf-8') + salt.encode('utf-8')).hexdigest() + if content.get("project_role_mappings"): + projects = [mapping[0] for mapping in content["project_role_mappings"]] + + if content.get("projects"): + content["projects"] += projects + else: + content["projects"] = projects @staticmethod def format_on_edit(final_content, edit_content): @@ -369,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) @@ -387,6 +394,10 @@ class UserTopicAuth(UserTopic): username = indata.get("username") user_list = list(map(lambda x: x["username"], self.auth.get_user_list())) + if "projects" in indata.keys(): + raise EngineException("Format invalid: the keyword \"projects\" is not allowed for Keystone", + HTTPStatus.BAD_REQUEST) + if username in user_list: raise EngineException("username '{}' exists".format(username), HTTPStatus.CONFLICT) @@ -457,6 +468,21 @@ 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, "role": role}) + + del content["projects"] + content["project_role_mappings"] = project_role_mappings + def new(self, rollback, session, indata=None, kwargs=None, headers=None): """ Creates a new entry into the authentication backend. @@ -497,7 +523,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: @@ -530,17 +556,9 @@ 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 if mapping not in edit_mapping] @@ -576,7 +594,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): """ @@ -731,7 +751,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 @@ -842,13 +862,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 @@ -872,8 +899,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): @@ -886,6 +917,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] @@ -899,7 +932,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 = self._get_project_filter(session) filter_db["_id"] = _id role = self.db.get_one(self.topic, filter_db) @@ -919,6 +952,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 = []