X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fadmin_topics.py;h=7c98a34c14bc89bf88b551009b0f20d445ae7c00;hp=2bc300302bebb41aeffd341e07e87020f63eded6;hb=4015b4734a923c29c04bf9b30f5a06604dd2f0a4;hpb=8c3df70403b06b3206821c4f19dbfec13a7b59ac diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py index 2bc3003..7c98a34 100644 --- a/osm_nbi/admin_topics.py +++ b/osm_nbi/admin_topics.py @@ -508,8 +508,9 @@ class UserTopicAuth(UserTopic): self.format_on_new(content, session["project_id"], make_public=session["public"]) _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"]) + if "project_role_mappings" in content.keys(): + 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"] @@ -656,7 +657,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) @@ -734,6 +735,35 @@ class ProjectTopicAuth(ProjectTopic): return v return None + def edit(self, session, _id, indata=None, kwargs=None, content=None): + """ + Updates a project entry. + + :param session: contains "username", "admin", "force", "public", "project_id", "set_project" + :param _id: + :param indata: data to be inserted + :param kwargs: used to override the indata descriptor + :param content: + :return: _id: identity of the inserted data. + """ + indata = self._remove_envelop(indata) + + # Override descriptor with query string kwargs + if kwargs: + BaseTopic._update_input_with_kwargs(indata, kwargs) + try: + indata = self._validate_input_edit(indata, force=session["force"]) + + if not content: + content = self.show(session, _id) + self.check_conflict_on_edit(session, content, indata, _id=_id) + self.format_on_edit(content, indata) + + if "name" in indata: + self.auth.update_project(content["_id"], indata["name"]) + except ValidationError as e: + raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY) + class RoleTopicAuth(BaseTopic): topic = "roles_operations" @@ -761,14 +791,14 @@ 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)] if len(role_def_matches) == 0: @@ -788,7 +818,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 +832,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 +861,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 +877,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 +898,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 +925,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 +943,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 +972,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 = []