forked-synapse

mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00

Author	SHA1	Message	Date
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
Richard van der Hoff	b4189b112f	Rename get_events->get_events_from_store_or_dest (#5344 ) We have too many things called get_event, and it's hard to figure out what we mean. Also remove some unused params from the signature, and add some logging.	2019-06-04 18:01:09 +01:00
Brendan Abolivier	f6dd12d1e2	Merge pull request #5341 from matrix-org/babolivier/email_config Make account validity renewal emails work when email notifs are disabled	2019-06-04 14:49:06 +01:00
Brendan Abolivier	2f62e1f6ff	Only parse from email if provided	2019-06-04 14:24:36 +01:00
Erik Johnston	d1d38081a7	Merge pull request #5324 from matrix-org/erikj/ignore_null Ignore room state with null bytes in for room stats	2019-06-04 14:20:08 +01:00
Brendan Abolivier	1cc5fc1f6c	Lint	2019-06-04 13:51:23 +01:00
Brendan Abolivier	ac3cc32367	Make account validity renewal emails work when email notifs are disabled	2019-06-04 13:47:44 +01:00
Richard van der Hoff	df9c100542	Avoid rapidly backing-off a server if we ignore the retry interval (#5335 )	2019-06-04 11:53:29 +01:00
Richard van der Hoff	4d08b8f30c	Don't do long retries when calling the key notary server. (#5334 ) It takes at least 20 minutes to work through the long_retries schedule (11 attempts, each with a 60 second timeout, and 60 seconds between each request), so if the notary server isn't returning within the timeout, we'll just end up blocking whatever request is happening for 20 minutes. Ain't nobody got time for that.	2019-06-04 11:53:07 +01:00
Richard van der Hoff	cb683d3e3c	Merge pull request #5333 from matrix-org/rav/server_keys/09_improve_notary_server Fixes for the key-notary server	2019-06-04 11:48:18 +01:00
Richard van der Hoff	5bdb189f86	Improve docstrings on MatrixFederationClient. (#5332 )	2019-06-04 11:14:16 +01:00
Amber Brown	b2b90b7d34	Hawkowl/fix missing auth (#5328 )	2019-06-04 15:54:27 +10:00
Richard van der Hoff	c5d60eadd5	Notary server: make requests to origins in parallel ... else we're guaranteed to time out.	2019-06-04 00:16:56 +01:00
Richard van der Hoff	def5ea4062	Don't bomb out on direct key fetches as soon as one fails	2019-06-04 00:16:56 +01:00
Richard van der Hoff	dce6e9e0c1	Avoid rapidly backing-off a server if we ignore the retry interval	2019-06-03 23:58:42 +01:00
Richard van der Hoff	06a1f3e207	Reduce timeout for outbound /key/v2/server requests.	2019-06-03 23:17:38 +01:00
Richard van der Hoff	fec2dcb1a5	Enforce validity period on server_keys for fed requests. (#5321 ) When handling incoming federation requests, make sure that we have an up-to-date copy of the signing key. We do not yet enforce the validity period for event signatures.	2019-06-03 22:59:51 +01:00
Erik Johnston	0a56966f7d	Fix	2019-06-03 17:42:52 +01:00
Erik Johnston	fa4b54aca5	Ignore room state with null bytes in for room stats	2019-06-03 17:06:54 +01:00
Amber Brown	6f9f08005c	Merge remote-tracking branch 'origin/develop' into hawkowl/full-schema-v1	2019-06-04 01:16:01 +10:00
Amber Brown	2198b7ce2a	add stuff in bg updates	2019-06-04 01:06:00 +10:00
Amber Brown	4e75c5e02a	WHY IS THIS CALLED A SLIGHTLY DIFFERENT THING	2019-06-03 22:42:12 +10:00
Amber Brown	be452fc9ac	more fix	2019-06-03 22:24:23 +10:00
Amber Brown	7f81b967ca	fix schemas	2019-06-03 22:23:40 +10:00
Richard van der Hoff	862b2f9ad5	Merge pull request #5307 from matrix-org/rav/server_keys/07-fix-notary-cache-poison Stop overwriting server keys with other keys	2019-06-03 13:19:20 +01:00
Amber Brown	dc72b90cd6	full schema	2019-06-03 22:03:28 +10:00
Amber Brown	37057d5d60	prepare	2019-06-03 22:02:47 +10:00
Amber Brown	2889b05554	Unify v1 and v2 REST client APIs (#5226 )	2019-06-03 21:28:59 +10:00
Erik Johnston	220a733d73	Fix handling of failures when calling /event_auth. When processing an incoming event over federation, we may try and resolve any unexpected differences in auth events. This is a non-essential process and so should not stop the processing of the event if it fails (e.g. due to the remote disappearing or not implementing the necessary endpoints). Fixes #3330	2019-06-03 09:56:45 +01:00
Alexander Trost	dc3e586938	SAML2 Improvements and redirect stuff Signed-off-by: Alexander Trost <galexrt@googlemail.com>	2019-06-02 18:14:40 +02:00
Richard van der Hoff	d828d1dc57	Merge pull request #5309 from matrix-org/rav/limit_displayname_length Limit displaynames and avatar URLs	2019-06-01 11:34:50 +01:00
Richard van der Hoff	d16c6375fe	Limit displaynames and avatar URLs These end up in join events everywhere, so let's limit them. Fixes #5079	2019-06-01 10:44:36 +01:00
Richard van der Hoff	37b165620d	Merge pull request #5299 from matrix-org/rav/server_keys/05-rewrite-gsvk-again Rewrite get_server_verify_keys, again.	2019-05-31 17:07:31 +01:00
Richard van der Hoff	3600f5568b	Stop overwriting server keys with other keys Fix a bug where we would discard a key result which the origin server is no longer returning. Fixes #5305.	2019-05-31 15:58:35 +01:00
Erik Johnston	58cce39f3a	Merge pull request #5276 from matrix-org/babolivier/account_validity_job_delta Allow configuring a range for the account validity startup job	2019-05-31 12:11:56 +01:00
Richard van der Hoff	c605da97bf	Merge remote-tracking branch 'origin/develop' into rav/server_keys/05-rewrite-gsvk-again	2019-05-31 11:38:13 +01:00
Richard van der Hoff	fe79b5e521	Merge pull request #5300 from matrix-org/rav/server_keys/06-fix-serverkeys-handling Remove some pointless exception handling	2019-05-31 11:35:29 +01:00
Richard van der Hoff	2ae3cc287e	Merge pull request #5296 from matrix-org/rav/server_keys/04-use-attrs-for_verify-request use attr.s for VerifyKeyRequest	2019-05-31 11:34:09 +01:00
Brendan Abolivier	4d794dae21	Move delta from +10% to -10%	2019-05-31 11:09:39 +01:00
Erik Johnston	e9981d58ca	Merge pull request #5293 from Kagamihime/messages-federation-format Fix ignored filter field in `/messages` endpoint	2019-05-31 10:52:59 +01:00
Erik Johnston	31d44ec4bd	Merge pull request #5294 from matrix-org/erikj/speed_up_room_stats Speed up room stats background update	2019-05-31 10:48:51 +01:00
Erik Johnston	5037326d66	Add indices. Remove room_ids accidentally added We have to do this by re-inserting a background update and recreating tables, as the tables only get created during a background update and will later be deleted. We also make sure that we remove any entries that should have been removed but weren't due to a race that has been fixed in a previous commit.	2019-05-31 10:26:56 +01:00
Brendan Abolivier	0c2362861e	Gah python	2019-05-31 09:56:52 +01:00
Brendan Abolivier	847b9dcd1c	Make max_delta equal to period * 10%	2019-05-31 09:54:46 +01:00
Richard van der Hoff	8ea2f756a9	Remove some pointless exception handling The verify_request deferred already returns a suitable SynapseError, so I don't really know what we expect to achieve by doing more wrapping, other than log spam. Fixes #4278.	2019-05-30 18:29:56 +01:00
Richard van der Hoff	a82c96b87f	Rewrite get_server_verify_keys, again. Attempt to simplify the logic in get_server_verify_keys by splitting it into two methods.	2019-05-30 18:20:40 +01:00
Richard van der Hoff	099829d5a9	use attr.s for VerifyKeyRequest because namedtuple is awful	2019-05-30 17:39:28 +01:00
Erik Johnston	99113e40ba	Merge branch 'master' into develop	2019-05-30 16:39:49 +01:00
Erik Johnston	c831748f4d	0.99.5.2	2019-05-30 16:29:47 +01:00
Erik Johnston	e2c3660a0f	Add index to temp table	2019-05-30 16:18:40 +01:00
Erik Johnston	06eb408da5	Update synapse/storage/events_bg_updates.py Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-05-30 16:15:37 +01:00
Erik Johnston	7386c35f58	Rename constant	2019-05-30 16:15:37 +01:00
Erik Johnston	98f438b52a	Move event background updates to a separate file	2019-05-30 16:15:37 +01:00
Erik Johnston	9b8cd66524	Fixup comments and logging	2019-05-30 16:15:37 +01:00
Erik Johnston	1d818fde14	Log actual number of entries deleted	2019-05-30 16:15:37 +01:00
Erik Johnston	6ebc08c09d	Add DB bg update to cleanup extremities. Due to #5269 we may have extremities in our DB that we shouldn't have, so lets add a cleanup task such to remove those.	2019-05-30 16:15:37 +01:00
Erik Johnston	df9d900544	Correctly filter out extremities with soft failed prevs (#5274 ) When we receive a soft failed event we, correctly, do not update the forward extremity table with the event. However, if we later receive an event that references the soft failed event we then need to remove the soft failed events prev events from the forward extremities table, otherwise we just build up forward extremities. Fixes #5269	2019-05-30 16:12:50 +01:00
Eisha Chen-yen-su	8824325b82	Fix ignored filter field in `/messages` endpoint This fixes a bug which were causing the "event_format" field to be ignored in the filter of requests to the `/messages` endpoint of the CS API. Signed-off-by: Eisha Chen-yen-su <chenyensu0@gmail.com>	2019-05-30 16:58:53 +02:00
Erik Johnston	5ac75fc9a2	Join against events to use its room_id index	2019-05-30 15:26:55 +01:00
Erik Johnston	e2c46ed851	Move deletion from table inside txn	2019-05-30 15:26:38 +01:00
Erik Johnston	04710cc2d7	Fetch membership counts all at once	2019-05-30 15:25:41 +01:00
Erik Johnston	54d50fbfdf	Get events all at once	2019-05-30 15:15:13 +01:00
Erik Johnston	6cdfb0207e	Add index to temp table	2019-05-30 15:02:31 +01:00
Erik Johnston	e9e5d3392d	Merge pull request #5278 from matrix-org/erikj/cleanup_bad_extremities Add DB bg update to cleanup extremities.	2019-05-30 14:28:26 +01:00
Erik Johnston	cb967e2346	Update synapse/storage/events_bg_updates.py Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-05-30 14:06:42 +01:00
Erik Johnston	45f5d8f3fd	Merge pull request #5256 from aaronraimist/logout-correct-error Show correct error when logging out and access token is missing	2019-05-30 13:33:44 +01:00
Erik Johnston	468bd090ff	Rename constant	2019-05-30 11:24:42 +01:00
Erik Johnston	5c1ece0ffc	Move event background updates to a separate file	2019-05-30 11:22:59 +01:00
Erik Johnston	640fcbb07f	Fixup comments and logging	2019-05-30 10:55:55 +01:00
Aaron Raimist	123918b739	Lint Signed-off-by: Aaron Raimist <aaron@raim.ist>	2019-05-29 14:44:28 -05:00
Richard van der Hoff	8d92329214	Remove spurious debug from MatrixFederationHttpClient.get_json (#5287 ) This is just unhelpful spam	2019-05-29 19:31:52 +01:00
Richard van der Hoff	3dcf2feba8	Improve logging for logcontext leaks. (#5288 )	2019-05-29 19:27:50 +01:00
Amber Brown	46c8f7a517	Implement the SHHS complexity API (#5216 )	2019-05-30 01:47:16 +10:00
Amber Brown	532b825ed9	Serve CAS login over r0 (#5286 )	2019-05-30 00:55:18 +10:00
Erik Johnston	7e8e683754	Log actual number of entries deleted	2019-05-29 15:11:28 +01:00
Erik Johnston	d79c9994f4	Add DB bg update to cleanup extremities. Due to #5269 we may have extremities in our DB that we shouldn't have, so lets add a cleanup task such to remove those.	2019-05-29 15:11:26 +01:00
Aaron Raimist	30858ff461	Fix error when downloading thumbnail with width/height param missing (#5258 ) Fix error when downloading thumbnail with width/height param missing Fixes #2748 Signed-off-by: Aaron Raimist <aaron@raim.ist>	2019-05-29 14:27:41 +01:00
Erik Johnston	58c8ed5b0d	Correctly filter out extremities with soft failed prevs (#5274 ) When we receive a soft failed event we, correctly, do not update the forward extremity table with the event. However, if we later receive an event that references the soft failed event we then need to remove the soft failed events prev events from the forward extremities table, otherwise we just build up forward extremities. Fixes #5269	2019-05-29 11:56:24 +01:00
Richard van der Hoff	f76d407ef3	Fix dropped logcontexts during high outbound traffic. (#5277 ) Fixes #5271.	2019-05-29 09:17:33 +01:00
Aaron Raimist	9b6f72663e	Fix docs on resetting the user directory (#5036 ) Signed-off-by: Aaron Raimist <aaron@raim.ist>	2019-05-28 20:54:01 -05:00
Richard van der Hoff	540f40f0cd	Merge pull request #5251 from matrix-org/rav/server_keys/01-check_sig Ensure that server_keys fetched via a notary server are correctly signed.	2019-05-28 21:32:17 +01:00
Richard van der Hoff	5726378ece	Fix "db txn 'update_presence' from sentinel context" log messages (#5275 ) Fixes #4414.	2019-05-28 21:20:11 +01:00
Brendan Abolivier	52839886d6	Allow configuring a range for the account validity startup job When enabling the account validity feature, Synapse will look at startup for registered account without an expiration date, and will set one equals to 'now + validity_period' for them. On large servers, it can mean that a large number of users will have the same expiration date, which means that they will all be sent a renewal email at the same time, which isn't ideal. In order to mitigate this, this PR allows server admins to define a 'max_delta' so that the expiration date is a random value in the [now + validity_period ; now + validity_period + max_delta] range. This allows renewal emails to be progressively sent over a configured period instead of being sent all in one big batch.	2019-05-28 16:52:45 +01:00
Brendan Abolivier	a97d4e218a	Merge pull request #5268 from matrix-org/babolivier/account_validity_fix_schema Fix schema update for account validity	2019-05-28 10:30:07 +01:00
Brendan Abolivier	ba17de7fbc	Fix schema update for account validity	2019-05-28 10:11:38 +01:00
Aaron Raimist	119c9c10b0	Get rid of try except Signed-off-by: Aaron Raimist <aaron@raim.ist>	2019-05-27 00:13:56 -05:00
Erik Johnston	d0bba35197	Merge pull request #5260 from matrix-org/travis/fix-room-bg-task Fix logging for room stats background update	2019-05-25 19:59:42 +01:00
Travis Ralston	bc4b2ecf70	Fix logging for room stats background update	2019-05-25 12:02:48 -06:00
Erik Johnston	338dca58c0	Merge pull request #5257 from aaronraimist/fix-error-code-publicrooms Fix error code for invalid parameter	2019-05-25 14:09:27 +01:00
Aaron Raimist	2d4853039f	Fix error code for invalid parameter Signed-off-by: Aaron Raimist <aaron@raim.ist>	2019-05-24 17:13:16 -05:00
Aaron Raimist	56f07d980a	Show correct error when logging out and access token is missing Signed-off-by: Aaron Raimist <aaron@raim.ist>	2019-05-24 16:32:27 -05:00
Richard van der Hoff	fa1b293da2	Simplification to Keyring.wait_for_previous_lookups. (#5250 ) The list of server names was redundant, since it was equivalent to the keys on the server_to_deferred map. This reduces the number of large lists being passed around, and has the benefit of deduplicating the entries in `wait_on`.	2019-05-24 22:17:18 +01:00
Richard van der Hoff	b825d1c800	Improve error handling/logging for perspectives-key fetching. In particular, don't give up on the first failure.	2019-05-24 15:46:25 +01:00
Tulir Asokan	dd64b9dbdd	Fix appservice timestamp massaging (#5233 ) Signed-off-by: Tulir Asokan <tulir@maunium.net>	2019-05-24 14:44:04 +01:00
Richard van der Hoff	dba9152d15	Add missing blank line in config (#5249 )	2019-05-24 14:12:38 +01:00
Erik Johnston	d16f5574b6	Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_events Don't bundle aggregations with events in /sync or /events or state queries	2019-05-24 10:36:31 +01:00
Erik Johnston	4cb577c23f	Don't bundle aggs for /state and /members etc APIs	2019-05-24 09:52:33 +01:00
Erik Johnston	8c41c04ee4	Merge pull request #5244 from matrix-org/rav/server_keys/00-factor-out-fetchers Factor out KeyFetchers from KeyRing	2019-05-23 16:28:51 +01:00
Richard van der Hoff	753b1270da	Require sig from origin server on perspectives responses	2019-05-23 15:01:09 +01:00
Andrew Morgan	6368150a74	Add config option for setting homeserver's default room version (#5223 ) Replaces DEFAULT_ROOM_VERSION constant with a method that first checks the config, then returns a hardcoded value if the option is not present. That hardcoded value is now located in the server.py config file.	2019-05-23 15:00:20 +01:00
Richard van der Hoff	ec24108cc2	Fix remote_key_resource	2019-05-23 14:52:13 +01:00
Richard van der Hoff	895b79ac2e	Factor out KeyFetchers from KeyRing Rather than have three methods which have to have the same interface, factor out a separate interface which is provided by three implementations. I find it easier to grok the code this way.	2019-05-23 13:46:47 +01:00
Richard van der Hoff	b75537beaf	Store key validity time in the storage layer This is a first step to checking that the key is valid at the required moment. The idea here is that, rather than passing VerifyKey objects in and out of the storage layer, we instead pass FetchKeyResult objects, which simply wrap the VerifyKey and add a valid_until_ts field.	2019-05-23 11:52:22 +01:00
Richard van der Hoff	84660d91b2	Simplify process_v2_response (#5236 ) * Pass time_added_ms into process_v2_response * Simplify process_v2_response We can merge old_verify_keys into verify_keys, and reduce the number of dicts flying around.	2019-05-23 11:51:39 +01:00
Richard van der Hoff	cc187f9337	Remove unused VerifyKey.expired and .time_added fields (#5235 ) These were never used, and poking arbitary data into objects from other packages seems confusing at best.	2019-05-23 11:46:05 +01:00
Richard van der Hoff	2e052110ee	Rewrite store_server_verify_key to store several keys at once (#5234 ) Storing server keys hammered the database a bit. This replaces the implementation which stored a single key, with one which can do many updates at once.	2019-05-23 11:45:39 +01:00
Richard van der Hoff	85d1e03b9d	Simplifications and comments in do_auth (#5227 ) I was staring at this function trying to figure out wtf it was actually doing. This is (hopefully) a non-functional refactor which makes it a bit clearer.	2019-05-23 11:17:42 +01:00
Richard van der Hoff	1a94de60e8	Run black on synapse.crypto.keyring (#5232 )	2019-05-22 18:39:33 +01:00
Neil Johnson	73f1de31d1	Merge branch 'master' into develop	2019-05-22 17:59:43 +01:00
Neil Johnson	3d5bba581b	0.99.5.1	2019-05-22 17:52:44 +01:00
Neil Johnson	006bd8f4f6	Revert "0.99.5" This reverts commit `c31e375ade`.	2019-05-22 17:49:53 +01:00
Neil Johnson	c31e375ade	0.99.5	2019-05-22 17:45:44 +01:00
Marcus Hoffmann	62388a1e44	remove urllib3 pin (#5230 ) requests 2.22.0 as been released supporting urllib3 1.25.2 Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>	2019-05-22 16:48:12 +01:00
Neil Johnson	ae5521be9c	Merge branch 'master' into develop	2019-05-22 15:56:55 +01:00
Neil Johnson	8031a6f3d5	0.99.5	2019-05-22 15:40:28 +01:00
Neil Johnson	66b75e2d81	Neilj/ensure get profileinfo available in client reader slaved store (#5213 ) * expose SlavedProfileStore to ClientReaderSlavedStore	2019-05-22 13:55:32 +01:00
Richard van der Hoff	b898a5600a	Merge branch 'master' into develop	2019-05-22 11:38:27 +01:00
Amber Brown	4a30e4acb4	Room Statistics (#4338 )	2019-05-21 11:36:50 -05:00
Richard van der Hoff	f3ff64e000	Merge commit 'f4c80d70f' into release-v0.99.5	2019-05-21 17:35:31 +01:00
Erik Johnston	f4c80d70f8	Merge pull request #5203 from matrix-org/erikj/aggregate_by_sender Only count aggregations from distinct senders	2019-05-21 17:10:48 +01:00
Erik Johnston	9526aa96a6	Merge pull request #5212 from matrix-org/erikj/deny_multiple_reactions Block attempts to annotate the same event twice	2019-05-21 17:08:14 +01:00
Richard van der Hoff	959550b645	0.99.5rc1	2019-05-21 16:51:49 +01:00
Erik Johnston	44b8ba484e	Fix words	2019-05-21 16:51:45 +01:00
Richard van der Hoff	17f6804837	Introduce room v4 which updates event ID format. (#5217 ) Implements https://github.com/matrix-org/matrix-doc/pull/2002.	2019-05-21 16:22:54 +01:00
Richard van der Hoff	c4aef549ad	Exclude soft-failed events from fwd-extremity candidates. (#5146 ) When considering the candidates to be forward-extremities, we must exclude soft failures. Hopefully fixes #5090.	2019-05-21 16:10:54 +01:00
Richard van der Hoff	bab3eddac4	Pin eliot to <1.8 on python 3.5.2 (#5218 ) * Pin eliot to <1.8 on python 3.5.2 Fixes https://github.com/matrix-org/synapse/issues/5199 * Add support for 'markers' to python_dependencies * tell xargs not to strip quotes	2019-05-21 15:58:01 +01:00
Erik Johnston	7b0e804a4a	Fix get_max_topological_token to never return None	2019-05-21 15:21:43 +01:00
Brendan Abolivier	6a5a70edf0	Merge pull request #5204 from matrix-org/babolivier/account_validity_expiration_date Add startup background job for account validity	2019-05-21 14:55:15 +01:00
Brendan Abolivier	384122efa8	Doc	2019-05-21 14:39:36 +01:00
Erik Johnston	de7672b78f	Don't bundle events in /sync or /events As we'll send down the annotations too anyway, so this just ends up confusing clients.	2019-05-21 13:54:09 +01:00
Richard van der Hoff	04d53794d6	Fix error handling for rooms whose versions are unknown. (#5219 ) If we remove support for a particular room version, we should behave more gracefully. This should make client requests fail with a 400 rather than a 500, and will ignore individiual PDUs in a federation transaction, rather than the whole transaction.	2019-05-21 13:47:25 +01:00
Brendan Abolivier	5ceee46c6b	Do the select and insert in a single transaction	2019-05-21 13:38:51 +01:00
Erik Johnston	c7ec06e8a6	Block attempts to annotate the same event twice	2019-05-20 17:39:05 +01:00
Richard van der Hoff	24b93b9c76	Revert "expose SlavedProfileStore to ClientReaderSlavedStore (#5200 )" This reverts commit `ce5bcefc60`. This caused: ``` Traceback (most recent call last): File "/usr/local/lib/python3.7/runpy.py", line 193, in _run_module_as_main "__main__", mod_spec) File "/usr/local/lib/python3.7/runpy.py", line 85, in _run_code exec(code, run_globals) File "/home/synapse/src/synapse/app/client_reader.py", line 32, in <module> from synapse.replication.slave.storage import SlavedProfileStore ImportError: cannot import name 'SlavedProfileStore' from 'synapse.replication.slave.storage' (/home/synapse/src/synapse/replication/slave/storage/__init__.py) error starting synapse.app.client_reader('/home/synapse/config/workers/client_reader.yaml') (exit code: 1); see above for logs ```	2019-05-20 16:21:34 +01:00
Richard van der Hoff	5206648a4a	Add a test room version which updates event ID format (#5210 ) Implements MSC1884	2019-05-20 15:54:42 +01:00
Erik Johnston	1dff859d6a	Rename relation types to match MSC	2019-05-20 14:31:19 +01:00
Erik Johnston	57ba3451b6	Merge pull request #5209 from matrix-org/erikj/reactions_base Land basic reaction and edit support.	2019-05-20 14:06:40 +01:00
Erik Johnston	935af0da38	Correctly update aggregation counts after redaction	2019-05-20 12:09:27 +01:00
ReidAnderson	3787133c9e	Limit UserIds to a length that fits in a state key (#5198 )	2019-05-20 11:20:08 +01:00
Brendan Abolivier	ad5b4074e1	Add startup background job for account validity If account validity is enabled in the server's configuration, this job will run at startup as a background job and will stick an expiration date to any registered account missing one.	2019-05-17 19:37:31 +01:00
Erik Johnston	b63cc325a9	Only count aggregations from distinct senders As a user isn't allowed to send a single emoji more than once.	2019-05-17 18:03:10 +01:00
bytepoets-blo	291e1eea5e	fix mapping of return values for get_or_register_3pid_guest (#5177 ) * fix mapping of return values for get_or_register_3pid_guest	2019-05-17 17:27:14 +01:00
Erik Johnston	85ece3df46	Merge pull request #5191 from matrix-org/erikj/refactor_pagination_bounds Make generating SQL bounds for pagination generic	2019-05-17 17:24:36 +01:00
Erik Johnston	8dd9cca8ea	Spelling and clarifications	2019-05-17 16:40:51 +01:00
Erik Johnston	5dbff34509	Fixup bsaed on review comments	2019-05-17 15:48:04 +01:00
Neil Johnson	ce5bcefc60	expose SlavedProfileStore to ClientReaderSlavedStore (#5200 ) * expose SlavedProfileStore to ClientReaderSlavedStore	2019-05-17 13:27:19 +01:00
Brendan Abolivier	fdeac1e984	Merge pull request #5196 from matrix-org/babolivier/per_room_profiles Add an option to disable per-room profiles	2019-05-17 12:10:49 +01:00
PauRE	f89f688a55	Fix image orientation when generating thumbnail (#5039 )	2019-05-16 19:04:26 +01:00
David Baker	07cff7b121	Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_only Re-order registration stages to do msisdn & email auth last	2019-05-16 17:27:39 +01:00
Erik Johnston	d46aab3fa8	Add basic editing support	2019-05-16 16:54:45 +01:00
Erik Johnston	895179a4dc	Update docstring	2019-05-16 16:41:05 +01:00
Brendan Abolivier	cd32375846	Add option to disable per-room profiles	2019-05-16 14:34:28 +01:00
Erik Johnston	7a7eba8302	Move parsing of tokens out of storage layer	2019-05-16 14:26:23 +01:00
Erik Johnston	2c662ddde4	Indirect tuple conversion	2019-05-16 14:21:39 +01:00
Erik Johnston	95f3fcda3c	Check that event is visible in new APIs	2019-05-16 14:19:06 +01:00
Matthew Hodgson	4a6d5de98c	Make /sync attempt to return device updates for both joined and invited users (#3484 )	2019-05-16 13:23:43 +01:00
David Baker	fafb936de5	Merge pull request #5187 from matrix-org/dbkr/only_check_threepid_not_in_use_if_actually_registering Only check 3pids not in use when registering	2019-05-16 10:58:09 +01:00
Erik Johnston	b5c62c6b26	Fix relations in worker mode	2019-05-16 10:38:13 +01:00
Erik Johnston	33453419b0	Add cache to relations	2019-05-16 10:02:14 +01:00
Erik Johnston	a0603523d2	Add aggregations API	2019-05-16 09:37:20 +01:00
Amber Brown	f1e5b41388	Make all the rate limiting options more consistent (#5181 )	2019-05-15 12:06:04 -05:00
Richard van der Hoff	5f027a315f	Drop support for v2_alpha API prefix (#5190 )	2019-05-15 17:37:46 +01:00
Erik Johnston	5be34fc3e3	Actually check for None rather falsey	2019-05-15 17:30:23 +01:00
Erik Johnston	e6459c26b4	Actually implement idempotency	2019-05-15 17:28:33 +01:00
Richard van der Hoff	1757e2d7c3	Merge branch 'master' into develop	2019-05-15 14:09:30 +01:00
Richard van der Hoff	4a926f528e	0.99.4	2019-05-15 13:58:45 +01:00
Erik Johnston	b50641e357	Add simple pagination API	2019-05-15 13:36:51 +01:00
Erik Johnston	efe3c7977a	Add simple send_relation API and track in DB	2019-05-15 13:36:51 +01:00
Erik Johnston	54d77107c1	Make generating SQL bounds for pagination generic This will allow us to reuse the same structure when we paginate e.g. relations	2019-05-15 11:30:05 +01:00
Erik Johnston	0aba6c8251	Merge pull request #5183 from matrix-org/erikj/async_serialize_event Allow client event serialization to be async	2019-05-15 10:36:30 +01:00
Erik Johnston	d94544051b	Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_array Expose DataStore._get_events as get_events_as_list	2019-05-15 10:17:38 +01:00
Erik Johnston	8ed2f182f7	Update docstring with correct return type Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-05-15 09:52:52 +01:00
Erik Johnston	52ddc6c0ed	Update docstring with correct type Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-05-15 09:52:15 +01:00
David Baker	6ca88c4693	Only check 3pids not in use when registering We checked that 3pids were not already in use before we checked if we were going to return the account previously registered in the same UI auth session, in which case the 3pids will definitely be in use. https://github.com/vector-im/riot-web/issues/9586	2019-05-14 19:04:59 +01:00
Richard van der Hoff	daa2fb6317	comment about user_joined_room	2019-05-14 18:53:09 +01:00
Erik Johnston	4fb44fb5b9	Expose DataStore._get_events as get_events_as_list This is in preparation for reaction work which requires it.	2019-05-14 13:37:44 +01:00
Erik Johnston	a80e6b53f9	Newsfile	2019-05-14 13:12:23 +01:00
Erik Johnston	b54b03f9e1	Allow client event serialization to be async	2019-05-14 11:58:01 +01:00
Amber Brown	df2ebd75d3	Migrate all tests to use the dict-based config format instead of hanging items off HomeserverConfig (#5171 )	2019-05-13 15:01:14 -05:00
Andrew Morgan	5a4b328f52	Add ability to blacklist ip ranges for federation traffic (#5043 )	2019-05-13 19:05:06 +01:00
Brendan Abolivier	2e1129b5f7	0.99.4rc1	2019-05-13 16:11:21 +01:00
David Baker	516a5fb64b	Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_recaptcha_only	2019-05-13 15:54:25 +01:00
David Baker	9e99143c47	Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_recaptcha_only	2019-05-13 15:37:03 +01:00
Brendan Abolivier	bb93757b32	Fix CI after new release of isort	2019-05-13 15:19:44 +01:00
Andrew Morgan	2f48c4e1ae	URL preview blacklisting fixes (#5155 ) Prevents a SynapseError being raised inside of a IResolutionReceiver and instead opts to just return 0 results. This thus means that we have to lump a failed lookup and a blacklisted lookup together with the same error message, but the substitute should be generic enough to cover both cases.	2019-05-10 10:32:44 -07:00
David Baker	04299132af	Re-order flows so that email auth is done last It's more natural for the user if the bit that takes them away from the registration flow comes last. Adding the dummy stage allows us to do the stages in this order without the ambiguity.	2019-05-10 13:58:03 +01:00
David Baker	9c61dce3c8	Comment	2019-05-10 11:14:55 +01:00
David Baker	8714ff6d51	Add a DUMMY stage to captcha-only registration flow This allows the client to complete the email last which is more natual for the user. Without this stage, if the client would complete the recaptcha (and terms, if enabled) stages and then the registration request would complete because you've now completed a flow, even if you were intending to complete the flow that's the same except has email auth at the end. Adding a dummy auth stage to the recaptcha-only flow means it's always unambiguous which flow the client was trying to complete. Longer term we should think about changing the protocol so the client explicitly says which flow it's trying to complete. vector-im/riot-web#9586	2019-05-10 11:09:53 +01:00
David Baker	c2bb7476c9	Revert `085ae346ac` Accidentally went straight to develop	2019-05-10 11:08:01 +01:00
David Baker	085ae346ac	Add a DUMMY stage to captcha-only registration flow This allows the client to complete the email last which is more natual for the user. Without this stage, if the client would complete the recaptcha (and terms, if enabled) stages and then the registration request would complete because you've now completed a flow, even if you were intending to complete the flow that's the same except has email auth at the end. Adding a dummy auth stage to the recaptcha-only flow means it's always unambiguous which flow the client was trying to complete. Longer term we should think about changing the protocol so the client explicitly says which flow it's trying to complete. https://github.com/vector-im/riot-web/issues/9586	2019-05-10 10:52:24 +01:00
Richard van der Hoff	130f932cbc	Run `black` on per_destination_queue ... mostly to fix pep8 fails	2019-05-09 16:27:02 +01:00
Quentin Dufour	11ea16777f	Limit the number of EDUs in transactions to 100 as expected by receiver (#5138 ) Fixes #3951.	2019-05-09 11:01:41 +01:00
Matthew Hodgson	c0e0740bef	add options to require an access_token to GET /profile and /publicRooms on CS API (#5083 ) This commit adds two config options: * `restrict_public_rooms_to_local_users` Requires auth to fetch the public rooms directory through the CS API and disables fetching it through the federation API. * `require_auth_for_profile_requests` When set to `true`, requires that requests to `/profile` over the CS API are authenticated, and only returns the user's profile if the requester shares a room with the profile's owner, as per MSC1301. MSC1301 also specifies a behaviour for federation (only returning the profile if the server asking for it shares a room with the profile's owner), but that's currently really non-trivial to do in a not too expensive way. Next step is writing down a MSC that allows a HS to specify which user sent the profile query. In this implementation, Synapse won't send a profile query over federation if it doesn't believe it already shares a room with the profile's owner, though. Groups have been intentionally omitted from this commit.	2019-05-08 18:26:56 +01:00
Erik Johnston	c8c069db92	Merge pull request #5037 from matrix-org/erikj/limit_inflight_dns Limit in flight DNS requests	2019-05-08 17:11:03 +01:00
Brendan Abolivier	1473058b5e	Do checks on aliases for incoming m.room.aliases events (#5128 ) Follow-up to #5124 Also added a bunch of checks to make sure everything (both the stuff added on #5124 and this PR) works as intended.	2019-05-08 17:01:30 +01:00
Erik Johnston	de655e669a	Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_invite Ratelimit 3pid invites	2019-05-07 10:12:49 +01:00
Richard van der Hoff	59e2d2694d	Remove the requirement to authenticate for /admin/server_version. (#5122 ) This endpoint isn't much use for its intended purpose if you first need to get yourself an admin's auth token. I've restricted it to the `/_synapse/admin` path to make it a bit easier to lock down for those concerned about exposing this information. I don't imagine anyone is using it in anger currently.	2019-05-07 09:29:30 +01:00
Richard van der Hoff	836d3adcce	Merge branch 'master' into develop	2019-05-03 19:25:01 +01:00
Richard van der Hoff	fa21455e08	0.99.3.2	2019-05-03 18:56:24 +01:00
Richard van der Hoff	e3281d7d26	pin urllib3 to <1.25	2019-05-03 18:33:10 +01:00
Richard van der Hoff	863ec09622	0.99.3.1	2019-05-03 16:03:24 +01:00
Richard van der Hoff	a845abbf3a	Merge pull request #5134 from matrix-org/rav/url_preview_blacklist Blacklist 0.0.0.0 and :: by default for URL previews	2019-05-03 15:59:20 +01:00
Richard van der Hoff	1565ebec2c	more config comment updates	2019-05-03 15:50:59 +01:00
Richard van der Hoff	1acfb9e9f0	Merge pull request #5133 from matrix-org/rav/systemrandom Use SystemRandom for token generation.	2019-05-03 15:39:30 +01:00
Richard van der Hoff	1a7104fde3	Blacklist 0.0.0.0 and :: by default for URL previews	2019-05-03 15:35:49 +01:00
Richard van der Hoff	247dc1bd0b	Use SystemRandom for token generation	2019-05-03 13:02:55 +01:00
Erik Johnston	176f31c2e3	Rate limit early	2019-05-02 15:23:08 +01:00
Richard van der Hoff	12f9d51e82	Add admin api for sending server_notices (#5121 )	2019-05-02 11:59:16 +01:00
Brendan Abolivier	c193b39134	Merge pull request #5124 from matrix-org/babolivier/aliases Add some limitations to alias creation	2019-05-02 11:22:40 +01:00
Brendan Abolivier	84196cb231	Add some limitations to alias creation	2019-05-02 11:05:11 +01:00
Richard van der Hoff	0836cbb9f5	Factor out an "assert_requester_is_admin" function (#5120 ) Rather than copying-and-pasting the same four lines hundreds of times	2019-05-02 10:45:52 +01:00
Richard van der Hoff	f203c98794	fix examples	2019-05-01 17:49:56 +01:00
Richard van der Hoff	40e576e29c	Move admin api impl to its own package It doesn't really belong under rest/client/v1 any more.	2019-05-01 15:44:30 +01:00
Richard van der Hoff	8e9ca83537	Move admin API to a new prefix	2019-05-01 15:44:30 +01:00
Richard van der Hoff	579b637b6c	Move admin API away from ClientV1RestServlet	2019-05-01 15:16:04 +01:00
Travis Ralston	8c5b1e30d4	Add a default .m.rule.tombstone push rule (#4867 ) * Add a default .m.rule.tombstone push rule In support of MSC1930: https://github.com/matrix-org/matrix-doc/pull/1930 * changelog * Appease the changelog linter	2019-04-29 15:40:31 -06:00
Richard van der Hoff	b31cc1c613	Merge pull request #5100 from matrix-org/rav/verification_hackery Improve logging when event-signature checking fails	2019-04-29 13:19:32 +01:00
Erik Johnston	d6118c5be6	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_3pid_invite	2019-04-26 18:14:23 +01:00
Erik Johnston	28a81ed62f	Ratelimit 3pid invites We do ratelimit sending the 3PID invite events, but that happens after spamming the identity server.	2019-04-26 18:06:25 +01:00
Richard van der Hoff	bd0d45ca69	Fix infinite loop in presence handler Fixes #5102	2019-04-26 11:14:49 +01:00
Richard van der Hoff	837d7f85a9	more logging improvements	2019-04-25 22:17:59 +01:00
Richard van der Hoff	fd8fb32bdd	remove extraneous exception logging	2019-04-25 22:02:03 +01:00
Richard van der Hoff	7ca638c761	Clarify logging when PDU signature checking fails	2019-04-25 20:55:12 +01:00
Andrew Morgan	6824ddd93d	Config option for verifying federation certificates (MSC 1711) (#4967 )	2019-04-25 14:22:49 +01:00
Michael Kaye	788163e204	Remove log error for .well-known/matrix/client (#4972 )	2019-04-24 17:44:06 +01:00
Katie Wolfe	7e07dc429f	Lint I probably should've just run autopep8 in the first place... Signed-off-by: Katie Wolfe <katie@dnaf.moe>	2019-04-24 12:43:18 -04:00
Amber Brown	6b2b9a58c4	Prevent "producer not unregistered" message (#5009 )	2019-04-24 17:37:32 +01:00
Katie Wolfe	b3e5db402d	Clean up code Signed-off-by: Katie Wolfe <katie@dnaf.moe>	2019-04-24 12:26:55 -04:00
Katie Wolfe	5d3ed79944	Show heroes if room name or canonical alias are empty Fixes #4194 Signed-off-by: Katie Wolfe <katie@dnaf.moe>	2019-04-24 12:26:53 -04:00
Katie Wolfe	7f025eb425	Show heroes if room name or canonical alias are empty Fixes #4194 Signed-off-by: Katie Wolfe <katie@dnaf.moe>	2019-04-24 12:26:29 -04:00
Brendan Abolivier	f8826d31cd	Don't crash on lack of expiry templates	2019-04-18 14:50:05 +01:00
Erik Johnston	ca90336a69	Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/account_expiration	2019-04-17 19:44:40 +01:00
Brendan Abolivier	eaf41a943b	Add management endpoints for account validity	2019-04-17 19:34:45 +01:00
Brendan Abolivier	91934025b9	Merge pull request #5047 from matrix-org/babolivier/account_expiration Send out emails with links to extend an account's validity period	2019-04-17 14:57:39 +01:00
Brendan Abolivier	20f0617e87	Send out emails with links to extend an account's validity period	2019-04-17 14:42:20 +01:00
Brendan Abolivier	49ff74da9b	Merge pull request #5071 from matrix-org/babolivier/3pid-check Make sure we're not registering the same 3pid twice	2019-04-17 14:37:42 +01:00
Brendan Abolivier	600ec04739	Make sure we're not registering the same 3pid twice	2019-04-17 14:23:01 +01:00
Erik Johnston	fd2fcb817c	Merge pull request #5070 from matrix-org/erikj/postpath Remove usage of request.postpath	2019-04-17 09:03:26 +01:00
Erik Johnston	a1eb4c6d2f	Merge pull request #5065 from matrix-org/erikj/fix_versions VersionRestServlet doesn't take a param	2019-04-16 17:52:36 +01:00
Erik Johnston	ad010f6306	Remove usage of request.postpath This is an undocumented variable in twisted, and relies on the servlet being mounted in the right way. This also breaks getting push rules on workers.	2019-04-16 17:42:50 +01:00
Silke Hofstra	a137f4eac0	Add systemd-python to optional dependencies (#4339 ) Using systemd-python allows for logging to the systemd journal, as is documented in: `synapse/contrib/systemd/log_config.yaml`. Signed-off-by: Silke Hofstra <silke@slxh.eu>	2019-04-16 20:41:17 +10:00
Erik Johnston	38642614cf	VersionRestServlet doesn't take a param	2019-04-15 19:39:47 +01:00
Erik Johnston	6e27a8620f	Merge pull request #5063 from matrix-org/erikj/move_endpoints Move some rest endpoints to client reader	2019-04-15 18:55:01 +01:00
Erik Johnston	ec638a1602	Only handle GET requests for /push_rules	2019-04-15 18:51:48 +01:00
Erik Johnston	d5adf297e6	Move some rest endpoints to client reader	2019-04-15 17:21:03 +01:00
Andrew Morgan	caa76e6021	Remove periods from copyright headers (#5046 )	2019-04-11 17:08:13 +01:00
Erik Johnston	c132c8e505	Handle the case of `get_missing_events` failing Currently if a call to `/get_missing_events` fails we log an exception and stop processing the top level event we received over federation. Instead let's try and handle it sensibly given it is a somewhat expected failure mode.	2019-04-10 10:39:54 +01:00
Erik Johnston	e446921def	Merge pull request #5033 from matrix-org/erikj/fix_schema_delta Fix schema upgrade when dropping tables	2019-04-10 10:22:35 +01:00
Richard van der Hoff	329688c161	Fix disappearing exceptions in manhole. (#5035 ) Avoid sending syntax errors from the manhole to sentry.	2019-04-10 07:23:48 +01:00
Erik Johnston	a0fc256d65	Limit in flight DNS requests This is to work around a bug in twisted where a large number of concurrent DNS requests cause it to tight loop forever. c.f. https://twistedmatrix.com/trac/ticket/9620#ticket	2019-04-09 17:23:42 +01:00
Brendan Abolivier	bfc8fdf1fc	Merge pull request #5027 from matrix-org/babolivier/account_expiration Add time-based account expiration	2019-04-09 17:02:41 +01:00
Brendan Abolivier	747aa9f8ca	Add account expiration feature	2019-04-09 16:46:04 +01:00
Erik Johnston	50d2a3059d	Fix schema upgrade when dropping tables We need to drop tables in the correct order due to foreign table constraints (on `application_services`), otherwise the DROP TABLE command will fail. Introduced in #4992.	2019-04-09 14:39:18 +01:00
Richard van der Hoff	644b86677f	Merge pull request #5030 from matrix-org/rav/rewrite_g_s_v_k Rewrite Datastore.get_server_verify_keys	2019-04-09 11:30:23 +01:00
Richard van der Hoff	4abf5aa81a	Bump psycopg requirement (#5032 )	2019-04-09 11:29:50 +01:00
Richard van der Hoff	18b69be00f	Rewrite Datastore.get_server_verify_keys Rewrite this so that it doesn't hammer the database.	2019-04-09 00:00:10 +01:00
Richard van der Hoff	f50efcb65d	Replace SlavedKeyStore with a shim since we're pulling everything out of KeyStore anyway, we may as well simplify it.	2019-04-08 23:59:07 +01:00
Richard van der Hoff	f88a9e6323	Remove redundant merged_keys dict There's no point in collecting a merged dict of keys: it is sufficient to consider just the new keys which have been fetched by the most recent key_fetch_fns.	2019-04-08 22:36:18 +01:00
Richard van der Hoff	3352baac4b	Remove unused server_tls_certificates functions (#5028 ) These have been unused since #4120, and with the demise of perspectives, it is unlikely that they will ever be used again.	2019-04-08 21:50:18 +01:00
Neil Johnson	b25e387c0d	add context to phonehome stats (#5020 ) add context to phonehome stats	2019-04-08 15:47:39 +01:00
Richard van der Hoff	67d7b44784	Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeys Fix from_server buglet in get_keys_from_perspectives	2019-04-08 15:40:37 +01:00
Neil Johnson	2d951686a7	drop tables listed in #1830 (#4992 ) Tables dropped: * application_services, * application_services_regex, * transaction_id_to_pdu, * stats_reporting * current_state_resets * event_content_hashes * event_destinations * event_edge_hashes * event_signatures * feedback * room_hosts * state_forward_extremities	2019-04-08 15:37:26 +01:00
Richard van der Hoff	7d2a0c848e	Fix from_server buglet in get_keys_from_perspectives make sure we store the name of the server the keys came from, rather than the origin server, after doing a fetch-from-perspectives.	2019-04-08 12:51:16 +01:00
Richard van der Hoff	7fc1e17f4c	Merge pull request #5001 from matrix-org/rav/keyring_cleanups Cleanups in the Keyring	2019-04-08 12:47:09 +01:00
Richard van der Hoff	6ae9361510	Hoist server_name check out of process_v2_response It's easier to check it in the caller than to complicate the interface with an extra param.	2019-04-04 19:12:54 +01:00
Richard van der Hoff	ef27d434d1	Clean up Keyring.process_v2_response Make this just return the key dict, rather than a single-entry dict mapping the server name to the key dict. It's easy for the caller to get the server name from from the response object anyway.	2019-04-04 19:12:54 +01:00
Richard van der Hoff	b43d9a920b	Fix docstring on get_server_keys_json	2019-04-04 18:54:03 +01:00
Brendan Abolivier	8e85493b0c	Add config option to block users from looking up 3PIDs (#5010 )	2019-04-04 17:25:47 +01:00
Amber Brown	a33a5abc4c	Clean up the database pagination code (#5007 ) * rewrite & simplify * changelog * cleanup potential sql injection	2019-04-05 00:21:16 +11:00
Erik Johnston	616e6a10bd	Merge pull request #5002 from matrix-org/erikj/delete_group Add delete group admin API	2019-04-04 14:15:41 +01:00
Andrew Morgan	db265f0642	Prevent kicking users who aren't in the room (#4999 ) Prevent kick events from succeeding if the user is not currently in the room.	2019-04-04 13:05:51 +01:00
Marcel Krüger	9f5d206c4a	Avoid redundant URL encoding (#4555 ) * Do not double encode fallback redirect URL Signed-off-by: Marcel Fabian Krüger <zauguin@gmail.com>	2019-04-04 12:05:56 +01:00
Erik Johnston	c192bf8970	Add admin API for group deletion	2019-04-03 16:29:52 +01:00
Erik Johnston	4a2e13631d	Add functions to delete a group	2019-04-03 16:29:52 +01:00
Andrew Morgan	4a4d5c4fd6	Fix grammar and document get_current_users_in_room (#4998 )	2019-04-03 14:32:20 +01:00
Neil Johnson	e8419554ff	Remove presence lists (#4989 ) Remove presence list support as per MSC 1819	2019-04-03 11:11:15 +01:00
Erik Johnston	8f549c1177	Merge pull request #4982 from matrix-org/erikj/msc1915 Implement MSC1915 - 3PID unbind APIs	2019-04-03 11:07:09 +01:00
Amber Brown	7efd1d87c2	Run black on the rest of the storage module (#4996 )	2019-04-03 10:07:29 +01:00
Erik Johnston	3039d61baf	Merge pull request #4991 from matrix-org/erikj/stagger_push_startup Make starting pushers faster during start up	2019-04-02 18:23:32 +01:00
Andrew Morgan	66e78700a2	Transfer related groups on room upgrade (#4990 ) Transfers the m.room.related_groups state event on room upgrade.	2019-04-02 17:15:24 +01:00
Richard van der Hoff	8530090b16	Add config.signing_key_path. (#4974 ) As requested by @andrewshadura	2019-04-02 16:59:27 +01:00
Erik Johnston	5bec8d660d	Make starting pushers faster during start up We start all pushers on start up and immediately start a background process to fetch push to send. This makes start up incredibly painful when dealing with many pushers. Instead, let's do a quick fast DB check to see if there may be push to send and only start the background processes for those pushers. We also stagger starting up and doing those checks so that we don't try and handle all pushers at once.	2019-04-02 16:59:13 +01:00
Richard van der Hoff	297bf2547e	Fix sync bug when accepting invites (#4956 ) Hopefully this time we really will fix #4422. We need to make sure that the cache on `get_rooms_for_user_with_stream_ordering` is invalidated before the SyncHandler is notified for the new events, and we can now do so reliably via the `events` stream.	2019-04-02 12:42:39 +01:00
Erik Johnston	4ef5d17b96	Correctly handle id_server param	2019-04-02 11:20:09 +01:00
Erik Johnston	24232514bf	Remove threepid binding if id server returns 400/404/501	2019-04-02 11:20:09 +01:00
Erik Johnston	c75e2017f1	Fixup docstrings	2019-04-02 11:20:06 +01:00
Erik Johnston	862d6e5ba5	Add unbind API to /r0 as it is now stabalised	2019-04-01 15:25:19 +01:00
Erik Johnston	3715c124b3	Grandfather in existing user threepids We assume, as we did before, that users bound their threepid to one of the trusted identity servers. So we simply fill the new table with all threepids in `user_threepids` joined with the trusted identity servers.	2019-04-01 15:25:19 +01:00
Erik Johnston	057715aaa2	Allowing specifying IS to use in unbind API. By default the homeserver will use the identity server used during the binding of the 3PID to unbind the 3PID. However, we need to allow clients to explicitly ask the homeserver to unbind via a particular identity server, for the case where the 3PID was bound out of band from the homeserver. Implements MSC915.	2019-04-01 15:25:18 +01:00
Erik Johnston	9fbbc3d9e5	For unbind poke IS used during binding of 3PID This changes the behaviour from using the server specified trusted identity server to using the IS that used during the binding of the 3PID, if known. This is the behaviour specified by MSC1915.	2019-04-01 15:23:30 +01:00
Erik Johnston	1666c0696a	Track IS used to bind 3PIDs This will then be used to know which IS to default to when unbinding the threepid.	2019-04-01 15:23:01 +01:00
Neil Johnson	62988f73fd	Merge branch 'master' into develop	2019-04-01 14:08:53 +01:00
Neil Johnson	35442efb75	0.99.3	2019-04-01 12:49:03 +00:00
Richard van der Hoff	54a87a7b08	Collect room-version variations into one place (#4969 ) Collect all the things that make room-versions different to one another into one place, so that it's easier to define new room versions.	2019-04-01 10:24:38 +01:00
Richard van der Hoff	902cdc63b6	Merge pull request #4955 from matrix-org/rav/merge_state_into_events Combine the CurrentStateDeltaStream into the EventStream	2019-03-28 18:32:13 +00:00
Richard van der Hoff	d688a51736	Merge pull request #4954 from matrix-org/rav/refactor_parse_row Refactors to replication stream row update/parsing	2019-03-28 18:31:17 +00:00
Neil Johnson	c7296bcb98	remove log line for password (#4965 ) Remove log line for password.	2019-03-28 17:38:01 +00:00
Andrew Morgan	7a91b9d81c	Allow password providers to bind emails (#4947 ) This PR allows password provider modules to bind email addresses when a user is registering and is motivated by matrix-org/matrix-synapse-ldap3#58	2019-03-28 15:48:07 +00:00
Erik Johnston	248014379e	Merge pull request #4942 from matrix-org/erikj/fix_presence Use event streams to calculate presence	2019-03-28 14:38:31 +00:00
Erik Johnston	4e5f0f7ca0	Use an assert	2019-03-28 14:05:05 +00:00
Erik Johnston	40e56997bc	Review comments	2019-03-28 13:48:41 +00:00
Richard van der Hoff	d035d62f6b	Merge remote-tracking branch 'origin/develop' into rav/refactor_parse_row	2019-03-28 13:45:14 +00:00
Richard van der Hoff	4eeb2c2f07	Merge pull request #4953 from matrix-org/rav/refactor_replication_streams Split up replication.tcp.streams into smaller files	2019-03-28 13:43:25 +00:00
Amber Brown	2e060774ad	Run `black` on some storage modules that the stats branch touches (#4959 )	2019-03-29 00:37:16 +11:00
Richard van der Hoff	4b91c313a9	Combine the CurrentStateDeltaStream into the EventStream	2019-03-27 22:07:05 +00:00
Richard van der Hoff	1f6d6f918a	Make EventStream rows have a type ... as a precursor to combining it with the CurrentStateDelta stream.	2019-03-27 22:07:05 +00:00
Richard van der Hoff	015b3622eb	Skip building a ROW_TYPE when building updates We're about to turn it straight into a JSON object anyway so building a ROW_TYPE is a bit pointless, and reduces flexibility in the update_function.	2019-03-27 21:58:03 +00:00
Richard van der Hoff	f570916a3e	Add parse_row method to replication stream class This will allow individual stream classes to override how a row is parsed.	2019-03-27 21:32:33 +00:00
Richard van der Hoff	71dcb275f1	move FederationStream out to its own file	2019-03-27 21:13:14 +00:00
Richard van der Hoff	aa1e017864	move EventsStream out to its own file	2019-03-27 21:13:14 +00:00
Richard van der Hoff	a5798de067	Move replication.tcp.streams into a package	2019-03-27 21:13:14 +00:00
Richard van der Hoff	acaa18f7dd	Fix/improve some docstrings in the replication code. (#4949 )	2019-03-27 21:12:36 +00:00
Erik Johnston	197fae1639	Use event streams to calculate presence Primarily this fixes a bug in the handling of remote users joining a room where the server sent out the presence for all local users in the room to all servers in the room. We also change to using the state delta stream, rather than the distributor, as it will make it easier to split processing out of the master process (as well as being more flexible). Finally, when sending presence states to newly joined servers we filter out old presence states to reduce the number sent. Initially we filter out states that are offline and have a last active more than a week ago, though this can be changed down the line. Fixes #3962	2019-03-27 13:41:36 +00:00
Neil Johnson	4aa914369b	bump version	2019-03-27 10:23:03 +00:00
Andrew Morgan	bbd244c7b2	Support 3PID login in password providers (#4931 ) Adds a new method, check_3pid_auth, which gives password providers the chance to allow authentication with third-party identifiers such as email or msisdn.	2019-03-26 17:48:30 +00:00
Amber Brown	903f04c21f	Use the state event amount for userdir import batching, not room count (#4944 )	2019-03-27 02:49:28 +11:00
Andrew Morgan	4a125be138	Make federation endpoints more tolerant of trailing slashes v2 (#4935 ) Redo of https://github.com/matrix-org/synapse/pull/4840	2019-03-26 11:35:29 +00:00
Richard van der Hoff	8cbbedaa2b	Fix ClientReplicationStreamProtocol.__str__ (#4929 ) `__str__` depended on `self.addr`, which was absent from ClientReplicationStreamProtocol, so attempting to call str on such an object would raise an exception. We can calculate the peer addr from the transport, so there is no need for addr anyway.	2019-03-25 16:41:51 +00:00
Richard van der Hoff	9bde730ef8	Fix bug where read-receipts lost their timestamps (#4927 ) Make sure that they are sent correctly over the replication stream. Fixes: #4898	2019-03-25 16:38:05 +00:00
Amber Brown	ac396a0d32	Refactor out state delta handling into its own class (#4917 )	2019-03-25 20:37:08 +11:00
Erik Johnston	5fee9d8067	Merge pull request #4869 from matrix-org/erikj/yaml_load Fix yaml warnings by using safe_load	2019-03-22 11:58:13 +00:00
Erik Johnston	3677548a82	Use yaml safe_load	2019-03-22 10:20:17 +00:00
Andrew Morgan	7bef97dfb7	Remove trailing slashes from outbound federation requests and retry on 400 (#4840 ) As per #3622, we remove trailing slashes from outbound federation requests. However, to ensure that we remain backwards compatible with previous versions of Synapse, if we receive a HTTP 400 with `M_UNRECOGNIZED`, then we are likely talking to an older version of Synapse in which case we retry with a trailing slash appended to the request path.	2019-03-21 15:07:28 +00:00
Andrew Morgan	b41c2eaadc	Clean up backoff_on_404 and metehod calls	2019-03-21 14:32:47 +00:00
Erik Johnston	01e6b405be	Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms Deny peeking into rooms that have been blocked	2019-03-21 14:07:17 +00:00
Erik Johnston	3959858eaa	Merge pull request #4904 from matrix-org/erikj/fix_shutdown Fixup shutdown room API	2019-03-21 11:24:42 +00:00
Erik Johnston	536a266520	Deny peeking into rooms that have been blocked	2019-03-21 11:20:13 +00:00
Erik Johnston	3ecec5ede2	Fix upsert	2019-03-21 10:21:15 +00:00
Erik Johnston	09f991a63d	Merge pull request #4896 from matrix-org/erikj/disable_room_directory Add option to disable search room lists	2019-03-21 10:16:54 +00:00
Erik Johnston	cd62981a6a	Revert spurious delete	2019-03-20 17:51:27 +00:00
Erik Johnston	8d8834d3e7	comment block_room	2019-03-20 17:49:56 +00:00
Erik Johnston	aa959a6c07	Use flags	2019-03-20 17:40:29 +00:00
Erik Johnston	7d47cc1305	Move requester check into assert_accepted_privacy_policy	2019-03-20 17:08:36 +00:00
Erik Johnston	72a14860ab	Gracefully handle failing to kick user	2019-03-20 16:54:21 +00:00
Erik Johnston	6b28890543	Log new room ID	2019-03-20 16:52:28 +00:00
Erik Johnston	74c46d81fa	Only require consent for events with an associated request There are a number of instances where a server or admin may puppet a user to join/leave rooms, which we don't want to fail if the user has not consented to the privacy policy. We fix this by adding a check to test if the requester has an associated access_token, which is used as a proxy to answer the question of whether the action is being done on behalf of a real request from the user.	2019-03-20 16:50:23 +00:00
Erik Johnston	67d618e111	Allow blocking a room multiple times	2019-03-20 16:50:05 +00:00
Erik Johnston	263f2c9ce1	Merge pull request #4895 from matrix-org/erikj/disable_user_search Add option to disable searching in the user dir	2019-03-20 16:47:15 +00:00
Amber Brown	4d53017432	Batching in the user directory import (#4900 )	2019-03-21 03:06:36 +11:00
Richard van der Hoff	cdb8036161	Add a config option for torture-testing worker replication. (#4902 ) Setting this to 50 or so makes a bunch of sytests fail in worker mode.	2019-03-20 16:04:35 +00:00
Richard van der Hoff	a902d13180	Batch up outgoing read-receipts to reduce federation traffic. (#4890 ) Rate-limit outgoing read-receipts as per #4730.	2019-03-20 16:02:25 +00:00
Erik Johnston	cd8c5b91ad	Fix up sample config	2019-03-20 14:35:41 +00:00
Richard van der Hoff	ab20f85c59	Update synapse/config/user_directory.py Co-Authored-By: erikjohnston <erikj@jki.re>	2019-03-20 14:33:11 +00:00
Erik Johnston	cc197a61a1	Disable publishing to room list when its disabled	2019-03-20 14:30:36 +00:00
Erik Johnston	2c90422146	Pull out config option	2019-03-20 14:25:58 +00:00
Erik Johnston	7529038e66	Return before we log	2019-03-20 14:25:28 +00:00
Erik Johnston	926f29ea6d	Fix up config comments	2019-03-20 14:24:53 +00:00
Andrew Morgan	2150151abe	kwargs doesn't like commas on calling funcs either. TIL	2019-03-20 14:13:32 +00:00
Andrew Morgan	bb52a2e653	lint	2019-03-20 14:08:57 +00:00
Andrew Morgan	cd36a1283b	New test, fix issues	2019-03-20 14:00:39 +00:00
Andrew Morgan	c69df5d5d3	Fix comments. v0.99.2 -> v0.99.3	2019-03-20 11:27:18 +00:00
Andrew Morgan	551ea11559	Just return if not doing any trailing slash shennanigans	2019-03-20 11:07:36 +00:00
Erik Johnston	213c98c00a	Add option to disable search room lists This disables both local and remote room list searching.	2019-03-19 17:10:52 +00:00
Erik Johnston	320667a479	Add option to disable searching in the user dir We still populate it, as it can still be accessed via the admin API.	2019-03-19 16:40:19 +00:00
Richard van der Hoff	13bc1e0746	Use a regular HomeServerConfig object for unit tests Rather than using a Mock for the homeserver config, use a genuine HomeServerConfig object. This makes for a more realistic test, and means that we don't have to keep remembering to add things to the mock config every time we add a new config setting.	2019-03-19 11:44:43 +00:00
Richard van der Hoff	45c4e19c74	Merge remote-tracking branch 'origin/develop' into HEAD	2019-03-19 11:43:46 +00:00
Neil Johnson	88f0675967	fix test_auto_create_auto_join_where_no_consent (#4886 )	2019-03-19 11:38:59 +00:00
Richard van der Hoff	0dbfae03f9	Enforce hs_disabled_message correctly Fixes a bug where hs_disabled_message was not enforced for 3pid-based requests if there was no server_notices_mxid configured.	2019-03-19 11:30:54 +00:00
Erik Johnston	e9eeca1314	Fix user directory background update (#4887 )	2019-03-19 22:13:53 +11:00
Richard van der Hoff	fd463b4f5d	Comment out most options in the generated config. (#4863 ) Make it so that most options in the config are optional, and commented out in the generated config. The reasons this is a good thing are as follows: * If we decide that we should change the default for an option, we can do so, and only those admins that have deliberately chosen to override that option will be stuck on the old setting. * It moves us towards a point where we can get rid of the super-surprising feature of synapse where the default settings for the config come from the generated yaml. * It makes setting up a test config for unit testing an order of magnitude easier (see forthcoming PR). * It makes the generated config more consistent, and hopefully easier for users to understand.	2019-03-19 10:06:40 +00:00
Amber Brown	282c97327f	Migrate the user directory initial population to a background task (#4864 )	2019-03-19 04:50:24 +11:00
Andrew Morgan	a8ad39eec7	lint	2019-03-18 17:47:39 +00:00
Andrew Morgan	621e7f37f1	Better exception handling	2019-03-18 17:45:54 +00:00
Brendan Abolivier	651ad8bc96	Add ratelimiting on failed login attempts (#4865 )	2019-03-18 12:57:20 +00:00
Brendan Abolivier	899e523d6d	Add ratelimiting on login (#4821 ) Add two ratelimiters on login (per-IP address and per-userID).	2019-03-15 17:46:16 +00:00
Richard van der Hoff	3b7ceb2c69	Merge pull request #4855 from matrix-org/rav/refactor_transaction_queue Split TransactionQueue up	2019-03-15 12:32:11 +00:00
Richard van der Hoff	2dee441bdb	Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_worker Move client receipt processing to federation sender worker.	2019-03-15 12:30:30 +00:00
Erik Johnston	b0fa3f6ff3	Merge pull request #4853 from matrix-org/erikj/worker_docker_ci Allow passing --daemonize to workers	2019-03-15 10:35:38 +00:00
Erik Johnston	271cb1998b	Revert "Make federation endpoints more tolerant of trailing slashes for some endpoints (#4793 )" This reverts commit `290552fd83`.	2019-03-14 14:30:54 +00:00
Erik Johnston	9073cfc8bd	Merge pull request #4846 from matrix-org/hawkowl/userdir-search Improve searching in the userdir	2019-03-14 13:54:15 +00:00
Erik Johnston	9ad448c1e5	Correctly handle all command line options	2019-03-14 13:32:14 +00:00
Andrew Morgan	ecea5af491	Correct var name	2019-03-13 21:21:03 +00:00
Andrew Morgan	b2df0e8e2c	receiving a 400 caused an exception. handle it	2019-03-13 21:08:10 +00:00
Andrew Morgan	9a2e22fd41	is this what purgatory feels like	2019-03-13 20:29:38 +00:00
Andrew Morgan	45524f2f5e	i should have given up x2	2019-03-13 20:17:39 +00:00
Andrew Morgan	8d16ffaf7a	i should have given up	2019-03-13 20:03:10 +00:00
Richard van der Hoff	02e23b36bc	Rename and move the classes	2019-03-13 20:02:56 +00:00
Andrew Morgan	26f8e2d099	there comes a time when you should give up. but you dont	2019-03-13 19:49:08 +00:00
Andrew Morgan	5ca857ad84	as above	2019-03-13 19:35:23 +00:00
Andrew Morgan	7c0295f13c	no kwargs today	2019-03-13 19:27:10 +00:00
Andrew Morgan	66cdb840a6	Or perhaps I was the one who was drunk	2019-03-13 19:18:25 +00:00
Andrew Morgan	bec313818c	go home python, you're drunk	2019-03-13 19:10:56 +00:00
Andrew Morgan	c991e7aec7	Syntax checker is bork	2019-03-13 19:08:08 +00:00
Andrew Morgan	c2d848b80d	Destructure again	2019-03-13 19:04:43 +00:00
Andrew Morgan	ee8ba397e8	Are you happy now	2019-03-13 18:48:31 +00:00
Andrew Morgan	9dd0e34679	Syntax test	2019-03-13 18:45:17 +00:00
Andrew Morgan	220607a618	Remove testing code	2019-03-13 18:43:40 +00:00
Andrew Morgan	660b77f362	Add missing docstring detail	2019-03-13 18:38:16 +00:00
Andrew Morgan	5526b054aa	Fix syntax issues	2019-03-13 18:35:21 +00:00
Andrew Morgan	09626bfd39	Switch to wrapper function around _send_request	2019-03-13 18:26:06 +00:00
Richard van der Hoff	5d89a526f1	Factor per-destination stuff out of TransactionQueue This is easier than having to have a million fields keyed on destination.	2019-03-13 17:48:29 +00:00
Erik Johnston	72bfaf746d	Allow passing --daemonize to workers	2019-03-13 17:33:54 +00:00
Richard van der Hoff	fdcad8eabd	Move client receipt processing to federation sender worker. This is mostly a prerequisite for #4730, but also fits with the general theme of "move everything off the master that we possibly can".	2019-03-13 17:21:19 +00:00
Richard van der Hoff	eed7271b3b	declare a ReadReceipt class I'm going to use this in queues and things, so it'll be useful to give it more of a structure.	2019-03-13 17:20:55 +00:00
Andrew Morgan	7998ca3a66	Document using a certificate with a full chain (#4849 )	2019-03-13 15:26:29 +00:00
Andrew Morgan	7d053cfe10	Retry on 400:M_UNRECOGNIZED	2019-03-13 12:10:33 +00:00
Andrew Morgan	7e75d9644b	Fix paranthesis indent	2019-03-13 11:15:23 +00:00
Andrew Morgan	cf301e37d8	Add workaround note	2019-03-13 11:14:43 +00:00
Andrew Morgan	d42c81d724	Transfer local user's push rules on room upgrade (#4838 ) Transfer push rules (notifications) on room upgrade	2019-03-12 14:42:53 +00:00
Amber Brown	c0332d095f	fixup	2019-03-13 01:30:54 +11:00
Amber Brown	797b6a63fc	fixup	2019-03-13 01:17:51 +11:00
Andrew Morgan	0ea8582f8b	Cleaner way of implementing trailing slashes	2019-03-12 14:11:11 +00:00
Amber Brown	81d9d1bee6	fixup	2019-03-12 22:28:48 +11:00
Amber Brown	6f5890b2fa	fixup	2019-03-12 22:27:56 +11:00
Amber Brown	10480c4348	fixup	2019-03-12 21:47:14 +11:00
Amber Brown	8b618041ef	fixup	2019-03-12 18:06:28 +11:00
Amber Brown	c980c7e31f	use the old method	2019-03-12 17:51:14 +11:00
Aaron Raimist	8ea1b41a0e	Clarify what registration_shared_secret allows for (#2885 ) (#4844 ) * Clarify what registration_shared_secret allows for (#2885) Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>	2019-03-11 18:21:52 +00:00
Andrew Morgan	f18dca26da	Merge branch 'develop' into anoa/trailing_slashes_client	2019-03-11 17:44:29 +00:00
Andrew Morgan	290552fd83	Make federation endpoints more tolerant of trailing slashes for some endpoints (#4793 ) Server side of a solution towards #3622.	2019-03-11 17:44:03 +00:00
Andrew Morgan	a8a028dfce	Merge branch 'develop' into anoa/trailing_slashes_client	2019-03-11 17:07:31 +00:00
Erik Johnston	78c563b77c	Correctly log expected errors when fetching server keys	2019-03-11 14:11:10 +00:00
Amber Brown	78a6b950b3	fix	2019-03-12 00:50:28 +11:00
Amber Brown	1b77bd69fb	pep8	2019-03-12 00:39:12 +11:00
Amber Brown	5ba8ceab4c	fixes	2019-03-12 00:35:31 +11:00
Amber Brown	8da22e2b53	master startup	2019-03-11 21:13:35 +11:00
Amber Brown	30a8deeb68	Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-search	2019-03-11 21:12:30 +11:00
Amber Brown	4abc988c6a	initial	2019-03-11 21:11:36 +11:00
Matthew Hodgson	2326e00bc4	fix incorrect encoding of filenames with spaces in (#2090 ) fixes https://github.com/vector-im/riot-web/issues/3155	2019-03-11 09:53:45 +00:00
Andrew Morgan	a5dd335cd8	lint	2019-03-08 18:25:59 +00:00
Andrew Morgan	64ff11019e	Retry certain federation requests on 404	2019-03-08 18:22:47 +00:00
Andrew Morgan	525dd02bbe	Remove trailing slashes from outbound federation requests	2019-03-08 16:55:52 +00:00
Erik Johnston	fe6c12e6cd	Add comment to schema	2019-03-08 16:38:23 +00:00
Erik Johnston	5536ddba75	Make `prev_state` field optional The `prev_state` field on events is not specced and so synapse shouldn't explode if an event is missing the field. Fixes #4787	2019-03-08 15:05:32 +00:00
Erik Johnston	8c4896668f	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_impl	2019-03-08 11:44:20 +00:00
Erik Johnston	0ff8163eae	Factor out soft fail checks	2019-03-08 11:26:33 +00:00
Erik Johnston	469b66c102	Merge pull request #4829 from matrix-org/erikj/device_list_seen_updates When re-syncing device lists reset the state	2019-03-08 09:54:54 +00:00
Erik Johnston	d42b41544a	When re-syncing device lists reset the state We keep track of what stream IDs we've seen so that we know what updates we've handled or missed. If we re-sync we don't know if the updates we've seen are included in the re-sync (there may be a race), so we should reset the seen updates.	2019-03-07 16:04:24 +00:00
Erik Johnston	c633fc02d7	Add some debug logging for device list handling	2019-03-07 15:58:03 +00:00
Amber Brown	f6135d06cf	Rewrite userdir to be faster (#4537 )	2019-03-07 01:22:53 -08:00
Travis Ralston	06cbf79fe3	Merge pull request #4779 from matrix-org/travis/icons Use static locations for Riot icons	2019-03-06 15:11:41 -07:00
Erik Johnston	1f85c2c0ce	Merge pull request #4818 from matrix-org/erikj/prefill_client_ips Prefill client IPs cache on workers	2019-03-06 19:17:39 +00:00
Erik Johnston	0a6e716600	Merge pull request #4815 from matrix-org/erikj/docstrings Add docstrings from matrix-org-hotfixes	2019-03-06 18:59:28 +00:00
Erik Johnston	c665b637de	Merge pull request #4816 from matrix-org/erikj/4422_debug Port #4422 debug logging from hotfixes	2019-03-06 18:59:12 +00:00
Erik Johnston	face0c5b3c	Prefill client IPs cache on workers	2019-03-06 17:39:32 +00:00
Erik Johnston	b879870b2d	Send message after room has been shutdown Currently the explanation message is sent to the abuse room before any users are forced joined, which means it tends to get lost in the backlog of joins. So instead we send the message after we've forced joined everyone.	2019-03-06 17:35:11 +00:00
Erik Johnston	8b7790e68f	Port #4422 debug logging from hotfixes	2019-03-06 17:29:15 +00:00
Erik Johnston	6d13bdec91	Add docstrings from matrix-org-hotfixes	2019-03-06 17:24:26 +00:00
Erik Johnston	a9de04be72	Implement soft fail	2019-03-06 16:22:16 +00:00
Andrew Morgan	7b8a157b79	Merge pull request #4792 from matrix-org/anoa/replication_tokens Support batch updates in the worker sender	2019-03-06 15:48:29 +00:00
Brendan Abolivier	6f3cde8b25	Make registration ratelimiter separate from the main events one	2019-03-06 11:02:42 +00:00
Brendan Abolivier	f4195f4118	Revert "Split ratelimiters in two (one for events, one for registration)" This reverts commit `d7dbad3526`.	2019-03-06 10:55:22 +00:00
Brendan Abolivier	d7dbad3526	Split ratelimiters in two (one for events, one for registration)	2019-03-05 18:41:27 +00:00
Brendan Abolivier	067ce795c0	Move settings from registration to ratelimiting in config file	2019-03-05 18:03:14 +00:00
Erik Johnston	16c8b4ecbd	Merge pull request #4772 from jbweston/jbweston/server-version-api Add 'server_version' endpoint to admin API	2019-03-05 16:31:00 +00:00
Brendan Abolivier	a4c3a361b7	Add rate-limiting on registration (#4735 ) * Rate-limiting for registration * Add unit test for registration rate limiting * Add config parameters for rate limiting on auth endpoints * Doc * Fix doc of rate limiting function Co-Authored-By: babolivier <contact@brendanabolivier.com> * Incorporate review * Fix config parsing * Fix linting errors * Set default config for auth rate limiting * Fix tests * Add changelog * Advance reactor instead of mocked clock * Move parameters to registration specific config and give them more sensible default values * Remove unused config options * Don't mock the rate limiter un MAU tests * Rename _register_with_store into register_with_store * Make CI happy * Remove unused import * Update sample config * Fix ratelimiting test for py2 * Add non-guest test	2019-03-05 14:25:33 +00:00
Andrew Morgan	b9f6163092	Simplify token replication logic	2019-03-05 13:58:30 +00:00
Andrew Morgan	ae90531036	Merge pull request #4794 from matrix-org/anoa/erroneous_dollahs Remove unnecessary dollar signs	2019-03-05 09:46:59 +00:00
Erik Johnston	b050a10871	Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_room Stop backpaginating when events not visible	2019-03-05 09:32:33 +00:00
Erik Johnston	9e8bca5667	Merge pull request #4799 from matrix-org/rav/clean_up_replication_code Clean ups in replication notifier	2019-03-05 09:19:48 +00:00
Erik Johnston	aa06d26ae0	clarify comments	2019-03-05 09:16:35 +00:00
Erik Johnston	c3c542bb4a	Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keys Allow /keys/{changes,query} API to run on worker	2019-03-05 09:06:25 +00:00
Richard van der Hoff	c7325776a7	Remove redundant PreserveLoggingContext Both (!) things that register as replication listeners do the right thing wrt logcontexts, so this is redundant.	2019-03-04 18:31:18 +00:00
Erik Johnston	bfa7d46a10	Allow /keys/{changes,query} API to run on worker	2019-03-04 18:30:01 +00:00
Erik Johnston	157e5a8f27	Split DeviceHandler into master and worker	2019-03-04 18:29:26 +00:00
Richard van der Hoff	daa10e3e66	Remove unused `wait_for_replication` method I guess this was used once? It's not now, anyway.	2019-03-04 18:27:32 +00:00
Richard van der Hoff	2db49ea476	Add some debug about processing read receipts. I'm hoping to establish which rooms are having lots of RRs sent for them, and how old the events are when they are sent.	2019-03-04 18:19:40 +00:00
Richard van der Hoff	b29693a30b	Clean up read-receipt handling. Remove a call to run_as_background_process: there is no need to run this as a background process, because build_and_send_edu does not block. We may as well inline the whole of _push_remotes.	2019-03-04 18:16:43 +00:00
Erik Johnston	a84b8d56c2	Fixup slave stores	2019-03-04 18:04:57 +00:00
Richard van der Hoff	8e28bc5eee	Include a default configuration file in the 'docs' directory. (#4791 )	2019-03-04 17:14:58 +00:00
Erik Johnston	0d2d046709	Fix missing null guard	2019-03-04 16:04:04 +00:00
Andrew Morgan	336de1d45b	Remove unnecessary dollar signs A dollar sign is already appended to the end of each PATH, so there's no need to add one in the PATH declaration as well.	2019-03-04 15:25:12 +00:00
Andrew Morgan	fe7bd23a85	Clean up logic and add comments	2019-03-04 15:08:15 +00:00
Erik Johnston	d1523aed6b	Only check history visibility when filtering When filtering events to send to server we check more than just history visibility. However when deciding whether to backfill or not we only care about the history visibility.	2019-03-04 14:43:42 +00:00
Andrew Morgan	9f7cdf3da1	Clearer branching, fix missing list clear	2019-03-04 14:36:52 +00:00
Andrew Morgan	5f0c449dd5	Prevent replication wedging	2019-03-04 14:03:18 +00:00
Richard van der Hoff	856c83f5f8	Avoid rebuilding Edu objects in worker mode (#4770 ) In worker mode, on the federation sender, when we receive an edu for sending over the replication socket, it is parsed into an Edu object. There is no point extracting the contents of it so that we can then immediately build another Edu.	2019-03-04 12:57:44 +00:00
Erik Johnston	8b63fe4c26	s/get_forward_events/get_successor_events/	2019-03-04 11:56:03 +00:00
Erik Johnston	fbc047f2a5	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_not_in_room	2019-03-04 11:54:58 +00:00
Travis Ralston	4dfbae18fe	Use static locations for Riot icons See https://github.com/vector-im/riot-web/issues/9009	2019-03-01 15:06:21 -07:00
Richard van der Hoff	3064952939	Fix incorrect log about not persisting duplicate state event. (#4776 ) We were logging this when it was not true.	2019-03-01 16:47:12 +00:00
Richard van der Hoff	1beebe916f	Merge branch 'master' into develop	2019-03-01 10:58:39 +00:00
Richard van der Hoff	9ac72d9543	0.99.2	2019-03-01 10:55:44 +00:00
Joseph Weston	1e8388b311	Add 'server_version' endpoint to admin API This is required because the 'Server' HTTP header is not always passed through proxies.	2019-03-01 09:56:58 +01:00
Andrew Morgan	ac61b45a75	Minor docstring fixes for MatrixFederationAgent (#4765 )	2019-02-28 16:24:01 +00:00

... 19 20 21 22 23 ...

11638 Commits