summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix mainline ordering in state res v2 (#8971)Erik Johnston2020-12-181-1/+1
| | | | | | This had two effects 1) it'd give the wrong answer and b) would iterate *all* power levels in the auth chain of each event. The latter of which can be *very* expensive for certain types of IRC bridge rooms that have large numbers of power level changes.
* Implement a username picker for synapse (#8942)Richard van der Hoff2020-12-189-45/+512
| | | | | | | | | | | | | | The final part (for now) of my work to implement a username picker in synapse itself. The idea is that we allow `UsernameMappingProvider`s to return `localpart=None`, in which case, rather than redirecting the browser back to the client, we redirect to a username-picker resource, which allows the user to enter a username. We *then* complete the SSO flow (including doing the client permission checks). The static resources for the username picker itself (in https://github.com/matrix-org/synapse/tree/rav/username_picker/synapse/res/username_picker) are essentially lifted wholesale from https://github.com/matrix-org/matrix-synapse-saml-mozilla/tree/master/matrix_synapse_saml_mozilla/res. As the comment says, we might want to think about making them customisable, but that can be a follow-up. Fixes #8876.
* Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-187-18/+114
|
* Ensure that a URL exists in the content during push. (#8965)Patrick Cloke2020-12-182-2/+6
| | | | This fixes an KeyError exception, after this PR the content is just considered unknown.
* Merge remote-tracking branch 'origin/erikj/as_mau_block' into developErik Johnston2020-12-185-7/+41
|\
| * Correctly handle AS registerations and add testErik Johnston2020-12-174-7/+34
| |
| * Don't MAU limit AS ghost usersErik Johnston2020-12-171-0/+7
| |
* | Try and drop stale extremities. (#8929)Erik Johnston2020-12-184-18/+188
| | | | | | | | If we see stale extremities while persisting events, and notice that they don't change the result of state resolution, we drop them.
* | Use the simple dictionary in full text search for the user directory (#8959)Brendan Abolivier2020-12-171-12/+12
| | | | | | | | | | * Use the simple dictionary in fts for the user directory * Clarify naming
* | Fix a bug that deactivated users appear in the directory (#8933)Dirk Klimpel2020-12-171-2/+6
| | | | | | | | | | | | | | | | | | | | Fixes a bug that deactivated users appear in the directory when their profile information was updated. To change profile information of deactivated users is neccesary for example you will remove displayname or avatar. But they should not appear in directory. They are deactivated. Co-authored-by: Erik Johnston <erikj@jki.re>
* | Make search statement in List Room and User Admin API case-insensitive (#8931)Dirk Klimpel2020-12-172-5/+6
| |
* | Add a maximum size for well-known lookups. (#8950)Patrick Cloke2020-12-163-18/+52
| |
* | Push login completion down into SsoHandler (#8941)Richard van der Hoff2020-12-163-82/+75
| | | | | | This is another part of my work towards fixing #8876. It moves some of the logic currently in the SAML and OIDC handlers - in particular the call to `AuthHandler.complete_sso_login` down into the `SsoHandler`.
* | Fix the sample config location for the ip_range_whitelist setting. (#8954)Patrick Cloke2020-12-162-12/+12
| | | | | | | | Move it from the federation section to the server section to match ip_range_blacklist.
* | Convert internal pusher dicts to attrs classes. (#8940)Patrick Cloke2020-12-1612-195/+255
| | | | | | This improves type hinting and should use less memory.
* | Do not assume that the contents dictionary includes history_visibility. (#8945)Patrick Cloke2020-12-168-28/+57
| |
* | Preparatory refactoring of the SamlHandlerTestCase (#8938)Richard van der Hoff2020-12-151-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | * move simple_async_mock to test_utils ... so that it can be re-used * Remove references to `SamlHandler._map_saml_response_to_user` from tests This method is going away, so we can no longer use it as a test point. Instead, factor out a higher-level method which takes a SAML object, and verify correct behaviour by mocking out `AuthHandler.complete_sso_login`. * changelog
* | Fix handling of stream tokens for push. (#8943)Patrick Cloke2020-12-155-50/+17
| | | | | | | | Removes faulty assertions and fixes the logic to ensure the max stream token is always set.
* | Fix startup failure with localdb_enabled: False (#8937)Richard van der Hoff2020-12-141-14/+12
| |
* | Various clean-ups to the logging context code (#8935)Patrick Cloke2020-12-145-28/+11
| |
* | Allow spam-checker modules to be provide async methods. (#8890)David Teller2020-12-1116-65/+82
| | | | | | | | Spam checker modules can now provide async methods. This is implemented in a backwards-compatible manner.
* | Add type hints to the push module. (#8901)Patrick Cloke2020-12-116-80/+155
| |
* | Honour AS ratelimit settings for /login requests (#8920)Erik Johnston2020-12-113-10/+26
| | | | | | | | Fixes #8846.
* | Add number of local devices to Room Details Admin API (#8886)Dirk Klimpel2020-12-112-16/+64
| |
* | Don't ratelimit autojoining of rooms (#8921)Erik Johnston2020-12-112-11/+17
| | | | | | Fixes #8866
* | Fix deadlock on SIGHUP (#8918)Erik Johnston2020-12-101-1/+5
| | | | | | Fixes #8892
* | Refactor `SsoHandler.get_mxid_from_sso` (#8900)Richard van der Hoff2020-12-102-28/+50
| | | | | | | | | | | | | | * Factor out _call_attribute_mapper and _register_mapped_user This is mostly an attempt to simplify `get_mxid_from_sso`. * Move mapping_lock down into SsoHandler.
* | Fix buglet in DirectRenderJsonResource (#8897)Richard van der Hoff2020-12-101-3/+5
| | | | | | | | this was using `canonical_json` without setting it, so when you used it as a standalone class, you would get exceptions.
* | Default to blacklisting reserved IP ranges and add a whitelist. (#8870)Patrick Cloke2020-12-094-62/+100
| | | | | | | | This defaults `ip_range_blacklist` to reserved IP ranges and also adds an `ip_range_whitelist` setting to override it.
* | Merge branch 'master' into developErik Johnston2020-12-092-2/+6
|\|
| * 1.24.0 v1.24.0Erik Johnston2020-12-091-1/+1
| |
| * Fix installing pysaml2 on Python 3.5. (#8898)Patrick Cloke2020-12-081-1/+5
| | | | | | This pins pysaml2 to < 6.4.0 on Python 3.5, as the last known working version.
* | Add X-Robots-Tag header to stop crawlers from indexing media (#8887)Aaron Raimist2020-12-081-0/+5
| | | | | | | | | | | | | | Fixes / related to: https://github.com/matrix-org/synapse/issues/6533 This should do essentially the same thing as a robots.txt file telling robots to not index the media repo. https://developers.google.com/search/reference/robots_meta_tag Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | Better formatting for config errors from modules (#8874)Richard van der Hoff2020-12-0812-37/+159
| | | | | | | | | | | | | | | | | | | | The idea is that the parse_config method of extension modules can raise either a ConfigError or a JsonValidationError, and it will be magically turned into a legible error message. There's a few components to it: * Separating the "path" and the "message" parts of a ConfigError, so that we can fiddle with the path bit to turn it into an absolute path. * Generally improving the way ConfigErrors get printed. * Passing in the config path to load_module so that it can wrap any exceptions that get caught appropriately.
* | Simplify the flow for SSO UIA (#8881)Richard van der Hoff2020-12-085-40/+142
| | | | | | | | | | | | | | | | | | * SsoHandler: remove inheritance from BaseHandler * Simplify the flow for SSO UIA We don't need to do all the magic for mapping users when we are doing UIA, so let's factor that out.
* | Clarify config template comments (#8891)Richard van der Hoff2020-12-082-8/+4
| |
* | Call set_avatar_url with target_user, not user_id (#8872)Will Hunt2020-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Call set_avatar_url with target_user, not user_id Fixes https://github.com/matrix-org/synapse/issues/8871 * Create 8872.bugfix * Update synapse/rest/admin/users.py Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> * Testing * Update changelog.d/8872.bugfix Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
* | Do not raise a 500 exception when previewing empty media. (#8883)Patrick Cloke2020-12-071-1/+5
| |
* | Add type hints for HTTP and email pushers. (#8880)Patrick Cloke2020-12-076-101/+164
| |
* | Add type hints to the push mailer module. (#8882)Patrick Cloke2020-12-071-40/+83
| |
* | Add authentication to replication endpoints. (#8853)Patrick Cloke2020-12-042-6/+51
| | | | | | | | Authentication is done by checking a shared secret provided in the Synapse configuration file.
* | Pass room_id to get_auth_chain_difference (#8879)Erik Johnston2020-12-043-5/+12
| | | | | | | | | | This is so that we can choose which algorithm to use based on the room ID.
* | Add additional validation to pusher URLs. (#8865)Patrick Cloke2020-12-042-3/+16
| | | | | | | | Pusher URLs now must end in `/_matrix/push/v1/notify` per the specification.
* | Do not 500 if the content-length is not provided when uploading media. (#8862)Patrick Cloke2020-12-041-1/+1
| | | | | | Instead return the proper 400 error.
* | Merge tag 'v1.24.0rc2' into developPatrick Cloke2020-12-044-15/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.24.0rc2 (2020-12-04) ============================== Bugfixes -------- - Fix a regression in v1.24.0rc1 which failed to allow SAML mapping providers which were unable to redirect users to an additional page. ([\#8878](https://github.com/matrix-org/synapse/issues/8878)) Internal Changes ---------------- - Add support for the `prometheus_client` newer than 0.9.0. Contributed by Jordan Bancino. ([\#8875](https://github.com/matrix-org/synapse/issues/8875))
| * 1.24.0rc2Patrick Cloke2020-12-041-1/+1
| |
| * Fix a regression that mapping providers should be able to redirect users. ↵Patrick Cloke2020-12-042-6/+23
| | | | | | | | | | (#8878) This was broken in #8801.
| * Remove version pin prometheus_client dependency (#8875)Jordan Bancino2020-12-041-8/+5
| | | | | | | | | | | | | | This removes the version pin of the `prometheus_client` dependency, in direct response to #8831. If merged, this will close #8831 As far as I can tell, no other changes are needed, but as I'm no synapse expert, I'm relying heavily on CI and maintainer reviews for this. My very primitive test of synapse with prometheus_client v0.9.0 on my home server didn't bring up any issues, so we'll see what happens. Signed-off-by: Jordan Bancino
* | Fix errorcode for disabled registration (#8867)Richard van der Hoff2020-12-031-1/+1
| | | | | | | | The spec says we should return `M_FORBIDDEN` when someone tries to register and registration is disabled.
* | Merge pull request #8858 from matrix-org/rav/sso_uiaRichard van der Hoff2020-12-024-16/+86
|\ \ | | | | | | UIA: offer only available auth flows
| * | UIA: offer only available auth flowsRichard van der Hoff2020-12-023-15/+85
| | | | | | | | | | | | | | | | | | | | | During user-interactive auth, do not offer password auth to users with no password, nor SSO auth to users with no SSO. Fixes #7559.
| * | fix up various test casesRichard van der Hoff2020-12-021-1/+1
| | | | | | | | | | | | | | | A few test cases were relying on being able to mount non-client servlets on the test resource. it's better to give them their own Resources.
* | | Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-0213-69/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces the `federation_ip_range_blacklist` configuration setting with an `ip_range_blacklist` setting with wider scope. It now applies to: * Federation * Identity servers * Push notifications * Checking key validitity for third-party invite events The old `federation_ip_range_blacklist` setting is still honored if present, but with reduced scope (it only applies to federation and identity servers).
* | | Correctly handle unpersisted events when calculating auth chain difference. ↵Erik Johnston2020-12-021-4/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | (#8827) We do state res with unpersisted events when calculating the new current state of the room, so that should be the only thing impacted. I don't think this is tooooo big of a deal as: 1. the next time a state event happens in the room the current state should correct itself; 2. in the common case all the unpersisted events' auth events will be pulled in by other state, so will still return the correct result (or one which is sufficiently close to not affect the result); and 3. we mostly use the state at an event to do important operations, which isn't affected by this.
* | | Add additional validation for the admin register endpoint. (#8837)David Florness2020-12-021-0/+3
| |/ |/| | | Raise a proper 400 error if the `mac` field is missing.
* | 1.24.0rc1Patrick Cloke2020-12-021-1/+1
|/
* Fix a regression when grandfathering SAML users. (#8855)Patrick Cloke2020-12-023-47/+52
| | | | | | This was broken in #8801 when abstracting code shared with OIDC. After this change both SAML and OIDC have a concept of grandfathering users, but with different implementations.
* Add basic SAML tests for mapping users. (#8800)Patrick Cloke2020-12-021-1/+1
|
* Create a `PasswordProvider` wrapper object (#8849)Richard van der Hoff2020-12-021-55/+148
| | | | The idea here is to abstract out all the conditional code which tests which methods a given password provider has, to provide a consistent interface.
* Support "identifier" dicts in UIA (#8848)Richard van der Hoff2020-12-012-129/+163
| | | | | | | | | | The spec requires synapse to support `identifier` dicts for `m.login.password` user-interactive auth, which it did not (instead, it required an undocumented `user` parameter.) To fix this properly, we need to pull the code that interprets `identifier` into `AuthHandler.validate_login` so that it can be called from the UIA code. Fixes #5665.
* Add missing `ordering` to background updates (#8850)Richard van der Hoff2020-12-014-12/+12
| | | | | | | It's important that we make sure our background updates happen in a defined order, to avoid disasters like #6923. Add an ordering to all of the background updates that have landed since #7190.
* Allow Date header through CORS (#8804)Nicolas Chamo2020-12-011-1/+1
|
* Don't offer password login when it is disabled (#8835)Richard van der Hoff2020-12-011-1/+9
| | | Fix a minor bug where we would offer "m.login.password" login if a custom auth provider supported it, even if password login was disabled.
* Simplify appservice login code (#8847)Richard van der Hoff2020-11-301-6/+21
| | | we don't need to support legacy login dictionaries here.
* Allow per-room profile to be used for server notice user (#8799)Mathieu Velten2020-11-301-1/+9
| | | | This applies even if the feature is disabled at the server level with `allow_per_room_profiles`. The server notice not being a real user it doesn't have an user profile.
* Drop (almost) unused index on event_json (#8845)Richard van der Hoff2020-11-302-1/+20
|
* Add a config option to change whether unread push notification counts are ↵Andrew Morgan2020-11-303-7/+35
| | | | | | | | per-message or per-room (#8820) This PR adds a new config option to the `push` section of the homeserver config, `group_unread_count_by_room`. By default Synapse will group push notifications by room (so if you have 1000 unread messages, if they lie in 55 rooms, you'll see an unread count on your phone of 55). However, it is also useful to be able to send out the true count of unread messages if desired. If `group_unread_count_by_room` is set to `false`, then with the above example, one would see an unread count of 1000 (email anyone?).
* Simplify the way the `HomeServer` object caches its internal attributes. ↵Jonathan de Jong2020-11-305-21/+21
| | | | | (#8565) Changes `@cache_in_self` to use underscore-prefixed attributes.
* Add `force_purge` option to delete-room admin api. (#8843)Richard van der Hoff2020-11-302-11/+28
|
* Remove special case of pretty printing JSON responses for curl (#8833)Tulir Asokan2020-11-271-24/+5
| | | | | * Remove special case of pretty printing JSON responses for curl Signed-off-by: Tulir Asokan <tulir@maunium.net>
* Add typing to membership Replication class methods (#8809)Andrew Morgan2020-11-271-22/+44
| | | | | This PR grew out of #6739, and adds typing to some method arguments You'll notice that there are a lot of `# type: ignores` in here. This is due to the base methods not matching the overloads here. This is necessary to stop mypy complaining, but a better solution is #8828.
* Defer SIGHUP handlers to reactor. (#8817)Erik Johnston2020-11-261-1/+9
| | | | | | | | | We can get a SIGHUP at any point, including times where we are not in a sane state. By deferring calling the handlers until the next reactor tick we ensure that we don't get unexpected conflicts, e.g. trying to flush logs from the signal handler while the code was in the process of writing a log entry. Fixes #8769.
* Strip trailing / from server_url in register_new_matrix_user (#8823)Dmitry Borodaenko2020-11-261-1/+1
| | | | | | | | | When server URL provided to register_new_matrix_user includes path component (e.g. "http://localhost:8008/"), the command fails with "ERROR! Received 400 Bad Request". Stripping trailing slash from the server_url command argument makes sure combined endpoint URL remains valid. Signed-off-by: Dmitry Borodaenko angdraug@debian.org
* Remove deprecated `/_matrix/client/*/admin` endpoints (#8785)Dirk Klimpel2020-11-257-58/+28
| | | These are now only available via `/_synapse/admin/v1`.
* Fix the formatting of push config section (#8818)Andrew Morgan2020-11-251-15/+20
| | | This PR updates the push config's formatting to better align with our [code style guidelines](https://github.com/matrix-org/synapse/blob/develop/docs/code_style.md#configuration-file-format).
* Speed up remote invite rejection database call (#8815)Andrew Morgan2020-11-252-6/+44
| | | | | | | | | | | | | This is another PR that grew out of #6739. The existing code for checking whether a user is currently invited to a room when they want to leave the room looks like the following: https://github.com/matrix-org/synapse/blob/f737368a26bb9eea401fcc3a5bdd7e0b59e91f09/synapse/handlers/room_member.py#L518-L540 It calls `get_invite_for_local_user_in_room`, which will actually query *all* rooms the user has been invited to, before iterating over them and matching via the room ID. It will then return a tuple of a lot of information which we pull the event ID out of. I need to do a similar check for knocking, but this code wasn't very efficient. I then tried to write a different implementation using `StateHandler.get_current_state` but this actually didn't work as we haven't *joined* the room yet - we've only been invited to it. That means that only certain tables in Synapse have our desired `invite` membership state. One of those tables is `local_current_membership`. So I wrote a store method that just queries that table instead
* Add additional type hints to HTTP client. (#8812)Patrick Cloke2020-11-252-147/+138
| | | | This also removes some duplicated code between the simple HTTP client and matrix federation client.
* Support trying multiple localparts for OpenID Connect. (#8801)Patrick Cloke2020-11-253-134/+232
| | | | Abstracts the SAML and OpenID Connect code which attempts to regenerate the localpart of a matrix ID if it is already in use.
* Add type hints to matrix federation client / agent. (#8806)Patrick Cloke2020-11-254-195/+228
|
* Properly report user-agent/IP during registration of SSO users. (#8784)Patrick Cloke2020-11-234-122/+171
| | | | | This also expands type-hints to the SSO and registration code. Refactors the CAS code to more closely match OIDC/SAML.
* Improve logging of the mapping from SSO IDs to Matrix IDs. (#8773)Andrew Morgan2020-11-232-5/+12
|
* Improve error checking for OIDC/SAML mapping providers (#8774)Patrick Cloke2020-11-193-8/+29
| | | | | | Checks that the localpart returned by mapping providers for SAML and OIDC are valid before registering new users. Extends the OIDC tests for existing users and invalid data.
* SAML: Allow specifying the IdP entityid to use. (#8630)Ben Banfield-Zanin2020-11-192-1/+12
| | | | If the SAML metadata includes multiple IdPs it is necessary to specify which IdP to redirect users to for authentication.
* Consistently use room_id from federation request body (#8776)Richard van der Hoff2020-11-193-53/+48
| | | | | | | | | | | | | * Consistently use room_id from federation request body Some federation APIs have a redundant `room_id` path param (see https://github.com/matrix-org/matrix-doc/issues/2330). We should make sure we consistently use either the path param or the body param, and the body param is easier. * Kill off some references to "context" Once upon a time, "rooms" were known as "contexts". I think this kills of the last references to "contexts".
* Improve appservice handler to send only the most recent read receipts when ↵Will Hunt2020-11-183-3/+9
| | | | | | | | | | | | | | | | | | | no stream_id is stored. (#8744) * Make this line debug (it's noisy) * Don't include from_key for presence if we are at 0 * Limit read receipts for all rooms to 100 * changelog.d/8744.bugfix * Allow from_key to be None * Update 8744.bugfix * The from_key is superflous * Update comment
* SAML: Document allowing a clock/time difference from IdP (#8731)Marcus Schopen2020-11-181-0/+6
| | | | Updates the sample configuration with the pysaml2 configuration for accepting clock skew/drift between the homeserver and IdP.
* Merge branch 'master' into developErik Johnston2020-11-182-1/+5
|\
| * 1.23.0Erik Johnston2020-11-181-1/+1
| |
| * Cap the version of prometheus_client to <v0.9.0 in the dockerfile (#8767)Andrew Morgan2020-11-171-0/+4
| | | | | | Short-term fix for https://github.com/matrix-org/synapse/issues/8766.
* | Abstract shared SSO code. (#8765)Patrick Cloke2020-11-174-113/+151
| | | | | | De-duplicates code between the SAML and OIDC implementations.
* | Use TYPE_CHECKING instead of magic MYPY variable. (#8770)Patrick Cloke2020-11-173-9/+6
| |
* | Add admin API for logging in as a user (#8617)Erik Johnston2020-11-1717-45/+174
| |
* | Generalise _locally_reject_invite (#8751)Andrew Morgan2020-11-161-17/+19
| | | | | | | | | | | | | | | | | | `_locally_reject_invite` generates an out-of-band membership event which can be passed to clients, but not other homeservers. This is used when we fail to reject an invite over federation. If this happens, we instead just generate a leave event locally and send it down /sync, allowing clients to reject invites even if we can't reach the remote homeserver. A similar flow needs to be put in place for rescinding knocks. If we're unable to contact any remote server from the room we've tried to knock on, we'd still like to generate and store the leave event locally. Hence the need to reuse, and thus generalise, this method. Separated from #6739.
* | Clarify the usecase for an msisdn delegate (#8734)Adrian Wannenmacher2020-11-141-2/+3
| | | | | | Signed-off-by: Adrian Wannenmacher <tfld@tfld.dev>
* | Generalise _maybe_store_room_on_invite (#8754)Andrew Morgan2020-11-133-13/+17
|/ | | | | | | | | There's a handy function called maybe_store_room_on_invite which allows us to create an entry in the rooms table for a room and its version for which we aren't joined to yet, but we can reference when ingesting events about. This is currently used for invites where we receive some stripped state about the room and pass it down via /sync to the client, without us being in the room yet. There is a similar requirement for knocking, where we will eventually do the same thing, and need an entry in the rooms table as well. Thus, reusing this function works, however its name needs to be generalised a bit. Separated out from #6739.
* 1.23.0rc1Erik Johnston2020-11-131-1/+1
|
* SAML: add <mdui:UIInfo> element examples (#8718)Marcus Schopen2020-11-131-0/+22
| | | add some mdui:UIInfo element examples for saml2_config in homeserver.yaml
* Add metrics for tracking 3PID /requestToken requests. (#8712)Erik Johnston2020-11-133-0/+32
| | | | | | The main use case is to see how many requests are being made, and how many are second/third/etc attempts. If there are large number of retries then that likely indicates a delivery problem.
* Cache event ID to auth event IDs lookups (#8752)Erik Johnston2020-11-131-12/+70
| | | | | This should hopefully speed up `get_auth_chain_difference` a bit in the case of repeated state res on the same rooms. `get_auth_chain_difference` does a breadth first walk of the auth graphs by repeatedly looking up events' auth events. Different state resolutions on the same room will end up doing a lot of the same event to auth events lookups, so by caching them we should speed things up in cases of repeated state resolutions on the same room.
* Enable reconnection in DB pool (#8726)Erik Johnston2020-11-121-1/+6
| | | | | | `adbapi.ConnectionPool` let's you turn on auto reconnect of DB connections. This is off by default. As far as I can tell if its not enabled dead connections never get removed from the pool. Maybe helps #8574
* Check support room has only two users before sending a notice (#8728)Will Hunt2020-11-111-1/+1
| | | | | | | | | | | * Check support room has only two users * Create 8728.bugfix * Update synapse/server_notices/server_notices_manager.py Co-authored-by: Erik Johnston <erik@matrix.org> Co-authored-by: Erik Johnston <erik@matrix.org>
* Better error message when a remote resource uses invalid Content-Type (#8719)Andrew Morgan2020-11-111-2/+8
|
* Catch exceptions in password_providers (#8636)Nicolai Søborg2020-11-111-4/+9
| | | Signed-off-by: Nicolai Søborg <git@xn--sb-lka.org>
* Fix SIGHUP handler (#8697)Richard van der Hoff2020-11-061-3/+2
| | | | | | | Fixes: ``` builtins.TypeError: _reload_logging_config() takes 1 positional argument but 2 were given ```
* Add an admin API for users' media statistics (#8700)Dirk Klimpel2020-11-053-0/+251
| | | | | | | | Add `GET /_synapse/admin/v1/statistics/users/media` to get statisics about local media usage by users. Related to #6094 It is the first API for statistics. Goal is to avoid/reduce usage of sql queries like [Wiki analyzing Synapse](https://github.com/matrix-org/synapse/wiki/SQL-for-analyzing-Synapse-PostgreSQL-database-stats) Signed-off-by: Dirk Klimpel dirk@klimpel.org
* Add `displayname` to Shared-Secret Registration for admins (#8722)Dirk Klimpel2020-11-051-0/+2
| | | Add `displayname` to Shared-Secret Registration for admins to `POST /_synapse/admin/v1/register`
* Block clients from sending server ACLs that lock the local server out. (#8708)Erik Johnston2020-11-032-9/+21
| | | Fixes #4042
* Improve error messages of non-str displayname/avatar_url (#8705)Andrew Morgan2020-11-021-2/+6
| | | | | | | | This PR fixes two things: * Corrects the copy/paste error of telling the client their displayname is wrong when they are submitting an `avatar_url`. * Returns a `M_INVALID_PARAM` instead of `M_UNKNOWN` for non-str type parameters. Reported by @t3chguy.
* Add base pushrule to notify for jitsi conferences (#8286)David Baker2020-11-021-0/+24
| | | This could be customised to trigger a different kind of notification in the future, but for now it's a normal non-highlight one.
* Improve start time by adding index to e2e_cross_signing_keys (#8694)Erik Johnston2020-11-022-2/+33
| | | We do a `SELECT MAX(stream_id) FROM e2e_cross_signing_keys` on startup.
* Fix error handling around when completing an AS transaction (#8693)Brendan Abolivier2020-10-301-1/+1
|
* Merge branch 'master' into developErik Johnston2020-10-301-1/+1
|\
| * use correct versionErik Johnston2020-10-301-1/+1
| |
| * Merge pull request #8678 from matrix-org/rav/fix_frozen_eventsRichard van der Hoff2020-10-306-40/+31
| | | | | | Fix serialisation errors when using third-party event rules.
| * Tie together matches_user_in_member_list and get_users_in_room caches (#8676)Will Hunt2020-10-301-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | * Tie together matches_user_in_member_list and get_users_in_room * changelog * Remove type to fix mypy * Add `on_invalidate` to the function signature in the hopes that may make things work well * Remove **kwargs * Update 8676.bugfix
* | Improve the sample config for SSO (OIDC, SAML, and CAS). (#8635)Patrick Cloke2020-10-303-54/+80
| |
* | Implement and use an @lru_cache decorator (#8595)Richard van der Hoff2020-10-302-60/+212
| | | | | | We don't always need the full power of a DeferredCache.
* | Fix race for concurrent downloads of remote media. (#8682)Erik Johnston2020-10-303-70/+152
| | | | | | Fixes #6755
* | Fix optional parameter in stripped state storage method (#8688)Andrew Morgan2020-10-301-1/+1
| | | | | | Missed in #8671.
* | Tie together matches_user_in_member_list and get_users_in_room caches (#8676)Will Hunt2020-10-291-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | * Tie together matches_user_in_member_list and get_users_in_room * changelog * Remove type to fix mypy * Add `on_invalidate` to the function signature in the hopes that may make things work well * Remove **kwargs * Update 8676.bugfix
* | Gracefully handle a pending logging connection during shutdown. (#8685)Patrick Cloke2020-10-291-9/+18
| |
* | Add ability for access tokens to belong to one user but grant access to ↵Erik Johnston2020-10-2911-105/+166
| | | | | | | | | | | | | | | | | | | | another user. (#8616) We do it this way round so that only the "owner" can delete the access token (i.e. `/logout/all` by the "owner" also deletes that token, but `/logout/all` by the "target user" doesn't). A future PR will add an API for creating such a token. When the target user and authenticated entity are different the `Processed request` log line will be logged with a: `{@admin:server as @bob:server} ...`. I'm not convinced by that format (especially since it adds spaces in there, making it harder to use `cut -d ' '` to chop off the start of log lines). Suggestions welcome.
* | Fix cache call signature to accept `on_invalidate`. (#8684)Erik Johnston2020-10-291-5/+7
| | | | | | Cached functions accept an `on_invalidate` function, which we failed to add to the type signature. It's rarely used in the files that we have typed, which is why we haven't noticed it before.
* | Use `%r` rather than `%s` for stringifying events (#8679)Richard van der Hoff2020-10-291-2/+2
| | | | | | | | otherwise non-state events get written as `<FrozenEvent ... state_key='None'>` which is indistinguishable from state events with the actual state_key `None`.
* | Optimise createRoom with multiple invites (#8559)Richard van der Hoff2020-10-292-13/+24
| | | | | | | | | | By not dropping the membership lock between invites, we can stop joins from grabbing the lock when we're half-done and slowing the whole thing down.
* | Support generating structured logs in addition to standard logs. (#8607)Patrick Cloke2020-10-296-501/+266
| | | | | | | | | | | | | | This modifies the configuration of structured logging to be usable from the standard Python logging configuration. This also separates the formatting of logs from the transport allowing JSON logs to files or standard logs to sockets.
* | Merge pull request #8678 from matrix-org/rav/fix_frozen_eventsRichard van der Hoff2020-10-286-40/+31
|\ \ | | | | | | Fix serialisation errors when using third-party event rules.
| * | remove unused importsRichard van der Hoff2020-10-281-2/+0
| | |
| * | Remove frozendict_json_encoder and support frozendicts everywhereRichard van der Hoff2020-10-286-38/+31
| |/ | | | | | | | | | | Not being able to serialise `frozendicts` is fragile, and it's annoying to have to think about which serialiser you want. There's no real downside to supporting frozendicts, so let's just have one json encoder.
* | Add type hints to application services. (#8655)Patrick Cloke2020-10-283-79/+117
| |
* | Add an admin APIs to allow server admins to list users' pushers (#8610)Dirk Klimpel2020-10-282-1/+55
| | | | | | Add an admin API `GET /_synapse/admin/v1/users/<user_id>/pushers` like https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-pushers
* | Don't pull event from DB when handling replication traffic. (#8669)Erik Johnston2020-10-284-31/+86
| | | | | | | | | | I was trying to make it so that we didn't have to start a background task when handling RDATA, but that is a bigger job (due to all the code in `generic_worker`). However I still think not pulling the event from the DB may help reduce some DB usage due to replication, even if most workers will simply go and pull that event from the DB later anyway. Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
* | Tell Black to format code for Python 3.5 (#8664)Dan Callahan2020-10-273-4/+4
| | | | | | | | | | | | | | | | This allows trailing commas in multi-line arg lists. Minor, but we might as well keep our formatting current with regard to our minimum supported Python version. Signed-off-by: Dan Callahan <danc@element.io>
* | Abstract code for stripping room state into a separate method (#8671)Andrew Morgan2020-10-272-29/+60
| | | | | | | | | | | | | | | | | | | | | | This is a requirement for [knocking](https://github.com/matrix-org/synapse/pull/6739), and is abstracting some code that was originally used by the invite flow. I'm separating it out into this PR as it's a fairly contained change. For a bit of context: when you invite a user to a room, you send them [stripped state events](https://matrix.org/docs/spec/server_server/unstable#put-matrix-federation-v2-invite-roomid-eventid) as part of `invite_room_state`. This is so that their client can display useful information such as the room name and avatar. The same requirement applies to knocking, as it would be nice for clients to be able to display a list of rooms you've knocked on - room name and avatar included. The reason we're sending membership events down as well is in the case that you are invited to a room that does not have an avatar or name set. In that case, the client should use the displayname/avatar of the inviter. That information is located in the inviter's membership event. This is optional as knocks don't really have any user in the room to link up to. When you knock on a room, your knock is sent by you and inserted into the room. It wouldn't *really* make sense to show the avatar of a random user - plus it'd be a data leak. So I've opted not to send membership events to the client here. The UX on the client for when you knock on a room without a name/avatar is a separate problem. In essence this is just moving some inline code to a reusable store method.
* | Don't unnecessarily start bg process in replication sending loop. (#8670)Erik Johnston2020-10-271-0/+10
| |
* | Don't unnecessarily start bg process while handling typing. (#8668)Erik Johnston2020-10-271-8/+13
| | | | | | There's no point starting a background process when all its going to do is bail if federation isn't enabled.
* | Add admin API to list users' local media (#8647)Dirk Klimpel2020-10-275-1/+128
| | | | | | Add admin API `GET /_synapse/admin/v1/users/<user_id>/media` to get information of users' uploaded files.
* | Merge branch 'master' into developErik Johnston2020-10-271-1/+1
|\|
| * 1.22.0 v1.22.0 github/release-v1.22.0 release-v1.22.0Erik Johnston2020-10-271-1/+1
| |
* | e2e: ensure we have both master and self-signing key (#8455)Jonas Jelten2020-10-261-5/+22
| | | | | | | | | | | | | | it seems to be possible that only one of them ends up to be cached. when this was the case, the missing one was not fetched via federation, and clients then failed to validate cross-signed devices. Signed-off-by: Jonas Jelten <jj@sft.lol>
* | Add type hints for account validity handler (#8620)Patrick Cloke2020-10-264-12/+29
| | | | | | This also fixes a bug by fixing handling of an account which doesn't expire.
* | Split admin API for reported events into a detail and a list view (#8539)Dirk Klimpel2020-10-263-19/+137
| | | | | | | | | | | | | | | | | | | | | | | | Split admin API for reported events in detail und list view. API was introduced with #8217 in synapse v.1.21.0. It makes the list (`GET /_synapse/admin/v1/event_reports`) less complex and provides a better overview. The details can be queried with: `GET /_synapse/admin/v1/event_reports/<report_id>`. It is similar to room and users API. It is a kind of regression in `GET /_synapse/admin/v1/event_reports`. `event_json` was removed. But the api was introduced one version before and it is an admin API (not under spec). Signed-off-by: Dirk Klimpel dirk@klimpel.org
* | Add an admin api to delete local media. (#8519)Dirk Klimpel2020-10-264-3/+220
| | | | | | | | | | | | Related to: #6459, #3479 Add `DELETE /_synapse/admin/v1/media/<server_name>/<media_id>` to delete a single file from server.
* | Fix a bug in the joined_rooms admin API (#8643)Dirk Klimpel2020-10-261-3/+4
| | | | | | | | If the user was not in any rooms then the API returned the same error as if the user did not exist.
* | Merge tag 'v1.22.0rc2' into developErik Johnston2020-10-261-1/+1
|\| | | | | | | | | | | | | | | | | | | | | Synapse 1.22.0rc2 (2020-10-26) ============================== Bugfixes -------- - Fix bugs where ephemeral events were not sent to appservices. Broke in v1.22.0rc1. ([\#8648](https://github.com/matrix-org/synapse/issues/8648), [\#8656](https://github.com/matrix-org/synapse/issues/8656)) - Fix `user_daily_visits` table to not have duplicate rows per user/device due to multiple user agents. Broke in v1.22.0rc1. ([\#8654](https://github.com/matrix-org/synapse/issues/8654))
| * 1.22.0rc2Erik Johnston2020-10-261-1/+1
| |
* | Merge branch 'release-v1.22.0' into developErik Johnston2020-10-262-7/+9
|\|
| * Fix get|set_type_stream_id_for_appservice store functions (#8648)Will Hunt2020-10-262-13/+28
| |
| * Properly handle presence events for application services. (#8656)Patrick Cloke2020-10-261-4/+5
| |
| * Fix user_daily_visits to not have duplicate rows for UA. (#8654)Erik Johnston2020-10-261-4/+5
| | | | | | | | | | | | | | | | | | | | | | * Fix user_daily_visits to not have duplicate rows for UA. Fixes #8641. * Newsfile * Fix typo. Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
* | Fix get|set_type_stream_id_for_appservice store functions (#8648)Will Hunt2020-10-262-13/+28
| |
* | Add field `total` to device list in admin API (#8644)Dirk Klimpel2020-10-261-1/+1
| |
* | Check status codes that profile handler returns (#8580)LEdoian2020-10-261-0/+7
| | | | | | | | | | | | | | Fixes #8520 Signed-off-by: Pavel Turinsky <pavel.turinsky@matfyz.cz> Co-authored-by: Erik Johnston <erikj@jki.re>
* | Start fewer opentracing spans (#8640)Erik Johnston2020-10-266-41/+87
| | | | | | | | | | | | | | #8567 started a span for every background process. This is good as it means all Synapse code that gets run should be in a span (unless in the sentinel logging context), but it means we generate about 15x the number of spans as we did previously. This PR attempts to reduce that number by a) not starting one for send commands to Redis, and b) deferring starting background processes until after we're sure they're necessary. I don't really know how much this will help.
* | Fix typos and spelling errors. (#8639)Patrick Cloke2020-10-2338-56/+58
| |
* | Fix handling of User-Agent headers with bad utf-8. (#8632)Erik Johnston2020-10-236-22/+14
| |
* | Fix email notifications for invites without local state. (#8627)Erik Johnston2020-10-231-13/+28
| | | | | | | | This can happen if e.g. the room invited into is no longer on the server (or if all users left the room).
* | Merge tag 'v1.22.0rc1' into developErik Johnston2020-10-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.22.0rc1 (2020-10-22) ============================== Features -------- - Add a configuration option for always using the "userinfo endpoint" for OpenID Connect. This fixes support for some identity providers, e.g. GitLab. Contributed by Benjamin Koch. ([\#7658](https://github.com/matrix-org/synapse/issues/7658)) - Add ability for `ThirdPartyEventRules` modules to query and manipulate whether a room is in the public rooms directory. ([\#8292](https://github.com/matrix-org/synapse/issues/8292), [\#8467](https://github.com/matrix-org/synapse/issues/8467)) - Add support for olm fallback keys ([MSC2732](https://github.com/matrix-org/matrix-doc/pull/2732)). ([\#8312](https://github.com/matrix-org/synapse/issues/8312), [\#8501](https://github.com/matrix-org/synapse/issues/8501)) - Add support for running background tasks in a separate worker process. ([\#8369](https://github.com/matrix-org/synapse/issues/8369), [\#8458](https://github.com/matrix-org/synapse/issues/8458), [\#8489](https://github.com/matrix-org/synapse/issues/8489), [\#8513](https://github.com/matrix-org/synapse/issues/8513), [\#8544](https://github.com/matrix-org/synapse/issues/8544), [\#8599](https://github.com/matrix-org/synapse/issues/8599)) - Add support for device dehydration ([MSC2697](https://github.com/matrix-org/matrix-doc/pull/2697)). ([\#8380](https://github.com/matrix-org/synapse/issues/8380)) - Add support for [MSC2409](https://github.com/matrix-org/matrix-doc/pull/2409), which allows sending typing, read receipts, and presence events to appservices. ([\#8437](https://github.com/matrix-org/synapse/issues/8437), [\#8590](https://github.com/matrix-org/synapse/issues/8590)) - Change default room version to "6", per [MSC2788](https://github.com/matrix-org/matrix-doc/pull/2788). ([\#8461](https://github.com/matrix-org/synapse/issues/8461)) - Add the ability to send non-membership events into a room via the `ModuleApi`. ([\#8479](https://github.com/matrix-org/synapse/issues/8479)) - Increase default upload size limit from 10M to 50M. Contributed by @Akkowicz. ([\#8502](https://github.com/matrix-org/synapse/issues/8502)) - Add support for modifying event content in `ThirdPartyRules` modules. ([\#8535](https://github.com/matrix-org/synapse/issues/8535), [\#8564](https://github.com/matrix-org/synapse/issues/8564)) Bugfixes -------- - Fix a longstanding bug where invalid ignored users in account data could break clients. ([\#8454](https://github.com/matrix-org/synapse/issues/8454)) - Fix a bug where backfilling a room with an event that was missing the `redacts` field would break. ([\#8457](https://github.com/matrix-org/synapse/issues/8457)) - Don't attempt to respond to some requests if the client has already disconnected. ([\#8465](https://github.com/matrix-org/synapse/issues/8465)) - Fix message duplication if something goes wrong after persisting the event. ([\#8476](https://github.com/matrix-org/synapse/issues/8476)) - Fix incremental sync returning an incorrect `prev_batch` token in timeline section, which when used to paginate returned events that were included in the incremental sync. Broken since v0.16.0. ([\#8486](https://github.com/matrix-org/synapse/issues/8486)) - Expose the `uk.half-shot.msc2778.login.application_service` to clients from the login API. This feature was added in v1.21.0, but was not exposed as a potential login flow. ([\#8504](https://github.com/matrix-org/synapse/issues/8504)) - Fix error code for `/profile/{userId}/displayname` to be `M_BAD_JSON`. ([\#8517](https://github.com/matrix-org/synapse/issues/8517)) - Fix a bug introduced in v1.7.0 that could cause Synapse to insert values from non-state `m.room.retention` events into the `room_retention` database table. ([\#8527](https://github.com/matrix-org/synapse/issues/8527)) - Fix not sending events over federation when using sharded event writers. ([\#8536](https://github.com/matrix-org/synapse/issues/8536)) - Fix a long standing bug where email notifications for encrypted messages were blank. ([\#8545](https://github.com/matrix-org/synapse/issues/8545)) - Fix increase in the number of `There was no active span...` errors logged when using OpenTracing. ([\#8567](https://github.com/matrix-org/synapse/issues/8567)) - Fix a bug that prevented errors encountered during execution of the `synapse_port_db` from being correctly printed. ([\#8585](https://github.com/matrix-org/synapse/issues/8585)) - Fix appservice transactions to only include a maximum of 100 persistent and 100 ephemeral events. ([\#8606](https://github.com/matrix-org/synapse/issues/8606)) Updates to the Docker image --------------------------- - Added multi-arch support (arm64,arm/v7) for the docker images. Contributed by @maquis196. ([\#7921](https://github.com/matrix-org/synapse/issues/7921)) - Add support for passing commandline args to the synapse process. Contributed by @samuel-p. ([\#8390](https://github.com/matrix-org/synapse/issues/8390)) Improved Documentation ---------------------- - Update the directions for using the manhole with coroutines. ([\#8462](https://github.com/matrix-org/synapse/issues/8462)) - Improve readme by adding new shield.io badges. ([\#8493](https://github.com/matrix-org/synapse/issues/8493)) - Added note about docker in manhole.md regarding which ip address to bind to. Contributed by @Maquis196. ([\#8526](https://github.com/matrix-org/synapse/issues/8526)) - Document the new behaviour of the `allowed_lifetime_min` and `allowed_lifetime_max` settings in the room retention configuration. ([\#8529](https://github.com/matrix-org/synapse/issues/8529)) Deprecations and Removals ------------------------- - Drop unused `device_max_stream_id` table. ([\#8589](https://github.com/matrix-org/synapse/issues/8589)) Internal Changes ---------------- - Check for unreachable code with mypy. ([\#8432](https://github.com/matrix-org/synapse/issues/8432)) - Add unit test for event persister sharding. ([\#8433](https://github.com/matrix-org/synapse/issues/8433)) - Allow events to be sent to clients sooner when using sharded event persisters. ([\#8439](https://github.com/matrix-org/synapse/issues/8439), [\#8488](https://github.com/matrix-org/synapse/issues/8488), [\#8496](https://github.com/matrix-org/synapse/issues/8496), [\#8499](https://github.com/matrix-org/synapse/issues/8499)) - Configure `public_baseurl` when using demo scripts. ([\#8443](https://github.com/matrix-org/synapse/issues/8443)) - Add SQL logging on queries that happen during startup. ([\#8448](https://github.com/matrix-org/synapse/issues/8448)) - Speed up unit tests when using PostgreSQL. ([\#8450](https://github.com/matrix-org/synapse/issues/8450)) - Remove redundant database loads of stream_ordering for events we already have. ([\#8452](https://github.com/matrix-org/synapse/issues/8452)) - Reduce inconsistencies between codepaths for membership and non-membership events. ([\#8463](https://github.com/matrix-org/synapse/issues/8463)) - Combine `SpamCheckerApi` with the more generic `ModuleApi`. ([\#8464](https://github.com/matrix-org/synapse/issues/8464)) - Additional testing for `ThirdPartyEventRules`. ([\#8468](https://github.com/matrix-org/synapse/issues/8468)) - Add `-d` option to `./scripts-dev/lint.sh` to lint files that have changed since the last git commit. ([\#8472](https://github.com/matrix-org/synapse/issues/8472)) - Unblacklist some sytests. ([\#8474](https://github.com/matrix-org/synapse/issues/8474)) - Include the log level in the phone home stats. ([\#8477](https://github.com/matrix-org/synapse/issues/8477)) - Remove outdated sphinx documentation, scripts and configuration. ([\#8480](https://github.com/matrix-org/synapse/issues/8480)) - Clarify error message when plugin config parsers raise an error. ([\#8492](https://github.com/matrix-org/synapse/issues/8492)) - Remove the deprecated `Handlers` object. ([\#8494](https://github.com/matrix-org/synapse/issues/8494)) - Fix a threadsafety bug in unit tests. ([\#8497](https://github.com/matrix-org/synapse/issues/8497)) - Add user agent to user_daily_visits table. ([\#8503](https://github.com/matrix-org/synapse/issues/8503)) - Add type hints to various parts of the code base. ([\#8407](https://github.com/matrix-org/synapse/issues/8407), [\#8505](https://github.com/matrix-org/synapse/issues/8505), [\#8507](https://github.com/matrix-org/synapse/issues/8507), [\#8547](https://github.com/matrix-org/synapse/issues/8547), [\#8562](https://github.com/matrix-org/synapse/issues/8562), [\#8609](https://github.com/matrix-org/synapse/issues/8609)) - Remove unused code from the test framework. ([\#8514](https://github.com/matrix-org/synapse/issues/8514)) - Apply some internal fixes to the `HomeServer` class to make its code more idiomatic and statically-verifiable. ([\#8515](https://github.com/matrix-org/synapse/issues/8515)) - Factor out common code between `RoomMemberHandler._locally_reject_invite` and `EventCreationHandler.create_event`. ([\#8537](https://github.com/matrix-org/synapse/issues/8537)) - Improve database performance by executing more queries without starting transactions. ([\#8542](https://github.com/matrix-org/synapse/issues/8542)) - Rename `Cache` to `DeferredCache`, to better reflect its purpose. ([\#8548](https://github.com/matrix-org/synapse/issues/8548)) - Move metric registration code down into `LruCache`. ([\#8561](https://github.com/matrix-org/synapse/issues/8561), [\#8591](https://github.com/matrix-org/synapse/issues/8591)) - Replace `DeferredCache` with the lighter-weight `LruCache` where possible. ([\#8563](https://github.com/matrix-org/synapse/issues/8563)) - Add virtualenv-generated folders to `.gitignore`. ([\#8566](https://github.com/matrix-org/synapse/issues/8566)) - Add `get_immediate` method to `DeferredCache`. ([\#8568](https://github.com/matrix-org/synapse/issues/8568)) - Fix mypy not properly checking across the codebase, additionally, fix a typing assertion error in `handlers/auth.py`. ([\#8569](https://github.com/matrix-org/synapse/issues/8569)) - Fix `synmark` benchmark runner. ([\#8571](https://github.com/matrix-org/synapse/issues/8571)) - Modify `DeferredCache.get()` to return `Deferred`s instead of `ObservableDeferred`s. ([\#8572](https://github.com/matrix-org/synapse/issues/8572)) - Adjust a protocol-type definition to fit `sqlite3` assertions. ([\#8577](https://github.com/matrix-org/synapse/issues/8577)) - Support macOS on the `synmark` benchmark runner. ([\#8578](https://github.com/matrix-org/synapse/issues/8578)) - Update `mypy` static type checker to 0.790. ([\#8583](https://github.com/matrix-org/synapse/issues/8583), [\#8600](https://github.com/matrix-org/synapse/issues/8600)) - Re-organize the structured logging code to separate the TCP transport handling from the JSON formatting. ([\#8587](https://github.com/matrix-org/synapse/issues/8587)) - Remove extraneous unittest logging decorators from unit tests. ([\#8592](https://github.com/matrix-org/synapse/issues/8592)) - Minor optimisations in caching code. ([\#8593](https://github.com/matrix-org/synapse/issues/8593), [\#8594](https://github.com/matrix-org/synapse/issues/8594))
| * 1.22.0rc1Erik Johnston2020-10-221-1/+1
| |
* | Remove unused OPTIONS handlers. (#8621)Patrick Cloke2020-10-2213-64/+1
| | | | | | | | The handling of OPTIONS requests was consolidated in #7534, but the endpoint specific handlers were not removed.
* | Don't 500 for invalid group IDs (#8628)Erik Johnston2020-10-221-1/+4
| |
* | Type hints for RegistrationStore (#8615)Erik Johnston2020-10-222-74/+83
|/
* Optimise CacheDescriptor (#8594) github/release-v1.21.3 release-v1.21.3Richard van der Hoff2020-10-211-5/+7
| | | don't bother constricting a CacheContext unless we need one.
* fix failure caseRichard van der Hoff2020-10-211-1/+4
|
* optimise DeferredCache.setRichard van der Hoff2020-10-211-3/+12
|
* Merge pull request #8572 from matrix-org/rav/cache_hacking/2Richard van der Hoff2020-10-212-34/+55
|\ | | | | Push some deferred wrangling down into DeferredCache
| * Push some deferred wrangling down into DeferredCacheRichard van der Hoff2020-10-212-34/+55
| |
* | Limit AS transactions to 100 events (#8606)Will Hunt2020-10-211-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | * Limit AS transactions to 100 events * Update changelog.d/8606.feature Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Add tests * Update synapse/appservice/scheduler.py Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
* | Separate the TCP and terse JSON formatting code. (#8587)Patrick Cloke2020-10-212-186/+238
| | | | | | | | This should (theoretically) allow for using the TCP code with a different output type and make it easier to use the JSON code with files / console.
* | Add type hints to profile and base handlers. (#8609)Patrick Cloke2020-10-214-40/+68
|/
* Consistently use wrap_as_background_task in more places (#8599)Patrick Cloke2020-10-204-30/+19
|
* Move schema file for as_device_stream (#8590)Will Hunt2020-10-201-3/+2
| | | | | | | | | * Move schema file * Add a . * Add matching changelog entry * Fix sqlite
* Fix 'LruCache' object has no attribute '_on_resize' (#8591)Richard van der Hoff2020-10-191-1/+9
| | | We need to make sure we are readu for the `set_cache_factor` callback.
* Drop unused `device_max_stream_id` table (#8589)Vasilis Gerakaris2020-10-191-0/+1
| | | Signed-off-by: Vasilis Gerakaris <vasilis.gerakaris@navarino.gr>
* Fix mypy error: auth handler "checkpw" internal function type mismatch (#8569)Jonathan de Jong2020-10-191-3/+5
|
* Expose the experimental appservice login flow to clients. (#8504)Patrick Cloke2020-10-191-0/+2
|
* Add `DeferredCache.get_immediate` method (#8568)Richard van der Hoff2020-10-195-23/+29
| | | | | | | | | | | * Add `DeferredCache.get_immediate` method A bunch of things that are currently calling `DeferredCache.get` are only really interested in the result if it's completed. We can optimise and simplify this case. * Remove unused 'default' parameter to DeferredCache.get() * another get_immediate instance
* Include a simple message in email notifications that include encrypted ↵Patrick Cloke2020-10-197-74/+92
| | | | content (#8545)
* Start an opentracing span for background processes. (#8567)Erik Johnston2020-10-191-5/+6
| | | | | | This should reduce the number of `There was no active span` errors we see. Fixes #8510.
* Replace DeferredCache with LruCache where possible (#8563)Richard van der Hoff2020-10-197-27/+29
| | | Most of these uses don't need a full-blown DeferredCache; LruCache is lighter and more appropriate.
* Pre-emptively fix synapse.storage.types.Connection for future mypy release ↵Jonathan de Jong2020-10-172-3/+3
| | | | | (#8577) Fix the Connection protocol according to typeshed's assertions about sqlite3.Connection
* Type annotations for LruCache (#8562)Richard van der Hoff2020-10-165-31/+94
|\ | | | | | | | | | | | | | | | | | | | | | | | | * type annotations for LruCache * changelog * Apply suggestions from code review Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> * review comments Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
| * review commentsRichard van der Hoff2020-10-161-3/+8
| |
| * Apply suggestions from code reviewRichard van der Hoff2020-10-162-2/+2
| | | | | | Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
| * type annotations for LruCacheRichard van der Hoff2020-10-165-31/+89
| |
* | Clean-up old transaction IDs on the background worker. (#8544)Patrick Cloke2020-10-161-1/+1
|/
* Make LruCache register its own metrics (#8561)Richard van der Hoff2020-10-166-60/+59
| | | | | rather than have everything that instantiates an LruCache manage metrics separately, have LruCache do it itself.
* Fix modifying events in `ThirdPartyRules` modules (#8564)Richard van der Hoff2020-10-162-2/+7
| | | EventBuilder.build wants auth events these days
* Merge pull request #8535 from matrix-org/rav/third_party_events_updatesRichard van der Hoff2020-10-154-77/+93
|\ | | | | Support modifying event content from ThirdPartyRules modules
| * guard against accidental modificationRichard van der Hoff2020-10-132-3/+10
| |
| * Allow ThirdPartyRules modules to replace event contentRichard van der Hoff2020-10-132-5/+71
| | | | | | | | Support returning a new event dict from `check_event_allowed`.
| * Move third_party_rules check to event creation timeRichard van der Hoff2020-10-132-52/+13
| | | | | | | | | | Rather than waiting until we handle the event, call the ThirdPartyRules check when we fist create the event.
| * Remove redundant calls to third_party_rules in `on_send_{join,leave}`Richard van der Hoff2020-10-131-19/+1
| | | | | | | | | | There's not much point in calling these *after* we have decided to accept them into the DAG.
* | Solidify the HomeServer constructor. (#8515)Jonathan de Jong2020-10-151-5/+9
| | | | | | | | | | | | This implements a more standard API for instantiating a homeserver and moves some of the dependency injection into the test suite. More concretely this stops using `setattr` on all `kwargs` passed to `HomeServer`.
* | Send some ephemeral events to appservices (#8437)Will Hunt2020-10-1512-99/+499
| | | | | | Optionally sends typing, presence, and read receipt information to appservices.
* | Merge branch 'master' into developPatrick Cloke2020-10-151-1/+1
|\ \
| * | 1.21.2Patrick Cloke2020-10-151-1/+1
| | |
| * | Remove racey assertion in MultiWriterIDGenerator (#8530)Erik Johnston2020-10-151-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | We asserted that the IDs returned by postgres sequence was greater than any we had seen, however this is technically racey as we may update the current positions out of order. We now assert that the sequences are correct on startup, so the assertion is no longer really required, so we remove them.
* | | Enable mypy for synapse.util.caches (#8547)Richard van der Hoff2020-10-151-1/+1
| | | | | | | | | This seemed to entail dragging in a type stub for SortedList.
* | | Merge pull request #8548 from matrix-org/rav/deferred_cacheRichard van der Hoff2020-10-157-256/+313
|\ \ \ | | | | | | | | Rename Cache to DeferredCache, and related changes
| * | | move DeferredCache into its own moduleRichard van der Hoff2020-10-146-286/+300
| | | |
| * | | Rename Cache->DeferredCacheRichard van der Hoff2020-10-145-16/+21
| | | |
| * | | Add some more type annotations to CacheRichard van der Hoff2020-10-143-24/+62
| | |/ | |/|
* | | Include user agent in user daily visits table (#8503)Neil Johnson2020-10-152-3/+26
| | | | | | | | | Include user agent in user daily visits table.
* | | Merge pull request #8537 from matrix-org/rav/simplify_locally_reject_inviteRichard van der Hoff2020-10-154-60/+51
|\ \ \ | | | | | | | | Simplify `_locally_reject_invite`
| * | | Simplify `_locally_reject_invite`Richard van der Hoff2020-10-133-53/+48
| | | | | | | | | | | | | | | | | | | | Update `EventCreationHandler.create_event` to accept an auth_events param, and use it in `_locally_reject_invite` instead of reinventing the wheel.
| * | | Remove redundant `token_id` parameter to create_eventRichard van der Hoff2020-10-133-7/+3
| |/ / | | | | | | | | | this is always the same as requester.access_token_id.
* | | Use autocommit mode for single statement DB functions. (#8542)Erik Johnston2020-10-144-70/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autocommit means that we don't wrap the functions in transactions, and instead get executed directly. Introduced in #8456. This will help: 1. reduce the number of `could not serialize access due to concurrent delete` errors that we see (though there are a few functions that often cause serialization errors that we don't fix here); 2. improve the DB performance, as it no longer needs to deal with the overhead of `REPEATABLE READ` isolation levels; and 3. improve wall clock speed of these functions, as we no longer need to send `BEGIN` and `COMMIT` to the DB. Some notes about the differences between autocommit mode and our default `REPEATABLE READ` transactions: 1. Currently `autocommit` only applies when using PostgreSQL, and is ignored when using SQLite (due to silliness with [Twisted DB classes](https://twistedmatrix.com/trac/ticket/9998)). 2. Autocommit functions may get retried on error, which means they can get applied *twice* (or more) to the DB (since they are not in a transaction the previous call would not get rolled back). This means that the functions need to be idempotent (or otherwise not care about being called multiple times). Read queries, simple deletes, and updates/upserts that replace rows (rather than generating new values from existing rows) are all idempotent. 3. Autocommit functions no longer get executed in [`REPEATABLE READ`](https://www.postgresql.org/docs/current/transaction-iso.html) isolation level, and so data can change queries, which is fine for single statement queries.
* | | Remove racey assertion in MultiWriterIDGenerator (#8530)Erik Johnston2020-10-141-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | We asserted that the IDs returned by postgres sequence was greater than any we had seen, however this is technically racey as we may update the current positions out of order. We now assert that the sequences are correct on startup, so the assertion is no longer really required, so we remove them.
* | | Fix not sending events over federation when using sharded event persisters ↵Erik Johnston2020-10-148-18/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#8536) * Fix outbound federaion with multiple event persisters. We incorrectly notified federation senders that the minimum persisted stream position had advanced when we got an `RDATA` from an event persister. Notifying of federation senders already correctly happens in the notifier, so we just delete the offending line. * Change some interfaces to use RoomStreamToken. By enforcing use of `RoomStreamTokens` we make it less likely that people pass in random ints that they got from somewhere random.
* | | Make sure a retention policy is a state event (#8527)Brendan Abolivier2020-10-142-0/+7
| | | | | | | | | | | | | | | * Make sure a retention policy is a state event * Changelog
* | | Add correct M_BAD_JSON error code to /profile/{userId}/displayname (#8517)Aaron Raimist2020-10-141-1/+3
|/ / | | | | Fixes #8029
* | Move additional tasks to the background worker, part 4 (#8513)Patrick Cloke2020-10-139-187/+181
| |
* | Fix message duplication if something goes wrong after persisting the event ↵Erik Johnston2020-10-139-29/+313
| | | | | | | | | | (#8476) Should fix #3365.
* | Merge branch 'master' into developAndrew Morgan2020-10-131-1/+1
|\| | | | | | | | | | | * master: 1.21.1 Explicitly install test dependencies when building deb packages (#8523)
| * 1.21.1 v1.21.1 github/release-v1.21.1 release-v1.21.1Andrew Morgan2020-10-131-1/+1
| |
* | Merge branch 'master' into developAndrew Morgan2020-10-121-1/+1
|\|
| * 1.21.0Andrew Morgan2020-10-121-1/+1
| |
* | Make event persisters periodically announce position over replication. (#8499)Erik Johnston2020-10-126-21/+102
| | | | | | | | | | Currently background proccesses stream the events stream use the "minimum persisted position" (i.e. `get_current_token()`) rather than the vector clock style tokens. This is broadly fine as it doesn't matter if the background processes lag a small amount. However, in extreme cases (i.e. SyTests) where we only write to one event persister the background processes will never make progress. This PR changes it so that the `MultiWriterIDGenerator` keeps the current position of a given instance as up to date as possible (i.e using the latest token it sees if its not in the process of persisting anything), and then periodically announces that over replication. This then allows the "minimum persisted position" to advance, albeit with a small lag.
* | Increase default max_upload_size from 10M to 50M (#8502)Mateusz Przybyłowicz2020-10-091-2/+2
| | | | | | Signed-off-by: Mateusz Przybyłowicz <uamfhq@gmail.com>
* | Add type hints to response cache. (#8507)Patrick Cloke2020-10-097-34/+46
| |
* | Allow modules to create and send events into rooms (#8479)Andrew Morgan2020-10-092-7/+34
| | | | | | | | | | This PR allows Synapse modules making use of the `ModuleApi` to create and send non-membership events into a room. This can useful to have modules send messages, or change power levels in a room etc. Note that they must send event through a user that's already in the room. The non-membership event limitation is currently arbitrary, as it's another chunk of work and not necessary at the moment.
* | Only send RDATA for instance local events. (#8496)Erik Johnston2020-10-095-25/+53
| | | | | | | | | | When pulling events out of the DB to send over replication we were not filtering by instance name, and so we were sending events for other instances.
* | Move additional tasks to the background worker, part 3 (#8489)Patrick Cloke2020-10-097-282/+275
| |
* | Remove the deprecated Handlers object (#8494)Patrick Cloke2020-10-0921-94/+79
| | | | | | All handlers now available via get_*_handler() methods on the HomeServer.
* | Add type hints to some handlers (#8505)Patrick Cloke2020-10-098-22/+54
| |
* | Invalidate the cache when an olm fallback key is uploaded (#8501)Hubert Chathi2020-10-081-0/+4
| |
* | Merge tag 'v1.21.0rc3' into developErik Johnston2020-10-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.21.0rc3 (2020-10-08) ============================== Bugfixes -------- - Fix duplication of events on high traffic servers, caused by PostgreSQL `could not serialize access due to concurrent update` errors. ([\#8456](https://github.com/matrix-org/synapse/issues/8456)) Internal Changes ---------------- - Add Groovy Gorilla to the list of distributions we build `.deb`s for. ([\#8475](https://github.com/matrix-org/synapse/issues/8475))
| * 1.21.0rc3Erik Johnston2020-10-081-1/+1
| |
| * Reduce serialization errors in MultiWriterIdGen (#8456)Erik Johnston2020-10-075-5/+107
| | | | | | | | | | | | | | We call `_update_stream_positions_table_txn` a lot, which is an UPSERT that can conflict in `REPEATABLE READ` isolation level. Instead of doing a transaction consisting of a single query we may as well run it outside of a transaction.
* | Clarify error message when plugin config parsers raise an error (#8492)Richard van der Hoff2020-10-081-1/+1
| | | | | | | | | | | | | | | | | | This turns: Failed to parse config for 'myplugin': Exception('error message') into: Failed to parse config for 'myplugin': error message.
* | Move additional tasks to the background worker (#8458)Patrick Cloke2020-10-077-197/+194
| |
* | Include the configured log level in phone home stats. (#8477)Patrick Cloke2020-10-071-0/+7
| | | | | | By reporting the log level of the synapse logger as a string.
* | Reduce serialization errors in MultiWriterIdGen (#8456)Erik Johnston2020-10-075-8/+110
| | | | | | | | | | | | We call `_update_stream_positions_table_txn` a lot, which is an UPSERT that can conflict in `REPEATABLE READ` isolation level. Instead of doing a transaction consisting of a single query we may as well run it outside of a transaction.
* | Use vector clocks for room stream tokens. (#8439)Erik Johnston2020-10-073-42/+379
| | | | | | | | | | | | | | | | | | | | Currently when using multiple event persisters we (in the worst case) don't tell clients about events until all event persisters have persisted new events after the original event. This is a suboptimal, especially if one of the event persisters goes down. To handle this, we encode the position of each event persister in the room tokens so that we can send events to clients immediately. To reduce the size of the token we do two things: 1. We create a unique immutable persistent mapping between instance names and a generated small integer ID, which we can encode in the tokens instead of the instance name; and 2. We encode the "persisted upto position" of the room token and then only explicitly include instances that have positions strictly greater than that. The new tokens look something like: `m3478~1.3488~2.3489`, where the first number is the min position, and the subsequent `-` separated pairs are the instance ID to positions map. (We use `.` and `~` as separators as they're URL safe and not already used by `StreamToken`).
* | Add typing information to the device handler. (#8407)Patrick Cloke2020-10-072-38/+57
| |
* | Fix returning incorrect prev_batch token in incremental sync (#8486)Erik Johnston2020-10-071-1/+6
| |
* | Add support for MSC2697: Dehydrated devices (#8380)Hubert Chathi2020-10-077-21/+371
| | | | | | | | This allows a user to store an offline device on the server and then restore it at a subsequent login.
* | Merge pull request #8463 from matrix-org/rav/clean_up_event_handlingRichard van der Hoff2020-10-073-90/+78
|\ \ | | | | | | Reduce inconsistencies between codepaths for membership and non-membership events.
| * | update wordingRichard van der Hoff2020-10-071-2/+3
| | |
| * | kill off `send_nonmember_event`Richard van der Hoff2020-10-052-51/+27
| | | | | | | | | | | | This is now redundant, and we can just call `handle_new_client_event` directly.
| * | pull up event.sender assertionRichard van der Hoff2020-10-052-4/+5
| | |
| * | Move shadow-ban check down into `handle_new_client_event`.Richard van der Hoff2020-10-051-8/+24
| | |
| * | De-duplicate duplicate handlingRichard van der Hoff2020-10-052-38/+32
| | | | | | | | | | | | | | | move the "duplicate state event" handling down into `handle_new_client_event` where it can be shared between multiple call paths.
* | | Combine `SpamCheckerApi` with the more generic `ModuleApi`. (#8464)Richard van der Hoff2020-10-077-50/+45
| | | | | | | | | | | | | | | Lots of different module apis is not easy to maintain. Rather than adding yet another ModuleApi(hs, hs.get_auth_handler()) incantation, first add an hs.get_module_api() method and use it where possible.
* | | Add support for MSC2732: olm fallback keys (#8312)Hubert Chathi2020-10-065-1/+148
| | |
* | | Additional tests for third-party event rules (#8468)Richard van der Hoff2020-10-061-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Optimise and test state fetching for 3p event rules Getting all the events at once is much more efficient than getting them individually * Test that 3p event rules can modify events
* | | Merge pull request #8467 from matrix-org/rav/fix_3pevent_rulesRichard van der Hoff2020-10-061-1/+3
|\ \ \ | | | | | | | | Fix third-party event modules for `check_visibility_can_be_modified` check
| * | | Fix third-party event modules for `check_visibility_can_be_modified` checkRichard van der Hoff2020-10-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | PR #8292 tried to maintain backwards compat with modules which don't provide a `check_visibility_can_be_modified` method, but the tests weren't being run, and the check didn't work.
* | | | Don't bother responding to client requests that have already disconnected ↵Andrew Morgan2020-10-062-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#8465) This PR ports the quick fix from https://github.com/matrix-org/synapse/pull/2796 to further methods which handle media, URL preview and `/key/v2/server` requests. This prevents a harmless `ERROR` that comes up in the logs when we were unable to respond to a client request when the client had already disconnected. In this case we simply bail out if the client has already done so. This is the 'simple fix' as suggested by https://github.com/matrix-org/synapse/issues/5304#issuecomment-574740003. Fixes https://github.com/matrix-org/synapse/issues/6700 Fixes https://github.com/matrix-org/synapse/issues/5304