Merge pull request #1 from MrCirca/ntlm_auth

Ntlm auth
MrCirca · Sep 27, 2018 · 4c93e78 · 4c93e78
2 parents 14bd165 + 2d53b86
commit 4c93e78
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/redash/authentication/ldap_auth.py b/redash/authentication/ldap_auth.py
@@ -7,7 +7,7 @@
 from flask_login import current_user, login_required, login_user, logout_user
 
 try:
-    from ldap3 import Server, Connection, SIMPLE, ANONYMOUS
+    from ldap3 import Server, Connection, SIMPLE, ANONYMOUS, NTLM
 except ImportError:
     if settings.LDAP_LOGIN_ENABLED:
         logger.error("The ldap3 library was not found. This is required to use LDAP authentication (see requirements.txt).")

diff --git a/redash/settings/__init__.py b/redash/settings/__init__.py
@@ -83,7 +83,7 @@ def all_settings():
 LDAP_LOGIN_ENABLED = parse_boolean(os.environ.get('REDASH_LDAP_LOGIN_ENABLED', 'false'))
 # Bind LDAP using SSL. Default is False
 LDAP_SSL = parse_boolean(os.environ.get('REDASH_LDAP_USE_SSL', 'false'))
-# Choose authentication method(SIMPLE or ANONYMOUS). Default is SIMPLE
+# Choose authentication method(SIMPLE, ANONYMOUS or NTLM). Default is SIMPLE
 LDAP_AUTH_METHOD = os.environ.get('REDASH_LDAP_AUTH_METHOD', 'SIMPLE')
 # The LDAP directory address (ex. ldap://10.0.10.1:389)
 LDAP_HOST_URL = os.environ.get('REDASH_LDAP_URL', None)