ldap: Fix unintended user deactivation in case of connection failure. #13131
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timabbott
reviewed
Sep 4, 2019
| @@ -566,6 +567,24 @@ def authenticate(self, *, username: str, password: str, realm: Realm, | |||
| return_data: Optional[Dict[str, Any]]=None) -> Optional[UserProfile]: | |||
| return None | |||
|
|
|||
| class PopulateUserLDAPError(Exception): | |||
| pass | |||
There was a problem hiding this comment.
Should this be a subclass of ZulipLDAPException?
There was a problem hiding this comment.
@timabbott indeed, that seems better, I pushed again with this change
Fixes zulip#13130. django_auth_ldap doesn't give any other way of detecting that LDAPError happened other than catching the signal it emits - so we have to register a receiver. In the receiver we just raise our own Exception which will properly propagate without being silenced by django_auth_ldap. This will stop execution before the user gets deactivated.
mateuszmandera
force-pushed
the
ldap_sync_deactivation_bug
branch
from
cb4af12
to
94c710d
Compare
|
Nice, merged, thanks @mateuszmandera! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #13130.
django_auth_ldap doesn't give any other way of detecting that LDAPError
happened other than catching the signal it emits - so we have to
register a receiver. In the receiver we just raise our own Exception
which will properly propagate without being silenced by
django_auth_ldap. This will stop execution before the user gets
deactivated.