11612 Commits

Author	SHA1	Message	Date
Michael Kaye	9eebc1e73b	use %r to __repr__ objects ... This avoids calculating __repr__ unless we are going to log.	2019-10-24 18:18:56 +01:00
Michael Kaye	f85b9842f0	Don't encode object as UTF-8 string if not needed. ... I believe that string formatting ~10-15 sized events will take a proportion of CPU time.	2019-10-24 18:08:45 +01:00
Michael Kaye	39266a9c9f	Make user/room stats log line less verbose.	2019-10-24 17:55:53 +01:00
Erik Johnston	3aa2a90556	Move schema delta files to the correct data store. ... They were put in the global schema delta directory due to a bad merge.	2019-10-24 16:45:03 +01:00
Andrew Morgan	8831b04a53	1.5.0rc1	2019-10-24 12:47:58 +01:00
Neil Johnson	2794b79052	Option to suppress resource exceeded alerting (#6173) ... The expected use case is to suppress MAU limiting on small instances	2019-10-24 11:48:46 +01:00
Andrew Morgan	92e88a71d3	Cleanup extra quotes from IDEs (#6236)	2019-10-23 16:49:05 +01:00
Erik Johnston	3ca4c7c516	Use new EventPersistenceStore	2019-10-23 16:15:03 +01:00
Erik Johnston	73cf63784b	Add DataStores and Storage classes.	2019-10-23 16:15:03 +01:00
Hubert Chathi	dc2cd6f79d	move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works with workers	2019-10-23 09:13:47 -04:00
Erik Johnston	22a9847670	Move persist_events out from main data store. ... This is in preparation for splitting out of state_groups_state from the main store into it own one, as persisting events depends on calculating state.	2019-10-23 13:29:44 +01:00
Andrew Morgan	409c62b27b	Add config linting script that checks for bool casing (#6203) ... 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.	2019-10-23 13:22:54 +01:00
Hubert Chathi	480eac30eb	black	2019-10-22 22:37:16 -04:00
Hubert Chathi	404e8c8532	vendor-prefix the EDU name until MSC1756 is merged into the spec	2019-10-22 22:33:23 -04:00
Hubert Chathi	1fabf82d50	update to work with newer code, and fix formatting	2019-10-22 21:44:58 -04:00
Hubert Chathi	41ad35b523	add missing param	2019-10-22 19:06:29 -04:00
Hubert Chathi	cfdb84422d	make black happy	2019-10-22 19:06:06 -04:00
Hubert Chathi	a1aaf3eea6	don't crash if the user doesn't have cross-signing keys	2019-10-22 19:04:37 -04:00
Hubert Chathi	8d3542a64e	implement federation parts of cross-signing	2019-10-22 19:04:35 -04:00
Erik Johnston	c17efdc01c	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_stores	2019-10-22 18:44:29 +01:00
Erik Johnston	23d62eded2	Clean up prepare_database.py a bit and add comments	2019-10-22 18:43:31 +01:00
Erik Johnston	6cc497f99b	Delete background_update table creation in main data_store	2019-10-22 18:02:50 +01:00
Erik Johnston	1bbc5444a8	Move README into synapse/storage/__init__.py	2019-10-22 17:59:31 +01:00
Hubert Chathi	2761731634	Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2 ... Cross-signing [3/4] -- uploading signatures edition	2019-10-22 17:05:06 +01:00
Erik Johnston	acf47c7698	Add a basic README to synapse.storage	2019-10-22 11:55:46 +01:00
Erik Johnston	bb6264be0b	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_stores	2019-10-22 10:41:18 +01:00
Erik Johnston	ffd24545bb	Fix schema management to work with multiple data stores.	2019-10-21 16:08:40 +01:00
Erik Johnston	c66a06ac6b	Move storage classes into a main "data store". ... This is in preparation for having multiple data stores that offer different functionality, e.g. splitting out state or event storage.	2019-10-21 16:05:06 +01:00
Neil Johnson	82c8799ec7	Set room version default to 5	2019-10-19 09:06:15 +01:00
Richard van der Hoff	93eaeec75a	Remove Auth.check method (#6217) ... This method was somewhat redundant, and confusing.	2019-10-18 19:43:36 +02:00
Hubert Chathi	36adfaedab	Merge branch 'develop' into cross-signing_sig_upload	2019-10-18 18:34:42 +01:00
Hubert Chathi	125eb45e19	fix doc strings	2019-10-18 16:56:16 +01:00
Hubert Chathi	0a9d22808c	Merge branch 'uhoreg/e2e_cross-signing_merged' into develop	2019-10-18 15:57:40 +01:00
Richard van der Hoff	2b22faded7	Merge remote-tracking branch 'origin/develop' into rav/event_auth/1	2019-10-18 12:35:13 +01:00
Richard van der Hoff	560c122267	Fix logging config for the docker image (#6197) ... 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.	2019-10-18 13:34:33 +02:00
Hubert Chathi	cfc28325a6	Merge branch 'develop' into uhoreg/e2e_cross-signing_merged	2019-10-18 11:39:40 +01:00
Brendan Abolivier	1ee97cbd01	Merge branch 'master' into develop	2019-10-18 11:00:43 +01:00
Hubert Chathi	f0f6a2b360	use the right function for when we're already in runInteraction	2019-10-18 10:56:54 +01:00
Erik Johnston	d98029ea89	Merge pull request #6196 from matrix-org/erikj/await ... Move rest/admin to use async/await.	2019-10-18 11:53:02 +02:00
Brendan Abolivier	41b9faed16	1.4.1	2019-10-18 10:15:12 +01:00
Richard van der Hoff	80003dfcd5	Merge remote-tracking branch 'origin/develop' into rav/event_auth/1	2019-10-18 10:11:40 +01:00
Erik Johnston	5859a5c569	Fix presence timeouts when synchrotron restarts. (#6212) ... * 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.	2019-10-18 06:42:26 +01:00
Richard van der Hoff	1ba359a11f	rip out some unreachable code ... The only possible rejection reason is AUTH_ERROR, so all of this is unreachable.	2019-10-17 21:45:59 +01:00
Richard van der Hoff	70d9759cdf	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](5b0e9948ea)) -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEv27Axt/F4vrTL/8QOSor00I9eP8FAl2oj9sACgkQOSor00I9 eP+ZQQf9GQbjQhq92G1Mt1dI3HxXQnIvelGWaLC9rB++eGcafBkP0EJgCbQZTKda WntghJib0oWVHVtPbwYKtwF3z365WbME3awO6RpRoMvrFL5PDqJ8Ma5LUgJ6/GuO yDBfABbZk7PVS5WibftXXqibK8MkSrnId57VN3tc/SUHj3DGe4vk+A7plwjNckBj 2SLUA8DPw5I3Y4Z6peb6VweEA8M59+i3/0cZFAJ+4Ofy2Jad3z8kVXmJ1gTjBOdG 1bjBfnS2SrZLZwD79zJzaUR0zxfIvj62mL/fjrtR66oRmKF2T+9UnM7+9gH9JHWZ ct3Mk4Nnr4VaBBWOWOcD2btvByckug== =9lJk -----END PGP SIGNATURE----- Merge tag 'v1.4.1rc1' into develop 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](5b0e9948ea))	2019-10-17 17:03:02 +01:00
Richard van der Hoff	71cd3fed66	1.4.1rc1	2019-10-17 16:40:56 +01:00
Erik Johnston	5b0e9948ea	Do the update as a background index	2019-10-17 16:31:42 +01:00
Erik Johnston	a2bb50c2eb	Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets ... Fix inserting bytes as text in `censor_redactions`	2019-10-17 16:29:07 +01:00
Hubert Chathi	06fc66c81e	Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage ... make storage layer in charge of interpreting the device key data	2019-10-11 15:19:06 -04:00
Hubert Chathi	132b251e29	expand on comment	2019-10-11 14:24:52 -04:00
Erik Johnston	2e97a4c197	Port synapse/rest/client/_base.py to async/await	2019-10-11 15:29:26 +01:00
Erik Johnston	3c2d6c708c	Add maybe_awaitable and fix __init__ bugs	2019-10-11 15:26:09 +01:00
Hubert Chathi	691dd67fcd	Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version ... make version optional in body of e2e backup version update	2019-10-11 10:11:59 -04:00
Erik Johnston	6f5c6c8f60	Merge pull request #6195 from matrix-org/erikj/opentracing_preview_url ... Trace non-JSON APIs, /media, /key etc	2019-10-11 13:23:52 +01:00
Valérian Rousset	be9b55e0d2	cas: support setting display name (#6114) ... Now, the CAS server can return an attribute stating what's the desired displayname, instead of using the username directly.	2019-10-11 12:33:12 +01:00
Erik Johnston	dfbb62c28d	Port synaps/rest/client/users.py to async/await	2019-10-11 12:21:40 +01:00
Erik Johnston	f95325e22a	Port synaps/rest/client/server_notice_servlet.py to async/await	2019-10-11 12:21:40 +01:00
Erik Johnston	281f887090	Port synaps/rest/client/media.py to async/await	2019-10-11 12:21:40 +01:00
Erik Johnston	fca3a541e7	Port rest/admin/__init__.py to async/await	2019-10-11 12:17:52 +01:00
Erik Johnston	f3ceaf4323	Trace non-JSON APIs, /media, /key etc	2019-10-11 11:58:52 +01:00
Neil Johnson	a0d0ba7862	Fix MAU reaping where reserved users are specified. (#6168)	2019-10-11 09:38:26 +01:00
Hubert Chathi	7a0dce9259	make sure we actually return something	2019-10-10 20:31:30 -04:00
Hubert Chathi	4908fb3b30	make storage layer in charge of interpreting the device key data	2019-10-10 19:15:30 -04:00
Erik Johnston	83d86106a8	Merge pull request #6156 from matrix-org/erikj/postgres_any ... Use Postgres ANY for selecting many values.	2019-10-10 16:41:36 +01:00
Erik Johnston	b54b1e759a	Fix SQLite take 2	2019-10-10 16:19:40 +01:00
Erik Johnston	afb6d9d53b	Fix SQLite	2019-10-10 15:55:41 +01:00
Erik Johnston	3bc687508f	Remove add_in_list_sql_clause	2019-10-10 15:35:46 +01:00
Erik Johnston	ca3e01e50d	Fix store_url_cache using bytes	2019-10-10 14:52:29 +01:00
Erik Johnston	9d06fb9cb1	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/postgres_any	2019-10-10 14:38:21 +01:00
Erik Johnston	8bc529c04d	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sql_bytes	2019-10-10 14:30:51 +01:00
Erik Johnston	933034e2fe	Merge pull request #6127 from matrix-org/erikj/patch_inner ... Add more log context checks when patching inlineCallbacks	2019-10-10 13:47:50 +01:00
Erik Johnston	fe1c1e6c28	Fixup comments ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-10-10 13:17:19 +01:00
Erik Johnston	b161786c14	Replace IN usage with helper funcs	2019-10-10 13:15:49 +01:00
Erik Johnston	b4fbf71187	Add helper funcs to use postgres ANY ... This means that we can write queries with `col = ANY(?)`, which helps postgres.	2019-10-10 13:15:24 +01:00
Erik Johnston	91f43dca39	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sql_bytes	2019-10-10 13:10:57 +01:00
werner291	b5b03b7079	Add domain validation when creating room with list of invitees (#6121)	2019-10-10 13:05:48 +01:00
Michael Telatynski	9a84d74417	before fulfilling a group invite,check if user is already joined/invited (#3436) ... Fixes vector-im/riot-web#5645	2019-10-10 13:03:44 +01:00
krombel	2efd050c9d	send 404 as http-status when filter-id is unknown to the server (#2380) ... 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.	2019-10-10 12:59:55 +01:00
Erik Johnston	59e0ed8306	Fix py3.5	2019-10-10 12:47:07 +01:00
Erik Johnston	c349e3ebaf	Fix py3.5	2019-10-10 12:29:38 +01:00
Erik Johnston	f735aeec65	sort	2019-10-10 12:20:29 +01:00
Erik Johnston	941edad583	Appease mypy	2019-10-10 12:15:17 +01:00
Erik Johnston	791a8c559b	Add coments	2019-10-10 11:53:57 +01:00
Erik Johnston	9970f955ce	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner	2019-10-10 11:51:50 +01:00
Richard van der Hoff	a139420a3c	Fix races in room stats (and other) updates. (#6187) ... 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.	2019-10-10 11:29:01 +01:00
Richard van der Hoff	562b4e51dd	Rewrite the user_filter migration again (#6184) ... you can't plausibly ALTER TABLE in sqlite, so we create the new table with the right schema to start with.	2019-10-10 11:28:23 +01:00
Erik Johnston	128d5948c4	Fix packaging	2019-10-10 11:16:26 +01:00
Erik Johnston	ec0596f2ab	Log correct context	2019-10-10 11:11:38 +01:00
Erik Johnston	3e4272961a	Test for sentinel commit	2019-10-10 10:58:32 +01:00
Erik Johnston	1d6dd1c294	Move patch_inline_callbacks into synapse/	2019-10-10 10:53:06 +01:00
Andrew Morgan	da815c1f69	Move tag/push rules room upgrade checking ealier (#6155) ... 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).	2019-10-10 10:06:45 +01:00
Amber Brown	f743108a94	Refactor HomeserverConfig so it can be typechecked (#6137)	2019-10-10 09:39:35 +01:00
Hubert Chathi	4535a07f4a	make version optional in body of e2e backup version update ... to agree with latest version of the MSC	2019-10-09 17:54:03 -04:00
Erik Johnston	5c1f886c75	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner	2019-10-09 16:52:21 +01:00
Erik Johnston	7f18b3d526	Do the update as a background index	2019-10-09 16:03:24 +01:00
Erik Johnston	def5413480	Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets ... Fix inserting bytes as text in `censor_redactions`	2019-10-09 15:39:13 +01:00
Brendan Abolivier	59d6290ed9	Merge pull request #6178 from matrix-org/babolivier/factor_out_bg_updates ... Factor out backgroung updates	2019-10-09 12:29:01 +01:00
Erik Johnston	1d3858371e	Disable bytes usage with postgres ... 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.	2019-10-08 16:28:57 +01:00
Erik Johnston	e7631d84e6	Fix existing hex encoded json values in DB	2019-10-08 16:18:43 +01:00
Erik Johnston	ced4784592	Fix inserting bytes as text	2019-10-08 16:18:43 +01:00
Brendan Abolivier	c69324ffb5	Fix RegistrationStore	2019-10-08 14:48:33 +01:00
Brendan Abolivier	b1c0a4ceb3	Cleanup client_ips	2019-10-08 14:38:14 +01:00
Brendan Abolivier	8f1b385acc	Don't end up with 4 classes in registration	2019-10-08 14:36:33 +01:00
Anshul Angaria	474abf1eb6	add M_TOO_LARGE error code for uploading a too large file (#6151) ... Fixes #6109	2019-10-08 13:55:16 +01:00
Andrew Morgan	ea7d938bca	Remove unused public room list timeout param (#6179) ... * Remove unused public room list timeout param * Add changelog	2019-10-08 13:51:25 +01:00
Richard van der Hoff	b94a401852	Fix /federation/v1/state for recent room versions (#6170) ... * 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.	2019-10-08 09:35:37 +01:00
Brendan Abolivier	66ebea1723	Lint	2019-10-07 17:44:41 +01:00
Brendan Abolivier	0496eafbf4	Move roommember's bg updates to a dedicated store	2019-10-07 17:35:01 +01:00
Brendan Abolivier	e106a0e4db	Move user_directory's bg updates to a dedicated store	2019-10-07 17:34:45 +01:00
Brendan Abolivier	cfccd2d78a	Move state's bg updates to a dedicated store	2019-10-07 17:34:39 +01:00
Brendan Abolivier	841054ad96	Move search's bg updates to a dedicated store	2019-10-07 17:34:35 +01:00
Brendan Abolivier	81e6ffb536	Move registration's bg updates to a dedicated store	2019-10-07 17:34:29 +01:00
Brendan Abolivier	54f87e0734	Move media_repository's bg updates to a dedicated store	2019-10-07 17:34:26 +01:00
Brendan Abolivier	cef9f6753e	Move devices's bg updates to a dedicated store	2019-10-07 17:34:20 +01:00
Brendan Abolivier	2d3b4f42f0	Move deviceinbox's bg updates to a dedicated store	2019-10-07 17:34:16 +01:00
Brendan Abolivier	88957199e7	Move client_ips's bg updates to a dedicated store	2019-10-07 17:34:12 +01:00
Erik Johnston	2cb7466993	Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failure ... Don't regenerate numeric user ID if registration fails.	2019-10-07 16:56:23 +01:00
Michael Kaye	dc795ba709	Log responder we are using. (#6139) ... This prevents us logging "Responding to media request with responder %s".	2019-10-07 15:41:25 +01:00
Richard van der Hoff	276ae5c63e	add some logging to the rooms stats updates, to try to track down a flaky test (#6167)	2019-10-07 14:41:39 +01:00
Brendan Abolivier	97e2722723	Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_index ... Fix unique_user_filter_index schema update	2019-10-07 13:48:43 +01:00
Brendan Abolivier	c8e6c308c6	Fix unique_user_filter_index schema update	2019-10-07 13:15:35 +01:00
Erik Johnston	86f4705866	Merge pull request #6159 from matrix-org/erikj/cache_memberships ... Cache room membership lookups in _get_joined_users_from_context	2019-10-07 13:15:00 +01:00
Erik Johnston	5119a4cac7	Fix bug where we didn't pull out event ID	2019-10-07 12:21:17 +01:00
Brendan Abolivier	ae0b78cb1f	Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revoked ... Don't 500 when trying to exchange a revoked 3PID invite	2019-10-04 12:09:05 +01:00
Brendan Abolivier	21d51ab598	Typo	2019-10-04 11:21:24 +01:00
Brendan Abolivier	4676732ca0	Lint	2019-10-04 11:18:28 +01:00
Brendan Abolivier	81d51ce48b	Incorporate review	2019-10-04 11:16:19 +01:00
Alexander Maznev	13c4345c84	Update user_filters table to have a unique index, and non-null columns (#1172)	2019-10-04 10:34:16 +01:00
Robert Swain	39b40d6d99	media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142) ... 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.	2019-10-04 09:34:52 +01:00
Erik Johnston	6511071837	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cache_memberships	2019-10-03 17:51:06 +01:00
Richard van der Hoff	66537e10ce	add some metrics on the federation sender (#6160)	2019-10-03 17:47:20 +01:00
Erik Johnston	ab8a64772b	Remove unused variable	2019-10-03 17:42:32 +01:00
Erik Johnston	693156aaf4	Don't regenerate numeric user ID if registration fails. ... This causes huge amounts of DB IO if registrations start to fail e.g. because the DB is struggling with IO.	2019-10-03 17:33:54 +01:00
Erik Johnston	91f61fc6d7	Use the right error....	2019-10-03 17:28:31 +01:00
Erik Johnston	84691da6c3	pep8	2019-10-03 17:27:18 +01:00
Erik Johnston	a9610cdf02	Fixup names and comments	2019-10-03 17:26:56 +01:00
Erik Johnston	d89ebf7c25	cachedList descriptor doesn't like typing	2019-10-03 17:23:11 +01:00
Erik Johnston	c8145af8a9	Cache room membership lookups in _get_joined_users_from_context	2019-10-03 17:11:04 +01:00
Andrew Morgan	6018bec919	Merge branch 'master' into develop	2019-10-03 13:48:45 +01:00
Andrew Morgan	ecb69d824a	1.4.0	2019-10-03 13:22:44 +01:00
Andrew Morgan	0f46bf5737	Replace client_secret with <redacted> in server logs (#6158) ... 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.	2019-10-03 12:57:26 +01:00
Brendan Abolivier	6527fa18c1	Add test case	2019-10-03 11:24:36 +01:00
Erik Johnston	dca7e32d3d	Merge pull request #6154 from matrix-org/erikj/fix_appservice_pagination ... Fix appservice room list pagination	2019-10-02 16:50:32 +01:00
Erik Johnston	22a6ffdf91	Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatable ... Fix not showing non-federatable rooms to remote room list queries	2019-10-02 16:09:15 +01:00
Erik Johnston	5d8ffdfe61	Merge pull request #6148 from matrix-org/erikj/find_next_generated ... Bound find_next_generated_user_id DB query.	2019-10-02 16:09:02 +01:00
Erik Johnston	7a5f080f91	Fix appservice room list pagination	2019-10-02 15:47:22 +01:00
Erik Johnston	4c4f44930d	Fix not showing non-federatable rooms to remote room list queries	2019-10-02 15:20:36 +01:00
Erik Johnston	03cf4385e0	Fix public room list pagination. ... 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.	2019-10-02 15:11:17 +01:00
Erik Johnston	a5166e4d5f	Land improved room list based on room stats (#6019) ... Use room_stats and room_state for room directory search	2019-10-02 14:08:35 +01:00
Andrew Morgan	aec1377d0b	1.4.0rc2	2019-10-02 13:55:00 +01:00
Amber Brown	864f144543	Fix up some typechecking (#6150) ... * type checking fixes * changelog	2019-10-02 05:29:01 -07:00
Brendan Abolivier	972c9f65d7	Lint	2019-10-02 12:17:46 +01:00
Andrew Morgan	2a1470cd05	Fix yields and copy instead of move push rules on room upgrade (#6144) ... 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.	2019-10-02 12:04:22 +01:00
Erik Johnston	d69fd53f74	Bound find_next_generated_user_id DB query. ... We can easily bound the set of user IDs we pull out of the DB, so lets do that.	2019-10-02 11:45:31 +01:00
Brendan Abolivier	5705ecaec6	Don't 500 code when trying to exchange a revoked 3PID invite ... 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.	2019-10-02 11:19:43 +01:00
Erik Johnston	ecd254bc49	Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop	2019-10-02 11:08:07 +01:00
Erik Johnston	b4fe7e19c0	Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings ... Fix errors storing large retry intervals.	2019-10-02 11:05:22 +01:00
Erik Johnston	35f392bb29	Merge pull request #6145 from matrix-org/erikj/fix_censored_redactions ... Fix fetching censored redactions from DB	2019-10-02 10:57:30 +01:00
Erik Johnston	f44f1d2e83	Fix errors storing large retry intervals. ... 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).	2019-10-02 10:36:27 +01:00
Erik Johnston	ce7a3e7e27	Fix fetching censored redactions from DB ... Fetching a censored redactions caused an exception due to the code expecting redactions to have a `redact` key, which redacted redactions don't have.	2019-10-02 10:14:01 +01:00
Erik Johnston	5e8387af9e	Use received_ts to find uncensored redacted events ... 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.	2019-10-01 13:43:48 +01:00
Erik Johnston	898dde981b	Add received_ts column to redactions. ... This will allow us to efficiently search for uncensored redactions in the DB before a given time.	2019-10-01 13:43:48 +01:00
Erik Johnston	a27fb7d5ca	Don't repeatedly attempt to censor events we don't have. ... 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.	2019-10-01 11:05:48 +01:00
Erik Johnston	1d349fb159	Merge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/synapse into develop	2019-10-01 10:17:24 +01:00
Erik Johnston	9267741a5f	Fix devices_last_seen background update. ... Fixes #6134.	2019-09-30 11:58:36 +01:00
Richard van der Hoff	16cb9a71b8	Drop unused tables (#6115) ... These tables are unused since #5893 (as amended by #6047), so we can now drop them. Fixes #6048.	2019-09-30 09:38:41 +01:00
Andrew Morgan	f3451118a6	Edit SimpleHttpClient to reference that header keys can be passed as str or bytes (#6077)	2019-09-27 17:59:18 +01:00
Brendan Abolivier	3e42d47a5a	Incorporate review	2019-09-27 16:15:01 +01:00
Brendan Abolivier	af92110c46	Update synapse/handlers/deactivate_account.py ... Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>	2019-09-27 16:12:15 +01:00
Brendan Abolivier	bbe2a0f339	Update synapse/handlers/deactivate_account.py ... Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>	2019-09-27 16:10:36 +01:00
Brendan Abolivier	873fe7883c	Lint	2019-09-27 15:21:03 +01:00
Brendan Abolivier	72a2708ac6	Fixup and add some logging	2019-09-27 15:13:39 +01:00
Erik Johnston	132279a46f	Patch inlinecallbacks for log contexts	2019-09-27 15:11:14 +01:00
Brendan Abolivier	5257a2fb1c	Reject pending invites on deactivation	2019-09-27 14:49:53 +01:00
Andrew Morgan	8c27bc8b60	Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978) ... Just to have all the methods that make calls to identity services in one place.	2019-09-27 10:36:20 +01:00
Erik Johnston	67ee18daea	Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-span ... Add some helpful opentracing tags and remove get_user_by_req span	2019-09-27 10:02:57 +01:00
Erik Johnston	3423633d50	Fix 'redaction_retention_period' sampel config to match guidelines	2019-09-26 16:43:52 +01:00
Richard van der Hoff	54569c787b	Kill off half-implemented password-reset via sms (#6101) ... 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.	2019-09-26 15:38:25 +01:00
Neil Johnson	8b8f8c7b3c	Explicitly log when a homeserver does not have a trusted key server configured (#6090)	2019-09-26 12:57:01 +01:00
Richard van der Hoff	2927c6bc4c	bump version	2019-09-26 12:29:59 +01:00
Neil Johnson	034db2ba21	Fix dummy event insertion consent bug (#6053) ... Fixes #5905	2019-09-26 11:47:53 +01:00
Richard van der Hoff	a96318127d	Update comments and docstring	2019-09-25 18:17:39 +01:00
Erik Johnston	4fb3c129aa	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips_2	2019-09-25 17:53:13 +01:00
Erik Johnston	9614d3c9d1	Merge pull request #6089 from matrix-org/erikj/cleanup_user_ips ... Move last seen info into devices table	2019-09-25 17:42:39 +01:00
Neil Johnson	a4f3ca48b5	Enable cleaning up extremities with dummy events by default to prevent undue build up of forward extremities. (#5884)	2019-09-25 17:27:35 +01:00
Erik Johnston	39b50ad42a	Review comments	2019-09-25 17:22:33 +01:00
Erik Johnston	d2bd0bc6b1	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips	2019-09-25 17:16:28 +01:00
Erik Johnston	50572db837	Use if is not None ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-09-25 17:00:23 +01:00
Neil Johnson	77dc7093a7	Threepid validity checks on msisdns should not be dependent on 'threepid_behaviour_email'. (#6104) ... Fixes #6103	2019-09-25 12:29:35 +01:00
Richard van der Hoff	990928abde	Stop advertising unsupported flows for registration (#6107) ... If email or msisdn verification aren't supported, let's stop advertising them for registration. Fixes #6100.	2019-09-25 12:10:26 +01:00
Erik Johnston	dc2c97e1a3	isort	2019-09-25 11:59:05 +01:00
Erik Johnston	dc01cad690	Add device and appservice tags	2019-09-25 11:59:00 +01:00
Erik Johnston	5d99713854	Add tags for event_id and txn_id in event sending ... This will make it easier to search for sending event requests.	2019-09-25 11:39:15 +01:00
Richard van der Hoff	2cd98812ba	Refactor the user-interactive auth handling (#6105) ... 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	2019-09-25 11:33:03 +01:00
Erik Johnston	fde4ce2213	Don't create new span for get_user_by_req ... 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.	2019-09-25 11:32:41 +01:00
Richard van der Hoff	8004d6ca2f	Refactor code for calculating registration flows (#6106) ... 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.	2019-09-25 11:32:05 +01:00
Hubert Chathi	c3635c9459	make isort happy	2019-09-24 16:21:03 -04:00
Hubert Chathi	f4b6d43ec3	add some comments	2019-09-24 16:19:54 -04:00
Hubert Chathi	39864f45ec	drop some logger lines to debug	2019-09-24 15:26:45 -04:00
Hubert Chathi	26113fb7de	make changes based on PR feedback	2019-09-24 14:12:20 -04:00
Brendan Abolivier	f99a9c9cb0	Merge pull request #6092 from matrix-org/babolivier/background_update_deactivated_return ... Fix the return value in the users_set_deactivated_flag background job	2019-09-24 17:11:12 +01:00
Richard van der Hoff	9b7c4f4078	Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work	2019-09-24 17:03:50 +01:00
Richard van der Hoff	566ac40939	remove unused parameter to get_user_id_by_threepid (#6099) ... Added in #5377, apparently in error	2019-09-24 17:01:09 +01:00
Erik Johnston	242017db8b	Prune rows in user_ips older than configured period ... Defaults to pruning everything older than 28d.	2019-09-24 15:53:17 +01:00
Erik Johnston	2135c198d1	Add has_completed_background_update ... This allows checking if a specific background update has completed.	2019-09-24 15:53:17 +01:00
Erik Johnston	367158a609	Add wrap_as_background_process decorator. ... This does the same thing as `run_as_background_process` but means we don't need to create superfluous functions.	2019-09-24 15:53:17 +01:00
Richard van der Hoff	bb82be9851	Merge pull request #6069 from matrix-org/rav/fix_attribute_mapping ... Fix a bug with saml attribute maps.	2019-09-24 15:07:26 +01:00
Brendan Abolivier	12fe2a29bc	Incorporate review	2019-09-24 14:43:38 +01:00
J. Ryan Stinnett	40fb00f5b7	Add sid to next_link for email validation (#6097)	2019-09-24 14:39:50 +01:00
Brendan Abolivier	f02f14e09a	Fix logging	2019-09-24 14:39:07 +01:00
Richard van der Hoff	ed8b92f0d2	Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work	2019-09-24 12:57:32 +01:00
Richard van der Hoff	a25b66d3f9	docstrings and comments	2019-09-24 11:15:08 +01:00
Andrew Morgan	50776261e1	Add submit_url response parameter to msisdn /requestToken (#6079) ... 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.	2019-09-23 21:21:03 +01:00
Andrew Morgan	2b071a2ff1	Add an unstable feature flag for separate add/bind 3pid APIs (#6044) ... Add a m.separate_add_and_bind flag set to True. See MSC2290's Backward Compatibility section for details.	2019-09-23 20:46:34 +01:00
Richard van der Hoff	78e8ec368e	Merge pull request #6064 from matrix-org/rav/saml_config_cleanup ... Make the sample saml config closer to our standards	2019-09-23 20:36:51 +01:00
Andrew Morgan	e08ea43463	Use the federation blacklist for requests to untrusted Identity Servers (#6000) ... 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	2019-09-23 20:23:20 +01:00
Andrew Morgan	1ea3ed7620	Add m.id_access_token to /versions unstable_features (MSC2264) (#5974) ... Adds a flag to /versions' unstable_features section indicating that this Synapse understands what an id_access_token is, as per MSC2264. Fixes #5927	2019-09-23 20:19:25 +01:00
Andrew Morgan	b38aa82b83	Add m.require_identity_server to /versions unstable_flags (#5972) ... 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.	2019-09-23 18:52:43 +01:00
Andrew Morgan	2c99c63453	Add POST submit_token endpoint for MSISDN (#6078) ... First part of solving #6076	2019-09-23 17:49:00 +01:00
Brendan Abolivier	323d685bf7	Typo	2019-09-23 17:23:49 +01:00
Brendan Abolivier	2858d10671	Fix the return value in the users_set_deactivated_flag background job	2019-09-23 17:22:01 +01:00
Erik Johnston	51d28272e2	Query devices table for last seen info. ... 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.	2019-09-23 16:59:45 +01:00
Erik Johnston	ed80231ade	Add BG update to populate devices last seen info	2019-09-23 16:59:45 +01:00
Erik Johnston	2ade05dca3	Add last seen info to devices table. ... This allows us to purge old user_ips entries without having to preserve the latest last seen info for active devices.	2019-09-23 16:59:35 +01:00
Andrew Morgan	30af161af2	Implement MSC2290 (#6043) ... 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.	2019-09-23 16:50:27 +01:00
Andrew Morgan	1b519e0272	Disable /register/available if registration is disabled (#6082) ... 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.	2019-09-23 15:38:38 +01:00
Andrew Morgan	1c9feadf4b	Generalize email sending logging (#6075) ... In ancient times Synapse would only send emails when it was notifying a user about a message they received... Now it can do all sorts of neat things! Change the logging so it's not just about notifications.	2019-09-23 14:38:19 +01:00
Andrew Morgan	885a4726b7	Return timeout error to user for identity server calls (#6073)	2019-09-23 14:37:23 +01:00
Richard van der Hoff	0660f8e367	Merge pull request #6072 from matrix-org/rav/fix_retry_reset ... Fix exception when resetting retry timings	2019-09-23 14:31:47 +01:00
Matthew Hodgson	7ef319aefe	fix broken copyrights	2019-09-23 12:28:01 +01:00
Andrew Morgan	df3401a71d	Allow HS to send emails when adding an email to the HS (#6042)	2019-09-20 15:21:30 +01:00
Andrew Morgan	7763dd3e95	Remove trailing slash ability from password reset's submit_token endpoint (#6074) ... Remove trailing slash ability from the password reset submit_token endpoint. Since we provide the link in an email, and have never sent it with a trailing slash, there's no point for us to accept them on the endpoint.	2019-09-20 14:58:37 +01:00
Richard van der Hoff	9d94313209	Fix exception when resetting retry timings ... Fixes: > TypeError: set_destination_retry_timings() missing 1 required positional argument: 'retry_interval' Introduced in #6016.	2019-09-20 12:09:39 +01:00
Richard van der Hoff	366dc7d2d4	Merge commit '33757bad1' into rav/saml_mapping_work	2019-09-20 11:21:40 +01:00
Richard van der Hoff	33757bad19	More better logging	2019-09-20 11:20:02 +01:00
Andrew Morgan	aeb40f355c	Ensure email validation link parameters are URL-encoded (#6063) ... The validation links sent via email had their query parameters inserted without any URL-encoding. Surprisingly this didn't seem to cause any issues, but if a user were to put a `/` in their client_secret it could lead to problems.	2019-09-20 10:46:59 +01:00
Andrew Morgan	3ac614eb6c	Drop support for bind param on POST /account/3pid (MSC2290) (#6067) ... As per [MSC2290](https://github.com/matrix-org/matrix-doc/pull/2290/files#diff-05cde9463e9209b701312b3baf2fb2ebR151), we're dropping the bind parameter from `/account/3pid`. This endpoint can now only be used for adding threepid's to the user's account on the homeserver.	2019-09-20 10:46:34 +01:00
J. Ryan Stinnett	36015d68ef	Use unstable prefix for 3PID unbind API (#6062)	2019-09-19 22:28:29 +01:00
Richard van der Hoff	284e1cb027	Merge branch 'develop' into rav/fix_attribute_mapping	2019-09-19 20:32:25 +01:00
Richard van der Hoff	b74606ea22	Fix a bug with saml attribute maps. ... 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.	2019-09-19 20:32:14 +01:00
Richard van der Hoff	b65327ff66	Merge branch 'develop' into rav/saml_mapping_work	2019-09-19 18:13:31 +01:00
Richard van der Hoff	7423fade92	better logging	2019-09-19 17:16:50 +01:00
Richard van der Hoff	bcd9132869	Undo the deletion of some tables (#6047) ... This is a partial revert of #5893. The problem is that if we drop these tables in the same release as removing the code that writes to them, it prevents users users from being able to roll back to a previous release. So let's leave the tables in place for now, and remember to drop them in a subsequent release. (Note that these tables haven't been *read* for *years*, so any missing rows resulting from a temporary upgrade to vNext won't cause a problem.)	2019-09-19 15:06:27 +01:00
Richard van der Hoff	b789c7eb03	Merge branch 'develop' into rav/saml_config_cleanup	2019-09-19 15:05:31 +01:00
Andrew Morgan	62e3ff92fd	Remove POST method from password reset submit_token endpoint (#6056) ... Removes the POST method from `/password_reset/<medium>/submit_token/` as it's only used by phone number verification which Synapse does not support yet.	2019-09-19 10:53:14 +01:00
Jorik Schellekens	38fd1f8e3f	Fix typo in account_threepid_delegates config (#6028)	2019-09-18 22:30:44 +01:00
J. Ryan Stinnett	a86a290850	Fix logcontext spam on non-Linux platforms (#6059) ... This checks whether the current platform supports thread resource usage tracking before logging a warning to avoid log spam. Fixes https://github.com/matrix-org/synapse/issues/6055	2019-09-18 21:55:37 +01:00
Andrew Morgan	6670bd4072	v2 3PID Invites (part of MSC2140) (#5979) ... 3PID invites require making a request to an identity server to check that the invited 3PID has an Matrix ID linked, and if so, what it is. These requests are being made on behalf of a user. The user will supply an identity server and an access token for that identity server. The homeserver will then forward this request with the access token (using an `Authorization` header) and, if the given identity server doesn't support v2 endpoints, will fall back to v1 (which doesn't require any access tokens). Requires: ~~#5976~~	2019-09-17 18:05:13 +01:00
dstipp	379d2a8c39	(#5849) Convert rst to markdown (#6040) ... Converting some of the rst documentation to markdown. Attempted to preserve whitespace and line breaks to minimize cosmetic change.	2019-09-17 12:55:29 +01:00
Erik Johnston	70c52821ce	Fix race condition in room stats. (#6029) ... Broke in #5971 Basically the bug is that if get_current_state_deltas returns no new updates and we then take the max pos, its possible that we miss an update that happens in between the two calls. (e.g. get_current_state_deltas looks up to stream pos 5, then an event persists and so getting the max stream pos returns 6, meaning that next time we check for things with a stream pos bigger than 6)	2019-09-17 12:41:23 +01:00
Richard van der Hoff	1e19ce00bf	Add 'failure_ts' column to 'destinations' table (#6016) ... Track the time that a server started failing at, for general analysis purposes.	2019-09-17 11:41:54 +01:00
Amber Brown	850dcfd2d3	Fix well-known lookups with the federation certificate whitelist (#5997)	2019-09-14 04:58:38 +10:00
Richard van der Hoff	a8ac40445c	Record mappings from saml users in an external table ... 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.	2019-09-13 16:01:46 +01:00
Richard van der Hoff	785cbd3999	Make the sample saml config closer to our standards ... It' still not great, thanks to the nested dictionaries, but it's better.	2019-09-13 12:07:03 +01:00
Amber Brown	b617864cd9	Fix for structured logging tests stomping on logs (#6023)	2019-09-13 02:29:55 +10:00
Richard van der Hoff	3d882a7ba5	Remove the cap on federation retry interval. (#6026) ... Essentially the intention here is to end up blacklisting servers which never respond to federation requests. Fixes https://github.com/matrix-org/synapse/issues/5113.	2019-09-12 13:00:13 +01:00
Richard van der Hoff	0388beafe4	Fix bug in calculating the federation retry backoff period (#6025) ... This was intended to introduce an element of jitter; instead it gave you a 30/60 chance of resetting to zero.	2019-09-12 12:59:43 +01:00
David Baker	642fad8bd4	Fix SSO fallback login ... Well, it worked, but forgot to remove the thing saying login was unavailable.	2019-09-12 11:42:47 +01:00
Sorunome	dd2e5b0038	add report_stats_endpoint config option (#6012) ... This PR adds the optional `report_stats_endpoint` to configure where stats are reported to, if enabled.	2019-09-12 11:24:57 +01:00
Jorik Schellekens	a8251da10f	Blow up config if opentracing is missing (#5985) ... * Blow up config if opentracing is missing	2019-09-12 10:57:37 +01:00
Jason Robinson	6d847d8ce6	Ensure support users can be registered even if MAU limit is reached ... This allows support users to be created even on MAU limits via the admin API. Support users are excluded from MAU after creation, so it makes sense to exclude them in creation - except if the whole host is in disabled state. Signed-off-by: Jason Robinson <jasonr@matrix.org>	2019-09-11 20:48:31 +03:00
Andrew Morgan	9fc71dc5ee	Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976) ... This is a redo of https://github.com/matrix-org/synapse/pull/5897 but with `id_access_token` accepted. Implements [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134) plus Identity Service v2 authentication ala [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140). Identity lookup-related functions were also moved from `RoomMemberHandler` to `IdentityHandler`.	2019-09-11 16:02:42 +01:00
Erik Johnston	cbcbfe64a2	Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction ... Allow use of different ratelimits for admin redactions.	2019-09-11 15:39:38 +01:00
Richard van der Hoff	7902bf1e1d	Clean up some code in the retry logic (#6017) ... * remove some unused code * make things which were constants into constants for efficiency and clarity	2019-09-11 15:14:56 +01:00
Andrew Morgan	9c555f37e3	Add note about extra arg to send_membership_event, remove arg in remote_reject_invite (#6009) ... Some small fixes to `room_member.py` found while doing other PRs. 1. Add requester to the base `_remote_reject_invite` method. 2. `send_membership_event`'s docstring was out of date and took in a `remote_room_hosts` arg that was not used and no calling function provided.	2019-09-11 14:23:24 +01:00
Jorik Schellekens	6604b64fae	Check dependencies on setup in the nicer way. (#5989)	2019-09-11 14:00:37 +01:00
Erik Johnston	57dd41a45b	Fix comments ... Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>	2019-09-11 13:54:50 +01:00
Andrew Morgan	3505ffcda7	Fix existing v2 identity server calls (MSC2140) (#6013) ... Two things I missed while implementing [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R80). 1. Access tokens should be provided to the identity server as `access_token`, not `id_access_token`, even though the homeserver may accept the tokens as `id_access_token`. 2. Access tokens must be sent to the identity server in a query parameter, the JSON body is not allowed. We now send the access token as part of an `Authorization: ...` header, which fixes both things. The breaking code was added in https://github.com/matrix-org/synapse/pull/5892 Sytest PR: https://github.com/matrix-org/sytest/pull/697	2019-09-11 11:59:45 +01:00
Erik Johnston	c64c3bb4c5	Fix how we check for self redaction	2019-09-11 11:18:04 +01:00
Erik Johnston	54ce81c86d	Allow use of different ratelimits for admin redactions. ... This is useful to allow room admins to quickly deal with a large number of abusive messages.	2019-09-11 10:46:38 +01:00
Andrew Morgan	cd17a2085e	Remove origin parameter from add_display_name_to_third_party_invite and add params to docstring (#6010) ... Another small fixup noticed during work on a larger PR. The `origin` field of `add_display_name_to_third_party_invite` is not used and likely was just carried over from the `on_PUT` method of `FederationThirdPartyInviteExchangeServlet` which, like all other servlets, provides an `origin` argument. Since it's not used anywhere in the handler function though, we should remove it from the function arguments.	2019-09-11 10:37:17 +01:00
Erik Johnston	5e9b05d7da	Merge pull request #6011 from matrix-org/anoa/fix_3pid_validation ... Use account_threepid_delegate for 3pid validation	2019-09-10 18:15:07 +01:00
Andrew Morgan	b5833a2abf	Add changelog	2019-09-10 17:56:10 +01:00
Andrew Morgan	60d3c57bd0	Use account_threepid_delegate for 3pid validation	2019-09-10 17:56:10 +01:00
Jason Robinson	63f9317b8e	Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users ... Only count real users when checking for auto-creation of auto-join room	2019-09-09 17:37:52 +03:00
Erik Johnston	470dc621ae	Merge pull request #5934 from matrix-org/erikj/censor_redactions ... Censor redactions in DB after a month	2019-09-09 15:29:39 +01:00
Amber Brown	aeb9b2179e	Add a build info metric to Prometheus (#6005)	2019-09-10 00:14:58 +10:00
Jason Robinson	aaed6b39e1	Fix code style, again ... Signed-off-by: Jason Robinson <jasonr@matrix.org>	2019-09-09 17:10:02 +03:00
Erik Johnston	580f3df9b2	Fix comments	2019-09-09 15:08:24 +01:00
Jason Robinson	e89fea4f04	Simplify count_real_users SQL to only count user_type is null rows ... Signed-off-by: Jason Robinson <jasonr@matrix.org>	2019-09-09 16:43:32 +03:00
Jason Robinson	8c03cd0e5f	Simplify is_real_user_txn check to trust user_type is null if real user ... Signed-off-by: Jason Robinson <jasonr@matrix.org>	2019-09-09 16:40:40 +03:00
Erik Johnston	8b9ade8c78	Default to censoring redactions after seven days	2019-09-09 13:55:28 +01:00
Erik Johnston	e7184a4370	Use better names in SQL	2019-09-09 13:33:38 +01:00
Erik Johnston	916c697228	Fixup comment	2019-09-09 13:31:00 +01:00
Erik Johnston	fffe17b77d	Don't start looping call unless enabled	2019-09-09 13:24:24 +01:00
Erik Johnston	80e14a8546	Handle setting retention period to 0	2019-09-09 13:23:41 +01:00
Jason Robinson	62fac9d969	Auto-fix a few code style issues ... Signed-off-by: Jason Robinson <jasonr@matrix.org>	2019-09-09 14:59:35 +03:00
Jason Robinson	be618e0551	Only count real users when checking for auto-creation of auto-join room ... Previously if the first registered user was a "support" or "bot" user, when the first real user registers, the auto-join rooms were not created. Fix to exclude non-real (ie users with a special user type) users when counting how many users there are to determine whether we should auto-create a room. Signed-off-by: Jason Robinson <jasonr@matrix.org>	2019-09-09 14:48:08 +03:00
Erik Johnston	05bae6b4fc	Add opentracing span for HTTP push	2019-09-09 10:24:14 +01:00
Hubert Chathi	d3f2fbcfe5	add function docs	2019-09-07 14:13:18 -04:00
Hubert Chathi	8e86f5b65c	Merge branch 'develop' into uhoreg/e2e_cross-signing_merged	2019-09-07 13:20:34 -04:00
Hubert Chathi	0d61d1d735	Merge branch 'develop' into cross-signing_sig_upload	2019-09-07 13:14:45 -04:00
Hubert Chathi	415d0a00e0	run black	2019-09-06 16:46:45 -04:00
Hubert Chathi	561cbba057	split out signature processing into separate functions	2019-09-06 16:44:24 -04:00
Amber Brown	55d5b3af88	Servers-known-about statistic (#5981)	2019-09-07 01:45:51 +10:00
Andrew Morgan	78801e7f9e	Ensure a sid parameter is passed to bind_threepid (#5995) ... `sid` is required to be part of `three_pid_creds`. We were 500'ing if it wasn't provided instead of returning `M_MISSING_PARAM`.	2019-09-06 15:36:50 +01:00
Erik Johnston	a2a695b7ec	Merge pull request #5998 from matrix-org/erikj/fixup_federate_flag ... Correctly handle non-bool m.federate flag	2019-09-06 15:32:43 +01:00
Erik Johnston	142c9325c2	Correctly handle non-bool m.federate flag	2019-09-06 14:21:06 +01:00
Erik Johnston	30b67e0f63	Merge pull request #5993 from matrix-org/anoa/worker_store_reg ... Move get_threepid_validation_session and delete_threepid_session into RegistrationWorkerStore	2019-09-06 14:10:02 +01:00
Andrew Morgan	cf5a420c8a	Apply suggestions from code review ... Co-Authored-By: Erik Johnston <erik@matrix.org>	2019-09-06 13:34:42 +01:00
Andrew Morgan	ca74b140f2	Fix destructuring assumption bug	2019-09-06 13:25:06 +01:00
Andrew Morgan	6ddda8152e	Move delete_threepid_session into RegistrationWorkerStore	2019-09-06 13:23:10 +01:00
Andrew Morgan	e059c5e648	Move get_threepid_validation_session into RegistrationWorkerStore	2019-09-06 13:10:11 +01:00
Erik Johnston	146af7b47f	Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcs ... Don't assume there is a 'self' arg in @trace decorator	2019-09-06 11:42:45 +01:00
Andrew Morgan	0c0b82b6d1	Allow Synapse to send registration emails + choose Synapse or an external server to handle 3pid validation (#5987) ... This is a combination of a few different PRs, finally all being merged into `develop`: * #5875 * #5876 * #5868 (This one added the `/versions` flag but the flag itself was actually [backed out](891afb57cb (diff-e591d42d30690ffb79f63bb726200891)) in #5969. What's left is just giving /versions access to the config file, which could be useful in the future) * #5835 * #5969 * #5940 Clients should not actually use the new registration functionality until https://github.com/matrix-org/synapse/pull/5972 is merged. UPGRADE.rst, changelog entries and config file changes should all be reviewed closely before this PR is merged.	2019-09-06 11:35:28 +01:00
Erik Johnston	d8517da85b	Don't assume there is a 'self' arg in @trace decorator	2019-09-06 10:07:12 +01:00
Hubert Chathi	369462da74	avoid modifying input parameter	2019-09-05 17:03:31 -04:00
Jorik Schellekens	f7c873a643	Trace how long it takes for the send trasaction to complete, including retrys (#5986)	2019-09-05 17:44:55 +01:00
Jorik Schellekens	bc604e7f94	Gracefully handle log context slips and missing opentracing import errors. (#5988)	2019-09-05 17:33:29 +01:00
Erik Johnston	591d82f06b	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_redactions	2019-09-05 17:27:46 +01:00
Erik Johnston	3ff0422d2d	Make redaction retention period configurable	2019-09-05 17:16:45 +01:00
Erik Johnston	1a6ae33309	Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_contexts ... Link the send loop with the edus contexts	2019-09-05 15:22:24 +01:00
Jorik Schellekens	ef20aa52eb	use access methods (duh..) ... Co-Authored-By: Erik Johnston <erik@matrix.org>	2019-09-05 15:07:17 +01:00
Jorik Schellekens	5ade977d08	Opentracing context cannot be none	2019-09-05 15:06:13 +01:00
Jorik Schellekens	909827b422	Add opentracing to all client servlets (#5983)	2019-09-05 14:46:04 +01:00
Jorik Schellekens	1d65292e94	Link the send loop with the edus contexts ... The contexts were being filtered too early so the send loop wasn't being linked to them unless the destination was whitelisted.	2019-09-05 14:42:37 +01:00
Andrew Morgan	a0d294c306	Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)	2019-09-05 14:31:22 +01:00
Jorik Schellekens	b9cfd3c375	Fix opentracing contexts missing from outbound replication requests (#5982)	2019-09-05 14:22:15 +01:00
Andrew Morgan	90d17a3d28	Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980) ... Implements `POST /_matrix/client/r0/account/3pid/unbind` from [MSC2140](https://github.com/matrix-org/matrix-doc/blob/dbkr/tos_2/proposals/2140-terms-of-service-2.md#post-_matrixclientr0account3pidunbind).	2019-09-05 14:00:30 +01:00
Hubert Chathi	c8dc740a94	update with newer coding style	2019-09-04 22:30:45 -04:00
Hubert Chathi	7d6c70fc7a	make black happy	2019-09-04 22:04:12 -04:00
Hubert Chathi	ac4746ac4b	allow uploading signatures of master key signed by devices	2019-09-04 22:03:41 -04:00
Hubert Chathi	4bb4544784	implement device signature uploading/fetching	2019-09-04 20:02:56 -04:00
Hubert Chathi	a22d58c96c	add user signature stream change cache to slaved device store	2019-09-04 19:32:35 -04:00
Hubert Chathi	faf72a4c40	Merge branch 'develop' into cross-signing_keys	2019-09-04 19:12:29 -04:00
Andrew Morgan	b736c6cd3a	Remove bind_email and bind_msisdn (#5964) ... Removes the `bind_email` and `bind_msisdn` parameters from the `/register` C/S API endpoint as per [MSC2140: Terms of Service for ISes and IMs](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R107).	2019-09-04 18:24:23 +01:00
Andrew Morgan	b09d443632	Cleanup event auth type initialisation (#5975) ... Very small code cleanup.	2019-09-04 16:16:56 +01:00
Erik Johnston	6e834e94fc	Fix and refactor room and user stats (#5971) ... Previously the stats were not being correctly populated.	2019-09-04 13:04:27 +01:00
Andrew Morgan	ea128a3e8e	code cleanups	2019-09-03 21:05:06 +01:00
Travis Ralston	2f416fc997	Ensure the list media admin API is always available (#5966) ... * Ensure the list media admin API is always available This API is required for some external media repo implementations to operate (mostly for doing quarantine operations on a room). * changelog	2019-09-03 13:35:20 -06:00
Andrew Morgan	6b6086b8bf	Fix docstring	2019-09-03 20:00:09 +01:00
Andrew Morgan	a98b8583c6	Remove unnecessary variable declaration	2019-09-03 19:58:51 +01:00
Travis Ralston	0eac7077c9	Ensure an auth instance is available to ListMediaInRoom (#5967) ... * Ensure an auth instance is available to ListMediaInRoom Fixes https://github.com/matrix-org/synapse/issues/5737 * Changelog	2019-09-03 09:01:30 -06:00
Matthew Hodgson	8401bcd206	fix typo	2019-09-03 12:44:14 +01:00
Andrew Morgan	2a44782666	Remove double return statements (#5962) ... Remove all the "double return" statements which were a result of us removing all the instances of ``` defer.returnValue(...) return ``` statements when we switched to python3 fully.	2019-09-03 11:42:45 +01:00
Jorik Schellekens	a90d16dabc	Opentrace device lists (#5853) ... Trace device list changes.	2019-09-03 10:21:30 +01:00
Andrew Morgan	36f34e6f3d	Remove unused methods from c/s api v1 in register.py (#5963) ... These methods were part of the v1 C/S API. Remove them as they are no longer used by any code paths.	2019-09-02 18:29:21 +01:00
L0ric0	ce7803b8b0	fix thumbnail storage location (#5915) ... * fix thumbnail storage location Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> * Add changelog file. Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> * Update Changelog Signed-off-by: Lorenz Steinert <lorenz@steinerts.de>	2019-09-02 12:18:41 +01:00
Andrew Morgan	2a012e8a04	Revert "Add m.id_access_token flag (#5930)" (#5945) ... This reverts commit 4765f0cfd9.	2019-08-30 17:13:37 +01:00
Andrew Morgan	4548d1f87e	Remove unnecessary parentheses around return statements (#5931) ... Python will return a tuple whether there are parentheses around the returned values or not. I'm just sick of my editor complaining about this all over the place :)	2019-08-30 16:28:26 +01:00
Andrew Morgan	4765f0cfd9	Add m.id_access_token flag (#5930) ... Adds a flag to `/versions`' `unstable_features` section indicating that this Synapse understands what an `id_access_token` is, as per https://github.com/matrix-org/synapse/issues/5927#issuecomment-523566043 Fixes #5927	2019-08-30 15:22:51 +01:00
Andrew Morgan	3057095a5d	Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937) ... This reverts commit 71fc04069a. This broke 3PID invites as #5892 was required for it to work correctly.	2019-08-30 12:00:20 +01:00
Erik Johnston	a4bf72c30c	Censor redactions in DB after a month	2019-08-30 11:29:17 +01:00
Hubert Chathi	e3d3fbf63f	Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys	2019-08-28 17:36:46 -07:00
Hubert Chathi	72d296a7f3	Merge branch 'develop' into uhoreg/e2e_cross-signing_merged	2019-08-28 17:33:44 -07:00
Hubert Chathi	96bda56370	black	2019-08-28 17:18:40 -07:00
Hubert Chathi	3b0b22cb05	use stream ID generator instead of timestamp	2019-08-28 17:17:21 -07:00
Jorik Schellekens	92c1550f4a	Add a link to python's logging config schema (#5926)	2019-08-28 19:08:32 +01:00
Will Hunt	c8fa620d7a	Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent ... Exempt support users from consent	2019-08-28 16:31:40 +01:00
Jorik Schellekens	deca277d09	Let synctl use a config directory. (#5904) ... * Let synctl use a config directory.	2019-08-28 15:55:58 +01:00
Andrew Morgan	71fc04069a	Use the v2 lookup API for 3PID invites (#5897) ... Fixes https://github.com/matrix-org/synapse/issues/5861 Adds support for the v2 lookup API as defined in [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134). Currently this is only used for 3PID invites. Sytest PR: https://github.com/matrix-org/sytest/pull/679	2019-08-28 14:59:26 +02:00
Jorik Schellekens	6d97843793	Config templating (#5900) ... Template config files * Imagine a system composed entirely of x, y, z etc and the basic operations.. Wait George, why XOR? Why not just neq? George: Eh, I didn't think of that.. Co-Authored-By: Erik Johnston <erik@matrix.org>	2019-08-28 13:12:22 +01:00
Amber Brown	7dc398586c	Implement a structured logging output system. (#5680)	2019-08-28 21:18:53 +10:00
Richard van der Hoff	49ef8ec399	Fix a cache-invalidation bug for worker-based deployments (#5920) ... Some of the caches on worker processes were not being correctly invalidated when a room's state was changed in a way that did not affect the membership list of the room. We need to make sure we send out cache invalidations even when no memberships are changing.	2019-08-28 10:18:16 +01:00
reivilibre	a3f0635686	Merge pull request #5914 from matrix-org/rei/admin_getadmin ... Add GET method to admin API /users/@user:dom/admin	2019-08-28 09:44:22 +01:00
reivilibre	7ccc251415	Merge pull request #5859 from matrix-org/rei/msc2197 ... MSC2197 Search Filters over Federation	2019-08-28 09:00:21 +01:00
Erik Johnston	dfd10f5133	Merge pull request #5864 from matrix-org/erikj/reliable_lookups ... Refactor MatrixFederationAgent to retry SRV.	2019-08-27 16:54:06 +01:00
Erik Johnston	91caa5b430	Fix off by one error in SRV result shuffling	2019-08-27 13:56:42 +01:00
Olivier Wilkinson (reivilibre)	c88a119259	Add GET method to admin API /users/@user:dom/admin ... Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>	2019-08-27 13:12:27 +01:00
reivilibre	322ccac33f	Allow schema deltas to be engine-specific (#5911) ... * Allow schema deltas to be engine-specific Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Newsfile Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Code style (Black) Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>	2019-08-27 11:53:21 +01:00
Richard van der Hoff	ccb15a5bbe	Merge pull request #5906 from matrix-org/neilj/increase_display_name_limit ... Increase profile display name limit	2019-08-27 11:52:59 +01:00
Erik Johnston	f5b50d0871	Merge pull request #5895 from matrix-org/erikj/notary_key ... Add config option to sign remote key query responses with a separate key.	2019-08-27 11:51:37 +01:00
Richard van der Hoff	7837a5f2ea	Merge pull request #5909 from aaronraimist/public_base_url ... public_base_url is actually public_baseurl	2019-08-27 11:49:59 +01:00
reivilibre	1a7e6eb633	Add Admin API capability to set adminship of a user (#5878) ... Admin API: Set adminship of a user	2019-08-27 10:14:00 +01:00
Olivier Wilkinson (reivilibre)	d1e0b91083	Code style (Black) ... Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>	2019-08-27 09:39:11 +01:00
Olivier Wilkinson (reivilibre)	aefa76f5cd	Allow schema deltas to be engine-specific ... Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>	2019-08-27 09:14:00 +01:00
Aaron Raimist	e8e3e033ee	public_base_url is actually public_baseurl ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2019-08-26 21:01:56 -05:00
Neil Johnson	27d3fc421a	Increase max display name limit	2019-08-24 22:33:43 +01:00
Erik Johnston	fbb758a7ce	Fixup comments	2019-08-23 15:37:20 +01:00
Erik Johnston	e70f0081da	Fix logcontexts	2019-08-23 15:37:20 +01:00
Erik Johnston	fe0ac98e66	Don't implicitly include server signing key	2019-08-23 15:36:28 +01:00
Erik Johnston	7af5a63063	Fixup review comments	2019-08-23 15:36:28 +01:00
Will Hunt	c998f25006	Apply suggestions from code review ... Co-Authored-By: Erik Johnston <erik@matrix.org>	2019-08-23 10:28:54 +01:00
Half-Shot	9ba32f6573	Exempt bot users	2019-08-23 09:56:31 +01:00
Half-Shot	ffa5b757c7	Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consent	2019-08-23 09:55:57 +01:00
Half-Shot	d9b8cf81be	Add bot type	2019-08-23 09:52:09 +01:00
Half-Shot	ae38e0569f	Ignore consent for support users	2019-08-23 09:15:10 +01:00
Half-Shot	886eceba3e	Return user_type in get_user_by_id	2019-08-23 09:14:52 +01:00
Jorik Schellekens	8767b63a82	Propagate opentracing contexts through EDUs (#5852) ... Propagate opentracing contexts through EDUs Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-08-22 18:21:10 +01:00
Richard van der Hoff	0b39fa53b6	Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_registration ... Remove shared secret registration	2019-08-22 18:12:25 +01:00
Jorik Schellekens	812ed6b0d5	Opentracing across workers (#5771) ... Propagate opentracing contexts across workers Also includes some Convenience modifications to opentracing for servlets, notably: - Add boolean to skip the whitelisting check on inject extract methods. - useful when injecting into carriers locally. Otherwise we'd always have to include our own servername and whitelist our servername - start_active_span_from_request instead of header - Add boolean to decide whether to extract context from a request to a servlet	2019-08-22 18:08:07 +01:00
Manuel Stahl	0bab582fd6	Remove shared secret registration from client/r0/register endpoint ... This type of registration was probably never used. It only includes the user name in the HMAC but not the password. Shared secret registration is still available via client/r0/admin/register. Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>	2019-08-22 18:04:08 +02:00
Brendan Abolivier	dbd46decad	Revert "Do not send consent notices if "no-consent-required" is set" ... This reverts commit 27a686e53b.	2019-08-22 14:47:43 +01:00
Brendan Abolivier	1c5b8c6222	Revert "Add "require_consent" parameter for registration" ... This reverts commit 3320aaab3a.	2019-08-22 14:47:34 +01:00
Half-Shot	27a686e53b	Do not send consent notices if "no-consent-required" is set	2019-08-22 14:22:04 +01:00
Half-Shot	3320aaab3a	Add "require_consent" parameter for registration	2019-08-22 14:21:54 +01:00
Erik Johnston	1e4b4d85e7	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reliable_lookups	2019-08-22 13:41:57 +01:00
Erik Johnston	1b09cf8658	Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_fail ... Retry well known on fail	2019-08-22 13:17:05 +01:00
Jorik Schellekens	9a6f2be572	Opentrace e2e keys (#5855) ... Add opentracing tags and logs for e2e keys	2019-08-22 11:28:12 +01:00
Richard van der Hoff	c9f11d09fc	Add missing index on users_in_public_rooms. (#5894)	2019-08-22 10:43:13 +01:00
Richard van der Hoff	119aa31b10	Servlet to purge old rooms (#5845)	2019-08-22 10:42:59 +01:00
Richard van der Hoff	ef1c524bb3	Improve error msg when key-fetch fails (#5896) ... There's no point doing a raise_from here, because the exception is always logged at warn with no stacktrace in the caller. Instead, let's try to give better messages to reduce confusion. In particular, this means that we won't log 'Failed to connect to remote server' when we don't even attempt to connect to the remote server due to blacklisting.	2019-08-22 10:42:06 +01:00
Hubert Chathi	814f253f1b	make isort happy	2019-08-21 13:22:15 -07:00
Hubert Chathi	7c3abc6572	apply PR review suggestions	2019-08-21 13:19:35 -07:00
Richard van der Hoff	4dab867288	Drop some unused tables. (#5893) ... These tables are never used, so we may as well drop them.	2019-08-21 13:16:28 +01:00
Erik Johnston	97cbc96093	Only sign when we respond to remote key requests	2019-08-21 11:21:58 +01:00
Erik Johnston	5906be8589	Add config option for keys to use to sign keys ... This allows servers to separate keys that are used to sign remote keys when acting as a notary server.	2019-08-21 10:44:58 +01:00
Richard van der Hoff	72bc285669	Refactor the Appservice scheduler code (#5886) ... Get rid of the labyrinthine `recoverer_fn` code, and clean up the startup code (it seemed to be previously inexplicably split between `ApplicationServiceScheduler.start` and `_Recoverer.start`). Add some docstrings too.	2019-08-20 17:42:45 +01:00
Richard van der Hoff	baa3f4a80d	Avoid deep recursion in appservice recovery (#5885) ... Hopefully, this will fix a stack overflow when recovering an appservice. The recursion here leads to a huge chain of deferred callbacks, which then overflows the stack when the chain completes. `inlineCallbacks` makes a better job of this if we use iteration instead. Clean up the code a bit too, while we're there.	2019-08-20 17:39:38 +01:00
Jorik Schellekens	c886f976e0	Opentracing doc update (#5776) ... Update opentracing docs to use the unified 'trace' method	2019-08-20 13:56:03 +01:00
Erik Johnston	74f016d343	Remove now unused pick_server_from_list	2019-08-20 12:37:08 +01:00
Erik Johnston	1f9df1cc7b	Fixup _sort_server_list to be slightly more efficient ... Also document that we are using the algorithm described in RFC2782 and ensure we handle zero weight correctly.	2019-08-20 12:36:11 +01:00
Richard van der Hoff	5019945828	Refactor the Appservice scheduler code ... Get rid of the labyrinthine `recoverer_fn` code, and clean up the startup code (it seemed to be previously inexplicably split between `ApplicationServiceScheduler.start` and `_Recoverer.start`). Add some docstrings too.	2019-08-20 11:50:23 +01:00
Erik Johnston	1dec31560e	Change jitter to be a factor rather than absolute value	2019-08-20 11:46:00 +01:00
Olivier Wilkinson (reivilibre)	bb29bc2937	Use MSC2197 on stable prefix as it has almost finished FCP ... Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>	2019-08-20 08:49:31 +01:00
Erik Johnston	d514dac0b2	Merge pull request #5860 from matrix-org/erikj/update_5704_comments ... Remove logging for #5407 and update comments	2019-08-19 10:20:59 +01:00
Brendan Abolivier	bdd201ea7f	Merge branch 'master' into develop	2019-08-17 10:50:42 +01:00
Richard van der Hoff	74fb729213	1.3.1	2019-08-17 09:16:17 +01:00
Richard van der Hoff	412c6e21a8	Drop dependency on sdnotify (#5871) ... ... to save OSes which don't use it from having to maintain a port. Fixes #5865.	2019-08-17 09:09:52 +01:00
Hubert Chathi	8a5f6ed130	Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_index ... add the version field to the index for e2e_room_keys	2019-08-16 17:45:50 -07:00
Chris Moos	6d86df73f1	Fix issue with Synapse not starting up. Fixes #5866. ... Signed-off-by: Chris Moos <chris@chrismoos.com>	2019-08-16 22:16:13 +01:00
Jorik Schellekens	87fa26006b	Opentracing misc (#5856) ... Add authenticated_entity and servlet_names tags. Functionally: - Add a tag for authenticated_entity - Add a tag for servlet_names Stylistically: Moved to importing methods directly from opentracing.	2019-08-16 16:13:25 +01:00
Erik Johnston	861d663c15	Fixup changelog and remove debug logging	2019-08-16 13:15:26 +01:00
Andrew Morgan	b13cac896d	Fix up password reset template config names (#5863) ... Fixes #5833 The emailconfig code was attempting to pull incorrect config file names. This corrects that, while also marking a difference between a config file variable that's a filepath versus a str containing HTML.	2019-08-15 16:27:11 +01:00
Erik Johnston	f299c5414c	Refactor MatrixFederationAgent to retry SRV. ... This refactors MatrixFederationAgent to move the SRV lookup into the endpoint code, this has two benefits: 1. Its easier to retry different host/ports in the same way as HostnameEndpoint. 2. We avoid SRV lookups if we have a free connection in the pool	2019-08-15 15:43:22 +01:00
Brendan Abolivier	ce5f1cb98c	Merge branch 'master' into develop	2019-08-15 12:38:21 +01:00
Brendan Abolivier	fb5acd7039	1.3.0	2019-08-15 12:05:24 +01:00
Erik Johnston	748aa38378	Remove logging for #5407 and update comments	2019-08-15 12:02:18 +01:00
Olivier Wilkinson (reivilibre)	2253b083d9	Add support for inbound MSC2197 requests on unstable Federation API ... Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>	2019-08-15 11:06:21 +01:00
Olivier Wilkinson (reivilibre)	6fadb560fc	Support MSC2197 outbound with unstable prefix ... Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>	2019-08-15 10:59:37 +01:00
Michael Telatynski	baee288fb4	Don't create broken room when power_level_content_override.users does not contain creator_id. (#5633)	2019-08-15 09:45:57 +01:00
Erik Johnston	e6e136decc	Retry well known on fail. ... If we have recently seen a valid well-known for a domain we want to retry on (non-final) errors a few times, to handle temporary blips in networking/etc.	2019-08-15 09:28:58 +01:00
Hubert Chathi	c058aeb88d	update set_e2e_room_key to agree with fixed index	2019-08-14 18:02:58 -07:00
Hubert Chathi	b7f7cc7ace	add the version field to the index for e2e_room_keys	2019-08-14 17:14:40 -07:00
Olivier Wilkinson (reivilibre)	1b63ccd848	Wrap get_local_public_room_list call in maybeDeferred because it ... is cached and so does not always return a `Deferred`. `await` does not silently pass-through non-Deferreds like `yield` used to. Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>	2019-08-14 14:53:49 +01:00
Erik Johnston	09f6152a11	Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookup ... Retry well-known lookup before expiry.	2019-08-14 09:53:33 +01:00
Brendan Abolivier	f70d0a1dd9	1.3.0rc1	2019-08-13 18:20:09 +01:00
Amber H. Brown	18bdac8ee4	fix config being a dict, actually	2019-08-14 02:06:42 +10:00
Erik Johnston	17e1e80726	Retry well-known lookup before expiry. ... This gives a bit of a grace period where we can attempt to refetch a remote `well-known`, while still using the cached result if that fails. Hopefully this will make the well-known resolution a bit more torelant of failures, rather than it immediately treating failures as "no result" and caching that for an hour.	2019-08-13 16:20:38 +01:00
Erik Johnston	af187805b3	Merge pull request #5809 from matrix-org/erikj/handle_pusher_stop ... Handle pusher being deleted during processing.	2019-08-13 14:08:29 +01:00
Erik Johnston	96bdd661b8	Remove redundant return	2019-08-13 12:50:36 +01:00
Amber Brown	0b6fbb28a8	Don't load the media repo when configured to use an external media repo (#5754)	2019-08-13 21:49:28 +10:00
Erik Johnston	e9906b0772	Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_known ... Add a lower bound to well-known TTL.	2019-08-13 12:41:16 +01:00
Erik Johnston	fb3469f53a	Clarify docstring ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-08-13 10:17:23 +01:00
Erik Johnston	f218705d2a	Make default well known cache global again.	2019-08-13 10:06:51 +01:00
Erik Johnston	2546f32b90	Merge pull request #5826 from matrix-org/erikj/reduce_event_pauses ... Don't unnecessarily block notifying of new events.	2019-08-13 09:36:25 +01:00
Hubert Chathi	f63ba7a795	Cross-signing [1/4] -- hidden devices (#5759) ... * 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.	2019-08-12 15:14:37 -07:00
Richard van der Hoff	fb86217553	Merge pull request #5788 from matrix-org/rav/metaredactions ... Fix handling of redactions of redactions	2019-08-12 12:25:19 +01:00
Erik Johnston	107ad133fc	Move well known lookup into a separate clas	2019-08-07 15:36:38 +01:00
Erik Johnston	af9f1c0764	Add a lower bound for TTL on well known results. ... It costs both us and the remote server for us to fetch the well known for every single request we send, so we add a minimum cache period. This is set to 5m so that we still honour the basic premise of "refetch frequently".	2019-08-06 17:01:23 +01:00
Erik Johnston	d1b5b055be	Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_sync ... Handle TimelineBatch being limited and empty.	2019-08-06 15:39:44 +01:00
Andrew Morgan	edeae53221	Return 404 instead of 403 when retrieving an event without perms (#5798) ... Part of fixing matrix-org/sytest#652 Sytest PR: matrix-org/sytest#667	2019-08-06 13:33:55 +01:00
Erik Johnston	bf4db42920	Don't unnecessarily block notifying of new events. ... When persisting events we calculate new stream orderings up front. Before we notify about an event all events with lower stream orderings must have finished being persisted. This PR moves the assignment of stream ordering till *after* calculated the new current state and split the batch of events into separate chunks for persistence. This means that if it takes a long time to calculate new current state then it will not block events in other rooms being notified about. This should help reduce some global pauses in the events stream which can last for tens of seconds (if not longer), caused by some particularly expensive state resolutions.	2019-08-06 13:32:02 +01:00
Erik Johnston	6881f21f3e	Handle TimelineBatch being limited and empty. ... This hopefully addresses #5407 by gracefully handling an empty but limited TimelineBatch. We also add some logging to figure out how this is happening.	2019-08-06 12:59:00 +01:00
Hubert Chathi	fac1cdc562	make changes from PR review	2019-08-01 21:51:19 -04:00
Hubert Chathi	336c546d6a	Merge branch 'cross-signing_hidden' into cross-signing_keys	2019-08-01 16:31:40 -04:00
Brendan Abolivier	8ed9e63432	Account validity: allow defining HTML templates to serve the us… (#5807) ... Account validity: allow defining HTML templates to serve the user on account renewal attempt	2019-08-01 16:09:25 +02:00
Erik Johnston	d55bc4a8bf	Merge pull request #5810 from matrix-org/erikj/no_server_reachable ... Return 502 not 500 when failing to reach any remote server.	2019-08-01 14:19:39 +01:00
Andrew Morgan	5d018d23f0	Have ClientReaderSlavedStore inherit RegistrationStore (#5806) ... Fixes #5803	2019-08-01 13:54:56 +01:00
Erik Johnston	3c076c79c5	Merge pull request #5808 from matrix-org/erikj/parse_decode_error ... Handle incorrectly encoded query params correctly	2019-08-01 13:48:10 +01:00
Erik Johnston	a8f40a8302	Return 502 not 500 when failing to reach any remote server.	2019-08-01 13:47:31 +01:00
Erik Johnston	55a0c98d16	Merge pull request #5805 from matrix-org/erikj/validate_state ... Validate well known state events are state events.	2019-08-01 13:45:48 +01:00
Erik Johnston	0b36decfb6	Merge pull request #5801 from matrix-org/erikj/recursive_tombstone ... Don't allow clients to send tombstones that reference the same room	2019-08-01 13:45:35 +01:00
Erik Johnston	d02e41dcb2	Handle pusher being deleted during processing. ... Instead of throwing a StoreError lets break out of processing loop and mark the pusher as stopped.	2019-08-01 13:44:12 +01:00
Erik Johnston	d2e3d5b9db	Handle incorrectly encoded query params correctly	2019-08-01 13:23:00 +01:00
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	58af30a6c7	Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_room ... Deny redaction of events in a different room.	2019-08-01 13:14:46 +01:00
Erik Johnston	0f632f3a57	Merge pull request #5790 from matrix-org/erikj/groups_request_errors ... Handle RequestSendFailed exception correctly in more places.	2019-08-01 13:14:08 +01:00
Brendan Abolivier	f25f638c35	Lint	2019-08-01 12:19:08 +02:00
Brendan Abolivier	a4a9ded4d0	Allow defining HTML templates to serve the user on account renewal	2019-08-01 11:59:27 +02:00
Hubert Chathi	d78a4fe156	don't need to return the hidden column any more	2019-08-01 02:16:09 -04:00
Hubert Chathi	73b26f827c	really fix queries to work with Postgres ... (by going back to not using SQL directly)	2019-07-31 18:37:05 -04:00
Hubert Chathi	430ea08186	PostgreSQL, Y U no like?	2019-07-31 15:38:11 -04:00
Hubert Chathi	185188be03	remove extra SQL query param	2019-07-31 15:18:15 -04:00
Erik Johnston	dc4d74e44a	Validate well-known state events are state events. ... Lets disallow sending things like memberships, topics etc as non-state events.	2019-07-31 16:36:20 +01:00
Erik Johnston	2e697d3013	Explicitly check that tombstone is a state event before notifying.	2019-07-31 16:32:03 +01:00
Erik Johnston	cf89266b98	Deny redaction of events in a different room. ... We already correctly filter out such redactions, but we should also deny them over the CS API.	2019-07-31 16:12:27 +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	a9bcae9f50	Share SSL options for well-known requests	2019-07-31 10:39:24 +01:00
Hubert Chathi	c1f0a5636c	Merge branch 'develop' into cross-signing_hidden	2019-07-30 23:33:06 -04:00
Hubert Chathi	bc95890822	Merge branch 'cross-signing_hidden' into cross-signing_keys	2019-07-30 23:21:26 -04:00
Hubert Chathi	781ade836b	apply changes from PR review	2019-07-30 23:09:50 -04:00
Erik Johnston	123c04daa7	Don't recreate column	2019-07-30 16:42:48 +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	b4d5ff0af7	Don't log as exception when failing durig backfill	2019-07-30 13:19:22 +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
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
Richard van der Hoff	4e97eb89e5	Handle loops in redaction events	2019-07-30 00:00:34 +01:00
Richard van der Hoff	448bcfd0f9	recursively fetch redactions	2019-07-30 00:00:34 +01:00
Richard van der Hoff	e6a6c4fbab	split _get_events_from_db out of _enqueue_events	2019-07-29 23:15:15 +01:00
Richard van der Hoff	c9964ba600	Return dicts from _fetch_event_list	2019-07-29 23:15:15 +01:00
Amber Brown	865077f1d1	Room Complexity Client Implementation (#5783)	2019-07-30 02:47:27 +10:00
Erik Johnston	aecae8f397	Correctly handle errors doing requests to group servers	2019-07-29 17:21:57 +01: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	45df38e61b	Fix current_state bg update to work on old SQLite	2019-07-29 13:04:10 +01: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	dde6ea7ff6	1.2.1	2019-07-26 11:33:16 +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
Erik Johnston	1f8bae7724	Log when we receive receipt from a different origin	2019-07-26 07:55:25 +01:00
Richard van der Hoff	0f2ecb961e	Fix DoS when there is a cycle in redaction events ... Make sure that synapse doesn't explode when a redaction redacts itself, or there is a larger cycle.	2019-07-26 06:36:48 +00:00
Richard van der Hoff	26d742fed6	Merge pull request #5767 from matrix-org/rav/redactions/cross_room_id ... log when a redaction attempts to redact an event in a different room	2019-07-25 18:49:56 +01:00
Richard van der Hoff	b1605cdd23	log when a redaction attempts to redact an event in a different room	2019-07-25 18:26:20 +01:00
Hubert Chathi	c659b9f94f	allow uploading keys for cross-signing	2019-07-25 11:08:24 -04:00
Richard van der Hoff	618bd1ee76	Fix some error cases in the caching layer. (#5749) ... There was some inconsistent behaviour in the caching layer around how exceptions were handled - particularly synchronously-thrown ones. This seems to be most easily handled by pushing the creation of ObservableDeferreds down from CacheDescriptor to the Cache.	2019-07-25 15:59:45 +01:00
Andrew Morgan	f16aa3a44b	Merge branch 'master' into develop	2019-07-25 15:19:22 +01:00
Andrew Morgan	c0a1301ccd	1.2.0	2019-07-25 14:10:32 +01:00
Hubert Chathi	d1c7c2a98a	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.	2019-07-24 23:21:52 -04:00
Andrew Morgan	baf081cd3b	Bugfixes ... -------- - Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734)) -----BEGIN PGP SIGNATURE----- iQJHBAABCgAxFiEEgQG31Z317NrSMt0QiISIDS7+X/QFAl04Ur0THGFuZHJld0Bh bW9yZ2FuLnh5egAKCRCIhIgNLv5f9F4oD/0TY6S/SEd2uAmzor64ojmbX5BOwPzf j/wzUTrfvuf40EvkNPDpnejNZSvy/ysbaGQaQusv0SQKlV3xrvdn4RuMvnOWVWck kBsO+lvzOaUTR0KHDxN4y9F5eI2NdPbub4847PPVzyqSIHAd+kolxXS8kSBBhwpL yfaICWV/AOy5L7xN+JZ9IQpnegVAvUj5DmgXzDHd6VdeiHDVJuARaBgrR5uCkwVS ZoLRqZ95XV/qiguMAUvPOwyEqht2mwO64989MswP16YYm8oMkB5QA6I5nYnACsTP qk9YcN/oNvEfQXUhttku6MxK1/4yUMPUhEoDBDH7ebc0440QDtWN+IHTdA6oPVZB IuStL9YGY16m7Ltx37ZUA4URfNMiSeLHo3zKc/mCAcwxN4HyOjJewtxbG5zKQAOZ SMs8UcDwGR4zL1hnt8ZDNYtWwfzJBQIdGjoHvjXJEY7/1csTv2lmAwewFTXiqSAr 30GW5ews94kotqBK53zZT6V0F5gHNqgGHniOz1ZpqLLxYLqO3LSAGe97CrqlWUdX GkhA9tZyweknociD9fyyBmKdcFJ4mL4a+oGI5CMnSMph8UvCY8Y5XMb1T+iYEABI tA9G3mBvgkLPj+5V+8QggNkBafSigW2Q4FX7enGsDmiiskZOtfeKrAcVkapD4ooi 3I7IW5aetZr2IQ== =+JBn -----END PGP SIGNATURE----- Merge tag 'v1.2.0rc2' into develop Bugfixes -------- - Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734))	2019-07-24 13:47:51 +01:00
Andrew Morgan	2d573e2e2b	1.2.0rc2	2019-07-24 13:43:40 +01:00
Erik Johnston	2276936bac	Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch ... Log when we receive receipt from a different origin	2019-07-24 13:27:57 +01:00
Richard van der Hoff	f30a71a67b	Stop trying to fetch events with event_id=None. (#5753) ... `None` is not a valid event id, so queuing up a database fetch for it seems like a silly thing to do. I considered making `get_event` return `None` if `event_id is None`, but then its interaction with `allow_none` seemed uninituitive, and strong typing ftw.	2019-07-24 13:16:18 +01:00
Jorik Schellekens	cf2972c818	Fix servlet metric names (#5734) ... * Fix servlet metric names Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Remove redundant check * Cover all return paths	2019-07-24 13:07:35 +01:00
Erik Johnston	0c4a99607e	Remove join when calculating room summaries.	2019-07-24 11:49:15 +01:00
Erik Johnston	62921fb53e	Remove join on room_memberships when fetching rooms for user.	2019-07-24 11:45:58 +01:00
Erik Johnston	32768e96d4	Add function to get all forgotten rooms for user ... This will allow us to efficiently filter out rooms that have been forgotten in other queries without having to join against the `room_memberships` table.	2019-07-24 11:44:23 +01:00
Richard van der Hoff	418635e68a	Add a prometheus metric for active cache lookups. (#5750) ... * Add a prometheus metric for active cache lookups. * changelog	2019-07-24 11:33:13 +01:00
Jorik Schellekens	3641784e8c	Make Jaeger fully configurable (#5694) ... * Allow Jaeger to be configured * Update sample config	2019-07-23 15:46:04 +01:00
Amber Brown	4806651744	Replace returnValue with return (#5736)	2019-07-23 23:00:55 +10:00
Jorik Schellekens	18a466b84e	Opentracing Utils (#5722) ... * Add decerators for tracing functions * Use the new clean contexts * Context and edu utils * Move opentracing setters * Move whitelisting * Sectioning comments * Better args wrapper * Docstrings Co-Authored-By: Erik Johnston <erik@matrix.org> * Remove unused methods. * Don't use global * One tracing decorator to rule them all.	2019-07-23 13:31:16 +01:00
Erik Johnston	3db1377b26	Log when we receive receipt from a different origin	2019-07-23 13:31:03 +01:00
Erik Johnston	841b12867e	Merge pull request #5732 from matrix-org/erikj/sdnotify ... Add process hooks to tell systemd our state.	2019-07-23 13:06:53 +01:00
Erik Johnston	b2a629ef49	Speed up current state background update. ... Turns out that storing huge JSON arrays in the progress JSON isn't something that postgres particularly likes.	2019-07-23 10:01:30 +01:00
Amber Brown	0d0f6d12bc	Fix logging in workers (#5729) ... This also adds a worker blacklist.	2019-07-22 16:05:00 +01:00
Erik Johnston	80cfad233e	Call startup commands as system triggers. ... This helps ensures that we only consider ourselves "up" once all the startup functions have completed.	2019-07-22 15:22:14 +01:00
Erik Johnston	720d30469f	Merge pull request #5730 from matrix-org/erikj/cache_versions ... Cache get_version_string.	2019-07-22 14:52:52 +01:00
Erik Johnston	c560b791e1	Add process hooks to tell systemd our state. ... Fixes #5676.	2019-07-22 14:52:18 +01:00
Jason Robinson	8e513e7afc	Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-type ... Add `user_type` to returned fields in admin API user list endpoints	2019-07-22 16:28:51 +03:00
Richard van der Hoff	0cb72812f9	Fix stack overflow in Keyring (#5724) ... * Refactor Keyring._start_key_lookups There's an awful lot of deferreds and dictionaries flying around here. The whole thing can be made much simpler and achieve the same effect. * Add a delay to key lookup lock release to fix stack overflow A tactical call_later here should fix #5723 * changelog	2019-07-22 13:51:22 +01:00
Andrew Morgan	f477ce4b1a	v1.2.0rc1 ... Features -------- - Add support for opentracing. ([\#5544](https://github.com/matrix-org/synapse/issues/5544), [\#5712](https://github.com/matrix-org/synapse/issues/5712)) - Add ability to pull all locally stored events out of synapse that a particular user can see. ([\#5589](https://github.com/matrix-org/synapse/issues/5589)) - Add a basic admin command app to allow server operators to run Synapse admin commands separately from the main production instance. ([\#5597](https://github.com/matrix-org/synapse/issues/5597)) - Add `sender` and `origin_server_ts` fields to `m.replace`. ([\#5613](https://github.com/matrix-org/synapse/issues/5613)) - Add default push rule to ignore reactions. ([\#5623](https://github.com/matrix-org/synapse/issues/5623)) - Include the original event when asking for its relations. ([\#5626](https://github.com/matrix-org/synapse/issues/5626)) - Implement `session_lifetime` configuration option, after which access tokens will expire. ([\#5660](https://github.com/matrix-org/synapse/issues/5660)) - Return "This account has been deactivated" when a deactivated user tries to login. ([\#5674](https://github.com/matrix-org/synapse/issues/5674)) - Enable aggregations support by default ([\#5714](https://github.com/matrix-org/synapse/issues/5714)) Bugfixes -------- - Fix 'utime went backwards' errors on daemonization. ([\#5609](https://github.com/matrix-org/synapse/issues/5609)) - Various minor fixes to the federation request rate limiter. ([\#5621](https://github.com/matrix-org/synapse/issues/5621)) - Forbid viewing relations on an event once it has been redacted. ([\#5629](https://github.com/matrix-org/synapse/issues/5629)) - Fix requests to the `/store_invite` endpoint of identity servers being sent in the wrong format. ([\#5638](https://github.com/matrix-org/synapse/issues/5638)) - Fix newly-registered users not being able to lookup their own profile without joining a room. ([\#5644](https://github.com/matrix-org/synapse/issues/5644)) - Fix bug in #5626 that prevented the original_event field from actually having the contents of the original event in a call to `/relations`. ([\#5654](https://github.com/matrix-org/synapse/issues/5654)) - Fix 3PID bind requests being sent to identity servers as `application/x-form-www-urlencoded` data, which is deprecated. ([\#5658](https://github.com/matrix-org/synapse/issues/5658)) - Fix some problems with authenticating redactions in recent room versions. ([\#5699](https://github.com/matrix-org/synapse/issues/5699), [\#5700](https://github.com/matrix-org/synapse/issues/5700), [\#5707](https://github.com/matrix-org/synapse/issues/5707)) - Ignore redactions of m.room.create events. ([\#5701](https://github.com/matrix-org/synapse/issues/5701)) Updates to the Docker image --------------------------- - Base Docker image on a newer Alpine Linux version (3.8 -> 3.10). ([\#5619](https://github.com/matrix-org/synapse/issues/5619)) - Add missing space in default logging file format generated by the Docker image. ([\#5620](https://github.com/matrix-org/synapse/issues/5620)) Improved Documentation ---------------------- - Add information about nginx normalisation to reverse_proxy.rst. Contributed by @skalarproduktraum - thanks! ([\#5397](https://github.com/matrix-org/synapse/issues/5397)) - --no-pep517 should be --no-use-pep517 in the documentation to setup the development environment. ([\#5651](https://github.com/matrix-org/synapse/issues/5651)) - Improvements to Postgres setup instructions. Contributed by @Lrizika - thanks! ([\#5661](https://github.com/matrix-org/synapse/issues/5661)) - Minor tweaks to postgres documentation. ([\#5675](https://github.com/matrix-org/synapse/issues/5675)) Deprecations and Removals ------------------------- - Remove support for the `invite_3pid_guest` configuration setting. ([\#5625](https://github.com/matrix-org/synapse/issues/5625)) Internal Changes ---------------- - Move logging code out of `synapse.util` and into `synapse.logging`. ([\#5606](https://github.com/matrix-org/synapse/issues/5606), [\#5617](https://github.com/matrix-org/synapse/issues/5617)) - Add a blacklist file to the repo to blacklist certain sytests from failing CI. ([\#5611](https://github.com/matrix-org/synapse/issues/5611)) - Make runtime errors surrounding password reset emails much clearer. ([\#5616](https://github.com/matrix-org/synapse/issues/5616)) - Remove dead code for persiting outgoing federation transactions. ([\#5622](https://github.com/matrix-org/synapse/issues/5622)) - Add `lint.sh` to the scripts-dev folder which will run all linting steps required by CI. ([\#5627](https://github.com/matrix-org/synapse/issues/5627)) - Move RegistrationHandler.get_or_create_user to test code. ([\#5628](https://github.com/matrix-org/synapse/issues/5628)) - Add some more common python virtual-environment paths to the black exclusion list. ([\#5630](https://github.com/matrix-org/synapse/issues/5630)) - Some counter metrics exposed over Prometheus have been renamed, with the old names preserved for backwards compatibility and deprecated. See `docs/metrics-howto.rst` for details. ([\#5636](https://github.com/matrix-org/synapse/issues/5636)) - Unblacklist some user_directory sytests. ([\#5637](https://github.com/matrix-org/synapse/issues/5637)) - Factor out some redundant code in the login implementation. ([\#5639](https://github.com/matrix-org/synapse/issues/5639)) - Update ModuleApi to avoid register(generate_token=True). ([\#5640](https://github.com/matrix-org/synapse/issues/5640)) - Remove access-token support from `RegistrationHandler.register`, and rename it. ([\#5641](https://github.com/matrix-org/synapse/issues/5641)) - Remove access-token support from `RegistrationStore.register`, and rename it. ([\#5642](https://github.com/matrix-org/synapse/issues/5642)) - Improve logging for auto-join when a new user is created. ([\#5643](https://github.com/matrix-org/synapse/issues/5643)) - Remove unused and unnecessary check for FederationDeniedError in _exception_to_failure. ([\#5645](https://github.com/matrix-org/synapse/issues/5645)) - Fix a small typo in a code comment. ([\#5655](https://github.com/matrix-org/synapse/issues/5655)) - Clean up exception handling around client access tokens. ([\#5656](https://github.com/matrix-org/synapse/issues/5656)) - Add a mechanism for per-test homeserver configuration in the unit tests. ([\#5657](https://github.com/matrix-org/synapse/issues/5657)) - Inline issue_access_token. ([\#5659](https://github.com/matrix-org/synapse/issues/5659)) - Update the sytest BuildKite configuration to checkout Synapse in `/src`. ([\#5664](https://github.com/matrix-org/synapse/issues/5664)) - Add a `docker` type to the towncrier configuration. ([\#5673](https://github.com/matrix-org/synapse/issues/5673)) - Convert `synapse.federation.transport.server` to `async`. Might improve some stack traces. ([\#5689](https://github.com/matrix-org/synapse/issues/5689)) - Documentation for opentracing. ([\#5703](https://github.com/matrix-org/synapse/issues/5703)) -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEgQG31Z317NrSMt0QiISIDS7+X/QFAl01rA4THGFuZHJld0Bh bW9yZ2FuLnh5egAKCRCIhIgNLv5f9GYqD/sHgmTXL33/TL6ytdWfcrngo3+zyqz3 eMTvLggwFojTEzE2pO9R3UsaEZI+gMZEKfm+EEU4dXEnXxRxppMniHX3mMball7Q Xz7TgmediE6nW+m8FDbAuHsMYa7GY3p+u5ZyleO78zIjIu8YahcpKwX40JCJNCE1 Vzz1T24i+lIsGB+3ahzabxkG1QHMppfClEFEpC8jYb+DL8BQzdMl0HAvdw4tAbDW ONPAdGkjtPUv6TcfBDXoMXVdoAA4CFyDuCWR0O57I3Re5b7ARy6Dx0vcQbMCTEgQ GnT1/QWtrpkX04OezMre2FAI+VQpQu/Hlhrl3+h8uQT1jBqYpWfR9jy/Y/iJWH0a Dam0XzvZrMM1wrzd6exLMWS76W8EWKT9IV7xR9kf4HwnOxGrmusshzkCEUAxwxJX jmFfTUw2f0yKt6lfNWaa67wP3suOlb++g33becFMKEM2DIb3iFxdk8U9p50406fL asCfMsNWNKrcIkAnsgvPXfZMhUX0bgHBtkiZxTZ8/cJK01N+9pVvlb6ZZ7j30aIH r4I6MAfaA57QOIla9Ml3LrT49dRskJpbReIqPiPxfH47W7hZhaCt0mF95SXzogF0 cP6t36ths/ywJ85EQUYY+9VgYK26jObm2xFTN2rUnZ1hnCEhKY4/Lwz0jPRQ8au3 2XHFZfqeAVpvvw== =ZrnB -----END PGP SIGNATURE----- Merge tag 'v1.2.0rc1' into develop v1.2.0rc1 Features -------- - Add support for opentracing. ([\#5544](https://github.com/matrix-org/synapse/issues/5544), [\#5712](https://github.com/matrix-org/synapse/issues/5712)) - Add ability to pull all locally stored events out of synapse that a particular user can see. ([\#5589](https://github.com/matrix-org/synapse/issues/5589)) - Add a basic admin command app to allow server operators to run Synapse admin commands separately from the main production instance. ([\#5597](https://github.com/matrix-org/synapse/issues/5597)) - Add `sender` and `origin_server_ts` fields to `m.replace`. ([\#5613](https://github.com/matrix-org/synapse/issues/5613)) - Add default push rule to ignore reactions. ([\#5623](https://github.com/matrix-org/synapse/issues/5623)) - Include the original event when asking for its relations. ([\#5626](https://github.com/matrix-org/synapse/issues/5626)) - Implement `session_lifetime` configuration option, after which access tokens will expire. ([\#5660](https://github.com/matrix-org/synapse/issues/5660)) - Return "This account has been deactivated" when a deactivated user tries to login. ([\#5674](https://github.com/matrix-org/synapse/issues/5674)) - Enable aggregations support by default ([\#5714](https://github.com/matrix-org/synapse/issues/5714)) Bugfixes -------- - Fix 'utime went backwards' errors on daemonization. ([\#5609](https://github.com/matrix-org/synapse/issues/5609)) - Various minor fixes to the federation request rate limiter. ([\#5621](https://github.com/matrix-org/synapse/issues/5621)) - Forbid viewing relations on an event once it has been redacted. ([\#5629](https://github.com/matrix-org/synapse/issues/5629)) - Fix requests to the `/store_invite` endpoint of identity servers being sent in the wrong format. ([\#5638](https://github.com/matrix-org/synapse/issues/5638)) - Fix newly-registered users not being able to lookup their own profile without joining a room. ([\#5644](https://github.com/matrix-org/synapse/issues/5644)) - Fix bug in #5626 that prevented the original_event field from actually having the contents of the original event in a call to `/relations`. ([\#5654](https://github.com/matrix-org/synapse/issues/5654)) - Fix 3PID bind requests being sent to identity servers as `application/x-form-www-urlencoded` data, which is deprecated. ([\#5658](https://github.com/matrix-org/synapse/issues/5658)) - Fix some problems with authenticating redactions in recent room versions. ([\#5699](https://github.com/matrix-org/synapse/issues/5699), [\#5700](https://github.com/matrix-org/synapse/issues/5700), [\#5707](https://github.com/matrix-org/synapse/issues/5707)) - Ignore redactions of m.room.create events. ([\#5701](https://github.com/matrix-org/synapse/issues/5701)) Updates to the Docker image --------------------------- - Base Docker image on a newer Alpine Linux version (3.8 -> 3.10). ([\#5619](https://github.com/matrix-org/synapse/issues/5619)) - Add missing space in default logging file format generated by the Docker image. ([\#5620](https://github.com/matrix-org/synapse/issues/5620)) Improved Documentation ---------------------- - Add information about nginx normalisation to reverse_proxy.rst. Contributed by @skalarproduktraum - thanks! ([\#5397](https://github.com/matrix-org/synapse/issues/5397)) - --no-pep517 should be --no-use-pep517 in the documentation to setup the development environment. ([\#5651](https://github.com/matrix-org/synapse/issues/5651)) - Improvements to Postgres setup instructions. Contributed by @Lrizika - thanks! ([\#5661](https://github.com/matrix-org/synapse/issues/5661)) - Minor tweaks to postgres documentation. ([\#5675](https://github.com/matrix-org/synapse/issues/5675)) Deprecations and Removals ------------------------- - Remove support for the `invite_3pid_guest` configuration setting. ([\#5625](https://github.com/matrix-org/synapse/issues/5625)) Internal Changes ---------------- - Move logging code out of `synapse.util` and into `synapse.logging`. ([\#5606](https://github.com/matrix-org/synapse/issues/5606), [\#5617](https://github.com/matrix-org/synapse/issues/5617)) - Add a blacklist file to the repo to blacklist certain sytests from failing CI. ([\#5611](https://github.com/matrix-org/synapse/issues/5611)) - Make runtime errors surrounding password reset emails much clearer. ([\#5616](https://github.com/matrix-org/synapse/issues/5616)) - Remove dead code for persiting outgoing federation transactions. ([\#5622](https://github.com/matrix-org/synapse/issues/5622)) - Add `lint.sh` to the scripts-dev folder which will run all linting steps required by CI. ([\#5627](https://github.com/matrix-org/synapse/issues/5627)) - Move RegistrationHandler.get_or_create_user to test code. ([\#5628](https://github.com/matrix-org/synapse/issues/5628)) - Add some more common python virtual-environment paths to the black exclusion list. ([\#5630](https://github.com/matrix-org/synapse/issues/5630)) - Some counter metrics exposed over Prometheus have been renamed, with the old names preserved for backwards compatibility and deprecated. See `docs/metrics-howto.rst` for details. ([\#5636](https://github.com/matrix-org/synapse/issues/5636)) - Unblacklist some user_directory sytests. ([\#5637](https://github.com/matrix-org/synapse/issues/5637)) - Factor out some redundant code in the login implementation. ([\#5639](https://github.com/matrix-org/synapse/issues/5639)) - Update ModuleApi to avoid register(generate_token=True). ([\#5640](https://github.com/matrix-org/synapse/issues/5640)) - Remove access-token support from `RegistrationHandler.register`, and rename it. ([\#5641](https://github.com/matrix-org/synapse/issues/5641)) - Remove access-token support from `RegistrationStore.register`, and rename it. ([\#5642](https://github.com/matrix-org/synapse/issues/5642)) - Improve logging for auto-join when a new user is created. ([\#5643](https://github.com/matrix-org/synapse/issues/5643)) - Remove unused and unnecessary check for FederationDeniedError in _exception_to_failure. ([\#5645](https://github.com/matrix-org/synapse/issues/5645)) - Fix a small typo in a code comment. ([\#5655](https://github.com/matrix-org/synapse/issues/5655)) - Clean up exception handling around client access tokens. ([\#5656](https://github.com/matrix-org/synapse/issues/5656)) - Add a mechanism for per-test homeserver configuration in the unit tests. ([\#5657](https://github.com/matrix-org/synapse/issues/5657)) - Inline issue_access_token. ([\#5659](https://github.com/matrix-org/synapse/issues/5659)) - Update the sytest BuildKite configuration to checkout Synapse in `/src`. ([\#5664](https://github.com/matrix-org/synapse/issues/5664)) - Add a `docker` type to the towncrier configuration. ([\#5673](https://github.com/matrix-org/synapse/issues/5673)) - Convert `synapse.federation.transport.server` to `async`. Might improve some stack traces. ([\#5689](https://github.com/matrix-org/synapse/issues/5689)) - Documentation for opentracing. ([\#5703](https://github.com/matrix-org/synapse/issues/5703))	2019-07-22 13:49:16 +01:00
Jason Robinson	66f5ff72fd	Add user_type to returned fields in admin API user list endpoints ... Mostly user type will be empty (normal user) but there is also the "support" user type. Signed-off-by: Jason Robinson <jasonr@matrix.org>	2019-07-22 15:29:18 +03:00
Erik Johnston	5ea773c505	Cache get_version_string. ... The version of a module isn't going to change over the lifetime of the process (assuming no funky hot reloading is going on, which it isn't), so let's just cache the result to avoid spawning lots of git subprocesses. Fixes #5672.	2019-07-22 13:15:08 +01:00
Andrew Morgan	54437c48ca	1.2.0rc1	2019-07-22 12:59:04 +01:00
Jorik Schellekens	0fd171770a	Merge branch 'release-v1.2.0' into develop	2019-07-22 11:18:50 +01:00
Jorik Schellekens	826e6ec3bd	Opentracing Documentation (#5703) ... * Opentracing survival guide * Update decorator names in doc * Doc cleanup These are all alterations as a result of comments in #5703, it includes mostly typos and clarifications. The most interesting changes are: - Split developer and user docs into two sections - Add a high level description of OpenTracing * newsfile * Move contributer specific info to docstring. * Sample config. * Trailing whitespace. * Update 5703.misc * Apply suggestions from code review Mostly just rewording parts of the docs for clarity. Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-07-22 11:15:21 +01:00
Richard van der Hoff	dcca56baba	Add a delay to key lookup lock release to fix stack overflow ... A tactical call_later here should fix #5723	2019-07-19 17:57:00 +01:00
Richard van der Hoff	c7095be913	Refactor Keyring._start_key_lookups ... There's an awful lot of deferreds and dictionaries flying around here. The whole thing can be made much simpler and achieve the same effect.	2019-07-19 17:49:19 +01:00
Erik Johnston	7704873cb8	Merge pull request #5720 from matrix-org/erikj/transactions_upsert ... Use upsert when updating destination retry interval	2019-07-19 16:51:16 +01:00
Erik Johnston	d7bd9651bc	Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_state ... Delegate to cached version when using get_filtered_current_state_ids	2019-07-19 16:30:49 +01:00
Erik Johnston	5c07c97c09	Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_state ... Add membership column to current_state_events table	2019-07-19 16:30:33 +01:00
Jorik Schellekens	7b8bc61834	Don't accept opentracing data from clients. (#5715) ... * Don't accept opentracing data from clients. * newsfile	2019-07-19 16:29:57 +01:00
Erik Johnston	2410335507	Use upsert when updating destination retry interval	2019-07-19 13:40:24 +01:00
Erik Johnston	bd2e1a2aa8	LoggingTransaction accepts None for callback lists. ... Its a bit disingenuousto give LoggingTransaction lists to append callbacks to if we're not going to run the callbacks.	2019-07-19 13:36:04 +01:00
Erik Johnston	ebc5ed1296	Update comment for new column	2019-07-19 13:29:02 +01:00
Neil Johnson	5c05ae7ba0	Add 'rel' attribute to default welcome page. (#5695) ... add rel attribute as a precaution against reverse tabnabbing in future	2019-07-19 12:03:36 +01:00
Amber Brown	6a85cb5ef7	Remove non-dedicated logging options and command line arguments (#5678)	2019-07-19 01:40:08 +10:00
Neil Johnson	cfc00068bd	enable aggregations support by default	2019-07-18 15:56:59 +01:00
Erik Johnston	10523241d8	Delegate to cached version when using get_filtered_current_state_ids ... In the case where it gets called with `StateFilter.all()`	2019-07-18 15:17:39 +01:00
Richard van der Hoff	82345bc09a	Clean up opentracing configuration options (#5712) ... Clean up config settings and dead code. This is mostly about cleaning up the config format, to bring it into line with our conventions. In particular: * There should be a blank line after `## Section ##' headings * There should be a blank line between each config setting * There should be a `#`-only line between a comment and the setting it describes * We don't really do the `# #` style commenting-out of whole sections if we can help it * rename `tracer_enabled` to `enabled` While we're here, do more config parsing upfront, which makes it easier to use later on. Also removes redundant code from LogContextScopeManager. Also changes the changelog fragment to a `feature` - it's exciting!	2019-07-18 15:06:54 +01:00
Amber Brown	7ad1d76356	Support Prometheus_client 0.4.0+ (#5636)	2019-07-18 23:57:15 +10:00
Andrew Morgan	b2a382efdb	Remove the ability to query relations when the original event was redacted. (#5629) ... Fixes #5594 Forbid viewing relations on an event once it has been redacted.	2019-07-18 14:41:42 +01:00
Erik Johnston	8e1ada9e6f	Use the current_state_events.membership column	2019-07-18 14:16:01 +01:00
Erik Johnston	059d8c1a4e	Track if current_state_events.membership is up to date	2019-07-18 14:16:01 +01:00
Erik Johnston	c618a5d348	Add background update for current_state_events.membership column	2019-07-18 14:16:01 +01:00
Erik Johnston	6de09e07a6	Add membership column to current_state_events table. ... It turns out that doing a join is surprisingly expensive for the DB to do when room_membership table is larger than the disk cache.	2019-07-18 14:15:57 +01:00
Richard van der Hoff	fa8271c5ac	Convert synapse.federation.transport.server to async (#5689) ... * Convert BaseFederationServlet._wrap to async Empirically, this fixes some lost stacktraces. It should be safe because the wrapped function is called from JsonResource._async_render, which is already async. * Convert the rest of synapse.federation.transport.server to async We may as well do the whole file while we're here. * changelog * flake8	2019-07-18 11:46:47 +01:00
Richard van der Hoff	9c70a02a9c	Ignore redactions of m.room.create events (#5701)	2019-07-17 19:08:02 +01:00
Richard van der Hoff	2091c91fde	More refactoring in get_events_as_list (#5707) ... We can now use `_get_events_from_cache_or_db` rather than going right back to the database, which means that (a) we can benefit from caching, and (b) it opens the way forward to more extensive checks on the original event. We now always require the original event to exist before we will serve up a redaction.	2019-07-17 17:34:13 +01:00
Richard van der Hoff	375162b3c3	Fix redaction authentication (#5700) ... Ensures that redactions are correctly authenticated for recent room versions. There are a few things going on here: * `_fetch_event_rows` is updated to return a dict rather than a list of rows. * Rather than returning multiple copies of an event which was redacted multiple times, it returns the redactions as a list within the dict. * It also returns the actual rejection reason, rather than merely the fact that it was rejected, so that we don't have to query the table again in `_get_event_from_row`. * The redaction handling is factored out of `_get_event_from_row`, and now checks if any of the redactions are valid.	2019-07-17 16:52:02 +01:00
Richard van der Hoff	65c5592b8e	Refactor get_events_as_list (#5699) ... A couple of changes here: * get rid of a redundant `allow_rejected` condition - we should already have filtered out any rejected events before we get to that point in the code, and the redundancy is confusing. Instead, let's stick in an assertion just to make double-sure we aren't leaking rejected events by mistake. * factor out a `_get_events_from_cache_or_db` method, which is going to be important for a forthcoming fix to redactions.	2019-07-17 16:49:19 +01:00
Erik Johnston	5ed7853bb0	Remove pointless description	2019-07-16 11:45:57 +01:00
Erik Johnston	f44354e17f	Clean up arg name and remove lying comment	2019-07-16 11:39:40 +01:00
Erik Johnston	d0d479c1af	Fix typo in synapse/app/admin_cmd.py ... Co-Authored-By: Aaron Raimist <aaron@raim.ist>	2019-07-16 09:52:56 +01:00
Erik Johnston	03cc8c4b5d	Fix invoking add_argument from homeserver.py	2019-07-15 14:25:05 +01:00
Erik Johnston	eca4f5ac73	s/exfiltrate_user_data/export_user_data/	2019-07-15 14:17:28 +01:00
Erik Johnston	1b2067f53d	Add FileExfiltrationWriter	2019-07-15 14:15:22 +01:00
Erik Johnston	e8c53b07f2	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmd	2019-07-15 14:13:22 +01:00
Erik Johnston	c8f35d8d38	Use set_defaults(func=) style	2019-07-15 14:09:35 +01:00
Erik Johnston	fdefb9e29a	Move creation of ArgumentParser to caller	2019-07-15 14:09:35 +01:00
Erik Johnston	37b524f971	Fix up comments	2019-07-15 14:09:35 +01:00
Erik Johnston	823e13ddf4	Change add_arguments to be a static method	2019-07-15 14:09:33 +01:00
Andrew Morgan	18c516698e	Return a different error from Invalid Password when a user is deactivated (#5674) ... Return `This account has been deactivated` instead of `Invalid password` when a user is deactivated.	2019-07-15 11:45:29 +01:00
Erik Johnston	d86321300a	Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_data ... Add basic function to get all data for a user out of synapse	2019-07-15 10:04:02 +01:00
Richard van der Hoff	5f158ec039	Implement access token expiry (#5660) ... Record how long an access token is valid for, and raise a soft-logout once it expires.	2019-07-12 17:26:02 +01:00
Erik Johnston	db0a50bc40	Fixup docstrings	2019-07-12 16:59:59 +01:00
Andrew Morgan	24aa0e0a5b	fix typo: backgroud -> background	2019-07-12 15:29:40 +01:00
Andrew Morgan	78a1cd36b5	small typo fix (#5655)	2019-07-11 13:33:23 +01:00
Richard van der Hoff	0a4001eba1	Clean up exception handling for access_tokens (#5656) ... First of all, let's get rid of `TOKEN_NOT_FOUND_HTTP_STATUS`. It was a hack we did at one point when it was possible to return either a 403 or a 401 if the creds were missing. We always return a 401 in these cases now (thankfully), so it's not needed. Let's also stop abusing `AuthError` for these cases. Honestly they have nothing that relates them to the other places that `AuthError` is used, other than the fact that they are loosely under the 'Auth' banner. It makes no sense for them to share exception classes. Instead, let's add a couple of new exception classes: `InvalidClientTokenError` and `MissingClientTokenError`, for the `M_UNKNOWN_TOKEN` and `M_MISSING_TOKEN` cases respectively - and an `InvalidClientCredentialsError` base class for the two of them.	2019-07-11 11:06:23 +01:00
Jorik Schellekens	38a6d3eea7	Add basic opentracing support (#5544) ... * Configure and initialise tracer Includes config options for the tracer and sets up JaegerClient. * Scope manager using LogContexts We piggy-back our tracer scopes by using log context. The current log context gives us the current scope. If new scope is created we create a stack of scopes in the context. * jaeger is a dependency now * Carrier inject and extraction for Twisted Headers * Trace federation requests on the way in and out. The span is created in _started_processing and closed in _finished_processing because we need a meaningful log context. * Create logcontext for new scope. Instead of having a stack of scopes in a logcontext we create a new context for a new scope if the current logcontext already has a scope. * Remove scope from logcontext if logcontext is top level * Disable tracer if not configured * typo * Remove dependence on jaeger internals * bools * Set service name * :Explicitely state that the tracer is disabled * Black is the new black * Newsfile * Code style * Use the new config setup. * Generate config. * Copyright * Rename config to opentracing * Remove user whitelisting * Empty whitelist by default * User ConfigError instead of RuntimeError * Use isinstance * Use tag constants for opentracing. * Remove debug comment and no need to explicitely record error * Two errors a "s(c)entry" * Docstrings! * Remove debugging brainslip * Homeserver Whitlisting * Better opentracing config comment * linting * Inclue worker name in service_name * Make opentracing an optional dependency * Neater config retreival * Clean up dummy tags * Instantiate tracing as object instead of global class * Inlcude opentracing as a homeserver member. * Thread opentracing to the request level * Reference opetnracing through hs * Instantiate dummy opentracin g for tests. * About to revert, just keeping the unfinished changes just in case * Revert back to global state, commit number: 9ce4a3d9067bf9889b86c360c05ac88618b85c4f * Use class level methods in tracerutils * Start and stop requests spans in a place where we have access to the authenticated entity * Seen it, isort it * Make sure to close the active span. * I'm getting black and blue from this. * Logger formatting Co-Authored-By: Erik Johnston <erik@matrix.org> * Outdated comment * Import opentracing at the top * Return a contextmanager * Start tracing client requests from the servlet * Return noop context manager if not tracing * Explicitely say that these are federation requests * Include servlet name in client requests * Use context manager * Move opentracing to logging/ * Seen it, isort it again! * Ignore twisted return exceptions on context exit * Escape the scope * Scopes should be entered to make them useful. * Nicer decorator names * Just one init, init? * Don't need to close something that isn't open * Docs make you smarter	2019-07-11 10:36:03 +01:00
Richard van der Hoff	1890cfcf82	Inline issue_access_token (#5659) ... this is only used in one place, so it's clearer if we inline it and reduce the API surface. Also, fixes a buglet where we would create an access token even if we were about to block the user (we would never return the AT, so the user could never use it, but it was still created and added to the db.)	2019-07-11 04:10:07 +10:00
Brendan Abolivier	8ab3444fdf	Merge pull request #5658 from matrix-org/babolivier/is-json ... Send 3PID bind requests as JSON data	2019-07-10 17:01:26 +01:00
Richard van der Hoff	953dbb7980	Remove access-token support from RegistrationStore.register (#5642) ... The 'token' param is no longer used anywhere except the tests, so let's kill that off too.	2019-07-10 16:26:49 +01:00
Brendan Abolivier	b2a2e96ea6	Typo	2019-07-10 15:56:21 +01:00
Brendan Abolivier	f77e997619	Send 3PID bind requests as JSON data	2019-07-10 15:46:42 +01:00
Andrew Morgan	f281714583	Don't bundle aggregations when retrieving the original event (#5654) ... A fix for PR #5626, which returned the original event content as part of a call to /relations. Only problem was that we were attempting to aggregate the relations on top of it when we did so. We now set bundle_aggregations to False in the get_event call. We also do this when pulling the relation events as well, because edits of edits are not something we'd like to support here.	2019-07-10 14:43:11 +01:00
Brendan Abolivier	65434da75d	Merge pull request #5638 from matrix-org/babolivier/invite-json ... Use JSON when querying the IS's /store-invite endpoint	2019-07-09 18:48:38 +01:00
Hubert Chathi	7b3bc755a3	remove unused and unnecessary check for FederationDeniedError (#5645) ... FederationDeniedError is a subclass of SynapseError, which is a subclass of CodeMessageException, so if e is a FederationDeniedError, then this check for FederationDeniedError will never be reached since it will be caught by the check for CodeMessageException above. The check for CodeMessageException does almost the same thing as this check (since FederationDeniedError initialises with code=403 and msg="Federation denied with %s."), so may as well just keep allowing it to handle this case.	2019-07-09 18:37:39 +01:00
Andrew Morgan	d88421ab03	Include the original event in /relations (#5626) ... When asking for the relations of an event, include the original event in the response. This will mostly be used for efficiently showing edit history, but could be useful in other circumstances.	2019-07-09 13:43:08 +01:00
Brendan Abolivier	af67c7c1de	Merge pull request #5644 from matrix-org/babolivier/profile-allow-self ... Allow newly-registered users to lookup their own profiles	2019-07-09 10:25:40 +01:00
Richard van der Hoff	824707383b	Remove access-token support from RegistrationHandler.register (#5641) ... Nothing uses this now, so we can remove the dead code, and clean up the API. Since we're changing the shape of the return value anyway, we take the opportunity to give the method a better name.	2019-07-08 19:01:08 +01:00
Brendan Abolivier	7556851665	Allow newly-registered users to lookup their own profiles ... When a user creates an account and the 'require_auth_for_profile_requests' config flag is set, and a client that performed the registration wants to lookup the newly-created profile, the request will be denied because the user doesn't share a room with themselves yet.	2019-07-08 17:31:00 +01:00
Richard van der Hoff	b70e080b59	Better logging for auto-join. (#5643) ... It was pretty unclear what was going on, so I've added a couple of log lines.	2019-07-08 17:14:51 +01:00
Brendan Abolivier	57eacee4f4	Merge branch 'develop' into babolivier/invite-json	2019-07-08 15:49:23 +01:00
Richard van der Hoff	4b1f7febc7	Update ModuleApi to avoid register(generate_token=True) (#5640) ... * Update ModuleApi to avoid register(generate_token=True) This is the only place this is still used, so I'm trying to kill it off. * changelog	2019-07-08 23:55:34 +10:00
Richard van der Hoff	f9e99f9534	Factor out some redundant code in the login impl (#5639) ... * Factor out some redundant code in the login impl Also fixes a redundant access_token which was generated during jwt login. * changelog	2019-07-08 23:54:22 +10:00
Richard van der Hoff	1af2fcd492	Move get_or_create_user to test code (#5628) ... This is only used in tests, so...	2019-07-08 23:52:26 +10:00
Brendan Abolivier	f05c7d62bc	Lint	2019-07-08 14:29:27 +01:00
Brendan Abolivier	1a807dfe68	Use application/json when querying the IS's /store-invite endpoint	2019-07-08 14:19:39 +01:00
J. Ryan Stinnett	9b1b79f3f5	Add default push rule to ignore reactions (#5623) ... This adds a default push rule following the proposal in [MSC2153](https://github.com/matrix-org/matrix-doc/pull/2153). See also https://github.com/vector-im/riot-web/issues/10208 See also https://github.com/matrix-org/matrix-js-sdk/pull/976	2019-07-05 17:37:52 +01:00
Andrew Morgan	ad8b909ce9	Add origin_server_ts and sender fields to m.replace (#5613) ... Riot team would like some extra fields as part of m.replace, so here you go. Fixes: #5598	2019-07-05 17:20:02 +01:00
Richard van der Hoff	80cc82a445	Remove support for invite_3pid_guest. (#5625) ... This has never been documented, and I'm not sure it's ever been used outside sytest. It's quite a lot of poorly-maintained code, so I'd like to get rid of it. For now I haven't removed the database table; I suggest we leave that for a future clearout.	2019-07-05 16:47:58 +01:00
Erik Johnston	b4f5416dd9	pep8	2019-07-05 14:41:29 +01:00
Erik Johnston	eadb13d2e9	Remove FileExfiltrationWriter	2019-07-05 14:15:00 +01:00
Erik Johnston	7f0d8e4288	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfiltrate_data	2019-07-05 14:08:21 +01:00
Erik Johnston	9ccea16d45	Assume key existence. Update docstrings	2019-07-05 14:07:56 +01:00
Richard van der Hoff	a6a776f3d8	remove dead transaction persist code (#5622) ... this hasn't done anything for years	2019-07-05 12:59:42 +01:00
Richard van der Hoff	9481707a52	Fixes to the federation rate limiter (#5621) ... - Put the default window_size back to 1000ms (broken by #5181) - Make the `rc_federation` config actually do something - fix an off-by-one error in the 'concurrent' limit - Avoid creating an unused `_PerHostRatelimiter` object for every single incoming request	2019-07-05 11:10:19 +01:00
Andrew Morgan	0e5434264f	Make errors about email password resets much clearer (#5616) ... The runtime errors that dealt with local email password resets talked about config options that users may not even have in their config file yet (if upgrading). Instead, the cryptic errors are now replaced with hopefully much more helpful ones.	2019-07-05 10:44:12 +01:00
Amber Brown	1ee268d33d	Improve the backwards compatibility re-exports of synapse.logging.context (#5617) ... * Improve the backwards compatibility re-exports of synapse.logging.context. * reexport logformatter too	2019-07-05 02:32:02 +10:00
Erik Johnston	822a0f0435	Merge branch 'master' of github.com:matrix-org/synapse into develop	2019-07-04 14:00:27 +01:00
Erik Johnston	20332b278d	1.1.0	2019-07-04 11:44:09 +01:00
Erik Johnston	c061d4f237	Fixup from review comments.	2019-07-04 11:41:06 +01:00
Amber Brown	463b072b12	Move logging utilities out of the side drawer of util/ and into logging/ (#5606)	2019-07-04 00:07:04 +10:00
Erik Johnston	d0b849c86d	Apply comment fixups from code review ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-07-03 15:03:38 +01:00
Richard van der Hoff	cb8d568cf9	Fix 'utime went backwards' errors on daemonization. (#5609) ... * Fix 'utime went backwards' errors on daemonization. Fixes #5608 * remove spurious debug	2019-07-03 22:40:45 +10:00
Richard van der Hoff	463d5a8fde	1.1.0rc2	2019-07-03 10:51:47 +01:00
Richard van der Hoff	91753cae59	Fix a number of "Starting txn from sentinel context" warnings (#5605) ... Fixes #5602, #5603	2019-07-03 09:31:27 +01:00
Amber Brown	0ee9076ffe	Fix media repo breaking (#5593)	2019-07-02 19:01:28 +01:00
Erik Johnston	9f3c0a8556	Add basic admin cmd app	2019-07-02 17:12:48 +01:00
Erik Johnston	8ee69f299c	Add basic function to get all data for a user out of synapse	2019-07-02 12:09:04 +01:00
Richard van der Hoff	a0fa4641c4	prepare v1.1.0rc1	2019-07-02 11:51:55 +01:00
Richard van der Hoff	6eecb6e500	Complete the SAML2 implementation (#5422) ... * SAML2 Improvements and redirect stuff Signed-off-by: Alexander Trost <galexrt@googlemail.com> * Code cleanups and simplifications. Also: share the saml client between redirect and response handlers. * changelog * Revert redundant changes to static js * Move all the saml stuff out to a centralised handler * Add support for tracking SAML2 sessions. This allows us to correctly handle `allow_unsolicited: False`. * update sample config * cleanups * update sample config * rename BaseSSORedirectServlet for consistency * Address review comments	2019-07-02 11:18:11 +01:00
PauRE	948488e115	Fix JWT login with new users (#5586) ... Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>	2019-07-02 10:25:37 +01:00
Amber Brown	b4914681a5	fix async/await consentresource (#5585) ... Fixes #5582	2019-07-01 23:33:52 +10:00
Richard van der Hoff	b4fd86a9b4	Merge branch 'develop' into rav/saml2_client	2019-07-01 14:21:03 +01:00
Richard van der Hoff	3bcb13edd0	Address review comments	2019-07-01 12:13:22 +01:00
Erik Johnston	04196a4dae	Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloop ... Fix sync tightloop bug.	2019-07-01 11:43:10 +01:00
Erik Johnston	915280f1ed	Fixup comment	2019-07-01 10:22:42 +01:00
Amber Brown	f40a7dc41f	Make the http server handle coroutine-making REST servlets (#5475)	2019-06-29 17:06:55 +10:00
Brendan Abolivier	c7ff297dde	Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimit ... Don't update the ratelimiter before sending a 3PID invite	2019-06-28 17:43:48 +01:00
Brendan Abolivier	15d9fc31bd	Only ratelimit when sending the email ... If we do the opposite, an event can arrive after or while sending the email and the 3PID invite event will get ratelimited.	2019-06-28 16:04:05 +01:00
Brendan Abolivier	01d0f8e701	Don't update the ratelimiter before sending a 3PID invite ... This would cause emails being sent, but Synapse responding with a 429 when creating the event. The client would then retry, and with bad timing the same scenario would happen again. Some testing I did ended up sending me 10 emails for one single invite because of this.	2019-06-28 15:22:16 +01:00
Amber Brown	071150ce19	Don't log GC 0s at INFO (#5557)	2019-06-28 21:45:33 +10:00
Amber Brown	be3b901ccd	Update the TLS cipher string and provide configurability for TLS on outgoing federation (#5550)	2019-06-28 18:19:09 +10:00
Daniel Hoffend	9646a593ac	Added possibilty to disable local password authentication (#5092) ... Signed-off-by: Daniel Hoffend <dh@dotlan.net>	2019-06-27 18:37:29 +01:00
Andrew Morgan	c548dbc4b1	Make it clearer that the template dir is relative to synapse's root dir (#5543) ... Helps address #5444	2019-06-27 18:20:17 +01:00
Erik Johnston	e79ec03165	Merge pull request #5559 from matrix-org/erikj/refactor_changed_devices ... Refactor devices changed query to pull less from DB	2019-06-27 16:53:15 +01:00
Erik Johnston	729f5a4fb6	Review comments	2019-06-27 16:06:23 +01:00
PauRE	856ea04eb3	Fix JWT login (#5555) ... * Fix JWT login with register Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Add pyjwt conditional dependency Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Added changelog file Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Improved changelog description Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>	2019-06-27 12:02:41 +01:00
Richard van der Hoff	79b9d9076d	rename BaseSSORedirectServlet for consistency	2019-06-27 00:46:57 +01:00
Richard van der Hoff	28db0ae537	cleanups	2019-06-27 00:37:41 +01:00
Richard van der Hoff	36f4953dec	Add support for tracking SAML2 sessions. ... This allows us to correctly handle `allow_unsolicited: False`.	2019-06-26 23:50:55 +01:00
Richard van der Hoff	3705322103	Move all the saml stuff out to a centralised handler	2019-06-26 22:52:02 +01:00
Richard van der Hoff	0ade403f55	Revert redundant changes to static js	2019-06-26 22:46:23 +01:00
Richard van der Hoff	a4daa899ec	Merge branch 'develop' into rav/saml2_client	2019-06-26 22:34:41 +01:00
Erik Johnston	8624db3194	Refactor and comment sync device list code	2019-06-26 19:39:49 +01:00
Erik Johnston	f335e77d53	Use batch_iter and correct docstring	2019-06-26 19:39:46 +01:00
Erik Johnston	806a06daf2	Rename get_users_whose_devices_changed	2019-06-26 19:39:19 +01:00
Erik Johnston	a2f6d31a63	Refactor get_user_ids_changed to pull less from DB ... When a client asks for users whose devices have changed since a token we used to pull *all* users from the database since the token, which could easily be thousands of rows for old tokens. This PR changes this to only check for changes for users the client is actually interested in. Fixes #5553	2019-06-26 12:03:44 +01:00
Andrew Morgan	ef8c62758c	Prevent multiple upgrades on the same room at once (#5051) ... Closes #4583 Does slightly less than #5045, which prevented a room from being upgraded multiple times, one after another. This PR still allows that, but just prevents two from happening at the same time. Mostly just to mitigate the fact that servers are slow and it can take a moment for the room upgrade to actually complete. We don't want people sending another request to upgrade the room when really they just thought the first didn't go through.	2019-06-25 14:19:21 +01:00
Richard van der Hoff	4ac7ef4b67	Merge pull request #5524 from matrix-org/rav/new_cmdline_options ... Add --data-dir and --open-private-ports options.	2019-06-24 17:25:57 +01:00
Richard van der Hoff	af8a962905	Merge pull request #5523 from matrix-org/rav/arg_defaults ... Stop conflating generated config and default config	2019-06-24 17:24:35 +01:00
Richard van der Hoff	e59a8cd2e5	Merge pull request #5499 from matrix-org/rav/cleanup_metrics ... Cleanups and sanity-checking in cpu and db metrics	2019-06-24 17:12:54 +01:00
Brendan Abolivier	deb4fe6ef3	Merge pull request #5534 from matrix-org/babolivier/federation-publicrooms ... Split public rooms directory auth config in two	2019-06-24 16:08:02 +01:00
Brendan Abolivier	bfe84e051e	Split public rooms directory auth config in two	2019-06-24 15:42:31 +01:00
Erik Johnston	25433f212d	Merge pull request #5531 from matrix-org/erikj/workers_pagination_token ... Fix /messages on workers when no from param specified.	2019-06-24 15:30:10 +01:00
Richard van der Hoff	3f8a252dd8	Add "--open-private-ports" cmdline option ... This is helpful when generating a config file for running synapse under docker.	2019-06-24 14:15:34 +01:00
Richard van der Hoff	6a92b06cbb	Add --data-directory commandline argument ... We don't necessarily want to put the data in the cwd.	2019-06-24 14:15:34 +01:00
Richard van der Hoff	16b52642e2	Don't load the generated config as the default. ... It's too confusing.	2019-06-24 14:14:52 +01:00
Richard van der Hoff	7c2f8881a9	Ensure that all config options have sensible defaults ... This will enable us to skip the unintuitive behaviour where the generated config and default config are the same thing.	2019-06-24 14:14:52 +01:00
Richard van der Hoff	367a8263b3	Remove unused Config.config_dir_path attribute ... This is no longer used and only serves to confuse.	2019-06-24 13:51:22 +01:00
Richard van der Hoff	edea4bb5be	Allow configuration of the path used for ACME account keys. ... Because sticking it in the same place as the config isn't necessarily the right thing to do.	2019-06-24 13:51:22 +01:00
Richard van der Hoff	c3c6b00d95	Pass config_dir_path and data_dir_path into Config.read_config. (#5522) ... * Pull config_dir_path and data_dir_path calculation out of read_config_files * Pass config_dir_path and data_dir_path into read_config	2019-06-24 11:34:45 +01:00
Richard van der Hoff	21bf4318b5	Factor acme bits out to a separate file (#5521) ... This makes some of the conditional-import hoop-jumping easier.	2019-06-24 11:33:56 +01:00
Richard van der Hoff	1793de6c6d	black	2019-06-24 11:16:13 +01:00
Erik Johnston	dddf20e8e1	Fix /messages on workers when no from param specified. ... If no `from` param is specified we calculate and use the "current token" that inlcuded typing, presence, etc. These are unused during pagination and are not available on workers, so we simply don't calculate them.	2019-06-24 10:06:51 +01:00
Richard van der Hoff	dc94773e60	Avoid raising exceptions in metrics ... Sentry will catch the errors if they happen, so that should be good enough, and woun't make things explode if we hit the error condition.	2019-06-24 10:01:16 +01:00
Richard van der Hoff	5097aee740	Merge branch 'develop' into rav/cleanup_metrics	2019-06-24 10:00:13 +01:00
Richard van der Hoff	c753c098dd	Merge pull request #5498 from matrix-org/rav/fix_clock_reversal ... Use monotonic clock where possible for metrics	2019-06-24 09:55:12 +01:00
Richard van der Hoff	6cda36777b	Drop support for cpu_affinity (#5525) ... This has no useful purpose on python3, and is generally a source of confusion.	2019-06-22 11:01:55 +10:00
Richard van der Hoff	e1a795758c	Improve help and cmdline option names for --generate-config options (#5512) ... * group the arguments together into a group * add new names "--generate-missing-config" and "--config-directory" for existing cmdline options "--generate-keys" and "--keys-dir", which better reflect their purposes.	2019-06-21 18:50:43 +01:00
Richard van der Hoff	03cea2b0fe	Refactor Config parser and add some comments. (#5511) ... Add some comments, and simplify `read_config_files`.	2019-06-21 17:43:38 +01:00
Richard van der Hoff	37933a3bf8	Improve logging when generating config files (#5510) ... Make it a bit clearer what's going on.	2019-06-21 17:14:56 +01:00
Andrew Morgan	5d6644efe0	Only import jinja2 when needed (#5514) ... Fixes https://github.com/matrix-org/synapse/issues/5431 `jinja2` was being imported even when it wasn't strictly necessary. This made it required to run Synapse, even if the functionality that required it wasn't enabled. This was causing new Synapse installations to crash on startup. Email modules are now required.	2019-06-21 16:52:09 +01:00
Richard van der Hoff	0e8b35f7b0	Fix "Unexpected entry in 'full_schemas'" log warning (#5509) ... There is a README.txt which always sets off this warning, which is a bit alarming when you first start synapse. I don't think we need to warn about this.	2019-06-21 15:11:57 +01:00
Richard van der Hoff	2f8491daef	Fix logging error when a tampered event is detected. (#5500)	2019-06-21 15:11:42 +01:00
Erik Johnston	7eadb74056	Fix /messages on worker when no token supplied	2019-06-21 14:15:59 +01:00
Erik Johnston	8181e290a9	Fix sync tightloop bug. ... If, for some reason, presence updates take a while to persist then it can trigger clients to tightloop calling `/sync` due to the presence handler returning updates but not advancing the stream token. Fixes #5503.	2019-06-21 11:10:27 +01:00
Erik Johnston	f3ab533374	Support pagination API in client_reader worker	2019-06-21 10:43:12 +01:00
Erik Johnston	7456698241	Merge pull request #5476 from matrix-org/erikj/histogram_extremities ... Add metrics for length of new extremities persisted.	2019-06-21 09:58:54 +01:00
Neil Johnson	f47969f42a	Improve email notification logging (#5502)	2019-06-20 15:14:26 +01:00
Erik Johnston	f8bd30af2a	Black	2019-06-20 13:10:06 +01:00
Erik Johnston	45f28a9d2f	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/histogram_extremities	2019-06-20 11:59:14 +01:00
Amber Brown	32e7c9e7f2	Run Black. (#5482)	2019-06-20 19:32:02 +10:00
Richard van der Hoff	fe641df770	Sanity-checking for metrics updates ... Check that our clocks go forward.	2019-06-19 21:18:38 +01:00
Richard van der Hoff	f682af052d	Simplify PerformanceCounters.update interface ... we already have the duration for the update, so may as well use it rather than passing extra params around and recalculating it.	2019-06-19 21:18:38 +01:00
Richard van der Hoff	68128d5626	Remove unused _get_event_counters ... This has been redundant since cdb3757942.	2019-06-19 21:14:25 +01:00
Richard van der Hoff	15bf32e062	Use monotonic clock where possible for metrics ... Fixes intermittent errors observed on Apple hardware which were caused by time.clock() appearing to go backwards when called from different threads. Also fixes a bug where database activity times were logged as 1/1000 of their correct ratio due to confusion between milliseconds and seconds.	2019-06-19 21:09:43 +01:00
Erik Johnston	7dcf984075	Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error ... Handle the case of `get_missing_events` failing	2019-06-19 13:20:09 +01:00
Erik Johnston	e0be8d7016	Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events ... Add experimental option to reduce extremities.	2019-06-19 13:19:18 +01:00
Erik Johnston	65787b0f7c	Add descriptions and remove redundant set(..)	2019-06-19 11:49:39 +01:00
Erik Johnston	554609288b	Run as background process and fix comments	2019-06-19 11:33:03 +01:00
Brendan Abolivier	092e36457a	Fix typo in deactivation background job	2019-06-19 11:09:41 +01:00
David Baker	f2d2ae03da	Add some logging to 3pid invite sig verification (#5015) ... I had to add quite a lot of logging to diagnose a problem with 3pid invites - we only logged the one failure which isn't all that informative. NB. I'm not convinced the logic of this loop is right: I think it should just accept a single valid signature from a trusted source rather than fail if *any* signature is invalid. Also it should probably not skip the rest of middle loop if a check fails? However, I'm deliberately not changing the logic here.	2019-06-18 22:51:24 +01:00
Erik Johnston	2b20d0fb59	Fix logline	2019-06-18 16:12:53 +01:00
Erik Johnston	19b80fe68a	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_missing_events_error	2019-06-18 16:11:43 +01:00
Erik Johnston	b42f90470f	Add experimental option to reduce extremities. ... Adds new config option `cleanup_extremities_with_dummy_events` which periodically sends dummy events to rooms with more than 10 extremities. THIS IS REALLY EXPERIMENTAL.	2019-06-18 15:02:18 +01:00
Erik Johnston	16a3124b76	Only count non-cache state resolution	2019-06-18 13:02:06 +01:00
Erik Johnston	c9385dd238	Use consistent buckets	2019-06-18 12:43:41 +01:00
Brendan Abolivier	d6328e03fd	Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pid ... Add third party rules hook for 3PID invites	2019-06-17 18:08:31 +01:00
Brendan Abolivier	33ea87be39	Make check_threepid_can_be_invited async	2019-06-17 17:39:38 +01:00
Brendan Abolivier	112cf5a73a	Add third party rules hook for 3PID invites	2019-06-17 17:39:09 +01:00
Erik Johnston	8353ddd951	Merge pull request #5479 from matrix-org/erikj/add_create_room_hook_develop ... Add third party rules hook into create room	2019-06-17 17:30:05 +01:00
Erik Johnston	ff88d36dcb	Add metric fo number of state groups in resolution	2019-06-17 17:02:53 +01:00
Erik Johnston	499d4a32cd	Add metrics for len of new extremities persisted. ... Of new events being persisted add metrics for total size of forward extremities and number of unchanged, "stale" extremities.	2019-06-17 17:02:48 +01:00
Erik Johnston	187d2837a9	Add third party rules hook into create room	2019-06-17 16:41:19 +01:00
Amber Brown	eba7caf09f	Remove Postgres 9.4 support (#5448)	2019-06-18 00:59:00 +10:00
Erik Johnston	6840ebeef8	Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptions ... Handle HttpResponseException when using federation client.	2019-06-17 13:54:47 +01:00
Erik Johnston	dd927b29e1	Merge pull request #5388 from matrix-org/erikj/fix_email_push ... Fix email notifications for unnamed rooms with multiple people	2019-06-17 13:54:35 +01:00
Erik Johnston	414d2ca3a6	Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_master ... Only start background group attestation renewals on master	2019-06-17 13:54:29 +01:00
Erik Johnston	a9dab970b8	Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_state ... Fix 3PID invite room state over federation.	2019-06-17 10:18:28 +01:00
Brendan Abolivier	f12e1f029c	Merge pull request #5440 from matrix-org/babolivier/third_party_event_rules ... Allow server admins to define implementations of extra rules for allowing or denying incoming events	2019-06-14 19:37:59 +01:00
Erik Johnston	9ca4ae7131	Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive ... Prometheus histograms are cumalative	2019-06-14 18:21:42 +01:00
Brendan Abolivier	f874b16b2e	Add plugin APIs for implementations of custom event rules.	2019-06-14 18:16:03 +01:00
Brendan Abolivier	14db086428	Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_job ... Fix background job for deactivated flag	2019-06-14 18:12:56 +01:00
Erik Johnston	304a1376c2	Fix 3PID invite room state over federation. ... Fixes that when a user exchanges a 3PID invite for a proper invite over federation it does not include the `invite_room_state` key. This was due to synapse incorrectly sending out two invite requests.	2019-06-14 16:19:11 +01:00
Brendan Abolivier	e0b77b004d	Fix background job for deactivated flag	2019-06-14 16:00:45 +01:00
Brendan Abolivier	9b14a810d2	Merge pull request #5462 from matrix-org/babolivier/account_validity_deactivated_accounts_2 ... Don't send renewal emails to deactivated users (second attempt)	2019-06-14 15:35:31 +01:00
Brendan Abolivier	6d56a694f4	Don't send renewal emails to deactivated users	2019-06-14 15:05:56 +01:00
Erik Johnston	e9344e0dee	Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_file ... Don't log exception when failing to fetch remote content.	2019-06-14 14:25:14 +01:00
Erik Johnston	3ed595e327	Prometheus histograms are cumalative	2019-06-14 14:07:32 +01:00
Brendan Abolivier	d0530382ee	Track deactivated accounts in the database (#5378)	2019-06-14 13:18:24 +01:00
Amber H. Brown	a10c8dae85	fix prometheus rendering error	2019-06-14 21:09:33 +10:00
Richard van der Hoff	5c15039e06	Clean up code for sending federation EDUs. (#5381) ... This code confused the hell out of me today. Split _get_new_device_messages into its two (unrelated) parts.	2019-06-13 13:52:08 +01:00
Amber Brown	6312d6cc7c	Expose statistics on extrems to prometheus (#5384)	2019-06-13 22:40:52 +10:00
Amber Brown	09e9a26b71	Remove Python 2.7 support. (#5425) ... * remove 2.7 from CI and publishing * fill out classifiers and also make it not be installed on 3.5 * some minor bumps so that the old deps work on python 3.5	2019-06-12 21:31:59 +10:00
Erik Johnston	7e68691ce9	Merge branch 'master' of github.com:matrix-org/synapse into develop	2019-06-11 17:25:16 +01:00
Erik Johnston	97174780ce	1.0.0	2019-06-11 17:10:01 +01:00
Erik Johnston	a766c41d25	Bump bleach version so that tests can run on old deps.	2019-06-11 12:34:18 +01:00
Erik Johnston	10383e6e6f	Change password reset links to /_matrix.	2019-06-11 11:34:33 +01:00
Erik Johnston	5bc9484537	Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop	2019-06-11 10:37:43 +01:00
Richard van der Hoff	b55e8840e4	Merge tag 'v1.0.0rc3' into rav/saml2_client ... Synapse 1.0.0rc3 (2019-06-10) ============================= Security: Fix authentication bug introduced in 1.0.0rc1. Please upgrade to rc3 immediately	2019-06-11 00:28:57 +01:00
Andrew Morgan	2ddc13577c	Don't warn user about password reset disabling through config code (#5387) ... Moves the warning about password resets being disabled to the point where a user actually tries to reset their password. Is this an appropriate place for it to happen? Also removed the disabling of msisdn password resets when you don't have an email config, as that just doesn't make sense. Also change the error a user receives upon disabled passwords to specify that only email-based password reset is disabled.	2019-06-11 00:25:07 +01:00
Erik Johnston	6bac9ca6d7	1.0.0rc3	2019-06-11 00:13:02 +01:00
Richard van der Hoff	426049247b	Code cleanups and simplifications. ... Also: share the saml client between redirect and response handlers.	2019-06-11 00:03:57 +01:00
Neil Johnson	94dac0f3e5	add monthly active users to phonehome stats (#5252) ... * add monthly active users to phonehome stats	2019-06-10 23:33:59 +01:00
Erik Johnston	49e01e5710	Fix defaults on checking threepids	2019-06-10 23:09:31 +01:00
Richard van der Hoff	69a43d9974	Merge remote-tracking branch 'origin/develop' into rav/saml2_client	2019-06-10 20:28:08 +01:00
Erik Johnston	78e74ab8a1	Merge pull request #5418 from matrix-org/erikj/fix_send_fed_with_limit_zero ... Fix bug sending federation transactions with lots of EDUs	2019-06-10 20:19:49 +01:00
Erik Johnston	abce00fc6a	Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop	2019-06-10 18:33:55 +01:00
Erik Johnston	0167447965	1.0.0rc2	2019-06-10 18:17:43 +01:00
Erik Johnston	a6b1817940	Merge pull request #5417 from matrix-org/rav/shared_ssl_context ... Share an SSL context object between SSL connections	2019-06-10 18:16:12 +01:00
Richard van der Hoff	81b8fdedf2	rename gutwrenched attr	2019-06-10 17:51:11 +01:00
Erik Johnston	c413540fb9	Fix bug sending federation transactions with lots of EDUs ... If we try and send a transaction with lots of EDUs and we run out of space, we call get_new_device_msgs_for_remote with a limit of 0, which then failed.	2019-06-10 16:22:45 +01:00
Richard van der Hoff	efe7b3176e	Fix federation connections to literal IP addresses ... turns out we need a shiny version of service_identity to enforce this correctly.	2019-06-10 15:58:35 +01:00
Erik Johnston	0382b0ffee	Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_ms ... Fix key verification when key stored with null valid_until_ms	2019-06-10 15:56:36 +01:00
Erik Johnston	8da0d83a54	Merge branch 'erikj/fix_null_valid_until_ms' of github.com:matrix-org/synapse into release-v1.0.0	2019-06-10 15:56:28 +01:00
Richard van der Hoff	d11c634ced	clean up impl, and import idna directly	2019-06-10 15:55:12 +01:00
Erik Johnston	43badd2cd4	Fix key verification when key stored with null valid_until_ms ... Some keys are stored in the synapse database with a null valid_until_ms which caused an exception to be thrown when using that key. We fix this by treating nulls as zeroes, i.e. they keys will match verification requests with a minimum_valid_until_ms of zero (i.e. don't validate ts) but will not match requests with a non-zero minimum_valid_until_ms. Fixes #5391.	2019-06-10 15:37:10 +01:00
Brendan Abolivier	26b62796c2	Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mail_auth ... Don't check whether the user's account is expired on /send_mail requests	2019-06-10 11:57:02 +01:00
Brendan Abolivier	028f674cd3	Better wording	2019-06-10 11:35:54 +01:00
Brendan Abolivier	4914a88829	Doc	2019-06-10 11:34:45 +01:00
Richard van der Hoff	88d7182ada	Improve startup checks for insecure notary configs (#5392) ... It's not really a problem to trust notary responses signed by the old key so long as we are also doing TLS validation. This commit adds a check to the config parsing code at startup to check that we do not have the insecure matrix.org key without tls validation, and refuses to start without it. This allows us to remove the rather alarming-looking warning which happens at runtime.	2019-06-10 10:33:00 +01:00
Richard van der Hoff	c2b6e945e1	Share an SSL context object between SSL connections ... This involves changing how the info callbacks work.	2019-06-09 14:01:32 +01:00
Erik Johnston	95d38afe96	Don't log exception when failing to fetch remote content. ... In particular, let's not log stack traces when we stop processing becuase the response body was too large.	2019-06-07 12:39:10 +01:00
Erik Johnston	837340bdce	Only start background group attestation renewals on master	2019-06-07 12:25:06 +01:00
Erik Johnston	2ebeda48b2	Add test	2019-06-07 12:15:33 +01:00
Erik Johnston	928d1ccd73	Fix email notifications for large unnamed rooms. ... When we try and calculate a description for a room for with no name but multiple other users we threw an exception (due to trying to subscript result of `dict.values()`).	2019-06-07 12:15:28 +01:00
Erik Johnston	6745b7de6d	Handle failing to talk to master over replication	2019-06-07 10:47:31 +01:00
Erik Johnston	a46ef1e3a4	Handle HttpResponseException when using federation client. ... Otherwise we just log exceptions everywhere.	2019-06-07 10:29:35 +01:00
Neil Johnson	7c455a86bc	1.0.0rc1	2019-06-07 10:29:32 +01:00
Andrew Morgan	2d1d7b7e6f	Prevent multiple device list updates from breaking a batch send (#5156) ... fixes #5153	2019-06-06 23:54:00 +01:00
Neil Johnson	a11865016e	Set default room version to v4. (#5379) ... Set default room version to v4.	2019-06-06 20:13:47 +01:00
Erik Johnston	1b8cb64393	Merge pull request #5320 from matrix-org/hawkowl/full-schema-v1 ... Make a full SQL schema	2019-06-06 18:35:38 +01:00
Amber H. Brown	ed872db8df	fix maybe	2019-06-07 02:53:47 +10:00
Andrew Morgan	3719680ee4	Add ability to perform password reset via email without trusting the identity server (#5377) ... Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option. This PR is a culmination of 3 smaller PRs which have each been separately reviewed: * #5308 * #5345 * #5368	2019-06-06 17:34:07 +01:00
Richard van der Hoff	9fbb20a531	Stop hardcoding trust of old matrix.org key (#5374) ... There are a few changes going on here: * We make checking the signature on a key server response optional: if no verify_keys are specified, we trust to TLS to validate the connection. * We change the default config so that it does not require responses to be signed by the old key. * We replace the old 'perspectives' config with 'trusted_key_servers', which is also formatted slightly differently. * We emit a warning to the logs every time we trust a key server response signed by the old key.	2019-06-06 17:33:11 +01:00
Amber H. Brown	837e32ef55	just user dir?	2019-06-07 01:49:25 +10:00
Amber H. Brown	3b6645d3bf	remove background updates that arent needed	2019-06-07 01:20:58 +10:00
Richard van der Hoff	71063a69b8	Fix missing logcontext for PresenceHandler.on_shutdown. (#5369) ... Fixes some warnings, and a scary-looking stacktrace when sytest kills the process.	2019-06-06 14:45:17 +01:00
Erik Johnston	89d3d7b2c0	Merge pull request #5221 from matrix-org/erikj/fix_worker_sytest ... Fix get_max_topological_token to never return None	2019-06-06 13:54:46 +01:00
Brendan Abolivier	8f06344e11	Merge pull request #5089 from dnaf/m-heroes-empty-room-name ... Make /sync return heroes if room name or canonical alias are empty	2019-06-06 11:18:13 +01:00
Erik Johnston	7f08a3523a	Better words	2019-06-06 11:09:38 +01:00
Richard van der Hoff	cb3b381fcb	Merge pull request #5359 from matrix-org/rav/enable_tls_verification ... Validate federation server TLS certificates by default.	2019-06-06 10:50:42 +01:00
Brendan Abolivier	64fa928792	Simplify condition	2019-06-06 10:34:12 +01:00
Brendan Abolivier	b9c43c8463	Merge pull request #5355 from matrix-org/babolivier/heroes_left_members ... Include left members in room summaries' heroes	2019-06-06 10:05:27 +01:00
Richard van der Hoff	99d3497949	Merge pull request #5354 from matrix-org/rav/server_keys/99-room-v5 ... Implement room v5 which enforces signing key validity	2019-06-06 09:42:13 +01:00
Richard van der Hoff	2eb47e5ee7	Merge pull request #5353 from matrix-org/rav/verify_key_logging ... Associate a request_name with each verify request, for logging	2019-06-06 09:33:09 +01:00
Amber Brown	6362e3af14	add more comments	2019-06-06 04:20:35 +10:00
Brendan Abolivier	fe13bd52ac	Don't check whether the user's account is expired on /send_mail requests	2019-06-05 16:35:05 +01:00
Richard van der Hoff	7603a706eb	Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verification	2019-06-05 16:32:35 +01:00
Richard van der Hoff	f8a45302c9	Fix federation_custom_ca_list configuration option. ... Previously, setting this option would cause an exception at startup.	2019-06-05 16:19:07 +01:00
Neil Johnson	94f6c674df	Neilj/add r0.5 to versions (#5360) ... * Update _matrix/client/versions to reference support for r0.5.0	2019-06-05 16:11:31 +01:00
Erik Johnston	75538813fc	Fix background updates to handle redactions/rejections (#5352) ... * Fix background updates to handle redactions/rejections In background updates based on current state delta stream we need to handle that we may not have all the events (or at least that `get_events` may raise an exception).	2019-06-06 00:45:46 +10:00
Richard van der Hoff	e2dfb922e1	Validate federation server TLS certificates by default.	2019-06-05 14:17:50 +01:00
Brendan Abolivier	0a2f522644	Simplify condition	2019-06-05 14:02:29 +01:00
Erik Johnston	d53faa40e9	Merge pull request #5317 from matrix-org/erikj/make_do_auth_non_essential ... Fix handling of failures when calling /event_auth.	2019-06-05 14:01:32 +01:00
Brendan Abolivier	40596aec0e	Merge branch 'develop' into m-heroes-empty-room-name	2019-06-05 13:38:01 +01:00
Neil Johnson	26713515de	Neilj/mau tracking config explainer (#5284) ... Improve documentation of monthly active user blocking and mau_trial_days	2019-06-05 13:16:23 +01:00
Brendan Abolivier	dbbaf25dd3	Do user_id != me checks before deciding whether we should pick heroes from the joined members or the parted ones	2019-06-05 11:50:27 +01:00
Erik Johnston	bc3d6b918b	Add logging when request fails and clarify we ignore errors.	2019-06-05 11:37:51 +01:00
Richard van der Hoff	d18e4ea0d4	Implement room v5 which enforces signing key validity ... Implements [MSC2077](https://github.com/matrix-org/matrix-doc/pull/2077) and fixes #5247 and #4364.	2019-06-05 11:00:47 +01:00
Richard van der Hoff	cea9750d11	Associate a request_name with each verify request, for logging ... Also: * rename VerifyKeyRequest->VerifyJsonRequest * calculate key_ids on VerifyJsonRequest construction * refactor things to pass around VerifyJsonRequests instead of 4-tuples	2019-06-05 10:46:26 +01:00
Richard van der Hoff	14f13babb0	Add a test room version where we enforce key validity (#5348)	2019-06-05 10:38:25 +01:00
Richard van der Hoff	2615c6bd9e	Clean up debug logging (#5347) ... Remove some spurious stuff, clarify some other stuff	2019-06-05 10:35:40 +01:00
Richard van der Hoff	016af01598	Rename VerifyKeyRequest.deferred field (#5343) ... it's a bit confusing	2019-06-05 10:35:13 +01:00
Richard van der Hoff	aa530e6800	Call RetryLimiter correctly (#5340) ... Fixes a regression introduced in #5335.	2019-06-04 22:02:53 +01:00
Richard van der Hoff	dae224a73f	Fix failure to fetch batches of PDUs (#5342) ... FederationClient.get_pdu is called in a loop to fetch a batch of PDUs. A failure to fetch one should not result in a failure of the whole batch. Add the missing `continue`.	2019-06-04 18:05:06 +01:00