Skip to content

Commit bf0ed2e

Browse files
authored
Merge pull request #18 from simcax/dependabot/pip/werkzeug-3.0.6
Bump werkzeug from 2.3.8 to 3.0.6
2 parents f37ae18 + eaaa6f4 commit bf0ed2e

File tree

6 files changed

+59
-15
lines changed

6 files changed

+59
-15
lines changed

.github/workflows/deploy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,5 @@ jobs:
4141
- uses: superfly/flyctl-actions/setup-flyctl@master
4242
- run: flyctl deploy --remote-only
4343
env:
44-
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
44+
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
45+
SESSION_COOKIE_DOMAIN: lf-web.fly.dev

.github/workflows/fly-review.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,19 @@ jobs:
4444
- name: Update fly.toml with version
4545
run: |
4646
uv run python utils/update_fly_toml.py
47+
- name: Modify URL
48+
id: modify-url
49+
run: |
50+
url=${{ steps.deploy.outputs.url }}
51+
modified_url=${url#https://}
52+
echo "::set-output name=url::$modified_url"
4753
- name: Deploy PR app to Fly.io
4854
id: deploy
4955
uses: superfly/fly-pr-review-apps@1.2.1
5056
with:
51-
secrets: API_USERNAME=${{ secrets.API_USERNAME }} API_PASSWORD=${{ secrets.API_PASSWORD }} ENVIRONMENT_NAME=${{ secrets.ENVIRONMENT_NAME }} REDIS_HOST=${{ secrets.REDIS_HOST }}
57+
secrets: |
58+
API_USERNAME=${{ secrets.API_USERNAME }}
59+
API_PASSWORD=${{ secrets.API_PASSWORD }}
60+
ENVIRONMENT_NAME=${{ secrets.ENVIRONMENT_NAME }}
61+
REDIS_HOST=${{ secrets.REDIS_HOST }}
62+
SESSION_COOKIE_DOMAIN=${{ steps.modify-url.outputs.url }}

fly.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ dockerfile = "docker/Dockerfile"
1111

1212
[env]
1313
PORT = "8080"
14-
SESSION_COOKIE_DOMAIN = "lf-web.fly.dev"
1514
SESSION_COOKIE_NAME = "lfweb"
1615
API_BASE_URL = "https://foreninglet.dk/api/"
1716
API_VERSION = "version=1"

lfweb/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""Lejre Fitness Website - Flask App"""
22

3+
from datetime import timedelta
34
from os import environ, urandom
45

56
import redis
@@ -50,6 +51,8 @@ def create_app(test_config=None):
5051
SESSION_COOKIE_SAMESITE="Strict",
5152
SESSION_COOKIE_DOMAIN=str(environ.get("SESSION_COOKIE_DOMAIN", "127.0.0.1")),
5253
SESSION_COOKIE_NAME=str(environ.get("SESSION_COOKIE_NAME", site_short_name)),
54+
SESSION_COOKIE_HTTPONLY=True, # Prevents JavaScript access to cookies
55+
PERMANENT_SESSION_LIFETIME=timedelta(days=14), # Controls session expiration
5356
)
5457

5558
print(secret_key)

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ requires-python = "~=3.11"
77
readme = "README.md"
88

99
dependencies = [
10-
"Flask==2.3.3",
11-
"Flask-Session>=0.5.0,<0.6",
10+
"flask>=3.1.0",
11+
"flask-session>0.6.0",
1212
"gunicorn>=23.0.0,<24",
1313
"Jinja2>=3.1.3,<4",
1414
"redis>=5.0.1,<6",
1515
"loguru>=0.7.2,<0.8",
16-
"werkzeug==2.3.8",
16+
"werkzeug>=3.1.0",
1717
"foreninglet-data>=0.3.3",
1818
"markdown>=3.5.2,<4",
1919
"markupsafe>=2.1.5,<3",

uv.lock

Lines changed: 39 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)