Merge branch 'master' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2016-11-08 14:43:49 +00:00
commit e6651e8046
3 changed files with 16 additions and 2 deletions

View File

@ -1,3 +1,16 @@
Changes in synapse v0.18.3 (2016-11-08)
=======================================
SECURITY UPDATE
Explicitly require authentication when using LDAP3. This is the default on
versions of ``ldap3`` above 1.0, but some distributions will package an older
version.
If you are using LDAP3 login and have a version of ``ldap3`` older than 1.0 it
is **CRITICAL to updgrade**.
Changes in synapse v0.18.2 (2016-11-01) Changes in synapse v0.18.2 (2016-11-01)
======================================= =======================================

View File

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server. """ This is a reference implementation of a Matrix home server.
""" """
__version__ = "0.18.2" __version__ = "0.18.3"

View File

@ -236,7 +236,8 @@ class LdapAuthProvider(object):
value=localpart, value=localpart,
base=self.ldap_base base=self.ldap_base
) )
conn = ldap3.Connection(server, bind_dn, password) conn = ldap3.Connection(server, bind_dn, password,
authentication=ldap3.AUTH_SIMPLE)
logger.debug( logger.debug(
"Established LDAP connection in simple bind mode: %s", "Established LDAP connection in simple bind mode: %s",
conn conn