From 5ae0c307db264e8d39b7eaa83ae293eba3c23488 Mon Sep 17 00:00:00 2001 From: Jonas Geertsen Lund Date: Thu, 30 Nov 2023 13:17:44 +0100 Subject: [PATCH] Changed port to 4444 and fix Authorization --- Dockerfile | 2 +- README.md | 4 ++-- docker-compose.yml | 4 ++-- server/server.py | 6 +++--- test/test_server/test_pre_processing_handler.py | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 71bc282..68f7895 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,4 +7,4 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . -CMD ["python", "-u", "-m", "server.server", "--host", "0.0.0.0", "--port", "80", "--reload"] \ No newline at end of file +CMD ["python", "-u", "-m", "server.server", "--host", "0.0.0.0", "--port", "4444", "--reload"] \ No newline at end of file diff --git a/README.md b/README.md index 9dcb22b..e736c24 100644 --- a/README.md +++ b/README.md @@ -151,11 +151,11 @@ You can also do it manually: `docker build -t server-image .` -`docker run --name server-container -p 8000:8000 server-image` +`docker run --name server-container -p 4444:4444 server-image` ## Accessing the knox server -`ssh @knox-preproc01.srv.aau.dk -L 8000:localhost:8000` +`ssh @knox-preproc01.srv.aau.dk -L 4444:localhost:4444` Note that the ports map to the ports used in the ssh command. diff --git a/docker-compose.yml b/docker-compose.yml index 01543ea..85282b4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,10 @@ services: server: build: . # Dockerfile location container_name: server-container - command: python -u -m server.server --host 0.0.0.0 --port 80 --reload + command: python -u -m server.server --host 0.0.0.0 --port 4444 --reload env_file: - .env volumes: - .:/code # Mount current directory to /code in the image ports: - - "80:80" \ No newline at end of file + - "4444:4444" \ No newline at end of file diff --git a/server/server.py b/server/server.py index e410f38..7edfbe3 100644 --- a/server/server.py +++ b/server/server.py @@ -10,7 +10,7 @@ def do_POST(self): content_length = int(self.headers['Content-Length']) post_content = {"post_data": self.rfile.read(content_length), "post_json": {}} - if self.headers.get("Access-Authorization").__str__() != os.getenv("API_SECRET"): + if self.headers.get("Authorization").__str__() != os.getenv("API_SECRET"): message = "Unauthorized" self.send_response(401) self.send_header('Content-type','text/html') @@ -56,6 +56,6 @@ def handled_request_body(self, post_content): if __name__ == '__main__': - with HTTPServer(('', 80), PreProcessingHandler) as server: - print("Hosting server on 0.0.0.0:80") + with HTTPServer(('', 4444), PreProcessingHandler) as server: + print("Hosting server on 0.0.0.0:4444") server.serve_forever() diff --git a/test/test_server/test_pre_processing_handler.py b/test/test_server/test_pre_processing_handler.py index 2f07a5b..8d89e54 100644 --- a/test/test_server/test_pre_processing_handler.py +++ b/test/test_server/test_pre_processing_handler.py @@ -15,7 +15,7 @@ def test_do_post_tripleconstruction_valid(self, mock_init, mock_handled_body, mo handler = PreProcessingHandler() handler.rfile = MagicMock() handler.wfile = MagicMock() - handler.headers = {'Content-Length': '0', "Access-Authorization": "env_var"} + handler.headers = {'Content-Length': '0', "Authorization": "env_var"} handler.send_response = MagicMock() handler.send_header = MagicMock() handler.end_headers = MagicMock() @@ -41,7 +41,7 @@ def test_do_post_invalid_endpoint(self, mock_init, mock_handled_body, mock_wrong handler = PreProcessingHandler() handler.rfile = MagicMock() handler.wfile = MagicMock() - handler.headers = {'Content-Length': '0', "Access-Authorization": "env_var"} + handler.headers = {'Content-Length': '0', "Authorization": "env_var"} handler.send_response = MagicMock() handler.send_header = MagicMock() handler.end_headers = MagicMock() @@ -67,7 +67,7 @@ def test_do_post_wrongly_formatted_request(self, mock_init, mock_handled_body, m handler = PreProcessingHandler() handler.rfile = MagicMock() handler.wfile = MagicMock() - handler.headers = {'Content-Length': '0', "Access-Authorization": "env_var"} + handler.headers = {'Content-Length': '0', "Authorization": "env_var"} handler.send_response = MagicMock() handler.send_header = MagicMock() handler.end_headers = MagicMock() @@ -107,7 +107,7 @@ def test_do_post_unauthrorized(self, mock_init, mock_handled_body, mock_wrong_re handler = PreProcessingHandler() handler.rfile = MagicMock() handler.wfile = MagicMock() - handler.headers = {'Content-Length': '0', "Access-Authorization": "invalid_var"} + handler.headers = {'Content-Length': '0', "Authorization": "invalid_var"} handler.send_response = MagicMock() handler.send_header = MagicMock() handler.end_headers = MagicMock()