14765 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	76a58fdcce	Fix spelling. ... Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>	2019-08-01 13:17:55 +01:00
Erik Johnston	02735e140f	Newsfile	2019-07-31 15:53:52 +01:00
Erik Johnston	f31d4cb7a2	Don't allow clients to send tombstones that reference the same room	2019-07-31 15:52:27 +01:00
Andrew Morgan	72167fb394	Change user deactivated errcode to USER_DEACTIVATED and use it (#5686) ... This is intended as an amendment to #5674 as using M_UNKNOWN as the errcode makes it hard for clients to differentiate between an invalid password and a deactivated user (the problem we were trying to solve in the first place). M_UNKNOWN was originally chosen as it was presumed than an MSC would have to be carried out to add a new code, but as Synapse often is the testing bed for new MSC implementations, it makes sense to try it out first in the wild and then add it into the spec if it is successful. Thus this PR return a new M_USER_DEACTIVATED code when a deactivated user attempts to login.	2019-07-31 15:19:06 +01:00
Andrew Morgan	58a755cdc3	Remove duplicate return statement	2019-07-31 13:24:51 +01:00
Erik Johnston	8fde611a8c	Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_known ... Share SSL options for well-known requests	2019-07-31 11:40:02 +01:00
Amber Brown	8f15832950	Remove DelayedCall debugging from test runs (#5787)	2019-07-31 20:39:22 +10:00
Erik Johnston	9fe6ad5fef	Merge pull request #5796 from matrix-org/erikj/disable_codecov_report ... Disable codecov reports to GH comments.	2019-07-31 11:16:15 +01:00
Erik Johnston	fe2f2fc530	Newsfile	2019-07-31 10:59:39 +01:00
Erik Johnston	6be336c0d8	Disable codecov reports to GH comments. ... The double posting is really annoying, and I don't think anyone is actually reading them. The commit statuses should give a good summary and will link to a full report.	2019-07-31 10:56:02 +01:00
Erik Johnston	3b7a35a59a	Newsfile	2019-07-31 10:39:24 +01:00
Erik Johnston	a9bcae9f50	Share SSL options for well-known requests	2019-07-31 10:39:24 +01:00
Brendan Abolivier	d4f91e7e9f	Merge pull request #5793 from matrix-org/erikj/fix_bg_update ... Don't recreate current_state_events.membership column	2019-07-30 21:19:39 +02:00
Erik Johnston	4037d3220a	Newsfile	2019-07-30 16:43:59 +01:00
Erik Johnston	123c04daa7	Don't recreate column	2019-07-30 16:42:48 +01:00
Erik Johnston	62a2d60d72	Merge pull request #5792 from matrix-org/erikj/fix_bg_update ... Fix current_state_events membership background update.	2019-07-30 15:20:09 +01:00
Erik Johnston	958d69f300	Newsfile	2019-07-30 14:53:52 +01:00
Erik Johnston	15056ca208	Fix current_state_events membership background update. ... Turns out not all rooms are in `rooms`, so lets fetch the room list from `current_state_events`. We move the delta file to force it to be run again.	2019-07-30 14:51:41 +01:00
Erik Johnston	7a48d0bab8	Merge pull request #5789 from matrix-org/erikj/fix_error_handling_keys ... Fix error handling when fetching remote device keys	2019-07-30 13:26:12 +01:00
Erik Johnston	e23ab7f41a	Newsfile	2019-07-30 13:10:00 +01:00
Erik Johnston	1ec7d656dd	Unwrap error	2019-07-30 13:09:02 +01:00
Erik Johnston	458e51df7a	Fix error handling when fetching remote device keys	2019-07-30 13:07:02 +01:00
Erik Johnston	63eb4a1b62	Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_state ... Add unit test for current state membership bg update	2019-07-30 10:00:02 +01:00
Richard van der Hoff	8c97f6414c	Remove non-functional 'expire_access_token' setting (#5782) ... The `expire_access_token` didn't do what it sounded like it should do. What it actually did was make Synapse enforce the 'time' caveat on macaroons used as access tokens, but since our access token macaroons never contained such a caveat, it was always a no-op. (The code to add 'time' caveats was removed back in v0.18.5, in #1656)	2019-07-30 08:25:02 +01:00
Amber Brown	865077f1d1	Room Complexity Client Implementation (#5783)	2019-07-30 02:47:27 +10:00
Erik Johnston	7c8c3b8437	Merge pull request #5774 from matrix-org/erikj/fix_rejected_membership ... Fix room summary when rejected events are in state	2019-07-29 17:15:15 +01:00
Erik Johnston	3e013b7c8e	Merge pull request #5752 from matrix-org/erikj/forgotten_user ... Remove some more joins on room_memberships	2019-07-29 17:15:01 +01:00
Erik Johnston	2a12d76646	Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqlite ... Fix current_state bg update to work on old SQLite	2019-07-29 17:09:01 +01:00
Amber Brown	97a8b4caf7	Move some timeout checking logs to DEBUG #5785	2019-07-30 02:02:18 +10:00
Erik Johnston	df3a5db629	Expand comment	2019-07-29 16:40:25 +01:00
Jorik Schellekens	85b0bd8fe0	Update the device list cache when keys/query is called (#5693)	2019-07-29 16:34:44 +01:00
Erik Johnston	105e7f6ed3	Remove lost comment	2019-07-29 16:09:48 +01:00
Erik Johnston	3b476f5767	Fix debian packages for sid being called buster. (#5775) ... * Fix debian packages for sid being called buster. I don't know why the sid images return buster as its codename in `lsb_release` but it does, so lets just grab the codename from the distro we pass into dockerfile * Newsfile	2019-07-30 00:33:32 +10:00
Erik Johnston	d94916852f	Newsfile	2019-07-29 13:04:58 +01:00
Erik Johnston	84c6ea1af8	Update old deps unit test to use old sqlite3	2019-07-29 13:04:50 +01:00
Erik Johnston	45df38e61b	Fix current_state bg update to work on old SQLite	2019-07-29 13:04:10 +01:00
Brendan Abolivier	fa87004bc1	Merge pull request #5780 from matrix-org/baboliver/loopingcall-args ... Add ability to pass arguments to looping calls	2019-07-29 10:58:22 +02:00
Brendan Abolivier	bd083a5fcf	Changelog	2019-07-29 10:04:09 +02:00
Brendan Abolivier	244953be3f	Add kwargs and doc	2019-07-29 10:03:14 +02:00
Brendan Abolivier	08352d44f8	Add ability to pass arguments to looping calls	2019-07-29 09:54:37 +02:00
Richard van der Hoff	d74595e2ca	Merge branch 'master' into develop	2019-07-26 12:39:33 +01:00
Richard van der Hoff	1a93daf353	Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatch ... Log when we receive a /make_* request from a different origin	2019-07-26 12:38:37 +01:00
Richard van der Hoff	97bf307755	yet more changelog attribution fixes	2019-07-26 12:06:06 +01:00
Richard van der Hoff	992333b995	correct attributions in changelog	2019-07-26 11:45:06 +01:00
Richard van der Hoff	8b16696b24	correct attributions in changelog	2019-07-26 11:36:28 +01:00
Richard van der Hoff	dde6ea7ff6	1.2.1	2019-07-26 11:33:16 +01:00
Erik Johnston	2e9cf7dda5	Newsfile	2019-07-26 10:14:31 +01:00
Erik Johnston	14c24c9037	Fix room summary when rejected events are in state ... Annoyingly, `current_state_events` table can include rejected events, in which case the membership column will be null. To work around this lets just always filter out null membership for now.	2019-07-26 10:11:36 +01:00
Richard van der Hoff	a0ee2ec458	Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1	2019-07-26 10:09:36 +01:00
Richard van der Hoff	d1020653fc	Log when we receive a /make_* request from a different origin	2019-07-26 10:08:22 +01:00