Merge branch 'bugfix/absent-paths-backend' into 'devel'

Stefan Negru · Stefan Negru · commit 05795a51710c · 2023-07-07T09:19:43.000Z
add missing paths in backend Closes #1065 See merge request sds-dev/sd-connect/swift-browser-ui!96
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -159,6 +159,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - fixed `REQUEST_DB_PORT` instead of `SHARING_DB_PORT` in sharing db
   - fixed typing for python code in db so that ports are int instead of string - required for deployment
 - (GL #1056) Fix creating a pseudo-container (forward slash) returning 403 and logging user out
+- (GL #1050) fixed missing paths in backend: `unauth`, `forbid`, `uidown`, `badrequest`, `notfound` and front-end api responses
 
 ### Removed
 
diff --git a/swift_browser_ui/ui/front.py b/swift_browser_ui/ui/front.py
@@ -116,3 +116,69 @@ async def loginpassword(
         return aiohttp.web.FileResponse(
             str(setd["static_directory"]) + "/loginpassword.html"
         )
+
+
+async def unauth(_: aiohttp.web.Request) -> aiohttp.web.FileResponse:
+    """Serve worker js in worker scope."""
+    return aiohttp.web.FileResponse(
+        path=str(f"{setd['static_directory']}/401.html"),
+        status=401,
+        headers={
+            "Cache-Control": "no-cache, no-store, must-revalidate",
+            "Pragma": "no-cache",
+            "Expires": "0",
+            "WWW-Authenticate": 'Bearer realm="/", charset="UTF-8"',
+        },
+    )
+
+
+async def forbid(_: aiohttp.web.Request) -> aiohttp.web.FileResponse:
+    """Serve worker js in worker scope."""
+    return aiohttp.web.FileResponse(
+        path=str(f"{setd['static_directory']}/403.html"),
+        status=403,
+        headers={
+            "Cache-Control": "no-cache, no-store, must-revalidate",
+            "Pragma": "no-cache",
+            "Expires": "0",
+        },
+    )
+
+
+async def uidown(_: aiohttp.web.Request) -> aiohttp.web.FileResponse:
+    """Serve worker js in worker scope."""
+    return aiohttp.web.FileResponse(
+        path=str(f"{setd['static_directory']}/503.html"),
+        status=503,
+        headers={
+            "Cache-Control": "no-cache, no-store, must-revalidate",
+            "Pragma": "no-cache",
+            "Expires": "0",
+        },
+    )
+
+
+async def badrequest(_: aiohttp.web.Request) -> aiohttp.web.FileResponse:
+    """Serve worker js in worker scope."""
+    return aiohttp.web.FileResponse(
+        path=str(f"{setd['static_directory']}/400.html"),
+        status=400,
+        headers={
+            "Cache-Control": "no-cache, no-store, must-revalidate",
+            "Pragma": "no-cache",
+            "Expires": "0",
+        },
+    )
+
+
+async def notfound(_: aiohttp.web.Request) -> aiohttp.web.FileResponse:
+    """Serve worker js in worker scope."""
+    return aiohttp.web.FileResponse(
+        path=str(f"{setd['static_directory']}/404.html"),
+        status=404,
+        headers={
+            "Cache-Control": "no-cache, no-store, must-revalidate",
+            "Pragma": "no-cache",
+            "Expires": "0",
+        },
+    )
diff --git a/swift_browser_ui/ui/middlewares.py b/swift_browser_ui/ui/middlewares.py
@@ -15,19 +15,17 @@
 ]
 
 
-def return_error_response(error_code: int) -> web.Response:
+def return_error_response(error_code: int) -> web.FileResponse:
     """Return the correct error page with correct status code."""
-    with open(str(setd["static_directory"]) + "/" + str(error_code) + ".html") as f:
-        resp = web.Response(
-            body="".join(f.readlines()),
-            status=error_code,
-            content_type="text/html",
-            headers={
-                "Cache-Control": "no-cache, no-store, must-revalidate",
-                "Pragma": "no-cache",
-                "Expires": "0",
-            },
-        )
+    resp = web.FileResponse(
+        path=str(f"{setd['static_directory']}/{str(error_code)}.html"),
+        status=error_code,
+        headers={
+            "Cache-Control": "no-cache, no-store, must-revalidate",
+            "Pragma": "no-cache",
+            "Expires": "0",
+        },
+    )
     if error_code == 401:
         resp.headers["WWW-Authenticate"] = 'Bearer realm="/", charset="UTF-8"'
     return resp
@@ -124,7 +122,9 @@ async def check_session_taintness(
 
 
 @web.middleware
-async def error_middleware(request: web.Request, handler: AiohttpHandler) -> web.Response:
+async def error_middleware(
+    request: web.Request, handler: AiohttpHandler
+) -> web.Response | web.FileResponse:
     """Return the correct HTTP Error page."""
     to_process = {400, 401, 403, 404}
     container_errors = {405, 409}
diff --git a/swift_browser_ui/ui/server.py b/swift_browser_ui/ui/server.py
@@ -46,11 +46,15 @@
 from swift_browser_ui.ui.discover import handle_discover
 from swift_browser_ui.ui.front import (
     browse,
+    forbid,
     index,
     loginpassword,
+    notfound,
     select,
     swasm,
     swjs,
+    uidown,
+    unauth,
 )
 from swift_browser_ui.ui.health import handle_health_check
 from swift_browser_ui.ui.login import (
@@ -194,6 +198,11 @@ async def on_prepare(
             # an spa
             aiohttp.web.get("/browse/{tail:.*}", browse),
             aiohttp.web.get("/select", select),
+            aiohttp.web.get("/unauth", unauth),
+            aiohttp.web.get("/forbid", forbid),
+            aiohttp.web.get("/uidown", uidown),
+            aiohttp.web.get("/badrequest", uidown),
+            aiohttp.web.get("/notfound", notfound),
         ]
     )
 
diff --git a/swift_browser_ui_frontend/src/common/api.js b/swift_browser_ui_frontend/src/common/api.js
@@ -16,10 +16,13 @@ async function fetchWithCookie({method, url, body, signal}) {
     .then(response => {
       switch (response.status) {
         case 401:
-        case 403:
           window.location.pathname = "/unauth";
           break;
-        case 500:
+        case 403:
+          window.location.pathname = "/forbid";
+          break;
+        case 503:
+          window.location.pathname = "/uidown";
           break;
       }
 
diff --git a/tests/ui_unit/test_middlewares.py b/tests/ui_unit/test_middlewares.py
@@ -17,28 +17,36 @@ async def return_401_handler(with_exception):
     """Return an HTTP401 error."""
     if with_exception:
         raise HTTPUnauthorized()
-    return Response(status=401)
+    return FileResponse(
+        status=401, path=f"{os.getcwd()}/swift_browser_ui_frontend/dist/401.html"
+    )
 
 
 async def return_403_handler(with_exception):
     """Return an HTTP403 error."""
     if with_exception:
         raise HTTPForbidden()
-    return Response(status=403)
+    return FileResponse(
+        status=403, path=f"{os.getcwd()}/swift_browser_ui_frontend/dist/403.html"
+    )
 
 
 async def return_404_handler(with_exception):
     """Return or raise an HTTP404 error."""
     if with_exception:
         raise HTTPNotFound()
-    return Response(status=404)
+    return FileResponse(
+        status=404, path=f"{os.getcwd()}/swift_browser_ui_frontend/dist/404.html"
+    )
 
 
 async def return_400_handler(with_exception):
     """Return or raise an HTTP400 error."""
     if with_exception:
         raise HTTPClientError()
-    return Response(status=400)
+    return FileResponse(
+        status=400, path=f"{os.getcwd()}/swift_browser_ui_frontend/dist/400.html"
+    )
 
 
 async def return_200_handler(_):
@@ -89,81 +97,51 @@ async def test_check_session_fail_no_raise(self):
 
     async def test_401_return(self):
         """Test 401 middleware when the 401 status is returned."""
-        patch_setd = unittest.mock.patch(
-            "swift_browser_ui.ui.middlewares.setd",
-            new={"static_directory": os.getcwd() + "/swift_browser_ui_frontend/dist"},
+        resp = await swift_browser_ui.ui.middlewares.error_middleware(
+            None, return_401_handler
         )
-        with patch_setd:
-            resp = await swift_browser_ui.ui.middlewares.error_middleware(
-                None, return_401_handler
-            )
-            self.assertEqual(resp.status, 401)
-            self.assertIsInstance(resp, Response)
+        self.assertEqual(resp.status, 401)
+        self.assertIsInstance(resp, FileResponse)
 
     async def test_401_exception(self):
         """Test 401 middleware when the 401 status is risen."""
-        patch_setd = unittest.mock.patch(
-            "swift_browser_ui.ui.middlewares.setd",
-            new={"static_directory": os.getcwd() + "/swift_browser_ui_frontend/dist"},
+        resp = await swift_browser_ui.ui.middlewares.error_middleware(
+            True, return_401_handler
         )
-        with patch_setd:
-            resp = await swift_browser_ui.ui.middlewares.error_middleware(
-                True, return_401_handler
-            )
-            self.assertEqual(resp.status, 401)
-            self.assertIsInstance(resp, Response)
+        self.assertEqual(resp.status, 401)
+        self.assertIsInstance(resp, FileResponse)
 
     async def test_403_return(self):
         """Test 403 middleware when the 403 status is returned."""
-        patch_setd = unittest.mock.patch(
-            "swift_browser_ui.ui.middlewares.setd",
-            new={"static_directory": os.getcwd() + "/swift_browser_ui_frontend/dist"},
+        resp = await swift_browser_ui.ui.middlewares.error_middleware(
+            None, return_403_handler
         )
-        with patch_setd:
-            resp = await swift_browser_ui.ui.middlewares.error_middleware(
-                None, return_403_handler
-            )
-            self.assertEqual(resp.status, 403)
-            self.assertIsInstance(resp, Response)
+        self.assertEqual(resp.status, 403)
+        self.assertIsInstance(resp, FileResponse)
 
     async def test_403_exception(self):
         """Test 403 middleware when the 403 status is risen."""
-        patch_setd = unittest.mock.patch(
-            "swift_browser_ui.ui.middlewares.setd",
-            new={"static_directory": os.getcwd() + "/swift_browser_ui_frontend/dist"},
+        resp = await swift_browser_ui.ui.middlewares.error_middleware(
+            True, return_403_handler
         )
-        with patch_setd:
-            resp = await swift_browser_ui.ui.middlewares.error_middleware(
-                True, return_403_handler
-            )
-            self.assertEqual(resp.status, 403)
-            self.assertIsInstance(resp, Response)
+        self.assertEqual(resp.status, 403)
+        self.assertIsInstance(resp, FileResponse)
 
     async def test_404_return(self):
         """Test 404 middleware when the 404 status is returned."""
-        patch_setd = unittest.mock.patch(
-            "swift_browser_ui.ui.middlewares.setd",
-            new={"static_directory": os.getcwd() + "/swift_browser_ui_frontend/dist"},
+        resp = await swift_browser_ui.ui.middlewares.error_middleware(
+            None, return_404_handler
         )
-        with patch_setd:
-            resp = await swift_browser_ui.ui.middlewares.error_middleware(
-                None, return_404_handler
-            )
-            self.assertEqual(resp.status, 404)
-            self.assertIsInstance(resp, Response)
+        self.assertEqual(resp.status, 404)
+        self.assertIsInstance(resp, FileResponse)
 
     async def test_404_exception(self):
         """Test 404 middlewrae when the 404 status is risen."""
-        patch_setd = unittest.mock.patch(
-            "swift_browser_ui.ui.middlewares.setd",
-            new={"static_directory": os.getcwd() + "/swift_browser_ui_frontend/dist"},
+        resp = await swift_browser_ui.ui.middlewares.error_middleware(
+            True, return_404_handler
         )
-        with patch_setd:
-            resp = await swift_browser_ui.ui.middlewares.error_middleware(
-                True, return_404_handler
-            )
-            self.assertEqual(resp.status, 404)
-            self.assertIsInstance(resp, Response)
+        self.assertEqual(resp.status, 404)
+        self.assertIsInstance(resp, FileResponse)
 
     async def test_error_middleware_no_error(self):
         """Test the general error middleware with correct status."""
@@ -178,11 +156,7 @@ async def test_error_middleware_no_error(self):
 
     async def test_error_middleware_non_handled_raise(self):
         """Test the general error middleware with other status code."""
-        patch_setd = unittest.mock.patch(
-            "swift_browser_ui.ui.middlewares.setd",
-            new={"static_directory": os.getcwd() + "/swift_browser_ui_frontend/dist"},
-        )
-        with self.assertRaises(HTTPClientError), patch_setd:
+        with self.assertRaises(HTTPClientError):
             await swift_browser_ui.ui.middlewares.error_middleware(
                 True, return_400_handler
             )
diff --git a/tests/upload/test_cryptupload.py b/tests/upload/test_cryptupload.py
@@ -1,6 +1,5 @@
 """Unit tests for swift_browser_ui.upload.cryptupload module."""
 
-import asyncio
 import aiohttp.web
 import unittest.mock
 
