User inheritance and roles

dds_web/api/db_connector.py

@@ -222,7 +222,7 @@ def delete_multiple(self, files):
 
         not_removed_dict, not_exist_list, error = ({}, [], "")
 
-        with ApiS3Connector() as s3conn:
+        with ApiS3Connector(project=self.project) as s3conn:
             # Error if not enough info
             if None in [s3conn.url, s3conn.keys, s3conn.bucketname]:
                 return (

dds_web/api/dds_decorators.py

@@ -27,6 +27,7 @@ def connect_cloud(func):
     @functools.wraps(func)
     def init_resource(self, *args, **kwargs):
 
+        _, self.keys, self.url, self.bucketname = self.get_s3_info()
         if None in [self.keys, self.url]:
             self.keys, self.url, self.bucketname, self.message = (
                 None,

dds_web/api/errors.py

@@ -14,6 +14,7 @@
 
 # Own modules
 from dds_web import actions
+from dds_web import auth
 
 ####################################################################################################
 # LOGGING ################################################################################ LOGGING #
@@ -50,7 +51,6 @@ class AccessDeniedError(exceptions.HTTPException):
 
     def __init__(
         self,
-        username=None,
         project=None,
         message="The user does not have the necessary permissions.",
     ):
@@ -60,7 +60,7 @@ def __init__(
             message,
             extra={
                 **extra_info,
-                "current_user": username,
+                "current_user": auth.current_user(),
                 "action": actions.get(flask.request.endpoint),
                 "project": project,
             },
@@ -70,9 +70,7 @@ def __init__(
 class DatabaseError(exceptions.HTTPException):
     """Baseclass for database related issues."""
 
-    def __init__(
-        self, message="The DDS encountered an Flask-SQLAlchemy issue.", username=None, project=None
-    ):
+    def __init__(self, message="The DDS encountered an Flask-SQLAlchemy issue.", project=None):
         super().__init__(message)
 
         general_logger.warning(message)
@@ -81,7 +79,7 @@ def __init__(
             message,
             extra={
                 **extra_info,
-                "current_user": username,
+                "current_user": auth.current_user(),
                 "action": actions.get(flask.request.endpoint),
                 "project": project,
             },
@@ -100,7 +98,7 @@ def __init__(self, project, username=None, message="The project is empty."):
             message,
             extra={
                 **extra_info,
-                "current_user": username,
+                "current_user": auth.current_user(),
                 "action": actions.get(flask.request.endpoint),
                 "project": project,
             },
@@ -110,7 +108,7 @@ def __init__(self, project, username=None, message="The project is empty."):
 class DeletionError(exceptions.HTTPException):
     """Deletion of item failed."""
 
-    def __init__(self, username, project, message="Deletion failed."):
+    def __init__(self, project, message="Deletion failed."):
         super().__init__(message)
 
         general_logger.warning(message)
@@ -119,7 +117,7 @@ def __init__(self, username, project, message="Deletion failed."):
             message,
             extra={
                 **extra_info,
-                "current_user": username,
+                "current_user": auth.current_user(),
                 "action": actions.get(flask.request.endpoint),
                 "project": project,
             },
@@ -129,7 +127,7 @@ def __init__(self, username, project, message="Deletion failed."):
 class NoSuchProjectError(exceptions.HTTPException):
     """The project does not exist in the database"""
 
-    def __init__(self, username, project, message="The specified project does not exist."):
+    def __init__(self, project, message="The specified project does not exist."):
         super().__init__(message)
 
         general_logger.warning(message)
@@ -138,7 +136,7 @@ def __init__(self, username, project, message="The specified project does not ex
             message,
             extra={
                 **extra_info,
-                "current_user": username,
+                "current_user": auth.current_user(),
                 "action": actions.get(flask.request.endpoint),
                 "project": project,
             },
@@ -181,15 +179,6 @@ def __init__(self, message):
         general_logger.warning(message)
 
 
-class KeyNotFoundError(exceptions.HTTPException):
-    """S3 keys not found."""
-
-    def __init__(self, message):
-        super().__init__(message)
-
-        general_logger.warning(message)
-
-
 class JwtTokenGenerationError(exceptions.HTTPException):
     """Errors when generating the JWT token during authentication."""
 
@@ -226,15 +215,13 @@ def __init__(self, message="No method found in request."):
         general_logger.warning(message)
 
 
-class PublicKeyNotFoundError(exceptions.HTTPException):
-    """Public key not found in database"""
+class KeyNotFoundError(exceptions.HTTPException):
+    """Key not found in database."""
 
     def __init__(self, project, message="No key found for current project"):
         self.message = f"{message}: {project}"
         super().__init__(self.message)
 
-        general_logger.warning(self.message)
-
 
 ####################################################################################################
 
@@ -258,6 +245,5 @@ def __init__(self, project, message="No key found for current project"):
     "S3ProjectNotFoundError": {"status": http.HTTPStatus.INTERNAL_SERVER_ERROR},
     "S3InfoNotFoundError": {"status": http.HTTPStatus.INTERNAL_SERVER_ERROR},
     "KeyNotFoundError": {"status": http.HTTPStatus.INTERNAL_SERVER_ERROR},
-    "PublicKeyNotFoundError": {"status": http.HTTPStatus.INTERNAL_SERVER_ERROR},
     "BucketNotFoundError": {"status": http.HTTPStatus.INTERNAL_SERVER_ERROR},
 }