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):
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)
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)
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.
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:
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]
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):
"""
: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 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 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
+
+ if "." in content.keys():
+ content["root"] = content["."]
+ del content["."]
+
+ if "root" not in content.keys():
+ content["root"] = False
- # Cleaning undesired values
- if "definition" in content:
- del content["definition"]
+ 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):
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:
+ 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
:param definition: role definition to be processed
"""
- ignore_fields = ["_admin", "_id", "name", "root"]
content_keys = list(content.keys())
- definition = dict(content)
-
+
+ content["_id"] = str(content["_id"])
+
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 _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)
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 = []
projects / osm / NBI.git / blobdiff