matrix/thirdparty/synapse.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	delete keys when deleting backups	Hubert Chathi	2019-10-24	2	-0/+33
\|
*	Move schema delta files to the correct data store.	Erik Johnston	2019-10-24	2	-0/+0
\| \| \| \|	They were put in the global schema delta directory due to a bad merge.
*	1.5.0rc1	Andrew Morgan	2019-10-24	1	-1/+1
\|
*	Option to suppress resource exceeded alerting (#6173)	Neil Johnson	2019-10-24	4	-43/+96
\| \| \| \|	The expected use case is to suppress MAU limiting on small instances
*	Cleanup extra quotes from IDEs (#6236)	Andrew Morgan	2019-10-23	1	-2/+1
\|
*	Add config linting script that checks for bool casing (#6203)	Andrew Morgan	2019-10-23	9	-15/+22
\| \| \| \| \|	Add a linting script that enforces all boolean values in the default config be lowercase. This has annoyed me for a while so I decided to fix it.
*	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-22	3	-13/+479
\|\ \| \| \| \| \| \|	erikj/refactor_stores
\| *	Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2	Hubert Chathi	2019-10-22	3	-13/+479
\| \|\ \| \| \| \| \| \|	Cross-signing [3/4] -- uploading signatures edition
\| \| *	Merge branch 'develop' into cross-signing_sig_upload	Hubert Chathi	2019-10-18	152	-2508/+5409
\| \| \|\
\| \| * \|	fix doc strings	Hubert Chathi	2019-10-18	1	-9/+13
\| \| \| \|
\| \| * \|	make isort happy	Hubert Chathi	2019-09-24	1	-1/+0
\| \| \| \|
\| \| * \|	add some comments	Hubert Chathi	2019-09-24	1	-2/+10
\| \| \| \|
\| \| * \|	drop some logger lines to debug	Hubert Chathi	2019-09-24	1	-3/+3
\| \| \| \|
\| \| * \|	make changes based on PR feedback	Hubert Chathi	2019-09-24	2	-118/+165
\| \| \| \|
\| \| * \|	add function docs	Hubert Chathi	2019-09-07	1	-2/+24
\| \| \| \|
\| \| * \|	Merge branch 'develop' into cross-signing_sig_upload	Hubert Chathi	2019-09-07	36	-510/+1219
\| \| \|\ \
\| \| * \| \|	run black	Hubert Chathi	2019-09-06	1	-24/+10
\| \| \| \| \|
\| \| * \| \|	split out signature processing into separate functions	Hubert Chathi	2019-09-06	1	-195/+204
\| \| \| \| \|
\| \| * \| \|	avoid modifying input parameter	Hubert Chathi	2019-09-05	1	-7/+7
\| \| \| \| \|
\| \| * \| \|	update with newer coding style	Hubert Chathi	2019-09-04	2	-3/+3
\| \| \| \| \|
\| \| * \| \|	make black happy	Hubert Chathi	2019-09-04	3	-93/+79
\| \| \| \| \|
\| \| * \| \|	allow uploading signatures of master key signed by devices	Hubert Chathi	2019-09-04	3	-84/+152
\| \| \| \| \|
\| \| * \| \|	implement device signature uploading/fetching	Hubert Chathi	2019-09-04	3	-0/+338
\| \| \| \| \|
* \| \| \| \|	Clean up prepare_database.py a bit and add comments	Erik Johnston	2019-10-22	1	-7/+30
\| \| \| \| \|
* \| \| \| \|	Delete background_update table creation in main data_store	Erik Johnston	2019-10-22	1	-21/+0
\| \| \| \| \|
* \| \| \| \|	Move README into synapse/storage/__init__.py	Erik Johnston	2019-10-22	2	-13/+12
\| \| \| \| \|
* \| \| \| \|	Add a basic README to synapse.storage	Erik Johnston	2019-10-22	1	-0/+13
\| \| \| \| \|
* \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-22	19	-198/+631
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/refactor_stores
\| * \| \| \|	Remove Auth.check method (#6217)	Richard van der Hoff	2019-10-18	2	-21/+5
\| \| \|_\|/ \| \|/\| \| \| \| \| \|	This method was somewhat redundant, and confusing.
\| * \| \|	Merge branch 'uhoreg/e2e_cross-signing_merged' into develop	Hubert Chathi	2019-10-18	12	-21/+623
\| \|\ \ \
\| \| * \ \	Merge branch 'develop' into uhoreg/e2e_cross-signing_merged	Hubert Chathi	2019-10-18	149	-2344/+5400
\| \| \|\ \ \
\| \| * \| \| \|	use the right function for when we're already in runInteraction	Hubert Chathi	2019-10-18	1	-4/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'develop' into uhoreg/e2e_cross-signing_merged	Hubert Chathi	2019-09-07	36	-510/+1219
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| / \| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	add user signature stream change cache to slaved device store	Hubert Chathi	2019-09-04	1	-0/+3
\| \| \| \| \|
\| \| * \| \|	Merge branch 'develop' into cross-signing_keys	Hubert Chathi	2019-09-04	96	-1261/+1463
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys	Hubert Chathi	2019-08-28	98	-1378/+3636
\| \| \|\ \ \ \
\| \| \| * \ \ \	Merge branch 'develop' into uhoreg/e2e_cross-signing_merged	Hubert Chathi	2019-08-28	85	-1304/+3405
\| \| \| \|\ \ \ \
\| \| \| * \| \| \| \|	Cross-signing [1/4] -- hidden devices (#5759)	Hubert Chathi	2019-08-12	3	-10/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* allow devices to be marked as "hidden" This is a prerequisite for cross-signing, as it allows us to create other things that live within the device namespace, so they can be used for signatures.
\| \| * \| \| \| \| \|	black	Hubert Chathi	2019-08-28	1	-3/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	use stream ID generator instead of timestamp	Hubert Chathi	2019-08-28	4	-23/+23
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	make isort happy	Hubert Chathi	2019-08-21	1	-1/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	apply PR review suggestions	Hubert Chathi	2019-08-21	4	-53/+46
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	make changes from PR review	Hubert Chathi	2019-08-01	4	-49/+75
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'cross-signing_hidden' into cross-signing_keys	Hubert Chathi	2019-08-01	187	-1954/+2779
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	don't need to return the hidden column any more	Hubert Chathi	2019-08-01	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	really fix queries to work with Postgres	Hubert Chathi	2019-07-31	1	-19/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(by going back to not using SQL directly)
\| \| \| * \| \| \| \| \|	PostgreSQL, Y U no like?	Hubert Chathi	2019-07-31	1	-3/+4
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	remove extra SQL query param	Hubert Chathi	2019-07-31	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge branch 'develop' into cross-signing_hidden	Hubert Chathi	2019-07-30	187	-1934/+2767
\| \| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Merge branch 'cross-signing_hidden' into cross-signing_keys	Hubert Chathi	2019-07-30	3	-21/+17
\| \| \|\\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	apply changes from PR review	Hubert Chathi	2019-07-30	3	-20/+17
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	allow uploading keys for cross-signing	Hubert Chathi	2019-07-25	10	-12/+558
\| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	allow devices to be marked as "hidden"	Hubert Chathi	2019-07-24	2	-16/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a prerequisite for cross-signing, as it allows us to create other things that live within the device namespace, so they can be used for signatures.
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into rav/event_auth/1	Richard van der Hoff	2019-10-18	9	-122/+125
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Fix logging config for the docker image (#6197)	Richard van der Hoff	2019-10-18	1	-3/+2
\| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turns out that loggers that are instantiated before the config is loaded get turned off. Also bring the logging config that is generated by --generate-config into line. Fixes #6194.
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into rav/event_auth/1	Richard van der Hoff	2019-10-18	29	-187/+354
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	rip out some unreachable code	Richard van der Hoff	2019-10-17	4	-153/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The only possible rejection reason is AUTH_ERROR, so all of this is unreachable.
* \| \| \| \| \| \| \| \| \|	Fix schema management to work with multiple data stores.	Erik Johnston	2019-10-21	1	-41/+108
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Move storage classes into a main "data store".	Erik Johnston	2019-10-21	261	-4324/+4500
\| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is in preparation for having multiple data stores that offer different functionality, e.g. splitting out state or event storage.
* \| \| \| \| \| \| \| \|	Merge branch 'master' into develop	Brendan Abolivier	2019-10-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	1.4.1	Brendan Abolivier	2019-10-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #6196 from matrix-org/erikj/await	Erik Johnston	2019-10-18	6	-114/+113
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move rest/admin to use async/await.
\| * \| \| \| \| \| \| \| \| \|	Port synapse/rest/client/_base.py to async/await	Erik Johnston	2019-10-11	1	-9/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add maybe_awaitable and fix __init__ bugs	Erik Johnston	2019-10-11	2	-2/+34
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Port synaps/rest/client/users.py to async/await	Erik Johnston	2019-10-11	1	-11/+7
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Port synaps/rest/client/server_notice_servlet.py to async/await	Erik Johnston	2019-10-11	1	-6/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Port synaps/rest/client/media.py to async/await	Erik Johnston	2019-10-11	1	-16/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Port rest/admin/__init__.py to async/await	Erik Johnston	2019-10-11	1	-72/+55
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Fix presence timeouts when synchrotron restarts. (#6212)	Erik Johnston	2019-10-18	1	-4/+9
\| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix presence timeouts when synchrotron restarts. Handling timeouts would fail if there was an external process that had timed out, e.g. a synchrotron restarting. This was due to a couple of variable name typoes. Fixes #3715.
* \| \| \| \| \| \| \| \| \|	Merge tag 'v1.4.1rc1' into develop	Richard van der Hoff	2019-10-17	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Synapse 1.4.1rc1 (2019-10-17) ============================= Bugfixes -------- - Fix bug where redacted events were sometimes incorrectly censored in the database, breaking APIs that attempted to fetch such events. ([\#6185](https://github.com/matrix-org/synapse/issues/6185), [5b0e9948](https://github.com/matrix-org/synapse/commit/5b0e9948eaae801643e594b5abc8ee4b10bd194e))
\| * \| \| \| \| \| \| \| \|	1.4.1rc1 v1.4.1rc1	Richard van der Hoff	2019-10-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Do the update as a background index	Erik Johnston	2019-10-17	2	-9/+51
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets	Erik Johnston	2019-10-17	2	-4/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inserting bytes as text in `censor_redactions`
* \| \| \| \| \| \| \| \| \|	Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage	Hubert Chathi	2019-10-11	2	-12/+16
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make storage layer in charge of interpreting the device key data
\| * \| \| \| \| \| \| \| \| \|	expand on comment	Hubert Chathi	2019-10-11	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	make sure we actually return something	Hubert Chathi	2019-10-10	2	-2/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	make storage layer in charge of interpreting the device key data	Hubert Chathi	2019-10-10	2	-13/+9
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version	Hubert Chathi	2019-10-11	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make version optional in body of e2e backup version update
\| * \| \| \| \| \| \| \| \| \| \|	make version optional in body of e2e backup version update	Hubert Chathi	2019-10-09	2	-3/+3
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to agree with latest version of the MSC
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #6195 from matrix-org/erikj/opentracing_preview_url	Erik Johnston	2019-10-11	2	-5/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|	Trace non-JSON APIs, /media, /key etc
\| * \| \| \| \| \| \| \| \| \|	Trace non-JSON APIs, /media, /key etc	Erik Johnston	2019-10-11	2	-5/+11
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	cas: support setting display name (#6114)	Valérian Rousset	2019-10-11	2	-1/+6
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now, the CAS server can return an attribute stating what's the desired displayname, instead of using the username directly.
* \| \| \| \| \| \| \| \| \|	Fix MAU reaping where reserved users are specified. (#6168)	Neil Johnson	2019-10-11	2	-42/+65
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #6156 from matrix-org/erikj/postgres_any	Erik Johnston	2019-10-10	14	-109/+189
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Postgres ANY for selecting many values.
\| * \| \| \| \| \| \| \| \| \|	Fix SQLite take 2	Erik Johnston	2019-10-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix SQLite	Erik Johnston	2019-10-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove add_in_list_sql_clause	Erik Johnston	2019-10-10	4	-34/+25
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/postgres_any	Erik Johnston	2019-10-10	3	-3/+231
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Replace IN usage with helper funcs	Erik Johnston	2019-10-10	11	-97/+138
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add helper funcs to use postgres ANY	Erik Johnston	2019-10-10	1	-8/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This means that we can write queries with `col = ANY(?)`, which helps postgres.
* \| \| \| \| \| \| \| \| \| \|	Fix store_url_cache using bytes	Erik Johnston	2019-10-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-10	3	-3/+231
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/disable_sql_bytes
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #6127 from matrix-org/erikj/patch_inner	Erik Johnston	2019-10-10	3	-3/+231
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|	Add more log context checks when patching inlineCallbacks
\| \| * \| \| \| \| \| \| \| \|	Fixup comments	Erik Johnston	2019-10-10	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
\| \| * \| \| \| \| \| \| \| \|	Fix py3.5	Erik Johnston	2019-10-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix py3.5	Erik Johnston	2019-10-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	sort	Erik Johnston	2019-10-10	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Appease mypy	Erik Johnston	2019-10-10	1	-13/+18
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Add coments	Erik Johnston	2019-10-10	1	-5/+25
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner	Erik Johnston	2019-10-10	39	-146/+521
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Fix packaging	Erik Johnston	2019-10-10	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Log correct context	Erik Johnston	2019-10-10	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Test for sentinel commit	Erik Johnston	2019-10-10	1	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Move patch_inline_callbacks into synapse/	Erik Johnston	2019-10-10	2	-1/+180
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner	Erik Johnston	2019-10-09	62	-1041/+1507
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Patch inlinecallbacks for log contexts	Erik Johnston	2019-09-27	4	-6/+13
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-10	88	-1620/+2239
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/disable_sql_bytes
\| * \| \| \| \| \| \| \| \| \| \|	Add domain validation when creating room with list of invitees (#6121)	werner291	2019-10-10	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	before fulfilling a group invite,check if user is already joined/invited (#3436)	Michael Telatynski	2019-10-10	1	-4/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes vector-im/riot-web#5645
\| * \| \| \| \| \| \| \| \| \| \|	send 404 as http-status when filter-id is unknown to the server (#2380)	krombel	2019-10-10	2	-22/+31
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixed the weirdness of 400 vs 404 as http status code in the case the filter id is not known by the server. As e.g. matrix-js-sdk expects 404 to catch this situation this leads to unwanted behaviour.
\| * \| \| \| \| \| \| \| \| \|	Fix races in room stats (and other) updates. (#6187)	Richard van der Hoff	2019-10-10	4	-23/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hopefully this will fix the occasional failures we were seeing in the room directory. The problem was that events are not necessarily persisted (and `current_state_delta_stream` updated) in the same order as their stream_id. So for instance current_state_delta 9 might be persisted before current_state_delta 8. Then, when the room stats saw stream_id 9, it assumed it had done everything up to 9, and never came back to do stream_id 8. We can solve this easily by only processing up to the stream_id where we know all events have been persisted.
\| * \| \| \| \| \| \| \| \| \|	Rewrite the user_filter migration again (#6184)	Richard van der Hoff	2019-10-10	1	-26/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	you can't plausibly ALTER TABLE in sqlite, so we create the new table with the right schema to start with.
\| * \| \| \| \| \| \| \| \| \|	Move tag/push rules room upgrade checking ealier (#6155)	Andrew Morgan	2019-10-10	1	-18/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It turns out that _local_membership_update doesn't run when you join a new, remote room. It only runs if you're joining a room that your server already knows about. This would explain #4703 and #5295 and why the transfer would work in testing and some rooms, but not others. This would especially hit single-user homeservers. The check has been moved to right after the room has been joined, and works much more reliably. (Though it may still be a bit awkward of a place).
\| * \| \| \| \| \| \| \| \| \|	Refactor HomeserverConfig so it can be typechecked (#6137)	Amber Brown	2019-10-10	33	-79/+385
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets	Erik Johnston	2019-10-09	2	-4/+28
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inserting bytes as text in `censor_redactions`
\| * \ \ \ \ \ \ \ \ \	Merge pull request #6178 from matrix-org/babolivier/factor_out_bg_updates	Brendan Abolivier	2019-10-09	9	-605/+670
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Factor out backgroung updates
\| \| * \| \| \| \| \| \| \| \| \|	Fix RegistrationStore	Brendan Abolivier	2019-10-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Cleanup client_ips	Brendan Abolivier	2019-10-08	1	-7/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Don't end up with 4 classes in registration	Brendan Abolivier	2019-10-08	1	-52/+50
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-10-07	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Move roommember's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-108/+114
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Move user_directory's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-84/+94
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Move state's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-190/+204
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Move search's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-25/+31
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Move registration's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-95/+103
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Move media_repository's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Move devices's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-22/+27
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Move deviceinbox's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-15/+22
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Move client_ips's bg updates to a dedicated store	Brendan Abolivier	2019-10-07	1	-94/+106
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	add M_TOO_LARGE error code for uploading a too large file (#6151)	Anshul Angaria	2019-10-08	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #6109
\| * \| \| \| \| \| \| \| \| \| \|	Remove unused public room list timeout param (#6179)	Andrew Morgan	2019-10-08	1	-12/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Remove unused public room list timeout param * Add changelog
\| * \| \| \| \| \| \| \| \| \| \|	Fix /federation/v1/state for recent room versions (#6170)	Richard van der Hoff	2019-10-08	1	-13/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix /federation/v1/state for recent room versions Turns out this endpoint was completely broken for v3 rooms. Hopefully this re-signing code is irrelevant nowadays anyway.
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failure	Erik Johnston	2019-10-07	1	-6/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't regenerate numeric user ID if registration fails.
\| \| * \| \| \| \| \| \| \| \| \| \|	Remove unused variable	Erik Johnston	2019-10-03	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Don't regenerate numeric user ID if registration fails.	Erik Johnston	2019-10-03	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This causes huge amounts of DB IO if registrations start to fail e.g. because the DB is struggling with IO.
\| * \| \| \| \| \| \| \| \| \| \| \|	Log responder we are using. (#6139)	Michael Kaye	2019-10-07	1	-1/+1
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents us logging "Responding to media request with responder %s".
\| * \| \| \| \| \| \| \| \| \| \|	add some logging to the rooms stats updates, to try to track down a flaky ↵	Richard van der Hoff	2019-10-07	2	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test (#6167)
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_index	Brendan Abolivier	2019-10-07	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix unique_user_filter_index schema update
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix unique_user_filter_index schema update	Brendan Abolivier	2019-10-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6159 from matrix-org/erikj/cache_memberships	Erik Johnston	2019-10-07	1	-19/+45
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|	Cache room membership lookups in _get_joined_users_from_context
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix bug where we didn't pull out event ID	Erik Johnston	2019-10-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-10-03	4	-19/+43
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/cache_memberships
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Use the right error....	Erik Johnston	2019-10-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	pep8	Erik Johnston	2019-10-03	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fixup names and comments	Erik Johnston	2019-10-03	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	cachedList descriptor doesn't like typing	Erik Johnston	2019-10-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Cache room membership lookups in _get_joined_users_from_context	Erik Johnston	2019-10-03	1	-19/+45
\| \| \| \|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revoked	Brendan Abolivier	2019-10-04	1	-2/+7
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't 500 when trying to exchange a revoked 3PID invite
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Typo	Brendan Abolivier	2019-10-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-10-04	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Incorporate review	Brendan Abolivier	2019-10-04	1	-14/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Add test case	Brendan Abolivier	2019-10-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-10-02	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Don't 500 code when trying to exchange a revoked 3PID invite	Brendan Abolivier	2019-10-02	1	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While this is not documented in the spec (but should be), Riot (and other clients) revoke 3PID invites by sending a m.room.third_party_invite event with an empty ({}) content to the room's state. When the invited 3PID gets associated with a MXID, the identity server (which doesn't know about revocations) sends down to the MXID's homeserver all of the undelivered invites it has for this 3PID. The homeserver then tries to talk to the inviting homeserver in order to exchange these invite for m.room.member events. When one of the invite is revoked, the inviting homeserver responds with a 500 error because it tries to extract a 'display_name' property from the content, which is empty. This might cause the invited server to consider that the server is down and not try to exchange other, valid invites (or at least delay it). This fix handles the case of revoked invites by avoiding trying to fetch a 'display_name' from the original invite's content, and letting the m.room.member event fail the auth rules (because, since the original invite's content is empty, it doesn't have public keys), which results in sending a 403 with the correct error message to the invited server.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Update `user_filters` table to have a unique index, and non-null columns (#1172)	Alexander Maznev	2019-10-04	1	-0/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)	Robert Swain	2019-10-04	1	-3/+11
\| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pillow will use nearest neighbour as the resampling algorithm if the source image is either 1-bit or a color palette using 8 bits. If we convert to RGB before scaling, we'll probably get a better result.
\| * \| \| \| \| \| \| \| \| \| \| \|	add some metrics on the federation sender (#6160)	Richard van der Hoff	2019-10-03	4	-19/+43
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into develop	Andrew Morgan	2019-10-03	2	-3/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6154 from matrix-org/erikj/fix_appservice_pagination	Erik Johnston	2019-10-02	1	-18/+18
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix appservice room list pagination
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix appservice room list pagination	Erik Johnston	2019-10-02	1	-18/+18
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatable	Erik Johnston	2019-10-02	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix not showing non-federatable rooms to remote room list queries
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix not showing non-federatable rooms to remote room list queries	Erik Johnston	2019-10-02	1	-0/+3
\| \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6148 from matrix-org/erikj/find_next_generated	Erik Johnston	2019-10-02	1	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|	Bound find_next_generated_user_id DB query.
\| \| * \| \| \| \| \| \| \| \| \| \|	Bound find_next_generated_user_id DB query.	Erik Johnston	2019-10-02	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We can easily bound the set of user IDs we pull out of the DB, so lets do that.
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix public room list pagination.	Erik Johnston	2019-10-02	2	-27/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We incorrectly used `room_id` as to bound the result set, even though we order by `joined_members, room_id`, leading to incorrect results after pagination.
\| * \| \| \| \| \| \| \| \| \| \| \|	Land improved room list based on room stats (#6019)	Erik Johnston	2019-10-02	5	-311/+272
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use room_stats and room_state for room directory search
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix up some typechecking (#6150)	Amber Brown	2019-10-02	20	-40/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* type checking fixes * changelog
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix yields and copy instead of move push rules on room upgrade (#6144)	Andrew Morgan	2019-10-02	2	-12/+8
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copy push rules during a room upgrade from the old room to the new room, instead of deleting them from the old room. For instance, we've defined upgrading of a room multiple times to be possible, and push rules won't be transferred on the second upgrade if they're deleted during the first. Also fix some missing yields that probably broke things quite a bit.
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2019-10-02	6	-19/+143
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'erikj/fixup_devices_last_seen_query' of ↵	Erik Johnston	2019-10-01	4	-8/+55
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:matrix-org/synapse into develop
\| * \| \| \| \| \| \| \| \| \| \| \|	Drop unused tables (#6115)	Richard van der Hoff	2019-09-30	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These tables are unused since #5893 (as amended by #6047), so we can now drop them. Fixes #6048.
\| * \| \| \| \| \| \| \| \| \| \| \|	Edit SimpleHttpClient to reference that header keys can be passed as str or ↵	Andrew Morgan	2019-09-27	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bytes (#6077)
\| * \| \| \| \| \| \| \| \| \| \| \|	Incorporate review	Brendan Abolivier	2019-09-27	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Update synapse/handlers/deactivate_account.py	Brendan Abolivier	2019-09-27	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
\| * \| \| \| \| \| \| \| \| \| \| \|	Update synapse/handlers/deactivate_account.py	Brendan Abolivier	2019-09-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
\| * \| \| \| \| \| \| \| \| \| \| \|	Lint	Brendan Abolivier	2019-09-27	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fixup and add some logging	Brendan Abolivier	2019-09-27	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Reject pending invites on deactivation	Brendan Abolivier	2019-09-27	1	-0/+31
\| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)	Andrew Morgan	2019-09-27	2	-364/+359
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Just to have all the methods that make calls to identity services in one place.
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-span	Erik Johnston	2019-09-27	2	-1/+21
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some helpful opentracing tags and remove get_user_by_req span
\| \| * \| \| \| \| \| \| \| \| \| \|	isort	Erik Johnston	2019-09-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Add device and appservice tags	Erik Johnston	2019-09-25	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Add tags for event_id and txn_id in event sending	Erik Johnston	2019-09-25	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will make it easier to search for sending event requests.
\| \| * \| \| \| \| \| \| \| \| \| \|	Don't create new span for get_user_by_req	Erik Johnston	2019-09-25	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't actually care about what happens in `get_user_by_req` and having it as a separate span means that the entity tag isn't added to the servlet spans, making it harder to search.
\| * \| \| \| \| \| \| \| \| \| \| \|	Kill off half-implemented password-reset via sms (#6101)	Richard van der Hoff	2019-09-26	1	-64/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doing a password reset via SMS has never worked, and in any case is a silly idea because msisdn recycling is a thing. See also matrix-org/matrix-doc#2303.
* \| \| \| \| \| \| \| \| \| \| \| \|	Do the update as a background index	Erik Johnston	2019-10-09	2	-9/+51
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Disable bytes usage with postgres	Erik Johnston	2019-10-08	3	-3/+10
\| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More often than not passing bytes to `txn.execute` is a bug (where we meant to pass a string) that just happens to work if `BYTEA_OUTPUT` is set to `ESCAPE`. However, this is a bit of a footgun so we want to instead error when this happens, and force using `bytearray` if we actually want to use bytes.
* \| \| \| \| \| \| \| \| \| \| \|	Fix existing hex encoded json values in DB	Erik Johnston	2019-10-08	1	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Fix inserting bytes as text	Erik Johnston	2019-10-08	1	-4/+2
\| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	1.4.0 v1.4.0 github/release-v1.4.0 release-v1.4.0	Andrew Morgan	2019-10-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Replace client_secret with <redacted> in server logs (#6158)	Andrew Morgan	2019-10-03	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace `client_secret` query parameter values with `<redacted>` in the logs. Prevents a scenario where a MITM of server traffic can horde 3pids on their account.
* \| \| \| \| \| \| \| \| \| \|	1.4.0rc2 v1.4.0rc2	Andrew Morgan	2019-10-02	1	-1/+1
\| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings	Erik Johnston	2019-10-02	2	-1/+19
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errors storing large retry intervals.
\| * \| \| \| \| \| \| \| \| \|	Fix errors storing large retry intervals.	Erik Johnston	2019-10-02	2	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have set the max retry interval to a value larger than a postgres or sqlite int can hold, which caused exceptions when updating the destinations table. To fix postgres we need to change the column to a bigint, and for sqlite we lower the max interval to 2**62 (which is still incredibly long).
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #6145 from matrix-org/erikj/fix_censored_redactions	Erik Johnston	2019-10-02	1	-0/+14
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Fix fetching censored redactions from DB
\| * \| \| \| \| \| \| \| \| \|	Fix fetching censored redactions from DB	Erik Johnston	2019-10-02	1	-0/+14
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetching a censored redactions caused an exception due to the code expecting redactions to have a `redact` key, which redacted redactions don't have.
* \| \| \| \| \| \| \| \| \|	Use `received_ts` to find uncensored redacted events	Erik Johnston	2019-10-01	1	-14/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Joining against `events` and ordering by `stream_ordering` is inefficient as it forced scanning the entirety of the redactions table. This isn't the case if we use `redactions.received_ts` column as we can then use an index.
* \| \| \| \| \| \| \| \| \|	Add received_ts column to redactions.	Erik Johnston	2019-10-01	3	-9/+92
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will allow us to efficiently search for uncensored redactions in the DB before a given time.
* \| \| \| \| \| \| \| \| \|	Don't repeatedly attempt to censor events we don't have.	Erik Johnston	2019-10-01	1	-1/+17
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we don't set `have_censored` column if we don't have the target event of a redaction, which means we repeatedly attempt to censor the same non-existant event. When we persist non-redacted events we unset the `have_censored` column for any redactions that target said event.
* \| \| \| \| \| \| \| \|	Fix `devices_last_seen` background update.	Erik Johnston	2019-09-30	3	-7/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #6134.
* \| \| \| \| \| \| \| \|	Fix 'redaction_retention_period' sampel config to match guidelines	Erik Johnston	2019-09-26	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Explicitly log when a homeserver does not have a trusted key server ↵	Neil Johnson	2019-09-26	2	-12/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configured (#6090)
* \| \| \| \| \| \| \|	bump version	Richard van der Hoff	2019-09-26	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix dummy event insertion consent bug (#6053)	Neil Johnson	2019-09-26	2	-30/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #5905
* \| \| \| \| \| \| \|	Update comments and docstring	Richard van der Hoff	2019-09-25	1	-4/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-09-25	19	-404/+1106
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/cleanup_user_ips_2
\| * \ \ \ \ \ \ \	Merge pull request #6089 from matrix-org/erikj/cleanup_user_ips	Erik Johnston	2019-09-25	2	-49/+99
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move last seen info into devices table
\| \| * \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-09-25	18	-400/+1104
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/cleanup_user_ips
\| \| * \| \| \| \| \| \| \| \|	Use if `is not None`	Erik Johnston	2019-09-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
\| * \| \| \| \| \| \| \| \| \|	Enable cleaning up extremities with dummy events by default to prevent undue ↵	Neil Johnson	2019-09-25	1	-3/+1
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	build up of forward extremities. (#5884)
\| * \| \| \| \| \| \| \| \|	Threepid validity checks on msisdns should not be dependent on ↵	Neil Johnson	2019-09-25	1	-29/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'threepid_behaviour_email'. (#6104) Fixes #6103
\| * \| \| \| \| \| \| \| \|	Stop advertising unsupported flows for registration (#6107)	Richard van der Hoff	2019-09-25	3	-4/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If email or msisdn verification aren't supported, let's stop advertising them for registration. Fixes #6100.
\| * \| \| \| \| \| \| \| \|	Refactor the user-interactive auth handling (#6105)	Richard van der Hoff	2019-09-25	3	-131/+248
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pull the checkers out to their own classes, rather than having them lost in a massive 1000-line class which does everything. This is also preparation for some more intelligent advertising of flows, as per #6100
\| * \| \| \| \| \| \| \| \|	Refactor code for calculating registration flows (#6106)	Richard van der Hoff	2019-09-25	1	-62/+62
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	because, frankly, it looked like it was written by an axe-murderer. This should be a non-functional change, except that where `m.login.dummy` was previously advertised before `m.login.terms`, it will now be advertised afterwards. AFAICT that should have no effect, and will be more consistent with the flows that involve passing a 3pid.
\| * \| \| \| \| \| \| \|	Merge pull request #6092 from ↵	Brendan Abolivier	2019-09-24	2	-6/+6
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/babolivier/background_update_deactivated_return Fix the return value in the users_set_deactivated_flag background job
\| \| * \| \| \| \| \| \| \|	Incorporate review	Brendan Abolivier	2019-09-24	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix logging	Brendan Abolivier	2019-09-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Typo	Brendan Abolivier	2019-09-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix the return value in the users_set_deactivated_flag background job	Brendan Abolivier	2019-09-23	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work	Richard van der Hoff	2019-09-24	4	-8/+72
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	remove unused parameter to get_user_id_by_threepid (#6099)	Richard van der Hoff	2019-09-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added in #5377, apparently in error
\| \| * \| \| \| \| \| \| \| \|	Merge pull request #6069 from matrix-org/rav/fix_attribute_mapping	Richard van der Hoff	2019-09-24	2	-7/+61
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a bug with saml attribute maps.
\| \| \| * \| \| \| \| \| \| \| \|	docstrings and comments	Richard van der Hoff	2019-09-24	1	-7/+21
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into rav/fix_attribute_mapping	Richard van der Hoff	2019-09-19	181	-2622/+6021
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \|	Fix a bug with saml attribute maps.	Richard van der Hoff	2019-09-19	2	-7/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes a bug where the default attribute maps were prioritised over user-specified ones, resulting in incorrect mappings. The problem is that if you call SPConfig.load() multiple times, it adds new attribute mappers to a list. So by calling it with the default config first, and then the user-specified config, we would always get the default mappers before the user-specified mappers. To solve this, let's merge the config dicts first, and then pass them to SPConfig.
\| \| * \| \| \| \| \| \| \| \| \| \|	Add sid to next_link for email validation (#6097)	J. Ryan Stinnett	2019-09-24	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work	Richard van der Hoff	2019-09-24	20	-196/+674
\| \|\\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Add submit_url response parameter to msisdn /requestToken (#6079)	Andrew Morgan	2019-09-23	2	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Second part of solving #6076 Fixes #6076 We return a submit_url parameter on calls to POST */msisdn/requestToken so that clients know where to submit token information to.
\| \| * \| \| \| \| \| \| \| \| \| \|	Add an unstable feature flag for separate add/bind 3pid APIs (#6044)	Andrew Morgan	2019-09-23	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a m.separate_add_and_bind flag set to True. See MSC2290's Backward Compatibility section for details.
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6064 from matrix-org/rav/saml_config_cleanup	Richard van der Hoff	2019-09-23	1	-51/+62
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the sample saml config closer to our standards
\| \| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'develop' into rav/saml_config_cleanup	Richard van der Hoff	2019-09-19	181	-2622/+6021
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / / / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Use the federation blacklist for requests to untrusted Identity Servers (#6000)	Andrew Morgan	2019-09-23	3	-4/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses a SimpleHttpClient instance equipped with the federation_ip_range_blacklist list for requests to identity servers provided by user input. Does not use a blacklist when contacting identity servers specified by account_threepid_delegates. The homeserver trusts the latter and we don't want to prevent homeserver admins from specifying delegates that are on internal IP addresses. Fixes #5935
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Add m.id_access_token to /versions unstable_features (MSC2264) (#5974)	Andrew Morgan	2019-09-23	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a flag to /versions' unstable_features section indicating that this Synapse understands what an id_access_token is, as per MSC2264. Fixes #5927
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Add m.require_identity_server to /versions unstable_flags (#5972)	Andrew Morgan	2019-09-23	1	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As MSC2263 states, m.require_identity_server must be set to false when it does not require an identity server to be provided by the client for the purposes of email registration or password reset. Adds an m.require_identity_server flag to /versionss unstable_flags section. This will advertise that Synapse no longer needs id_server as a parameter.
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Add POST submit_token endpoint for MSISDN (#6078)	Andrew Morgan	2019-09-23	2	-2/+79
\| \| \| \|_\|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First part of solving #6076
\| \| * \| \| \| \| \| \| \| \| \| \|	Implement MSC2290 (#6043)	Andrew Morgan	2019-09-23	5	-125/+202
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements MSC2290. This PR adds two new endpoints, /unstable/account/3pid/add and /unstable/account/3pid/bind. Depending on the progress of that MSC the unstable prefix may go away. This PR also removes the blacklist on some 3PID tests which occurs in #6042, as the corresponding Sytest PR changes them to use the new endpoints. Finally, it also modifies the account deactivation code such that it doesn't just try to deactivate 3PIDs that were bound to the user's account, but any 3PIDs that were bound through the homeserver on that user's account.
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge commit '33757bad1' into rav/saml_mapping_work	Richard van der Hoff	2019-09-20	1	-1/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	More better logging	Richard van der Hoff	2019-09-20	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into rav/saml_mapping_work	Richard van der Hoff	2019-09-19	181	-2622/+6021
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / \| \|/\| \| \| / / / / / / / / / \| \| \| \|_\|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	better logging	Richard van der Hoff	2019-09-19	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Record mappings from saml users in an external table	Richard van der Hoff	2019-09-13	5	-10/+250
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to assign unique mxids to saml users based on an incrementing suffix. For that to work, we need to record the allocated mxid in a separate table.
\| * \| \| \| \| \| \| \| \| \| \|	Make the sample saml config closer to our standards	Richard van der Hoff	2019-09-13	1	-51/+62
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It' still not great, thanks to the nested dictionaries, but it's better.
* \| \| \| \| \| \| \| \| \| \|	Review comments	Erik Johnston	2019-09-25	3	-6/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Prune rows in user_ips older than configured period	Erik Johnston	2019-09-24	2	-8/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Defaults to pruning everything older than 28d.
* \| \| \| \| \| \| \| \| \| \|	Add has_completed_background_update	Erik Johnston	2019-09-24	1	-1/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows checking if a specific background update has completed.
* \| \| \| \| \| \| \| \| \| \|	Add wrap_as_background_process decorator.	Erik Johnston	2019-09-24	1	-1/+28
\| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This does the same thing as `run_as_background_process` but means we don't need to create superfluous functions.
* \| \| \| \| \| \| \| \| \|	Query devices table for last seen info.	Erik Johnston	2019-09-23	1	-49/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a) simpler than querying user_ips directly and b) means we can purge older entries from user_ips without losing the required info. The storage functions now no longer return the access_token, since it was unused.
* \| \| \| \| \| \| \| \| \|	Add BG update to populate devices last seen info	Erik Johnston	2019-09-23	2	-0/+55
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Add last seen info to devices table.	Erik Johnston	2019-09-23	2	-0/+36
\| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to purge old user_ips entries without having to preserve the latest last seen info for active devices.
* \| \| \| \| \| \| \| \|	Disable /register/available if registration is disabled (#6082)	Andrew Morgan	2019-09-23	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #6066 This register endpoint should be disabled if registration is disabled, otherwise we're giving anyone the ability to check if a username exists on a server when we don't need to be. Error code is 403 (Forbidden) as that's the same returned by /register when registration is disabled.