From 4acf4b7dcd3f915b10eef8378222b848a602eeeb Mon Sep 17 00:00:00 2001
From: "Auke L. Klazema" <klazema@astron.nl>
Date: Mon, 24 Feb 2020 15:20:45 +0100
Subject: [PATCH] TMSS-143: Set OIDC urls correctly based on Environment or
defaults
---
SAS/TMSS/src/tmss/settings.py | 7 +++----
.../dockerfiles/oidc_testprovider | 5 ++++-
.../testprovider/bin/run.sh | 4 +++-
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/SAS/TMSS/src/tmss/settings.py b/SAS/TMSS/src/tmss/settings.py
index 6169cbb58ef..f97e2014374 100644
--- a/SAS/TMSS/src/tmss/settings.py
+++ b/SAS/TMSS/src/tmss/settings.py
@@ -207,10 +207,9 @@ if "OIDC_RP_CLIENT_ID" in os.environ.keys():
OIDC_RP_CLIENT_ID = os.environ.get('OIDC_RP_CLIENT_ID', '2') # Secret, do not put real credentials on Git
OIDC_RP_CLIENT_SECRET = os.environ.get('OIDC_RP_CLIENT_SECRET',
'secret') # Secret, do not put real credentials on Git
- OIDC_ENDPOINT_HOST = os.environ.get('OIDC_ENDPOINT_HOST', 'tmss_test_oidc')
- OIDC_OP_AUTHORIZATION_ENDPOINT = "http://%s:8088/openid/authorize" % OIDC_ENDPOINT_HOST
- OIDC_OP_TOKEN_ENDPOINT = "http://%s:8088/openid/token" % OIDC_ENDPOINT_HOST
- OIDC_OP_USER_ENDPOINT = "http://%s:8088/openid/userinfo" % OIDC_ENDPOINT_HOST
+ OIDC_OP_AUTHORIZATION_ENDPOINT = os.environ.get('OIDC_OP_AUTHORIZATION_ENDPOINT', "http://localhost:8088/openid/authorize")
+ OIDC_OP_TOKEN_ENDPOINT = os.environ.get('OIDC_OP_TOKEN_ENDPOINT', "http://localhost:8088/openid/token")
+ OIDC_OP_USER_ENDPOINT = os.environ.get('OIDC_OP_USER_ENDPOINT', "http:/localhost:8088/openid/userinfo")
AUTHENTICATION_BACKENDS = ('mozilla_django_oidc.auth.OIDCAuthenticationBackend',)
elif "TMSS_LDAPCREDENTIALS" in os.environ.keys():
diff --git a/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/dockerfiles/oidc_testprovider b/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/dockerfiles/oidc_testprovider
index 464d90658af..e93084d98a1 100644
--- a/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/dockerfiles/oidc_testprovider
+++ b/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/dockerfiles/oidc_testprovider
@@ -1,7 +1,10 @@
FROM python:3.6
EXPOSE 8088
-COPY testprovider /code/
WORKDIR /code
+COPY testprovider/requirements.txt /code/
RUN pip install -r requirements.txt
+
+COPY testprovider /code/
+
CMD ./bin/run.sh
diff --git a/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/testprovider/bin/run.sh b/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/testprovider/bin/run.sh
index 7008ec74df5..ddb95e5ed98 100755
--- a/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/testprovider/bin/run.sh
+++ b/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/testprovider/bin/run.sh
@@ -1,7 +1,9 @@
#!/bin/sh
+
+RUN if [ -n "$OIDC_OP_CALLBACK_ENDPOINT" ]; then sed -i "s|http://localhost:8008/oidc/callback/|$OIDC_OP_CALLBACK_ENDPOINT|" fixtures.json; fi
+
python manage.py migrate --noinput
python manage.py loaddata fixtures.json
python ./manage.py createuser paulus pauluspass paulus@localhost
python manage.py runserver 0.0.0.0:8088
-
--
GitLab