from validation import ValidationError
from validation import is_valid_uuid # To check that User/Project Names don't look like UUIDs
from base_topic import BaseTopic, EngineException
+from authconn_keystone import AuthconnKeystone
__author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
raise EngineException("username '{}' exists".format(indata["username"]), HTTPStatus.CONFLICT)
# check projects
if not session["force"]:
- for p in indata.get("projects"):
+ for p in indata.get("projects") or []:
# To allow project addressing by Name as well as ID
if not self.db.get_one("projects", {BaseTopic.id_field("projects", p): p}, fail_on_empty=False,
fail_on_more=False):
:return: None or raises EngineException
"""
username = indata.get("username")
- user_list = list(map(lambda x: x["username"], self.auth.get_user_list()))
+ if is_valid_uuid(username):
+ raise EngineException("username '{}' cannot have a uuid format".format(username),
+ HTTPStatus.UNPROCESSABLE_ENTITY)
+
+ # Check that username is not used, regardless keystone already checks this
+ if self.auth.get_user_list(filter_q={"name": username}):
+ raise EngineException("username '{}' is already used".format(username), HTTPStatus.CONFLICT)
if "projects" in indata.keys():
- raise EngineException("Format invalid: the keyword \"projects\" is not allowed for Keystone",
+ raise EngineException("Format invalid: the keyword \"projects\" is not allowed for keystone authentication",
HTTPStatus.BAD_REQUEST)
- if username in user_list:
- raise EngineException("username '{}' exists".format(username), HTTPStatus.CONFLICT)
-
def check_conflict_on_edit(self, session, final_content, edit_content, _id):
"""
Check that the data to be edited/uploaded is valid
:param _id: internal _id
:return: None or raises EngineException
"""
- users = self.auth.get_user_list()
- admin_user = [user for user in users if user["username"] == "admin"][0]
- 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",
- http_code=HTTPStatus.FORBIDDEN)
+ if "username" in edit_content:
+ username = edit_content.get("username")
+ if is_valid_uuid(username):
+ raise EngineException("username '{}' cannot have an uuid format".format(username),
+ HTTPStatus.UNPROCESSABLE_ENTITY)
+
+ # Check that username is not used, regardless keystone already checks this
+ if self.auth.get_user_list(filter_q={"name": username}):
+ raise EngineException("username '{}' is already used".format(username), HTTPStatus.CONFLICT)
+
+ if final_content["username"] == "admin":
+ for mapping in edit_content.get("remove_project_role_mappings", ()):
+ if mapping["project"] == "admin" and mapping.get("role") in (None, "system_admin"):
+ # TODO make this also available for project id and role id
+ 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):
"""
:param db_content: The database content of this item _id
:return: None if ok or raises EngineException with the conflict
"""
- if _id == session["username"]:
- raise EngineException("You cannot delete your own user", http_code=HTTPStatus.CONFLICT)
-
- @staticmethod
- def format_on_new(content, project_id=None, make_public=False):
- """
- Modifies content descriptor to include _id.
-
- NOTE: No password salt required because the authentication backend
- should handle these security concerns.
-
- :param content: descriptor to be modified
- :param make_public: if included it is generated as public for reading.
- :return: None, but content is modified
- """
- BaseTopic.format_on_new(content, make_public=False)
- content["_id"] = content["username"]
- content["password"] = content["password"]
-
- @staticmethod
- def format_on_edit(final_content, edit_content):
- """
- Modifies final_content descriptor to include the modified date.
-
- NOTE: No password salt required because the authentication backend
- should handle these security concerns.
-
- :param final_content: final descriptor generated
- :param edit_content: alterations to be include
- :return: None, but final_content is modified
- """
- BaseTopic.format_on_edit(final_content, edit_content)
- if "password" in edit_content:
- final_content["password"] = edit_content["password"]
- else:
- final_content["project_role_mappings"] = edit_content["project_role_mappings"]
+ if db_content["username"] == session["username"]:
+ raise EngineException("You cannot delete your own login user ", http_code=HTTPStatus.CONFLICT)
+
+ # @staticmethod
+ # def format_on_new(content, project_id=None, make_public=False):
+ # """
+ # Modifies content descriptor to include _id.
+ #
+ # NOTE: No password salt required because the authentication backend
+ # should handle these security concerns.
+ #
+ # :param content: descriptor to be modified
+ # :param make_public: if included it is generated as public for reading.
+ # :return: None, but content is modified
+ # """
+ # BaseTopic.format_on_new(content, make_public=False)
+ # content["_id"] = content["username"]
+ # content["password"] = content["password"]
+
+ # @staticmethod
+ # def format_on_edit(final_content, edit_content):
+ # """
+ # Modifies final_content descriptor to include the modified date.
+ #
+ # NOTE: No password salt required because the authentication backend
+ # should handle these security concerns.
+ #
+ # :param final_content: final descriptor generated
+ # :param edit_content: alterations to be include
+ # :return: None, but final_content is modified
+ # """
+ # BaseTopic.format_on_edit(final_content, edit_content)
+ # if "password" in edit_content:
+ # final_content["password"] = edit_content["password"]
+ # else:
+ # final_content["project_role_mappings"] = edit_content["project_role_mappings"]
@staticmethod
def format_on_show(content):
for project in content["projects"]:
for role in project["roles"]:
- project_role_mappings.append({"project": project["_id"], "role": role["_id"]})
+ project_role_mappings.append({"project": project["_id"],
+ "project_name": project["name"],
+ "role": role["_id"],
+ "role_name": role["name"]})
del content["projects"]
content["project_role_mappings"] = project_role_mappings
BaseTopic._update_input_with_kwargs(content, kwargs)
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"])
+ # 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"]
+ # del content["password"]
# self._send_msg("create", content)
return _id
except ValidationError as e:
:param _id: server internal id
:return: dictionary, raise exception if not found.
"""
- users = [user for user in self.auth.get_user_list() if user["_id"] == _id]
+ # Allow _id to be a name or uuid
+ filter_q = {self.id_field(self.topic, _id): _id}
+ users = self.auth.get_user_list(filter_q)
if len(users) == 1:
return self.format_on_show(users[0])
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 "password" in content:
- 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
- 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(
- _id,
- mapping["project"],
- mapping["role"]
- )
-
- for mapping in mappings_to_add:
- self.auth.assign_role_to_user(
- _id,
- mapping["project"],
- mapping["role"]
- )
-
- return content["_id"]
+ # self.format_on_edit(content, indata)
+
+ if "password" in indata or "username" in indata:
+ self.auth.update_user(_id, new_name=indata.get("username"), new_password=indata.get("password"))
+ if not indata.get("remove_project_role_mappings") and not indata.get("add_project_role_mappings") and \
+ not indata.get("project_role_mappings"):
+ return _id
+ if indata.get("project_role_mappings") and \
+ (indata.get("remove_project_role_mappings") or indata.get("add_project_role_mappings")):
+ raise EngineException("Option 'project_role_mappings' is incompatible with 'add_project_role_mappings"
+ "' or 'remove_project_role_mappings'", http_code=HTTPStatus.BAD_REQUEST)
+
+ user = self.show(session, _id)
+ original_mapping = user["project_role_mappings"]
+
+ mappings_to_add = []
+ mappings_to_remove = []
+
+ # remove
+ for to_remove in indata.get("remove_project_role_mappings", ()):
+ for mapping in original_mapping:
+ if to_remove["project"] in (mapping["project"], mapping["project_name"]):
+ if not to_remove.get("role") or to_remove["role"] in (mapping["role"], mapping["role_name"]):
+ mappings_to_remove.append(mapping)
+
+ # add
+ for to_add in indata.get("add_project_role_mappings", ()):
+ for mapping in original_mapping:
+ if to_add["project"] in (mapping["project"], mapping["project_name"]) and \
+ to_add["role"] in (mapping["role"], mapping["role_name"]):
+
+ if mapping in mappings_to_remove: # do not remove
+ mappings_to_remove.remove(mapping)
+ break # do not add, it is already at user
+ else:
+ mappings_to_add.append(to_add)
+
+ # set
+ if indata.get("project_role_mappings"):
+ for to_set in indata["project_role_mappings"]:
+ for mapping in original_mapping:
+ if to_set["project"] in (mapping["project"], mapping["project_name"]) and \
+ to_set["role"] in (mapping["role"], mapping["role_name"]):
+
+ if mapping in mappings_to_remove: # do not remove
+ mappings_to_remove.remove(mapping)
+ break # do not add, it is already at user
+ else:
+ mappings_to_add.append(to_set)
+ for mapping in original_mapping:
+ for to_set in indata["project_role_mappings"]:
+ if to_set["project"] in (mapping["project"], mapping["project_name"]) and \
+ to_set["role"] in (mapping["role"], mapping["role_name"]):
+ break
+ else:
+ # delete
+ if mapping not in mappings_to_remove: # do not remove
+ mappings_to_remove.append(mapping)
+
+ for mapping in mappings_to_remove:
+ self.auth.remove_role_from_user(
+ _id,
+ mapping["project"],
+ mapping["role"]
+ )
+
+ for mapping in mappings_to_add:
+ self.auth.assign_role_to_user(
+ _id,
+ mapping["project"],
+ mapping["role"]
+ )
+
+ return "_id"
except ValidationError as e:
raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
:param filter_q: filter of data to be applied
:return: The list, it can be empty if no one match the filter.
"""
- if not filter_q:
- filter_q = {}
-
users = [self.format_on_show(user) for user in self.auth.get_user_list(filter_q)]
return users
:param dry_run: make checking but do not delete
:return: dictionary with deleted item _id. It raises EngineException on error: not found, conflict, ...
"""
- self.check_conflict_on_del(session, _id, None)
+ # Allow _id to be a name or uuid
+ filter_q = {self.id_field(self.topic, _id): _id}
+ user_list = self.auth.get_user_list(filter_q)
+ if not user_list:
+ raise EngineException("User '{}' not found".format(_id), http_code=HTTPStatus.NOT_FOUND)
+ _id = user_list[0]["_id"]
+ self.check_conflict_on_del(session, _id, user_list[0])
if not dry_run:
v = self.auth.delete_user(_id)
return v
:param indata: data to be inserted
:return: None or raises EngineException
"""
- project = indata.get("name")
- project_list = list(map(lambda x: x["name"], self.auth.get_project_list()))
+ project_name = indata.get("name")
+ if is_valid_uuid(project_name):
+ raise EngineException("project name '{}' cannot have an uuid format".format(project_name),
+ HTTPStatus.UNPROCESSABLE_ENTITY)
+
+ project_list = self.auth.get_project_list(filter_q={"name": project_name})
- if project in project_list:
- raise EngineException("project '{}' exists".format(project), HTTPStatus.CONFLICT)
+ if project_list:
+ raise EngineException("project '{}' exists".format(project_name), HTTPStatus.CONFLICT)
+
+ def check_conflict_on_edit(self, session, final_content, edit_content, _id):
+ """
+ Check that the data to be edited/uploaded is valid
+
+ :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
+ :param final_content: data once modified
+ :param edit_content: incremental data that contains the modifications to apply
+ :param _id: internal _id
+ :return: None or raises EngineException
+ """
+
+ project_name = edit_content.get("name")
+ if project_name:
+ if is_valid_uuid(project_name):
+ raise EngineException("project name '{}' cannot be an uuid format".format(project_name),
+ HTTPStatus.UNPROCESSABLE_ENTITY)
+
+ # Check that project name is not used, regardless keystone already checks this
+ if self.auth.get_project_list(filter_q={"name": project_name}):
+ raise EngineException("project '{}' is already used".format(project_name), HTTPStatus.CONFLICT)
def check_conflict_on_del(self, session, _id, db_content):
"""
:param db_content: The database content of this item _id
:return: None if ok or raises EngineException with the conflict
"""
- projects = self.auth.get_project_list()
- current_project = [project for project in projects
- if project["name"] == session["project_id"]][0]
-
- if _id == current_project["_id"]:
+ # projects = self.auth.get_project_list()
+ # current_project = [project for project in projects
+ # if project["name"] in session["project_id"]][0]
+ # TODO check that any user is using this project, raise CONFLICT exception
+ if _id == session["project_id"]:
raise EngineException("You cannot delete your own project", http_code=HTTPStatus.CONFLICT)
def new(self, rollback, session, indata=None, kwargs=None, headers=None):
:param _id: server internal id
:return: dictionary, raise exception if not found.
"""
- projects = [project for project in self.auth.get_project_list() if project["_id"] == _id]
+ # Allow _id to be a name or uuid
+ filter_q = {self.id_field(self.topic, _id): _id}
+ projects = self.auth.get_project_list(filter_q=filter_q)
if len(projects) == 1:
return projects[0]
:param filter_q: filter of data to be applied
:return: The list, it can be empty if no one match the filter.
"""
- if not filter_q:
- filter_q = {}
-
return self.auth.get_project_list(filter_q)
def delete(self, session, _id, dry_run=False):
:param dry_run: make checking but do not delete
:return: dictionary with deleted item _id. It raises EngineException on error: not found, conflict, ...
"""
- self.check_conflict_on_del(session, _id, None)
+ # Allow _id to be a name or uuid
+ filter_q = {self.id_field(self.topic, _id): _id}
+ project_list = self.auth.get_project_list(filter_q)
+ if not project_list:
+ raise EngineException("Project '{}' not found".format(_id), http_code=HTTPStatus.NOT_FOUND)
+ _id = project_list[0]["_id"]
+ self.check_conflict_on_del(session, _id, project_list[0])
if not dry_run:
v = self.auth.delete_project(_id)
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"
- topic_msg = "roles"
+ topic = "roles"
+ topic_msg = None # "roles"
schema_new = roles_new_schema
schema_edit = roles_edit_schema
multiproject = False
BaseTopic.__init__(self, db, fs, msg)
self.auth = auth
self.operations = ops
+ self.topic = "roles_operations" if isinstance(auth, AuthconnKeystone) else "roles"
@staticmethod
def validate_role_definition(operations, role_definitions):
:param role_definitions: role definition to test
:return: None if ok, raises ValidationError exception on error
"""
- ignore_fields = ["_id", "_admin", "name"]
- for role_def in role_definitions.keys():
+ if not role_definitions.get("permissions"):
+ return
+ ignore_fields = ["admin", "default"]
+ for role_def in role_definitions["permissions"].keys():
if role_def in ignore_fields:
continue
- if role_def == ".":
- if isinstance(role_definitions[role_def], bool):
- continue
- else:
- raise ValidationError("Operation authorization \".\" should be True/False.")
- if role_def[-1] == ".":
- raise ValidationError("Operation cannot end with \".\"")
-
+ 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:
- raise ValidationError("No matching operation found.")
-
- if not isinstance(role_definitions[role_def], bool):
- raise ValidationError("Operation authorization {} should be True/False.".format(role_def))
+ raise ValidationError("Invalid permission '{}'".format(role_def))
def _validate_input_new(self, input, force=False):
"""
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):
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):
:param indata: data to be inserted
:return: None or raises EngineException
"""
- role = indata.get("name")
- role_list = list(map(lambda x: x["name"], self.auth.get_role_list()))
-
- if role in role_list:
- raise EngineException("role '{}' exists".format(role), HTTPStatus.CONFLICT)
+ # check name not exists
+ if self.db.get_one(self.topic, {"name": indata.get("name")}, fail_on_empty=False, fail_on_more=False):
+ raise EngineException("role name '{}' exists".format(indata["name"]), HTTPStatus.CONFLICT)
def check_conflict_on_edit(self, session, final_content, edit_content, _id):
"""
:param _id: internal _id
:return: None or raises EngineException
"""
- roles = self.auth.get_role_list()
- system_admin_role = [role for role in roles
- if roles["name"] == "system_admin"][0]
+ if "default" not in final_content["permissions"]:
+ final_content["permissions"]["default"] = False
+ if "admin" not in final_content["permissions"]:
+ final_content["permissions"]["admin"] = False
- if _id == system_admin_role["_id"]:
- raise EngineException("You cannot edit system_admin role", http_code=HTTPStatus.FORBIDDEN)
+ # check name not exists
+ if "name" in edit_content:
+ role_name = edit_content["name"]
+ if self.db.get_one(self.topic, {"name": role_name, "_id.ne": _id}, fail_on_empty=False, fail_on_more=False):
+ raise EngineException("role name '{}' exists".format(role_name), HTTPStatus.CONFLICT)
def check_conflict_on_del(self, session, _id, db_content):
"""
:return: None if ok or raises EngineException with the conflict
"""
roles = self.auth.get_role_list()
- system_admin_role = [role for role in roles
- if roles["name"] == "system_admin"][0]
+ system_admin_roles = [role for role in roles if role["name"] == "system_admin"]
- if _id == system_admin_role["_id"]:
+ if system_admin_roles and _id == system_admin_roles[0]["_id"]:
raise EngineException("You cannot delete system_admin role", http_code=HTTPStatus.FORBIDDEN)
@staticmethod
if not content["_admin"].get("created"):
content["_admin"]["created"] = now
content["_admin"]["modified"] = now
-
- 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]
+
+ if "permissions" not in content:
+ content["permissions"] = {}
+
+ if "default" not in content["permissions"]:
+ content["permissions"]["default"] = False
+ if "admin" not in content["permissions"]:
+ content["permissions"]["admin"] = False
@staticmethod
def format_on_edit(final_content, edit_content):
"""
final_content["_admin"]["modified"] = time()
- ignore_fields = ["_id", "name", "_admin"]
- delete_keys = [key for key in final_content.keys() if key not in ignore_fields]
-
- for key in delete_keys:
- del final_content[key]
-
- # Saving the role definition
- for role_def, value in edit_content.items():
- final_content[role_def.replace(".", ":")] = 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
-
- @staticmethod
- def format_on_show(content):
- """
- Modifies the content of the role information to separate the role
- metadata from the role definition. Eases the reading process of the
- role definition.
-
- :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
-
- :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
- :param _id: server internal id
- :return: dictionary, raise exception if not found.
- """
- filter_db = {"_id": _id}
-
- role = self.db.get_one(self.topic, filter_db)
- new_role = dict(role)
- self.format_on_show(new_role)
-
- return new_role
-
- def list(self, session, filter_q=None):
- """
- Get a list of the topic that matches a filter
-
- :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
- :param filter_q: filter of data to be applied
- :return: The list, it can be empty if no one match the filter.
- """
- 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 = []
-
- for role in roles:
- new_role = dict(role)
- self.format_on_show(new_role)
- new_roles.append(new_role)
-
- return new_roles
+ if "permissions" not in final_content:
+ final_content["permissions"] = {}
+
+ if "default" not in final_content["permissions"]:
+ final_content["permissions"]["default"] = False
+ if "admin" not in final_content["permissions"]:
+ final_content["permissions"]["admin"] = False
+
+ # @staticmethod
+ # def format_on_show(content):
+ # """
+ # Modifies the content of the role information to separate the role
+ # metadata from the role definition. Eases the reading process of the
+ # role definition.
+ #
+ # :param definition: role definition to be processed
+ # """
+ # content["_id"] = str(content["_id"])
+ #
+ # def show(self, session, _id):
+ # """
+ # Get complete information on an topic
+ #
+ # :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
+ # :param _id: server internal id
+ # :return: dictionary, raise exception if not found.
+ # """
+ # filter_db = {"_id": _id}
+ # filter_db = { BaseTopic.id_field(self.topic, _id): _id } # To allow role addressing by name
+ #
+ # role = self.db.get_one(self.topic, filter_db)
+ # new_role = dict(role)
+ # self.format_on_show(new_role)
+ #
+ # return new_role
+
+ # def list(self, session, filter_q=None):
+ # """
+ # Get a list of the topic that matches a filter
+ #
+ # :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
+ # :param filter_q: filter of data to be applied
+ # :return: The list, it can be empty if no one match the filter.
+ # """
+ # if not filter_q:
+ # filter_q = {}
+ #
+ # if ":" in filter_q:
+ # filter_q["root"] = filter_q[":"]
+ #
+ # 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 = []
+ #
+ # for role in roles:
+ # new_role = dict(role)
+ # self.format_on_show(new_role)
+ # new_roles.append(new_role)
+ #
+ # return new_roles
def new(self, rollback, session, indata=None, kwargs=None, headers=None):
"""
:return: _id: identity of the inserted data.
"""
try:
- content = BaseTopic._remove_envelop(indata)
+ content = self._remove_envelop(indata)
# Override descriptor with query string kwargs
- BaseTopic._update_input_with_kwargs(content, kwargs)
+ self._update_input_with_kwargs(content, kwargs)
content = self._validate_input_new(content, session["force"])
self.check_conflict_on_new(session, content)
self.format_on_new(content, project_id=session["project_id"], make_public=session["public"])
role_name = content["name"]
- role = self.auth.create_role(role_name)
- content["_id"] = role["_id"]
+ role_id = self.auth.create_role(role_name)
+ content["_id"] = role_id
_id = self.db.create(self.topic, content)
rollback.append({"topic": self.topic, "_id": _id})
# self._send_msg("create", content)
:return: dictionary with deleted item _id. It raises EngineException on error: not found, conflict, ...
"""
self.check_conflict_on_del(session, _id, None)
- filter_q = {"_id": _id}
+ # filter_q = {"_id": _id}
+ filter_q = {BaseTopic.id_field(self.topic, _id): _id} # To allow role addressing by name
if not dry_run:
self.auth.delete_role(_id)
v = self.db.del_one(self.topic, filter_q)
:param content:
:return: _id: identity of the inserted data.
"""
- indata = self._remove_envelop(indata)
-
- # Override descriptor with query string kwargs
- if kwargs:
- self._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)
- self.db.replace(self.topic, _id, content)
- return id
- except ValidationError as e:
- raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
+ _id = super().edit(session, _id, indata, kwargs, content)
+ if indata.get("name"):
+ self.auth.update_role(_id, name=indata.get("name"))