18135 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brendan Abolivier	6b0efe73e2	SAML2: render a comprehensible error page if something goes wrong ... If an error happened while processing a SAML AuthN response, or a client ends up doing a `GET` request to `/authn_response`, then render a customisable error page rather than a confusing error.	2020-03-10 13:59:22 +00:00
dklimpel	39f6595b4a	lint, fix tests	2020-03-09 22:13:20 +01:00
dklimpel	885134529f	updates after review	2020-03-09 22:09:29 +01:00
dklimpel	7e5f40e771	fix tests	2020-03-09 21:00:36 +01:00
dklimpel	50ea178c20	lint	2020-03-09 19:57:04 +01:00
dklimpel	04f4b5f6f8	add tests	2020-03-09 19:51:31 +01:00
Brendan Abolivier	14b2ebe767	Merge pull request #7055 from matrix-org/babolivier/get_time_of_last_push_action_before ... Move get_time_of_last_push_action_before to the EventPushActionsWorkerStore	2020-03-09 14:53:50 +00:00
Brendan Abolivier	f9e3a3f4d0	Changelog ... It's the same as in #6964 since it's the most likely cause of the bug and that change hasn't been released yet.	2020-03-09 14:21:01 +00:00
Brendan Abolivier	aee2bae952	Fix undefined room_id in make_summary_text ... This would break notifications about un-named rooms when processing notifications in a batch.	2020-03-09 14:10:19 +00:00
Brendan Abolivier	87c65576e0	Move get_time_of_last_push_action_before to the EventPushActionsWorkerStore ... Fixes #7054 I also had a look at the rest of the functions in `EventPushActionsStore` and in the push notifications send code and it looks to me like there shouldn't be any other method with this issue in this part of the codebase.	2020-03-09 13:58:38 +00:00
Patrick Cloke	06eb5cae08	Remove special auth and redaction rules for aliases events in experimental room ver. (#7037)	2020-03-09 08:58:25 -04:00
Patrick Cloke	66315d862f	Update routing of fallback auth in the worker docs. (#7048)	2020-03-09 07:19:24 -04:00
Brendan Abolivier	bbf725e7da	Merge pull request #7045 from matrix-org/babolivier/room_keys_check ... Make sure that is_verified is a boolean when processing room keys	2020-03-09 09:54:48 +00:00
dklimpel	99bbe177b6	add disable_3pid_changes	2020-03-08 21:58:12 +01:00
dklimpel	20545a2199	lint2	2020-03-08 15:28:00 +01:00
dklimpel	ce460dc31c	lint	2020-03-08 15:22:43 +01:00
dklimpel	fb078f921b	changelog	2020-03-08 15:19:07 +01:00
dklimpel	1f5f3ae8b1	Add options to disable setting profile info for prevent changes.	2020-03-08 14:49:33 +01:00
Neil Pilgrim	2bff4457d9	Add type hints to logging/context.py (#6309) ... * Add type hints to logging/context.py Signed-off-by: neiljp (Neil Pilgrim) <github@kepier.clara.net>	2020-03-07 17:57:26 +00:00
Neil Johnson	1d66dce83e	Break down monthly active users by appservice_id (#7030) ... * Break down monthly active users by appservice_id and emit via prometheus. Co-authored-by: Brendan Abolivier <babolivier@matrix.org>	2020-03-06 18:14:19 +00:00
Brendan Abolivier	54b78a0e3b	Lint	2020-03-06 15:11:13 +00:00
Brendan Abolivier	297aaf4816	Mention the session ID in the error message	2020-03-06 15:07:41 +00:00
Brendan Abolivier	45df9d35a9	Lint	2020-03-06 11:10:52 +00:00
Brendan Abolivier	a27056d539	Changelog	2020-03-06 11:06:47 +00:00
Brendan Abolivier	80e580ae92	Make sure that is_verified is a boolean when processing room keys	2020-03-06 11:05:00 +00:00
Patrick Cloke	87972f07e5	Convert remote key resource REST layer to async/await. (#7020)	2020-03-05 11:29:56 -05:00
Richard van der Hoff	78a15b1f9d	Store room_versions in EventBase objects (#6875) ... This is a bit fiddly because it all has to be done on one fell swoop: * Wherever we create a new event, pass in the room version (and check it matches the format version) * When we prune an event, use the room version of the unpruned event to create the pruned version. * When we pass an event over the replication protocol, pass the room version over alongside it, and use it when deserialising the event again.	2020-03-05 15:46:44 +00:00
Brendan Abolivier	fe678a0900	Merge pull request #7035 from matrix-org/babolivier/hide_dummy_events ... Hide extremities dummy events from clients	2020-03-05 10:51:19 +00:00
Brendan Abolivier	83b6c69d3d	Changelog	2020-03-04 17:29:09 +00:00
Brendan Abolivier	31a2116331	Hide extremities dummy events from clients	2020-03-04 17:28:13 +00:00
Patrick Cloke	13892776ef	Allow deleting an alias if the user has sufficient power level (#6986)	2020-03-04 11:30:46 -05:00
Richard van der Hoff	8ef8fb2c1c	Read the room version from database when fetching events (#6874) ... This is a precursor to giving EventBase objects the knowledge of which room version they belong to.	2020-03-04 13:11:04 +00:00
Brendan Abolivier	43f874055d	Merge branch 'master' into develop	2020-03-03 15:20:49 +00:00
Brendan Abolivier	6b0ef34706	Update debian changelog	2020-03-03 15:01:43 +00:00
Brendan Abolivier	fe6ab0439d	Merge branch 'babolivier/v1.11.1-changelog' into 'release-v1.11.1' ... v1.11.1 See merge request new-vector/synapse!6	2020-03-03 14:58:37 +00:00
Brendan Abolivier	fd983fad96	v1.11.1	2020-03-03 14:58:37 +00:00
Patrick Cloke	7dcbc33a1b	Validate the alt_aliases property of canonical alias events (#6971)	2020-03-03 07:12:45 -05:00
Brendan Abolivier	6a8880b9c3	Merge branch 'babolivier/complete_sso_login_saml' into 'release-v1.11.1' ... Fix wrong handler being used in SAML handler See merge request new-vector/synapse!5	2020-03-03 11:29:07 +00:00
Brendan Abolivier	a0178df104	Fix wrong handler being used in SAML handler	2020-03-03 11:29:07 +00:00
Brendan Abolivier	6f67a8b570	Merge branch 'babolivier/sso_module_api' into 'release-v1.11.1' ... Factor out complete_sso_login and expose it to the Module API See merge request new-vector/synapse!4	2020-03-03 10:54:44 +00:00
Brendan Abolivier	65c73cdfec	Factor out complete_sso_login and expose it to the Module API	2020-03-03 10:54:44 +00:00
Richard van der Hoff	809e8567f6	Merge branch 'rav/sso-confirm-whitelist' into 'release-v1.11.1' ... Add a whitelist for the SSO confirmation step. See merge request new-vector/synapse!3	2020-03-02 17:05:09 +00:00
Richard van der Hoff	b68041df3d	Add a whitelist for the SSO confirmation step.	2020-03-02 17:05:09 +00:00
Erik Johnston	65a941d1f8	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_devices_stream	2020-03-02 16:55:55 +00:00
Erik Johnston	b29474e0aa	Always return a deferred from get_current_state_deltas. (#7019) ... This currently causes presence notify code to log exceptions when there is no state changes to process. This doesn't actually cause any problems as we'd simply do nothing anyway.	2020-03-02 16:52:15 +00:00
Richard van der Hoff	27d099edd6	Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1	2020-03-02 16:43:33 +00:00
Brendan Abolivier	2e7fad87d4	Merge branch 'anoabolivier/sso-confirm' into 'release-v1.11.1' ... Add a confirmation step to the SSO login flow See merge request new-vector/synapse!2	2020-03-02 16:36:32 +00:00
Brendan Abolivier	b2bd54a2e3	Add a confirmation step to the SSO login flow	2020-03-02 16:36:32 +00:00
Erik Johnston	3ab8e9c293	Fix py35-old CI by using native tox. (#7018) ... I'm not really sure how this was going wrong, but this seems like the right approach anyway.	2020-03-02 16:17:11 +00:00
Richard van der Hoff	174aaa1d62	remove spurious changelog	2020-03-02 14:53:56 +00:00