diff --git a/SAS/TMSS/src/tmss/settings.py b/SAS/TMSS/src/tmss/settings.py index 4c1fa6c4cbafb7b7b82ee7f6037e812a2465a760..b0de94d8e795ffdd08d1a0a6df84d1e49967a73a 100644 --- a/SAS/TMSS/src/tmss/settings.py +++ b/SAS/TMSS/src/tmss/settings.py @@ -193,25 +193,24 @@ REST_FRAMEWORK = { } # LDAP -if 'TMSS_LDAPCREDENTIALS' in os.environ: - ldap_creds_name = os.environ.get('TMSS_LDAPCREDENTIALS', 'tmss_ldap') - django_ldap_credentials = dbcredentials.DBCredentials().get(ldap_creds_name) - logger.info("TMSS Django settings: Using dbcreds '%s' for ldap authentication: %s", - ldap_creds_name, django_ldap_credentials.stringWithHiddenPassword()) - - AUTH_LDAP_GLOBAL_OPTIONS = { ldap.OPT_X_TLS_REQUIRE_CERT: ldap.OPT_X_TLS_NEVER } # cert still expired? - 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 = '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" - - AUTH_LDAP_USER_ATTR_MAP = { - "first_name": "givenName", - "last_name": "sn", - "email": "mail" - } +ldap_creds_name = os.environ.get('TMSS_LDAPCREDENTIALS', 'tmss_ldap') +django_ldap_credentials = dbcredentials.DBCredentials().get(ldap_creds_name) +logger.info("TMSS Django settings: Using dbcreds '%s' for ldap authentication: %s", + ldap_creds_name, django_ldap_credentials.stringWithHiddenPassword()) + +AUTH_LDAP_GLOBAL_OPTIONS = { ldap.OPT_X_TLS_REQUIRE_CERT: ldap.OPT_X_TLS_NEVER } # cert still expired? +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 = '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" + +AUTH_LDAP_USER_ATTR_MAP = { + "first_name": "givenName", + "last_name": "sn", + "email": "mail" +} # OPEN-ID CONNECT @@ -241,7 +240,6 @@ LOGOUT_REDIRECT_URL_FAILURE = "/api/" AUTHENTICATION_BACKENDS = ( #'django_auth_ldap.backend.LDAPBackend', 'mozilla_django_oidc.auth.OIDCAuthenticationBackend', - 'django.contrib.auth.backends.ModelBackend', ) # Password validation