From 3c7efba233e7165db25c37a3b6534a3b760d5ab6 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Tue, 28 Jan 2020 10:55:45 +0100
Subject: [PATCH] TMSS-139: ldap protocol dependent on environment
---
SAS/TMSS/src/tmss/settings.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/SAS/TMSS/src/tmss/settings.py b/SAS/TMSS/src/tmss/settings.py
index 8605c85d371..42fe120b0cb 100644
--- a/SAS/TMSS/src/tmss/settings.py
+++ b/SAS/TMSS/src/tmss/settings.py
@@ -201,10 +201,7 @@ AUTH_LDAP_GLOBAL_OPTIONS = { ldap.OPT_X_TLS_REQUIRE_CERT: ldap.OPT_X_TLS_NEVER }
AUTH_LDAP_CONNECTION_OPTIONS = { ldap.OPT_X_TLS_REQUIRE_CERT : ldap.OPT_X_TLS_NEVER } # cert still expired?
# AUTH_LDAP_BIND_DN = '' # our LDAP is open
# AUTH_LDAP_BIND_PASSWORD = '' # our LDAP is open
-protocol = 'ldaps://'
-if isDevelopmentEnvironment():
- logging.warning('Test ldap credentials detected, using insecure connection for ldap autenthication') # mock LDAP does not support ldaps://
- protocol = 'ldap://'
+protocol = 'ldap://' if isDevelopmentEnvironment() else 'ldaps://'
AUTH_LDAP_SERVER_URI = "%s%s:%s" % (protocol, django_ldap_credentials.host, django_ldap_credentials.port)
AUTH_LDAP_USER_DN_TEMPLATE="cn=%(user)s,ou=Users,o=lofar,c=eu"
--
GitLab