Merge pull request #15 from numerique-gouv/serve-static-assets

✨(static) add static frontend to serve assets
numerique-gouv · Sep 11, 2024 · 3b518b9 · 3b518b9
2 parents 6424679 + 039d9a1
commit 3b518b9
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+- serve static files
+
 ## [1.0.3] - 2024-09-02
 - set SAML signing algorithm to use SHA256 for compatibility with AccessCheck
 

diff --git a/Dockerfile b/Dockerfile
@@ -38,7 +38,7 @@ RUN mkdir -p /usr/local/etc/gunicorn
 COPY docker/files/usr/local/etc/gunicorn/satosa.py /usr/local/etc/gunicorn/satosa.py
 
 # The default command runs gunicorn WSGI server in satosa's main module
-CMD ["gunicorn", "-c", "/usr/local/etc/gunicorn/satosa.py", "satosa.wsgi:app"]
+CMD ["gunicorn", "-c", "/usr/local/etc/gunicorn/satosa.py"]
 
 # ---- Development image ----
 FROM common as development

diff --git a/docker/files/usr/local/etc/gunicorn/satosa.py b/docker/files/usr/local/etc/gunicorn/satosa.py
@@ -63,6 +63,7 @@ def json_record(
 bind = ["0.0.0.0:8000"]
 name = "satosa"
 python_path = "/app"
+wsgi_app = "oidc2fer.wsgi:app"
 
 # Run
 graceful_timeout = 90

diff --git a/src/satosa/.pylintrc b/src/satosa/.pylintrc
@@ -67,7 +67,8 @@ disable=bad-inline-option,
         useless-suppression,
         missing-module-docstring,
         missing-class-docstring,
-        missing-function-docstring
+        missing-function-docstring,
+        wrong-import-order
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

diff --git a/src/satosa/oidc2fer/wsgi.py b/src/satosa/oidc2fer/wsgi.py
@@ -0,0 +1,9 @@
+import os
+
+from satosa.wsgi import app as satosa_app
+from whitenoise import WhiteNoise
+
+# Wrap the SATOSA WSGI app in WhiteNoise to serve static files
+app = WhiteNoise(
+    satosa_app, root=os.path.join(os.curdir, "static"), index_file="index.html"
+)
diff --git a/src/satosa/pyproject.toml b/src/satosa/pyproject.toml
@@ -27,6 +27,7 @@ dependencies = [
     "gunicorn==22.0.0",
     "redis==5.0.4",
     "JSON-log-formatter==1.0",
+    "WhiteNoise==6.7.0",
 ]
 
 [project.urls]

diff --git a/src/satosa/static/images/logo.svg b/src/satosa/static/images/logo.svg
diff --git a/src/satosa/static/index.html b/src/satosa/static/index.html
@@ -0,0 +1,9 @@
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="refresh" content="1; url=https://agentconnect.gouv.fr/">
+    </head>
+    <body>
+        <h1>Passerelle ProConnect vers RENATER. Redirection en cours…</h1>
+    </body>
+</html>
diff --git a/src/satosa/tests/test_e2e.py b/src/satosa/tests/test_e2e.py
@@ -126,3 +126,11 @@ def test_agent_connect_to_renater_student_not_allowed(page: Page):
     renater_test_idp(page, login="etudiant1")
 
     expect(page.locator("body")).to_contain_text("Une erreur technique est survenue.")
+
+
+@pytest.mark.skipif(
+    "TEST_E2E" not in os.environ, reason="Depends on app running locally"
+)
+def test_serve_static_assets(page: Page):
+    page.goto("https://satosa.traefik.me/images/logo.svg")
+    expect(page.locator("svg")).to_be_visible()