synapse-product

mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-25 09:49:27 -05:00

Author	SHA1	Message	Date
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

... 5 6 7 8 9 ...

10897 Commits