summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorMartin Weinelt <mweinelt@gmail.com>2016-06-06 02:05:57 +0200
committerMartin Weinelt <mweinelt@gmail.com>2016-06-22 17:51:59 +0200
commit0a32208e5dde4980a5962f17e9b27f2e28e1f3f1 (patch)
treea4645bede5b25546246eea46c969c67e8ac79899 /tests
parentMerge pull request #888 from matrix-org/markjh/content_repo (diff)
downloadsynapse-0a32208e5dde4980a5962f17e9b27f2e28e1f3f1.tar.xz
Rework ldap integration with ldap3
Use the pure-python ldap3 library, which eliminates the need for a
system dependency.

Offer both a `search` and `simple_bind` mode, for more sophisticated
ldap scenarios.
- `search` tries to find a matching DN within the `user_base` while
  employing the `user_filter`, then tries the bind when a single
  matching DN was found.
- `simple_bind` tries the bind against a specific DN by combining the
  localpart and `user_base`

Offer support for STARTTLS on a plain connection.

The configuration was changed to reflect these new possibilities.

Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>
Diffstat (limited to '')
-rw-r--r--tests/utils.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py
index 6e41ae1ff6..ed547bc39b 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -56,6 +56,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs):
 
     config.use_frozen_dicts = True
     config.database_config = {"name": "sqlite3"}
+    config.ldap_enabled = False
 
     if "clock" not in kargs:
         kargs["clock"] = MockClock()