Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only escape login and password for ldap query, not for connection #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Only escape login and password for ldap query, not for connection #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions pyramid_ldap/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def __init__(self, registry, manager):
self.registry = registry
self.manager = manager

def authenticate(self, login_unsafe, password_unsafe):
def authenticate(self, login, password):
"""Given a login name and a password, return a tuple of ``(dn,
attrdict)`` if the user exists and their password
is correct. Otherwise return ``None``.
Expand Down Expand Up @@ -138,28 +138,26 @@ def authenticate(self, login_unsafe, password_unsafe):
logins to make sure they are formatted correctly for their
``ldap.login_filter_tpl`` setting.
"""
if password_unsafe == '':
if password == '':
return None

# although we can run `search.execute(conn, login, password)` on `None`
# values, it will come back with no results and return `None`. It's
# better to return early here so that we know we're not passing `None`
# values to `escape_filter_chars`, which will raise an
# `AttributeError`.
if login_unsafe is None or password_unsafe is None:
if login is None or password is None:
return None

# we escape untrusted inputs `login_unsafe` and `password_unsafe`
login = escape_filter_chars(login_unsafe)
password = escape_filter_chars(password_unsafe)

with self.manager.connection() as conn:
search = getattr(self.registry, 'ldap_login_query', None)
if search is None:
raise ConfigurationError(
'ldap_set_login_query was not called during setup')

result = search.execute(conn, login=login, password=password)
result = search.execute(conn,
login=escape_filter_chars(login),
password=escape_filter_chars(password))
if len(result) == 1:
login_dn = result[0][0]
else:
Expand Down