Skip to content
This repository was archived by the owner on Oct 24, 2024. It is now read-only.

Commit 6304144

Browse files
author
Søren Howe Gersager
committed
Merge branch 'hotfix-3.2.3' into 'develop'
Hotfix 3.2.3 - develop See merge request bevillingsplatform/bevillingsplatform!987
2 parents 3d250ff + e522da3 commit 6304144

File tree

5 files changed

+19
-6
lines changed

5 files changed

+19
-6
lines changed

NEWS.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
Version 3.2.3, 2020-11-16
2+
-------------------------
3+
4+
Hotfix release
5+
6+
Bug fixes
7+
^^^^^^^^^
8+
9+
* Correctly initialize SAML in settings.py
10+
* Update SAML dependencies to allow POST SingleSignOnService binding
11+
112
Version 3.2.2, 2020-10-22
213
-------------------------
314

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.2.3

backend/bevillingsplatform/settings.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -502,9 +502,11 @@
502502
},
503503
"USE_JWT": True,
504504
"FRONTEND_URL": settings.get("SAML_PUBLIC_HOST") + "#/",
505-
"CERT_FILE": "",
506-
"KEY_FILE": "",
507-
"AUTHN_REQUESTS_SIGNED": False,
505+
"CERT_FILE": settings.get("CERT_FILE", fallback=""),
506+
"KEY_FILE": settings.get("KEY_FILE", fallback=""),
507+
"AUTHN_REQUESTS_SIGNED": settings.getboolean(
508+
"AUTHN_REQUESTS_SIGNED", fallback=False
509+
),
508510
}
509511

510512
SILENCED_SYSTEM_CHECKS = ["rest_framework.W001"]

backend/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ WeasyPrint==52.1
1717
python-dateutil==2.8.1
1818
django-constance[database]==2.7.0
1919
drf-writable-nested==0.6.2
20-
git+https://github.com/magenta-aps/django-saml2-auth#egg=django-saml2-auth
20+
git+https://github.com/magenta-aps/django-saml2-auth@2.2.3#egg=django-saml2-auth
2121
pysaml2==6.3.1
2222
django-mailer==2.0.1
2323
holidays==0.10.3

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ services:
9191
- smtp_user=bev:bev
9292

9393
idp:
94-
image: magentalabs/simplesamlphp:2.0.0
94+
image: magentalabs/simplesamlphp:2.0.1
9595
environment:
9696
- SIMPLESAMLPHP_BASEURLPATH=http://localhost:8080/simplesaml/
9797
- SIMPLESAMLPHP_SP_ENTITY_ID=http://localhost:8080

0 commit comments

Comments
 (0)