Merge branch 'Master-Container' into DEV

Author: frankcorneliusmartin

pytaskmanager/node/DockerManager.py

@@ -4,7 +4,6 @@
 import os
 import pathlib
 
-
 from typing import NamedTuple
 
 class Result(NamedTuple):
@@ -28,7 +27,7 @@ class DockerManager(object):
     # TODO validate that allowed repositoy is used
     # TODO authenticate to docker repository... from the config-file
 
-    def __init__(self, allowed_repositories, tasks_dir, server_api_url):
+    def __init__(self, allowed_repositories, tasks_dir, server_info):
         """Initialization of DockerManager creates docker connection and
         sets some default values.
         
@@ -45,7 +44,7 @@ def __init__(self, allowed_repositories, tasks_dir, server_api_url):
         self.__tasks_dir = tasks_dir
 
         # master container need to know where they can post tasks to
-        self.__server_url = server_api_url
+        self.__server_info = server_info
 
     def create_bind(self, filename, result_id, filecontents):
         input_path = self.__create_file(filename, result_id, filecontents)
@@ -140,7 +139,9 @@ def run(self, result_id: int,  image: str, database_uri: str,
         # define enviroment variables for the docker-container
         environment_variables = {
             "DATABASE_URI": database_uri,
-            "HOST": self.__server_url
+            "HOST": self.__server_info.host,
+            "PORT": self.__server_info.port,
+            "API_PATH": self.__server_info.path 
         }
         self.log.debug(f"Environment={environment_variables}")
 

pytaskmanager/node/FlaskIO.py

@@ -4,8 +4,16 @@
 import jwt
 import datetime
 
+from typing import NamedTuple
+
 module_name = __name__.split('.')[1]
 
+class ServerInfo(NamedTuple):
+    """Data-class to store the server info"""
+    host: str
+    port: int 
+    path: str
+
 class ClientBaseProtocol(object):
     """Implemention base protocols for communicating with server instance"""
 
@@ -160,6 +168,10 @@ def host(self):
     def port(self):
         return self.__port
 
+    @property
+    def path(self):
+        return self.__api_path
+
     @property
     def base_path(self):
         if self.__port:

pytaskmanager/node/__init__.py

@@ -20,7 +20,7 @@
 
 from pytaskmanager import util
 from pytaskmanager.node.DockerManager import DockerManager
-from pytaskmanager.node.FlaskIO import ClientNodeProtocol
+from pytaskmanager.node.FlaskIO import ClientNodeProtocol, ServerInfo
 
 def name():
     return __name__.split('.')[-1]
@@ -98,11 +98,17 @@ def __init__(self, ctx):
         self.log.debug("fetching tasks that were posted while offline")
         self.__sync_task_que_with_server() 
 
+        server_info = ServerInfo(
+            host=self.flaskIO.host, 
+            port=self.flaskIO.port, 
+            path=self.flaskIO.path
+        )
+
         # TODO read allowed repositories from the config file
         self.__docker = DockerManager(
             allowed_repositories=[], 
             tasks_dir=self.ctx.data_dir,
-            server_api_url=self.flaskIO.host
+            server_info=server_info
         )
 
         # send results to the server when they come available.

pytaskmanager/server/resource/collaboration.py

@@ -16,7 +16,7 @@
 
 from pytaskmanager.server import db
 from pytaskmanager.server.resource._schema import CollaborationSchema, TaskSchema
-from pytaskmanager.server.resource import with_user_or_node, with_user
+from pytaskmanager.server.resource import with_user_or_node, with_user, only_for
 
 module_name = __name__.split('.')[-1]
 log = logging.getLogger(module_name)
@@ -163,7 +163,7 @@ def delete(self, id):
 class CollaborationOrganization(Resource):
     """Resource for /api/collaboration/<int:id>/organization."""
 
-    @with_user
+    @only_for(["node","user","container"])
     @swag_from(str(Path(r"swagger/get_collaboration_organization.yaml")), endpoint='collaboration_with_id_organization')
     def get(self, id):
         """Return organizations for a specific collaboration."""