New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix handling of rejected threepid invites #3999

Merged
merged 3 commits into from Oct 3, 2018

Conversation

Projects
None yet
2 participants
@erikjohnston
Member

erikjohnston commented Oct 3, 2018

No description provided.

erikjohnston added some commits Oct 3, 2018

@@ -157,7 +157,7 @@ def check(event, auth_events, do_sig_check=True, do_size_check=True):
raise AuthError(
403, (
"You cannot issue a third party invite for %s." %
(event.content.display_name,)
(event.content.get("display_name", "<Unknown>"),)

This comment has been minimized.

@richvdh

richvdh Oct 3, 2018

Member

surely this is nothing to do with the display name?

This comment has been minimized.

@erikjohnston

erikjohnston Oct 3, 2018

Member

Err, good point.

@erikjohnston

This comment has been minimized.

Member

erikjohnston commented Oct 3, 2018

I've updated the error message for normal invites to be consistent

@erikjohnston erikjohnston requested a review from matrix-org/synapse-core Oct 3, 2018

@richvdh

richvdh approved these changes Oct 3, 2018

lgtm

@erikjohnston erikjohnston merged commit 8935ec5 into develop Oct 3, 2018

6 checks passed

ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

michaelkaye added a commit that referenced this pull request Oct 22, 2018

Merge tag 'v0.33.7' into dinsic
**Warning**: This release removes the example email notification templates from
`res/templates` (they are now internal to the python package). This should only
affect you if you (a) deploy your Synapse instance from a git checkout or a
github snapshot URL, and (b) have email notifications enabled.

If you have email notifications enabled, you should ensure that
`email.template_dir` is either configured to point at a directory where you
have installed customised templates, or leave it unset to use the default
templates.

The configuration parser will try to detect the situation where
`email.template_dir` is incorrectly set to `res/templates` and do the right
thing, but will warn about this.

Features
--------

- Ship the example email templates as part of the package ([\#4052](#4052))
- Add support for end-to-end key backup (MSC1687) ([\#4019](#4019))

Bugfixes
--------

- Fix bug which made get_missing_events return too few events ([\#4045](#4045))
- Fix bug in event persistence logic which caused 'NoneType is not iterable' ([\#3995](#3995))
- Fix exception in background metrics collection ([\#3996](#3996))
- Fix exception handling in fetching remote profiles ([\#3997](#3997))
- Fix handling of rejected threepid invites ([\#3999](#3999))
- Workers now start on Python 3. ([\#4027](#4027))
- Synapse now starts on Python 3.7. ([\#4033](#4033))

Internal Changes
----------------

- Log exceptions in looping calls ([\#4008](#4008))
- Optimisation for serving federation requests ([\#4017](#4017))
- Add metric to count number of non-empty sync responses ([\#4022](#4022))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment