from http import HTTPStatus
from authconn_keystone import AuthconnKeystone
+from authconn_internal import AuthconnInternal
from base_topic import EngineException, versiontuple
from admin_topics import UserTopic, ProjectTopic, VimAccountTopic, WimAccountTopic, SdnTopic
from admin_topics import UserTopicAuth, ProjectTopicAuth, RoleTopicAuth
"sdns": SdnTopic,
"users": UserTopic,
"projects": ProjectTopic,
+ "roles": RoleTopicAuth, # Valid for both internal and keystone authentication backends
"nsis": NsiTopic,
"nsilcmops": NsiLcmOpTopic
# [NEW_TOPIC]: add an entry here
map_target_version_to_int = {
"1.0": 1000,
- "1.1": 1001
+ "1.1": 1001,
+ "1.2": 1002,
# Add new versions here
}
if not self.auth:
if config["authentication"]["backend"] == "keystone":
self.auth = AuthconnKeystone(config["authentication"])
+ else:
+ self.auth = AuthconnInternal(config["authentication"], self.db, dict()) # TO BE CONFIRMED
if not self.operations:
if "resources_to_operations" in config["rbac"]:
resources_to_operations_file = config["rbac"]["resources_to_operations"]
if path.isfile(config_file):
resources_to_operations_file = config_file
break
- if not resources_to_operations_file:
+ if not resources_to_operations_file:
raise EngineException("Invalid permission configuration: resources_to_operations file missing")
-
+
with open(resources_to_operations_file, 'r') as f:
resources_to_operations = yaml.load(f)
-
+
self.operations = []
for _, value in resources_to_operations["resources_to_operations"].items():
:param session: contains the used login username and working project
:param topic: it can be: users, projects, vnfds, nsds, ...
:param _id: server id of the item
- :return: dictionary with deleted item _id. It raises exception if not found.
+ :return: operation id (None if there is not operation), raise exception if error or not found.
"""
if topic not in self.map_topic:
raise EngineException("Unknown topic {}!!!".format(topic), HTTPStatus.INTERNAL_SERVER_ERROR)
:param _id: identifier to be updated
:param indata: data to be inserted
:param kwargs: used to override the indata descriptor
- :return: dictionary, raise exception if not found.
+ :return: operation id (None if there is not operation), raise exception if error or not found.
"""
if topic not in self.map_topic:
raise EngineException("Unknown topic {}!!!".format(topic), HTTPStatus.INTERNAL_SERVER_ERROR)
users = self.db.get_one("users", fail_on_empty=False, fail_on_more=False)
if users:
return None
- # raise EngineException("Unauthorized. Database users is not empty", HTTPStatus.UNAUTHORIZED)
user_desc = {"username": "admin", "password": "admin", "projects": ["admin"]}
fake_session = {"project_id": "admin", "username": "admin", "admin": True, "force": True, "public": None}
- roolback_list = []
- _id = self.map_topic["users"].new(roolback_list, fake_session, user_desc)
+ rollback_list = []
+ _id = self.map_topic["users"].new(rollback_list, fake_session, user_desc)
return _id
def create_admin(self):
"""
project_id = self.create_admin_project()
user_id = self.create_admin_user()
- if not project_id and not user_id:
- return None
- else:
+ if project_id or user_id:
return {'project_id': project_id, 'user_id': user_id}
+ else:
+ return None
def upgrade_db(self, current_version, target_version):
if target_version not in self.map_target_version_to_int.keys():
- raise EngineException("Wrong database version '{}'. Expected '{}'"
- ". It cannot be up/down-grade".format(current_version, target_version),
+ raise EngineException("Cannot upgrade to version '{}' with this version of code".format(target_version),
http_code=HTTPStatus.INTERNAL_SERVER_ERROR)
if current_version == target_version:
self.db.set_secret_key(serial)
current_version = "1.0"
- if current_version == "1.0" and target_version_int >= self.map_target_version_to_int["1.1"]:
- self.db.del_list("roles_operations")
+ if current_version in ("1.0", "1.1") and target_version_int >= self.map_target_version_to_int["1.2"]:
+ table = "roles_operations" if self.config['authentication']['backend'] == "keystone" else "roles"
+ self.db.del_list(table)
version_data = {
"_id": "version",
- "version_int": 1001,
- "version": "1.1",
- "date": "2019-05-24",
+ "version_int": 1002,
+ "version": "1.2",
+ "date": "2019-06-11",
"description": "set new format for roles_operations"
}
self.db.set_one("admin", {"_id": "version"}, version_data)
- current_version = "1.1"
+ current_version = "1.2"
# TODO add future migrations here
def init_db(self, target_version='1.0'):
if db_version != target_version:
self.upgrade_db(db_version, target_version)
- # create user admin if not exist
- if not self.auth:
+ # create admin project&user if they don't exist
+ if self.config['authentication']['backend'] == 'internal' or not self.auth:
self.create_admin()
return
projects / osm / NBI.git / blobdiff