Merge pull request #238 from ZeusWPI/fix/session_duration

Fix session duration to 3 months

Dockerfile

@@ -3,11 +3,6 @@ FROM python:3.12.4-slim AS compile
 
 WORKDIR /
 
-ADD https://git.zeus.gent/Haldis/menus/archive/master.tar.gz .
-
-RUN mkdir menus && \
-	tar --directory=menus --extract --strip-components=1 --file=master.tar.gz
-
 RUN pip install poetry
 
 COPY pyproject.toml poetry.lock .
@@ -16,19 +11,21 @@ RUN poetry export --without-hashes --format=requirements.txt > requirements.txt
 
 FROM python:3.12.4-slim AS build
 
-RUN apt update -y && apt install -y build-essential curl
+RUN apt update -y && apt install -y build-essential curl git
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
 COPY --from=compile requirements.txt .
 
 RUN pip install -r requirements.txt
 
+RUN git clone https://git.zeus.gent/Haldis/menus.git menus
+
 FROM python:3.12.4-slim AS development
 
 WORKDIR /src
 
-COPY --from=compile menus menus
+COPY --from=build menus menus
 
 COPY --from=build /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages
 

app/app.py

@@ -73,6 +73,7 @@ def register_plugins(app: Flask) -> Flask:
     app.config.update(
         SESSION_COOKIE_HTTPONLY=True,
         SESSION_COOKIE_SAMESITE="Lax",
+        PERMANENT_SESSION_LIFETIME=3*31*24*60*60,
     )
 
     if not app.debug:

app/auth/zeus.py

@@ -78,6 +78,7 @@ def init_oauth(app):
 def login_and_redirect_user(user) -> Response:
     """Log in the user and then redirect them"""
     login_user(user)
+    session.permanent = True
     return redirect(url_for("general_bp.home"))
 
 

app/config.docker.py

@@ -16,7 +16,7 @@ class Configuration:
     SQLALCHEMY_TRACK_MODIFICATIONS = False
     DEBUG = True
     HALDIS_ADMINS = []
-    SECRET_KEY = "<change>"
+    SECRET_KEY = os.urandom(32)
     SLACK_WEBHOOK = None
     LOGFILE = "haldis.log"
     SENTRY_DSN = None

app/config.example.py

@@ -1,6 +1,6 @@
 """An example for a Haldis config"""
 
-# import os
+import os
 
 
 class Configuration:
@@ -15,7 +15,7 @@ class Configuration:
     SQLALCHEMY_TRACK_MODIFICATIONS = False
     DEBUG = True
     HALDIS_ADMINS = []
-    SECRET_KEY = "<change>"
+    SECRET_KEY = os.urandom(32) # Change this to a fixed, random value
     SLACK_WEBHOOK = None
     LOGFILE = "haldis.log"
     SENTRY_DSN = None