From 56e2a4333e0da7ab08b035ccd80cce95324fa745 Mon Sep 17 00:00:00 2001 From: Jurek Date: Wed, 15 Nov 2017 22:49:43 +0100 Subject: [PATCH 1/5] Fix auth handler #2678 --- synapse/handlers/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 7a0ba6ef3..080eb1427 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -551,7 +551,7 @@ class AuthHandler(BaseHandler): qualified_user_id, password, ) if is_valid: - defer.returnValue(qualified_user_id) + defer.returnValue((qualified_user_id, None)) if (not hasattr(provider, "get_supported_login_types") or not hasattr(provider, "check_auth")): From b26cbbb60e546d6f84bf567df0334268bf95d6e5 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 16 Nov 2017 17:18:11 +0000 Subject: [PATCH 2/5] Revert "Merge pull request #2679 from jkolo/fix_auth_handler" This PR was against master, not develop :( This reverts commit 203058a027193b6a07a148319a9a728bf7f8420c, reversing changes made to 552f123bea1014680ab798b7e34cd1b23424a189. --- synapse/handlers/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 080eb1427..7a0ba6ef3 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -551,7 +551,7 @@ class AuthHandler(BaseHandler): qualified_user_id, password, ) if is_valid: - defer.returnValue((qualified_user_id, None)) + defer.returnValue(qualified_user_id) if (not hasattr(provider, "get_supported_login_types") or not hasattr(provider, "check_auth")): From eded7084d2b829b07351c13cdb25221056f796a3 Mon Sep 17 00:00:00 2001 From: Jurek Date: Wed, 15 Nov 2017 22:49:43 +0100 Subject: [PATCH 3/5] Fix auth handler #2678 --- synapse/handlers/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 7a0ba6ef3..080eb1427 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -551,7 +551,7 @@ class AuthHandler(BaseHandler): qualified_user_id, password, ) if is_valid: - defer.returnValue(qualified_user_id) + defer.returnValue((qualified_user_id, None)) if (not hasattr(provider, "get_supported_login_types") or not hasattr(provider, "check_auth")): From 2187724ad20e586760cba8da8f6205d4d99d6540 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 17 Nov 2017 10:09:16 +0000 Subject: [PATCH 4/5] Prep changelog for v0.25.1 --- CHANGES.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index a8b821a2d..aff6688b9 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,11 @@ +Changes in synapse v0.25.1 (2017-11-17) +======================================= + +Bug fixes: + +* Fix login with LDAP and other password provider modules (PR #2678). Thanks to + @jkolo! + Changes in synapse v0.25.0 (2017-11-15) ======================================= From 74bbeb4373137f715e9ec706543f5d292f489f86 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 17 Nov 2017 10:10:53 +0000 Subject: [PATCH 5/5] Bump version in __init__.py --- synapse/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/__init__.py b/synapse/__init__.py index e04208961..8c3d7a210 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.25.0" +__version__ = "0.25.1"