This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
fix bug where preserved threepid user comes to sign up and server is … #3777
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
erikjohnston
suggested changes
Aug 31, 2018
| @@ -775,7 +775,7 @@ def check_in_room_or_world_readable(self, room_id, user_id): | |||
| ) | |||
|
|
|||
| @defer.inlineCallbacks | |||
| def check_auth_blocking(self, user_id=None): | |||
| def check_auth_blocking(self, user_id=None, threepid=None): | |||
| @@ -281,12 +281,20 @@ def _do_password(self, request, register_json, session): | |||
| register_json["user"].encode("utf-8") | |||
| if "user" in register_json else None | |||
| ) | |||
| threepid = None | |||
| if session[LoginType.EMAIL_IDENTITY]: | |||
There was a problem hiding this comment.
Won't this throw if the session doesn't have the email login step?
| # Necessary due to auth checks prior to the threepid being | ||
| # written to the db | ||
| if self.store.is_threepid_reserved(threepid): | ||
| self.store.upsert_monthly_active_user(registered_user_id) |
| # Necessary due to auth checks prior to the threepid being | ||
| # written to the db | ||
| if self.store.is_threepid_reserved(threepid): | ||
| self.store.upsert_monthly_active_user(registered_user_id) |
| and threepid['address'] == tp['address']): | ||
| return True | ||
| else: | ||
| return False |
There was a problem hiding this comment.
Why is this in store rather than e.g. in the config object?
synapse/api/auth.py
Outdated
| @@ -797,6 +803,10 @@ def check_auth_blocking(self, user_id=None): | |||
| limit_type=self.hs.config.hs_disabled_limit_type | |||
| ) | |||
| if self.hs.config.limit_usage_by_mau is True: | |||
|
|
|||
| if user_id and threepid: | |||
| logger.warn("Called with both user_id and threepid, this shoudn't happen") | |||
There was a problem hiding this comment.
Personally I'd assert not (user_id and threepid) or something so that if someone does do it it gets picked up in tests.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
…mau blocked
I have omitted saml2 support and a subset of v1/register