dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1877 from BuhtigithuB/improve/ldap-auth-contrib

Browse Source 
Improve/ldap auth contrib
This commit is contained in:
mdipierro
2018-03-20 16:54:40 -05:00
committed by GitHub
parent 9b99d8ae6c 1452fd3851
commit 99455cfb0a
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/login_methods/ldap_auth.py
+9 -10
View File
@@ -10,7 +10,7 @@ try:
import ldap.filter import ldap.filter
ldap.set_option(ldap.OPT_REFERRALS, 0) ldap.set_option(ldap.OPT_REFERRALS, 0)
except Exception as e: except Exception as e:
logging.error('missing ldap, try "easy_install python-ldap"') logging.error('missing ldap, try "pip install python-ldap"')
raise e raise e
@@ -169,14 +169,6 @@ def ldap_auth(server='ldap',
You can set the logging level with the "logging_level" parameter, default You can set the logging level with the "logging_level" parameter, default
is "error" and can be set to error, warning, info, debug. is "error" and can be set to error, warning, info, debug.
""" """
if self_signed_certificate:
# NOTE : If you have a self-signed SSL Certificate pointing over "port=686" and "secure=True" alone
# will not work, you need also to set "self_signed_certificate=True".
# Ref1: https://onemoretech.wordpress.com/2015/06/25/connecting-to-ldap-over-self-signed-tls-with-python/
# Ref2: http://bneijt.nl/blog/post/connecting-to-ldaps-with-self-signed-cert-using-python/
ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_NEVER)
logger = logging.getLogger('web2py.auth.ldap_auth') logger = logging.getLogger('web2py.auth.ldap_auth')
if logging_level == 'error': if logging_level == 'error':
logger.setLevel(logging.ERROR) logger.setLevel(logging.ERROR)
@@ -601,7 +593,14 @@ def ldap_auth(server='ldap',
if secure: if secure:
if not ldap_port: if not ldap_port:
ldap_port = 636 ldap_port = 636
if self_signed_certificate:
# NOTE : If you have a self-signed SSL Certificate pointing over "port=686" and "secure=True" alone
# will not work, you need also to set "self_signed_certificate=True".
# Ref1: https://onemoretech.wordpress.com/2015/06/25/connecting-to-ldap-over-self-signed-tls-with-python/
# Ref2: http://bneijt.nl/blog/post/connecting-to-ldaps-with-self-signed-cert-using-python/
ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_NEVER)
if cacert_path: if cacert_path:
ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, cacert_path) ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, cacert_path)