fail_on_more=False):
raise EngineException("project '{}' does not exist".format(p), HTTPStatus.CONFLICT)
- def check_conflict_on_del(self, session, _id):
+ def check_conflict_on_del(self, session, _id, db_content):
+ """
+ Check if deletion can be done because of dependencies if it is not force. To override
+ :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
+ :param _id: internal _id
+ :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)
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):
# Removed so that the UUID is kept, to allow Project Name modification
# content["_id"] = content["name"]
- def check_conflict_on_del(self, session, _id):
+ def check_conflict_on_del(self, session, _id, db_content):
+ """
+ Check if deletion can be done because of dependencies if it is not force. To override
+ :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
+ :param _id: internal _id
+ :param db_content: The database content of this item _id
+ :return: None if ok or raises EngineException with the conflict
+ """
if _id in session["project_id"]:
raise EngineException("You cannot delete your own project", http_code=HTTPStatus.CONFLICT)
if session["force"]:
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)
raise EngineException("You cannot remove system_admin role from admin user",
http_code=HTTPStatus.FORBIDDEN)
- def check_conflict_on_del(self, session, _id):
+ def check_conflict_on_del(self, session, _id, db_content):
"""
Check if deletion can be done because of dependencies if it is not force. To override
-
:param session: contains "username", "admin", "force", "public", "project_id", "set_project"
:param _id: internal _id
+ :param db_content: The database content of this item _id
:return: None if ok or raises EngineException with the conflict
"""
if _id == session["username"]:
:param filter_q: filter of data to be applied
:return: The list, it can be empty if no one match the filter.
"""
- return self.auth.get_user_list()
+ if not filter_q:
+ filter_q = {}
+
+ return self.auth.get_user_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)
+ self.check_conflict_on_del(session, _id, None)
if not dry_run:
v = self.auth.delete_user(_id)
return v
if project in project_list:
raise EngineException("project '{}' exists".format(project), HTTPStatus.CONFLICT)
- def check_conflict_on_del(self, session, _id):
+ def check_conflict_on_del(self, session, _id, db_content):
"""
Check if deletion can be done because of dependencies if it is not force. To override
:param session: contains "username", "admin", "force", "public", "project_id", "set_project"
:param _id: internal _id
+ :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()
:param filter_q: filter of data to be applied
:return: The list, it can be empty if no one match the filter.
"""
- return self.auth.get_project_list()
+ 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)
+ self.check_conflict_on_del(session, _id, None)
if not dry_run:
v = self.auth.delete_project(_id)
return v
:param role_definitions: role definition to test
:return: None if ok, raises ValidationError exception on error
"""
+ ignore_fields = ["_id", "name"]
for role_def in role_definitions.keys():
- if role_def == ".":
+ 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 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))
+
def _validate_input_new(self, input, force=False):
"""
Validates input user content for a new entry.
"""
if self.schema_new:
validate_input(input, self.schema_new)
- if "definition" in input and input["definition"]:
- self.validate_role_definition(self.operations, input["definition"])
+ 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)
- if "definition" in input and input["definition"]:
- self.validate_role_definition(self.operations, input["definition"])
+ self.validate_role_definition(self.operations, input)
+
return input
def check_conflict_on_new(self, session, indata):
if _id == system_admin_role["_id"]:
raise EngineException("You cannot edit system_admin role", http_code=HTTPStatus.FORBIDDEN)
- def check_conflict_on_del(self, session, _id):
+ def check_conflict_on_del(self, session, _id, db_content):
"""
Check if deletion can be done because of dependencies if it is not force. To override
:param session: contains "username", "admin", "force", "public", "project_id", "set_project"
:param _id: internal _id
+ :param db_content: The database content of this item _id
:return: None if ok or raises EngineException with the conflict
"""
roles = self.auth.get_role_list()
if not content["_admin"].get("created"):
content["_admin"]["created"] = now
content["_admin"]["modified"] = now
- content["root"] = False
-
- # Saving the role definition
- if "definition" in content and content["definition"]:
- for role_def, value in content["definition"].items():
- if role_def == ".":
- content["root"] = value
- else:
- content[role_def.replace(".", ":")] = value
+ content[":"] = False
- # Cleaning undesired values
- if "definition" in content:
- del content["definition"]
+ ignore_fields = ["_id", "_admin", "name"]
+ for role_def, value in content.items():
+ if role_def in ignore_fields:
+ continue
+ content[role_def.replace(".", ":")] = value
+ del content[role_def]
@staticmethod
def format_on_edit(final_content, edit_content):
del final_content[key]
# Saving the role definition
- if "definition" in edit_content and edit_content["definition"]:
- for role_def, value in edit_content["definition"].items():
- if role_def == ".":
- final_content["root"] = value
- else:
- final_content[role_def.replace(".", ":")] = value
-
- if "root" not in final_content:
- final_content["root"] = False
+ for role_def, value in edit_content.items():
+ final_content[role_def.replace(".", ":")] = value
+
+ if ":" not in final_content.keys():
+ final_content[":"] = False
@staticmethod
def format_on_show(content):
:param definition: role definition to be processed
"""
- ignore_fields = ["_admin", "_id", "name", "root"]
content_keys = list(content.keys())
- definition = dict(content)
-
+
for key in content_keys:
- if key in ignore_fields:
- del definition[key]
- if ":" not in key:
+ if ":" in key:
+ content[key.replace(":", ".")] = content[key]
del content[key]
- continue
- definition[key.replace(":", ".")] = definition[key]
- del definition[key]
- del content[key]
-
- content["definition"] = definition
def show(self, session, _id):
"""
: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)
- filter_q = self._get_project_filter(session, write=True, show_all=True)
+ self.check_conflict_on_del(session, _id, None)
+ filter_q = self._get_project_filter(session)
filter_q["_id"] = _id
if not dry_run:
self.auth.delete_role(_id)
# Override descriptor with query string kwargs
if kwargs:
- BaseTopic._update_input_with_kwargs(indata, kwargs)
+ self._update_input_with_kwargs(indata, kwargs)
try:
indata = self._validate_input_edit(indata, force=session["force"])
projects / osm / NBI.git / blobdiff