summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Enable mypy checking for unreachable code and fix instances. (#8432)Patrick Cloke2020-10-0117-53/+38
|
* Add prometheus metrics to track federation delays (#8430)Richard van der Hoff2020-10-018-6/+88
| | | | | Add a pair of federation metrics to track the delays in sending PDUs to/from particular servers.
* Make token serializing/deserializing async (#8427)Erik Johnston2020-09-3017-59/+115
| | | The idea is that in future tokens will encode a mapping of instance to position. However, we don't want to include the full instance name in the string representation, so instead we'll have a mapping between instance name and an immutable integer ID in the DB that we can use instead. We'll then do the lookup when we serialize/deserialize the token (we could alternatively pass around an `Instance` type that includes both the name and ID, but that turns out to be a lot more invasive).
* Merge pull request #8425 from matrix-org/rav/extremity_metricsRichard van der Hoff2020-09-305-84/+144
|\ | | | | Add an improved "forward extremities" metric
| * changelogRichard van der Hoff2020-09-301-0/+1
| |
| * Add an improved "forward extremities" metricRichard van der Hoff2020-09-301-2/+25
| | | | | | | | | | Hopefully, N(extremities) * N(state_events) is a more realistic approximation to "how big a problem is this room?".
| * Rewrite BucketCollectorRichard van der Hoff2020-09-303-71/+89
| | | | | | | | | | | | | | | | | | | | | | | | This was a bit unweildy for what I wanted: in particular, I wanted to assign each measurement straight into a bucket, rather than storing an intermediate Counter which didn't do any bucketing at all. I've replaced it with something that is hopefully a bit easier to use. (I'm not entirely sure what the difference between a HistogramMetricFamily and a GaugeHistogramMetricFamily is, but given our counters can go down as well as up the latter *sounds* more accurate?)
| * Fix _exposition.py to stop stripping samplesRichard van der Hoff2020-09-301-11/+29
| | | | | | | | | | | | Our hacked-up `_exposition.py` was stripping out some samples it shouldn't have been. Put them back in, to more closely match the upstream `exposition.py`.
* | Allow additional SSO properties to be passed to the client (#8413)Patrick Cloke2020-09-309-67/+278
|/
* Drop support for ancient prometheus_client (#8426)Richard van der Hoff2020-09-303-23/+8
| | | | Drop compatibility hacks for prometheus-client pre 0.4.0. Debian stretch and Fedora 31 both have newer versions, so hopefully this will be ok.
* Merge pull request #8420 from matrix-org/rav/state_res_statsRichard van der Hoff2020-09-304-79/+199
|\ | | | | Report metrics on expensive rooms for state res
| * changelogRichard van der Hoff2020-09-291-0/+1
| |
| * Report state res metrics to Prometheus and logRichard van der Hoff2020-09-291-20/+124
| |
| * Move Measure calls into `resolve_events_with_store`Richard van der Hoff2020-09-291-32/+31
| |
| * Expose a `get_resource_usage` method in `Measure`Richard van der Hoff2020-09-291-10/+21
| |
| * Move `resolve_events_with_store` into StateResolutionHandlerRichard van der Hoff2020-09-292-50/+55
| |
* | Various clean ups to room stream tokens. (#8423)Erik Johnston2020-09-2916-76/+96
| |
* | Update description of server_name config option (#8415)Aaron Raimist2020-09-293-8/+35
|/
* Discard an empty upload_name before persisting an uploaded file (#7905)Will Hunt2020-09-293-3/+9
|
* Don't check whether a 3pid is allowed to register during password reset (#8414)Andrew Morgan2020-09-292-7/+1
|\ | | | | | | | | | | | | | | * Don't check whether a 3pid is allowed to register during password reset This endpoint should only deal with emails that have already been approved, and are attached with user's account. There's no need to re-check them here. * Changelog
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2020-09-2919-118/+404
| |\ | | | | | | | | | anoa/info-mainline-no-check-password-reset
| * | ChangelogAndrew Morgan2020-09-281-0/+1
| | |
| * | Don't check whether a 3pid is allowed to register during password resetAndrew Morgan2020-09-281-7/+0
| | | | | | | | | | | | | | | This endpoint should only deal with emails that have already been approved, and are attached with user's account. There's no need to re-check them here.
* | | Don't table scan events on worker startup (#8419)Erik Johnston2020-09-293-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix table scan of events on worker startup. This happened because we assumed "new" writers had an initial stream position of 0, so the replication code tried to fetch all events written by the instance between 0 and the current position. Instead, set the initial position of new writers to the current persisted up to position, on the assumption that new writers won't have written anything before that point. * Consider old writers coming back as "new". Otherwise we'd try and fetch entries between the old stale token and the current position, even though it won't have written any rows. Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
* | | Mypy fixes for `synapse.handlers.federation` (#8422)Richard van der Hoff2020-09-296-11/+19
| |/ |/| | | For some reason, an apparently unrelated PR upset mypy about this module. Here are a number of little fixes.
* | Add support for running Complement against the local checkout (#8317)Andrew Morgan2020-09-292-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | This PR adds a script that: * Builds the local Synapse checkout using our existing `docker/Dockerfile` image. * Downloads [Complement](https://github.com/matrix-org/complement/)'s source code. * Builds the [Synapse.Dockerfile](https://github.com/matrix-org/complement/blob/master/dockerfiles/Synapse.Dockerfile) using the above dockerfile as a base. * Builds and runs Complement against it. This set up differs slightly from [that of the dendrite repo](https://github.com/matrix-org/dendrite/blob/master/build/scripts/complement.sh) (`complement.sh`, `Complement.Dockerfile`), which instead stores a separate, but slightly modified, dockerfile in Dendrite's repo rather than running the one stored in Complement's repo. That synapse equivalent to that dockerfile (`Synapse.Dockerfile`) in Complement's repo is just based on top of `matrixdotorg/synapse:latest`, which we opt to build here locally. Thus copying over the files from Complement's repo wouldn't change any functionality, and would result in two instances of the same files. So just using the dockerfile in Complement's repo was decided upon instead.
* | Filter out appservices from mau count (#8404)Will Hunt2020-09-293-2/+25
| | | | | | This is an attempt to fix #8403.
* | Only assert valid next_link params when provided (#8417)Andrew Morgan2020-09-293-6/+16
| | | | | | | | | | | | | | Broken in https://github.com/matrix-org/synapse/pull/8275 and has yet to be put in a release. Fixes https://github.com/matrix-org/synapse/issues/8418. `next_link` is an optional parameter. However, we were checking whether the `next_link` param was valid, even if it wasn't provided. In that case, `next_link` was `None`, which would clearly not be a valid URL. This would prevent password reset and other operations if `next_link` was not provided, and the `next_link_domain_whitelist` config option was set.
* | Add metrics to track success/otherwise of replication requests (#8406)Richard van der Hoff2020-09-292-12/+29
| | | | | | One hope is that this might provide some insights into #3365.
* | Fix handling of connection timeouts in outgoing http requests (#8400)Richard van der Hoff2020-09-299-98/+311
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove `on_timeout_cancel` from `timeout_deferred` The `on_timeout_cancel` param to `timeout_deferred` wasn't always called on a timeout (in particular if the canceller raised an exception), so it was unreliable. It was also only used in one place, and to be honest it's easier to do what it does a different way. * Fix handling of connection timeouts in outgoing http requests Turns out that if we get a timeout during connection, then a different exception is raised, which wasn't always handled correctly. To fix it, catch the exception in SimpleHttpClient and turn it into a RequestTimedOutError (which is already a documented exception). Also add a description to RequestTimedOutError so that we can see which stage it failed at. * Fix incorrect handling of timeouts reading federation responses This was trapping the wrong sort of TimeoutError, so was never being hit. The effect was relatively minor, but we should fix this so that it does the expected thing. * Fix inconsistent handling of `timeout` param between methods `get_json`, `put_json` and `delete_json` were applying a different timeout to the response body to `post_json`; bring them in line and test. Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> Co-authored-by: Erik Johnston <erik@matrix.org>
* Add checks for postgres sequence consistency (#8402)Erik Johnston2020-09-288-6/+160
|
* Create a mechanism for marking tests "logcontext clean" (#8399)Richard van der Hoff2020-09-284-21/+41
|
* Add `ui_auth_sessions_ips` table to `synapse_port_db` ignore list (#8410)Dagfinn Ilmari Mannsåker2020-09-282-0/+2
| | | | | | This table was created in #8034 (1.20.0). It references `ui_auth_sessions`, which is ignored, so this one should be too. Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
* A pair of tiny cleanups in the federation request code. (#8401)Richard van der Hoff2020-09-283-3/+2
|
* typoMatthew Hodgson2020-09-281-1/+1
|
* Escape the error description on the sso_error template. (#8405)Patrick Cloke2020-09-252-1/+2
|
* Fix occasional "Re-starting finished log context" from keyring (#8398)Richard van der Hoff2020-09-253-90/+101
| | | | | | | | | | | | | | | * Fix test_verify_json_objects_for_server_awaits_previous_requests It turns out that this wasn't really testing what it thought it was testing (in particular, `check_context` was turning failures into success, which was making the tests pass even though it wasn't clear they should have been. It was also somewhat overcomplex - we can test what it was trying to test without mocking out perspectives servers. * Fix warnings about finished logcontexts in the keyring We need to make sure that we finish the key fetching magic before we run the verifying code, to ensure that we don't mess up our logcontexts.
* Allow existing users to login via OpenID Connect. (#8345)Tdxdxoz2020-09-256-17/+76
| | | | | | | Co-authored-by: Benjamin Koch <bbbsnowball@gmail.com> This adds configuration flags that will match a user to pre-existing users when logging in via OpenID Connect. This is useful when switching to an existing SSO system.
* Fix schema delta for servers that have not backfilled (#8396)Erik Johnston2020-09-253-2/+9
| | | | | Fixes #8395.
* Merge branch 'master' into developAndrew Morgan2020-09-244-3/+25
|\
| * s/URLs/variables in changelog v1.20.1 github/release-v1.20.1 release-v1.20.1Andrew Morgan2020-09-241-1/+1
| |
| * s/accidentally/incorrectly in changelogAndrew Morgan2020-09-241-1/+1
| |
| * Update changelog wordingAndrew Morgan2020-09-241-1/+1
| |
| * 1.20.1Andrew Morgan2020-09-245-3/+17
| |
| * Mark the shadow_banned column as boolean in synapse_port_db. (#8386)Patrick Cloke2020-09-243-0/+2
| |
| * Hotfix: disable autoescape by default when rendering Jinja2 templates (#8394)Andrew Morgan2020-09-243-3/+12
| | | | | | | | | | #8037 changed the default `autoescape` option when rendering Jinja2 templates from `False` to `True`. This caused some bugs, noticeably around redirect URLs being escaped in SAML2 auth confirmation templates, causing those URLs to break for users. This change returns the previous behaviour as it stood. We may want to look at each template individually and see whether autoescaping is a good idea at some point, but for now lets just fix the breakage.
* | Fix MultiWriteIdGenerator's handling of restarts. (#8374)Erik Johnston2020-09-247-30/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On startup `MultiWriteIdGenerator` fetches the maximum stream ID for each instance from the table and uses that as its initial "current position" for each writer. This is problematic as a) it involves either a scan of events table or an index (neither of which is ideal), and b) if rows are being persisted out of order elsewhere while the process restarts then using the maximum stream ID is not correct. This could theoretically lead to race conditions where e.g. events that are persisted out of order are not sent down sync streams. We fix this by creating a new table that tracks the current positions of each writer to the stream, and update it each time we finish persisting a new entry. This is a relatively small overhead when persisting events. However for the cache invalidation stream this is a much bigger relative overhead, so instead we note that for invalidation we don't actually care about reliability over restarts (as there's no caches to invalidate) and simply don't bother reading and writing to the new table in that particular case.
* | Add type annotations to SimpleHttpClient (#8372)Richard van der Hoff2020-09-244-61/+143
| |
* | Add new sequences to port DB script (#8387)Erik Johnston2020-09-242-0/+25
| |
* | Add EventStreamPosition type (#8388)Erik Johnston2020-09-2411-57/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is to remove some of the places we pass around `int`, where it can represent one of two things: 1. the position of an event in the stream; or 2. a token that partitions the stream, used as part of the stream tokens. The valid operations are then: 1. did a position happen before or after a token; 2. get all events that happened before or after a token; and 3. get all events between two tokens. (Note that we don't want to allow other operations as we want to change the tokens to be vector clocks rather than simple ints)
* | Mark the shadow_banned column as boolean in synapse_port_db. (#8386)Patrick Cloke2020-09-243-0/+2
| |
* | Factor out `_send_dummy_event_for_room` (#8370)Richard van der Hoff2020-09-232-48/+55
| | | | | | this makes it possible to use from the manhole, and seems cleaner anyway.
* | Improve logging of state resolution (#8371)Richard van der Hoff2020-09-232-48/+17
| | | | | | | | | | | | | | | | | | | | I'd like to get a better insight into what we are doing with respect to state res. The list of state groups we are resolving across should be short (if it isn't, that's a massive problem in itself), so it should be fine to log it in ite entiretly. I've done some grepping and found approximately zero cases in which the "shortcut" code delivered the result, so I've ripped that out too.
* | Fix bug which caused failure on join with malformed membership events (#8385)Richard van der Hoff2020-09-232-3/+8
| |
* | Use `async with` for ID gens (#8383)Erik Johnston2020-09-2315-105/+144
| | | | | | This will allow us to hit the DB after we've finished using the generated stream ID.
* | Don't push if an user account has expired (#8353)Mathieu Velten2020-09-234-5/+34
| |
* | Fix missing null character check on guest_access room state (#8373)Andrew Morgan2020-09-232-0/+3
|\ \ | | | | | | | | | | | | | | | | | | When updating the `room_stats_state` table, we try to check for null bytes slipping in to the content for state events. It turns out we had added `guest_access` as a field to room_stats_state without including it in the null byte check. Lo and behold, a null byte in a `m.room.guest_access` event then breaks `room_stats_state` updates. This PR adds the check for `guest_access`.
| * | ChangelogAndrew Morgan2020-09-221-0/+1
| | |
| * | Fix missing null character check on guest_access room stateAndrew Morgan2020-09-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When updating room_stats_state, we try to check for null bytes slipping in to the content for state events. It turns out we had added guest_access as a field to room_stats_state without including it in the null byte check. Lo and behold, a null byte in a m.room.guest_access event then breaks room_stats_state updates. This PR adds the check for guest_access. A further PR will improve this function so that this hopefully does not happen again in future.
* | | Do not check lint/test dependencies at runtime. (#8377)Patrick Cloke2020-09-235-15/+25
| | | | | | | | | moves non-runtime dependencies out of synapse.python_dependencies (test and lint)
* | | Add note to reverse_proxy.md about disabling Apache's mod_security2 (#8375)Julian Fietkau2020-09-232-0/+9
|/ / | | | | This change adds a note and a few lines of configuration settings for Apache users to disable ModSecurity for Synapse's virtual hosts. With ModSecurity enabled and running with its default settings, Matrix clients are unable to send chat messages through the Synapse installation. With this change, ModSecurity can be disabled only for the Synapse virtual hosts.
* | Fixed a bug with reactivating users with the admin API (#8362)Dirk Klimpel2020-09-223-1/+16
| | | | | | | | | | | | | | Fixes: #8359 Trying to reactivate a user with the admin API (`PUT /_synapse/admin/v2/users/<user_name>`) causes an internal server error. Seems to be a regression in #8033.
* | Admin API for reported events (#8217)Dirk Klimpel2020-09-226-0/+697
| | | | | | Add an admin API to read entries of table `event_reports`. API: `GET /_synapse/admin/v1/event_reports`
* | Merge branch 'master' into developAndrew Morgan2020-09-223-3/+24
|\|
| * Fix wording of deprecation notice in changelog v1.20.0 github/release-v1.20.0 release-v1.20.0Andrew Morgan2020-09-221-5/+4
| |
| * Deprecation warning for synapse admin api being accessible under /_matrixAndrew Morgan2020-09-221-1/+13
| |
| * 1.20.0Andrew Morgan2020-09-223-3/+13
| |
* | Create function to check for long names in devices (#8364)Dionysis Grigoropoulos2020-09-224-7/+38
| | | | | | | | | | | | | | | | | | * Create a new function to verify that the length of a device name is under a certain threshold. * Refactor old code and tests to use said function. * Verify device name length during registration of device * Add a test for the above Signed-off-by: Dionysis Grigoropoulos <dgrig@erethon.com>
* | Add a comment re #1691Richard van der Hoff2020-09-211-1/+5
| |
* | Fix a bad merge from release-v1.20.0. (#8354)Patrick Cloke2020-09-182-1/+2
| |
* | Merge tag 'v1.20.0rc5' into developPatrick Cloke2020-09-1810-28/+128
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.20.0rc5 (2020-09-18) ============================== In addition to the below, Synapse 1.20.0rc5 also includes the bug fix that was included in 1.19.3. Features -------- - Add flags to the `/versions` endpoint for whether new rooms default to using E2EE. ([\#8343](https://github.com/matrix-org/synapse/issues/8343)) Bugfixes -------- - Fix rate limiting of federation `/send` requests. ([\#8342](https://github.com/matrix-org/synapse/issues/8342)) - Fix a longstanding bug where back pagination over federation could get stuck if it failed to handle a received event. ([\#8349](https://github.com/matrix-org/synapse/issues/8349)) Internal Changes ---------------- - Blacklist [MSC2753](https://github.com/matrix-org/matrix-doc/pull/2753) SyTests until it is implemented. ([\#8285](https://github.com/matrix-org/synapse/issues/8285))
| * Add a note about including the changes from 1.19.3. v1.20.0rc5Patrick Cloke2020-09-181-0/+2
| |
| * Tweak wording in the changelog.Patrick Cloke2020-09-181-2/+2
| |
| * 1.20.0rc5Patrick Cloke2020-09-186-5/+23
| |
| * Merge tag 'v1.19.3' into release-v1.20.0Patrick Cloke2020-09-183-5/+18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.19.3 Synapse 1.19.3 (2020-09-18) =========================== Bugfixes -------- - Partially mitigate bug where newly joined servers couldn't get past events in a room when there is a malformed event. ([\#8350](https://github.com/matrix-org/synapse/issues/8350))
| | * 1.19.3 v1.19.3 github/release-v1.19.3 release-v1.19.3Andrew Morgan2020-09-184-2/+16
| | |
| | * Use _check_sigs_and_hash_and_fetch to validate backfill requests (#8350)Andrew Morgan2020-09-182-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a bit of a hack, as `_check_sigs_and_hash_and_fetch` is intended for attempting to pull an event from the database/(re)pull it from the server that originally sent the event if checking the signature of the event fails. During backfill we *know* that we won't have the event in our database, however it is still useful to be able to query the original sending server as the server we're backfilling from may be acting maliciously. The main benefit and reason for this change however is that `_check_sigs_and_hash_and_fetch` will drop an event during backfill if it cannot be successfully validated, whereas the current code will simply fail the backfill request - resulting in the client's /messages request silently being dropped. This is a quick patch to fix backfilling rooms that contain malformed events. A better implementation in planned in future.
| * | Intelligently select extremities used in backfill. (#8349)Erik Johnston2020-09-184-20/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of just using the most recent extremities let's pick the ones that will give us results that the pagination request cares about, i.e. pick extremities only if they have a smaller depth than the pagination token. This is useful when we fail to backfill an extremity, as we no longer get stuck requesting that same extremity repeatedly.
| * | Add flags to /versions about whether new rooms are encrypted by default. (#8343)Patrick Cloke2020-09-182-0/+20
| | |
* | | Admin API for querying rooms where a user is a member (#8306)Dirk Klimpel2020-09-185-2/+160
| | | | | | | | | | | | Add a new admin API `GET /_synapse/admin/v1/users/<user_id>/joined_rooms` to list all rooms where a user is a member.
* | | Catch-up after Federation Outage (bonus): Catch-up on Synapse Startup (#8322)reivilibre2020-09-1810-5/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> * Fix _set_destination_retry_timings This came about because the code assumed that retry_interval could not be NULL — which has been challenged by catch-up.
* | | Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-18133-281/+272
| | | | | | | | | | | | | | | | | | | | | This converts calls like super(Foo, self) -> super(). Generated with: sed -i "" -Ee 's/super\([^\(]+\)/super()/g' **/*.py
* | | Allow appservice users to /login (#8320)Will Hunt2020-09-183-11/+173
| | | | | | | | | | | | | | | Add ability for ASes to /login using the `uk.half-shot.msc2778.login.application_service` login `type`. Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
* | | Update test logging to be able to accept braces (#8335)Jonathan de Jong2020-09-182-2/+2
| | |
* | | Merge remote-tracking branch 'origin/release-v1.20.0' into developErik Johnston2020-09-184-17/+54
|\| |
| * | Fix ratelimiting for federation `/send` requests. (#8342)Erik Johnston2020-09-184-17/+54
| | | | | | | | | c.f. #8295 for rationale
| * | blacklist MSC2753 sytests until it's implemented in synapse (#8285)Matthew Hodgson2020-09-172-0/+9
| | | | | | | | | Dendrite's implementing MSC2753 over at https://github.com/matrix-org/dendrite/pull/1370 to prove the implementation for MSC purposes, and so sytest has sprouted tests for it over at https://github.com/matrix-org/sytest/pull/944. But we don't want them to run on synapse until synapse implements it.
* | | Move lint dependencies to extras_require (#8330)Jonathan de Jong2020-09-174-12/+10
| | | | | | | | | | | | | | | Lint dependencies can now be installed with pip install -e ".[lint]" This should help keep the version in sync between tox and documentation.
* | | Remove obsolete __future__ imports (#8337)Jonathan de Jong2020-09-1719-40/+2
| | |
* | | Use admin_patterns for all admin APIs. (#8331)Patrick Cloke2020-09-177-26/+20
| | | | | | | | | This reduces duplication of the admin prefix in regular expressions.
* | | Fix a potential bug of UnboundLocalError (#8329)Jonathan de Jong2020-09-172-5/+9
| | | | | | | | | Replaced with less buggier control flow
* | | Switch metaclass initialization to python 3-compatible syntax (#8326)Jonathan de Jong2020-09-168-26/+16
| | |
* | | Merge tag 'v1.20.0rc4' into developPatrick Cloke2020-09-163-2/+25
|\| | | | | | | | | | | | | | | | | | | | Synapse 1.20.0rc4 (2020-09-16) ============================== Synapse 1.20.0rc4 is identical to 1.20.0rc3, with the addition of the security fix that was included in 1.19.2.
| * | 1.20.0rc4 v1.20.0rc4Patrick Cloke2020-09-162-1/+8
| | |
| * | Merge remote-tracking branch 'origin/master' into release-v1.20.0Patrick Cloke2020-09-163-2/+17
| |\|
| * | Merge branch 'erikj/fix_origin_check' into release-v1.20.0Erik Johnston2020-09-162-3/+5
| |\ \
* | \ \ Merge branch 'master' into developErik Johnston2020-09-160-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | 1.19.2 v1.19.2 github/release-v1.19.2 release-v1.19.2Erik Johnston2020-09-164-2/+18
| | | |
| * | | Merge branch 'erikj/fix_origin_check' into release-v1.19.2Erik Johnston2020-09-162-3/+5
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'erikj/fix_origin_check' into developErik Johnston2020-09-162-3/+5
|\ \ \ \ | | |/ / | |/| |
| * | | NewsfileErik Johnston2020-09-161-0/+1
| | | |
| * | | Don't assume that an event has an origin fieldErik Johnston2020-09-161-3/+4
| |/ / | | | | | | | | | This fixes #8319.
* | | Catch-up after Federation Outage (split, 4): catch-up loop (#8272)reivilibre2020-09-155-5/+338
| | |
* | | Use slots in attrs classes where possible (#8296)Patrick Cloke2020-09-1422-50/+33
| | | | | | | | | | | | | | | slots use less memory (and attribute access is faster) while slightly limiting the flexibility of the class attributes. This focuses on objects which are instantiated "often" and for short periods of time.
* | | Fix typos in comments.Patrick Cloke2020-09-145-6/+6
| | |
* | | Add the topic and avatar to the room details admin API (#8305)Tulir Asokan2020-09-144-1/+9
| | |
* | | Improve SAML error messages (#8248)Patrick Cloke2020-09-149-185/+178
| | |
* | | Add experimental support for sharding event persister. Again. (#8294)Erik Johnston2020-09-1418-80/+211
| | | | | | | | | | | | | | | | | | This is *not* ready for production yet. Caveats: 1. We should write some tests... 2. The stream token that we use for events can get stalled at the minimum position of all writers. This means that new events may not be processed and e.g. sent down sync streams if a writer isn't writing or is slow.
* | | Merge tag 'v1.20.0rc3' into developPatrick Cloke2020-09-119-17/+176
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Synapse 1.20.0rc3 (2020-09-11) ============================== Bugfixes -------- - Fix a bug introduced in v1.20.0rc1 where the wrong exception was raised when invalid JSON data is encountered. ([\#8291](https://github.com/matrix-org/synapse/issues/8291))
| * | Clarify changelog. v1.20.0rc3Patrick Cloke2020-09-111-1/+1
| | |
| * | 1.20.0rc3Patrick Cloke2020-09-113-2/+10
| | |
| * | Fix the exception that is raised when invalid JSON is encountered. (#8291)Patrick Cloke2020-09-106-2/+167
| | |
| * | Remove shared rooms info from upgrade/workers doc as it's still experimental ↵Andrew Morgan2020-09-102-14/+0
| | | | | | | | | | | | (#8290)
* | | Make `StreamToken.room_key` be a `RoomStreamToken` instance. (#8281)Erik Johnston2020-09-1116-99/+114
| | |
* | | Use TLSv1.2 for fake servers in tests (#8208)Dan Callaghan2020-09-102-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some Linux distros have begun disabling TLSv1.0 and TLSv1.1 by default for security reasons, for example in Fedora 33 onwards: https://fedoraproject.org/wiki/Changes/StrongCryptoSettings2 Use TLSv1.2 for the fake TLS servers created in the test suite, to avoid failures due to OpenSSL disallowing TLSv1.0: <twisted.python.failure.Failure OpenSSL.SSL.Error: [('SSL routines', 'ssl_choose_client_version', 'unsupported protocol')]> Signed-off-by: Dan Callaghan <djc@djc.id.au>
* | | Add /_synapse/client to the reverse proxy docs (#8227)Andrew Morgan2020-09-104-3/+39
| | | | | | | | | This PR adds a information about forwarding `/_synapse/client` endpoints through your reverse proxy. The first of these endpoints are introduced in https://github.com/matrix-org/synapse/pull/8004.
* | | Clean up `Notifier.on_new_room_event` code path (#8288)Erik Johnston2020-09-106-37/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea here is that we pass the `max_stream_id` to everything, and only use the stream ID of the particular event to figure out *when* the max stream position has caught up to the event and we can notify people about it. This is to maintain the distinction between the position of an item in the stream (i.e. event A has stream ID 513) and a token that can be used to partition the stream (i.e. give me all events after stream ID 352). This distinction becomes important when the tokens are more complicated than a single number, which they will be once we start tracking the position of multiple writers in the tokens. The valid operations here are: 1. Is a position before or after a token 2. Fetching all events between two tokens 3. Merging multiple tokens to get the "max", i.e. `C = max(A, B)` means that for all positions P where P is before A *or* before B, then P is before C. Future PR will change the token type to a dedicated type.
* | | Show a confirmation page during user password reset (#8004)Andrew Morgan2020-09-1016-90/+271
| | | | | | | | | | | | | | | This PR adds a confirmation step to resetting your user password between clicking the link in your email and your password actually being reset. This is to better align our password reset flow with the industry standard of requiring a confirmation from the user after email validation.
* | | Merge branch 'release-v1.20.0' into developRichard van der Hoff2020-09-103-3/+13
|\| |
| * | 1.20.0rc2 v1.20.0rc2Richard van der Hoff2020-09-093-2/+10
| | |
| * | Fix /notifications and pushers misbehaving because of unread counts (#8280)Brendan Abolivier2020-09-082-2/+4
| | |
* | | Do not error when thumbnailing invalid files (#8236)Patrick Cloke2020-09-095-22/+106
| | | | | | | | | | | | If a file cannot be thumbnailed for some reason (e.g. the file is empty), then catch the exception and convert it to a reasonable error message for the client.
* | | Remove some unused distributor signals (#8216)Patrick Cloke2020-09-097-141/+18
| | | | | | | | | | | | | | | Removes the `user_joined_room` and stops calling it since there are no observers. Also cleans-up some other unused signals and related code.
* | | Fixup pusher pool notifications (#8287)Erik Johnston2020-09-098-8/+24
| | | | | | | | | | | | | | | `pusher_pool.on_new_notifications` expected a min and max stream ID, however that was not what we were passing in. Instead, let's just pass it the current max stream ID and have it track the last stream ID it got passed. I believe that it mostly worked as we called the function for every event. However, it would break for events that got persisted out of order, i.e, that were persisted but the max stream ID wasn't incremented as not all preceding events had finished persisting, and push for that event would be delayed until another event got pushed to the effected users.
* | | Revert "Fixup pusher pool notifications"Erik Johnston2020-09-097-23/+8
| | | | | | | | | | | | This reverts commit e7fd336a53a4ca489cdafc389b494d5477019dc0.
* | | Fixup pusher pool notificationsErik Johnston2020-09-097-8/+23
| | |
* | | blacklist MSC2753 sytests until it's implemented in synapse (#8285)Matthew Hodgson2020-09-092-0/+9
| | | | | | | | | Dendrite's implementing MSC2753 over at https://github.com/matrix-org/dendrite/pull/1370 to prove the implementation for MSC purposes, and so sytest has sprouted tests for it over at https://github.com/matrix-org/sytest/pull/944. But we don't want them to run on synapse until synapse implements it.
* | | Don't remember `enabled` of deleted push rules and properly return 404 for ↵reivilibre2020-09-095-13/+610
| | | | | | | | | | | | | | | | | | | | | missing push rules in `.../actions` and `.../enabled` (#7796) Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* | | Add types to async_helpers (#8260)Patrick Cloke2020-09-083-51/+88
| | |
* | | Fix mypy error on develop (#8282)Erik Johnston2020-09-082-3/+7
| | |
* | | Include method in thumbnail media name (#7124)DeepBlueV7.X2020-09-086-1/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where different methods (crop/scale) overwrite each other. This first tries the new path. If that fails and we are looking for a remote thumbnail, it tries the old path. If that still isn't found, it continues as normal. This should probably be removed in the future, after some of the newer thumbnails were generated with the new path on most deployments. Then the overhead should be minimal if the other thumbnails need to be regenerated. Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
* | | Add types to StreamToken and RoomStreamToken (#8279)Erik Johnston2020-09-085-91/+95
| | | | | | | | | The intention here is to change `StreamToken.room_key` to be a `RoomStreamToken` in a future PR, but that is a big enough change without this refactoring too.
* | | Add a config option for validating 'next_link' parameters against a domain ↵Andrew Morgan2020-09-085-17/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whitelist (#8275) This is a config option ported over from DINUM's Sydent: https://github.com/matrix-org/sydent/pull/285 They've switched to validating 3PIDs via Synapse rather than Sydent, and would like to retain this functionality. This original purpose for this change is phishing prevention. This solution could also potentially be replaced by a similar one to https://github.com/matrix-org/synapse/pull/8004, but across all `*/submit_token` endpoint. This option may still be useful to enterprise even with that safeguard in place though, if they want to be absolutely sure that their employees don't follow links to other domains.
* | | Clean up types for PaginationConfig (#8250)Erik Johnston2020-09-087-86/+52
| | | | | | | | | This removes `SourcePaginationConfig` and `get_pagination_rows`. The reasoning behind this is that these generic classes/functions erased the types of the IDs it used (i.e. instead of passing around `StreamToken` it'd pass in e.g. `token.room_key`, which don't have uniform types).
* | | Use the right constructor for log records (#8278)Richard van der Hoff2020-09-082-3/+4
| | | | | | | | | | | | | | | | | | Update `log_function` to use the right factory to create log records, to make sure that they have `request` attributes. Fixes: #8267.
* | | Fix `MultiWriterIdGenerator.current_position`. (#8257)Erik Johnston2020-09-083-6/+88
| | | | | | | | | | | | | | | It did not correctly handle IDs finishing being persisted out of order, resulting in the `current_position` lagging until new IDs are persisted.
* | | Merge tag 'v1.20.0rc1' into developRichard van der Hoff2020-09-08116-122/+85
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.20.0rc1 (2020-09-08) ============================== Removal warning --------------- Some older clients used a [disallowed character](https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-register-email-requesttoken) (`:`) in the `client_secret` parameter of various endpoints. The incorrect behaviour was allowed for backwards compatibility, but is now being removed from Synapse as most users have updated their client. Further context can be found at [\#6766](https://github.com/matrix-org/synapse/issues/6766). Features -------- - Add an endpoint to query your shared rooms with another user as an implementation of [MSC2666](https://github.com/matrix-org/matrix-doc/pull/2666). ([\#7785](https://github.com/matrix-org/synapse/issues/7785)) - Iteratively encode JSON to avoid blocking the reactor. ([\#8013](https://github.com/matrix-org/synapse/issues/8013), [\#8116](https://github.com/matrix-org/synapse/issues/8116)) - Add support for shadow-banning users (ignoring any message send requests). ([\#8034](https://github.com/matrix-org/synapse/issues/8034), [\#8092](https://github.com/matrix-org/synapse/issues/8092), [\#8095](https://github.com/matrix-org/synapse/issues/8095), [\#8142](https://github.com/matrix-org/synapse/issues/8142), [\#8152](https://github.com/matrix-org/synapse/issues/8152), [\#8157](https://github.com/matrix-org/synapse/issues/8157), [\#8158](https://github.com/matrix-org/synapse/issues/8158), [\#8176](https://github.com/matrix-org/synapse/issues/8176)) - Use the default template file when its equivalent is not found in a custom template directory. ([\#8037](https://github.com/matrix-org/synapse/issues/8037), [\#8107](https://github.com/matrix-org/synapse/issues/8107), [\#8252](https://github.com/matrix-org/synapse/issues/8252)) - Add unread messages count to sync responses, as specified in [MSC2654](https://github.com/matrix-org/matrix-doc/pull/2654). ([\#8059](https://github.com/matrix-org/synapse/issues/8059), [\#8254](https://github.com/matrix-org/synapse/issues/8254), [\#8270](https://github.com/matrix-org/synapse/issues/8270), [\#8274](https://github.com/matrix-org/synapse/issues/8274)) - Optimise `/federation/v1/user/devices/` API by only returning devices with encryption keys. ([\#8198](https://github.com/matrix-org/synapse/issues/8198)) Bugfixes -------- - Fix a memory leak by limiting the length of time that messages will be queued for a remote server that has been unreachable. ([\#7864](https://github.com/matrix-org/synapse/issues/7864)) - Fix `Re-starting finished log context PUT-nnnn` warning when event persistence failed. ([\#8081](https://github.com/matrix-org/synapse/issues/8081)) - Synapse now correctly enforces the valid characters in the `client_secret` parameter used in various endpoints. ([\#8101](https://github.com/matrix-org/synapse/issues/8101)) - Fix a bug introduced in v1.7.2 impacting message retention policies that would allow federated homeservers to dictate a retention period that's lower than the configured minimum allowed duration in the configuration file. ([\#8104](https://github.com/matrix-org/synapse/issues/8104)) - Fix a long-standing bug where invalid JSON would be accepted by Synapse. ([\#8106](https://github.com/matrix-org/synapse/issues/8106)) - Fix a bug introduced in Synapse v1.12.0 which could cause `/sync` requests to fail with a 404 if you had a very old outstanding room invite. ([\#8110](https://github.com/matrix-org/synapse/issues/8110)) - Return a proper error code when the rooms of an invalid group are requested. ([\#8129](https://github.com/matrix-org/synapse/issues/8129)) - Fix a bug which could cause a leaked postgres connection if synapse was set to daemonize. ([\#8131](https://github.com/matrix-org/synapse/issues/8131)) - Clarify the error code if a user tries to register with a numeric ID. This bug was introduced in v1.15.0. ([\#8135](https://github.com/matrix-org/synapse/issues/8135)) - Fix a bug where appservices with ratelimiting disabled would still be ratelimited when joining rooms. This bug was introduced in v1.19.0. ([\#8139](https://github.com/matrix-org/synapse/issues/8139)) - Fix logging in via OpenID Connect with a provider that uses integer user IDs. ([\#8190](https://github.com/matrix-org/synapse/issues/8190)) - Fix a longstanding bug where user directory updates could break when unexpected profile data was included in events. ([\#8223](https://github.com/matrix-org/synapse/issues/8223)) - Fix a longstanding bug where stats updates could break when unexpected profile data was included in events. ([\#8226](https://github.com/matrix-org/synapse/issues/8226)) - Fix slow start times for large servers by removing a table scan of the `users` table from startup code. ([\#8271](https://github.com/matrix-org/synapse/issues/8271)) Updates to the Docker image --------------------------- - Fix builds of the Docker image on non-x86 platforms. ([\#8144](https://github.com/matrix-org/synapse/issues/8144)) - Added curl for healthcheck support and readme updates for the change. Contributed by @maquis196. ([\#8147](https://github.com/matrix-org/synapse/issues/8147)) Improved Documentation ---------------------- - Link to matrix-synapse-rest-password-provider in the password provider documentation. ([\#8111](https://github.com/matrix-org/synapse/issues/8111)) - Updated documentation to note that Synapse does not follow `HTTP 308` redirects due to an upstream library not supporting them. Contributed by Ryan Cole. ([\#8120](https://github.com/matrix-org/synapse/issues/8120)) - Explain better what GDPR-erased means when deactivating a user. ([\#8189](https://github.com/matrix-org/synapse/issues/8189)) Internal Changes ---------------- - Add filter `name` to the `/users` admin API, which filters by user ID or displayname. Contributed by Awesome Technologies Innovationslabor GmbH. ([\#7377](https://github.com/matrix-org/synapse/issues/7377), [\#8163](https://github.com/matrix-org/synapse/issues/8163)) - Reduce run times of some unit tests by advancing the reactor a fewer number of times. ([\#7757](https://github.com/matrix-org/synapse/issues/7757)) - Don't fail `/submit_token` requests on incorrect session ID if `request_token_inhibit_3pid_errors` is turned on. ([\#7991](https://github.com/matrix-org/synapse/issues/7991)) - Convert various parts of the codebase to async/await. ([\#8071](https://github.com/matrix-org/synapse/issues/8071), [\#8072](https://github.com/matrix-org/synapse/issues/8072), [\#8074](https://github.com/matrix-org/synapse/issues/8074), [\#8075](https://github.com/matrix-org/synapse/issues/8075), [\#8076](https://github.com/matrix-org/synapse/issues/8076), [\#8087](https://github.com/matrix-org/synapse/issues/8087), [\#8100](https://github.com/matrix-org/synapse/issues/8100), [\#8119](https://github.com/matrix-org/synapse/issues/8119), [\#8121](https://github.com/matrix-org/synapse/issues/8121), [\#8133](https://github.com/matrix-org/synapse/issues/8133), [\#8156](https://github.com/matrix-org/synapse/issues/8156), [\#8162](https://github.com/matrix-org/synapse/issues/8162), [\#8166](https://github.com/matrix-org/synapse/issues/8166), [\#8168](https://github.com/matrix-org/synapse/issues/8168), [\#8173](https://github.com/matrix-org/synapse/issues/8173), [\#8191](https://github.com/matrix-org/synapse/issues/8191), [\#8192](https://github.com/matrix-org/synapse/issues/8192), [\#8193](https://github.com/matrix-org/synapse/issues/8193), [\#8194](https://github.com/matrix-org/synapse/issues/8194), [\#8195](https://github.com/matrix-org/synapse/issues/8195), [\#8197](https://github.com/matrix-org/synapse/issues/8197), [\#8199](https://github.com/matrix-org/synapse/issues/8199), [\#8200](https://github.com/matrix-org/synapse/issues/8200), [\#8201](https://github.com/matrix-org/synapse/issues/8201), [\#8202](https://github.com/matrix-org/synapse/issues/8202), [\#8207](https://github.com/matrix-org/synapse/issues/8207), [\#8213](https://github.com/matrix-org/synapse/issues/8213), [\#8214](https://github.com/matrix-org/synapse/issues/8214)) - Remove some unused database functions. ([\#8085](https://github.com/matrix-org/synapse/issues/8085)) - Add type hints to various parts of the codebase. ([\#8090](https://github.com/matrix-org/synapse/issues/8090), [\#8127](https://github.com/matrix-org/synapse/issues/8127), [\#8187](https://github.com/matrix-org/synapse/issues/8187), [\#8241](https://github.com/matrix-org/synapse/issues/8241), [\#8140](https://github.com/matrix-org/synapse/issues/8140), [\#8183](https://github.com/matrix-org/synapse/issues/8183), [\#8232](https://github.com/matrix-org/synapse/issues/8232), [\#8235](https://github.com/matrix-org/synapse/issues/8235), [\#8237](https://github.com/matrix-org/synapse/issues/8237), [\#8244](https://github.com/matrix-org/synapse/issues/8244)) - Return the previous stream token if a non-member event is a duplicate. ([\#8093](https://github.com/matrix-org/synapse/issues/8093), [\#8112](https://github.com/matrix-org/synapse/issues/8112)) - Separate `get_current_token` into two since there are two different use cases for it. ([\#8113](https://github.com/matrix-org/synapse/issues/8113)) - Remove `ChainedIdGenerator`. ([\#8123](https://github.com/matrix-org/synapse/issues/8123)) - Reduce the amount of whitespace in JSON stored and sent in responses. ([\#8124](https://github.com/matrix-org/synapse/issues/8124)) - Update the test federation client to handle streaming responses. ([\#8130](https://github.com/matrix-org/synapse/issues/8130)) - Micro-optimisations to `get_auth_chain_ids`. ([\#8132](https://github.com/matrix-org/synapse/issues/8132)) - Refactor `StreamIdGenerator` and `MultiWriterIdGenerator` to have the same interface. ([\#8161](https://github.com/matrix-org/synapse/issues/8161)) - Add functions to `MultiWriterIdGen` used by events stream. ([\#8164](https://github.com/matrix-org/synapse/issues/8164), [\#8179](https://github.com/matrix-org/synapse/issues/8179)) - Fix tests that were broken due to the merge of 1.19.1. ([\#8167](https://github.com/matrix-org/synapse/issues/8167)) - Make `SlavedIdTracker.advance` have the same interface as `MultiWriterIDGenerator`. ([\#8171](https://github.com/matrix-org/synapse/issues/8171)) - Remove unused `is_guest` parameter from, and add safeguard to, `MessageHandler.get_room_data`. ([\#8174](https://github.com/matrix-org/synapse/issues/8174), [\#8181](https://github.com/matrix-org/synapse/issues/8181)) - Standardize the mypy configuration. ([\#8175](https://github.com/matrix-org/synapse/issues/8175)) - Refactor some of `LoginRestServlet`'s helper methods, and move them to `AuthHandler` for easier reuse. ([\#8182](https://github.com/matrix-org/synapse/issues/8182)) - Fix `wait_for_stream_position` to allow multiple waiters on same stream ID. ([\#8196](https://github.com/matrix-org/synapse/issues/8196)) - Make `MultiWriterIDGenerator` work for streams that use negative values. ([\#8203](https://github.com/matrix-org/synapse/issues/8203)) - Refactor queries for device keys and cross-signatures. ([\#8204](https://github.com/matrix-org/synapse/issues/8204), [\#8205](https://github.com/matrix-org/synapse/issues/8205), [\#8222](https://github.com/matrix-org/synapse/issues/8222), [\#8224](https://github.com/matrix-org/synapse/issues/8224), [\#8225](https://github.com/matrix-org/synapse/issues/8225), [\#8231](https://github.com/matrix-org/synapse/issues/8231), [\#8233](https://github.com/matrix-org/synapse/issues/8233), [\#8234](https://github.com/matrix-org/synapse/issues/8234)) - Fix type hints for functions decorated with `@cached`. ([\#8240](https://github.com/matrix-org/synapse/issues/8240)) - Remove obsolete `order` field from federation send queues. ([\#8245](https://github.com/matrix-org/synapse/issues/8245)) - Stop sub-classing from object. ([\#8249](https://github.com/matrix-org/synapse/issues/8249)) - Add more logging to debug slow startup. ([\#8264](https://github.com/matrix-org/synapse/issues/8264)) - Do not attempt to upgrade database schema on worker processes. ([\#8266](https://github.com/matrix-org/synapse/issues/8266), [\#8276](https://github.com/matrix-org/synapse/issues/8276))
| * | fix typo v1.20.0rc1Richard van der Hoff2020-09-081-1/+1
| | |
| * | s/fixes/fix/Richard van der Hoff2020-09-081-2/+2
| | |
| * | 1.20.0rc1Richard van der Hoff2020-09-08116-123/+80
| | |
| * | Systemd docs: configure workers to start after main process. (#8276)Richard van der Hoff2020-09-082-0/+6
| | |
* | | Directly import json from the standard library. (#8259)Patrick Cloke2020-09-085-6/+7
| | | | | | | | | | | | | | | By importing from canonicaljson the simplejson module was still being used in some situations. After this change the std lib json is consistenty used throughout Synapse.
* | | Allow for make_awaitable's return value to be re-used. (#8261)Patrick Cloke2020-09-0812-70/+56
| | |
* | | Rename 'populate_stats_process_rooms_2' background job back to ↵Andrew Morgan2020-09-084-39/+35
| | | | | | | | | | | | | | | | | | | | | 'populate_stats_process_rooms' again (#8243) Fixes https://github.com/matrix-org/synapse/issues/8238 Alongside the delta file, some changes were also necessary to the codebase to remove references to the now defunct `populate_stats_process_rooms_2` background job. Thankfully the latter doesn't seem to have made it into any documentation yet :)
* | | Merge remote-tracking branch 'origin/release-v1.20.0' into developRichard van der Hoff2020-09-0811-36/+122
|\| |
| * | Only add rows to the push actions table if the event notifies or should be ↵Brendan Abolivier2020-09-072-1/+7
| | | | | | | | | | | | marked unread (#8274)
| * | Avoid table-scanning users at startup (#8271)Richard van der Hoff2020-09-072-11/+15
| | | | | | | | | This takes about 10 seconds in the best case; often more.
| * | Fix unread count failing on NULL values (#8270)Brendan Abolivier2020-09-072-1/+7
| | | | | | | | | | | | Fix unread counts making sync fail if the value of the `unread_count` column in `event_push_summary` is `None`.
| * | Add more logging to debug slow startup (#8264)Richard van der Hoff2020-09-075-7/+33
| | | | | | | | | | | | I'm hoping this will provide some pointers for debugging https://github.com/matrix-org/synapse/issues/7968.
| * | Refuse to upgrade database on worker processes (#8266)Richard van der Hoff2020-09-072-17/+62
| | |
* | | Fix stack overflow when logging system encounters an error (#8268)Richard van der Hoff2020-09-072-2/+24
| | |
* | | Bump canonicaljson to version 1.4.0 (#8262)Alexandre Morignot2020-09-072-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version 1.3.0 has a bug with unicode charecters: ``` >>> from canonicaljson import encode_pretty_printed_json >>> encode_pretty_printed_json({'a': 'à'}) Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/home/erdnaxeli/.pyenv/versions/3.6.7/lib/python3.6/site-packages/canonicaljson.py", line 96, in encode_pretty_printed_json return _pretty_encoder.encode(json_object).encode("ascii") UnicodeEncodeError: 'ascii' codec can't encode character '\xe0' in position 12: ordinal not in range(128) ``` Signed-off-by: Alexandre Morignot <erdnaxeli@cervoi.se> Co-authored-by: Alexandre Morignot <erdnaxeli@cervoi.se>
* | | Run database updates in a transaction (#8265)Richard van der Hoff2020-09-072-5/+23
| | | | | | | | | Fixes: #6467
* | | Add tests for `last_successful_stream_ordering` (#8258)reivilibre2020-09-072-0/+77
| | |
* | | Merge branch 'release-v1.20.0' into developRichard van der Hoff2020-09-068-39/+25
|\| |
| * | Add cross-signing sigs to the `keys` object (#8234)Richard van der Hoff2020-09-043-34/+18
| | | | | | | | | | | | | | | All the callers want this info in the same place, so let's reduce the duplication by doing it here.
| * | Unread counts fixes (#8254)Brendan Abolivier2020-09-043-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixup `ALTER TABLE` database queries Make the new columns nullable, because doing otherwise can wedge a server with a big database, as setting a default value rewrites the table. * Switch back to using the notifications count in the push badge Clients are likely to be confused if we send a push but the badge count is the unread messages one, and not the notifications one. * Changelog
| * | Fix a regression from calling read_templates. (#8252)Patrick Cloke2020-09-042-1/+2
| | | | | | | | | Regressed in #8037.
* | | In light of #8255, use BIGINTs for destination_rooms (#8256)reivilibre2020-09-042-1/+2
| | |
* | | Catch up after Federation Outage (split, 2): Track last successful stream ↵reivilibre2020-09-044-0/+71
| | | | | | | | | | | | | | | ordering after transmission (#8247) Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* | | Catch-up after Federation Outage (split, 1) (#8230)reivilibre2020-09-047-7/+201
|/ / | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | Fix type signature in simple_select_one_onecol and friends (#8241)reivilibre2020-09-042-10/+8
| | | | | | Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
* | Stop sub-classing object (#8249)Patrick Cloke2020-09-04168-292/+293
| |
* | Revert "Add experimental support for sharding event persister. (#8170)" (#8242)Brendan Abolivier2020-09-0419-206/+78
| | | | | | | | | | | | | | * Revert "Add experimental support for sharding event persister. (#8170)" This reverts commit 82c1ee1c22a87b9e6e3179947014b0f11c0a1ac3. * Changelog
* | Add type hints to more handlers (#8244)Erik Johnston2020-09-035-79/+110
| |
* | Remove obsolete order field in `send_new_transaction` (#8245)reivilibre2020-09-034-28/+23
| | | | | | Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* | Split fetching device keys and signatures into two transactions (#8233)Richard van der Hoff2020-09-032-44/+66
| | | | | | I think this is simpler (and moves stuff out of the db threads)
* | Fix typing for `@cached` wrapped functions (#8240)Erik Johnston2020-09-035-20/+121
| | | | | | This requires adding a mypy plugin to fiddle with the type signatures a bit.
* | Remove useless changelog about reverting a #8239.Patrick Cloke2020-09-031-1/+0
| |
* | Revert pinning of setuptools (#8239)Patrick Cloke2020-09-034-6/+2
| |
* | Fix typing for SyncHandler (#8237)Erik Johnston2020-09-034-10/+13
| |
* | wrap `_get_e2e_device_keys_and_signatures_txn` in a non-txn method (#8231)Richard van der Hoff2020-09-033-17/+40
| | | | | | | | | | We have three things which all call `_get_e2e_device_keys_and_signatures_txn` with their own `runInteraction`. Factor out the common code.
* | Add an overload for simple_select_one_onecol_txn. (#8235)Patrick Cloke2020-09-022-0/+25
| |
* | Convert runInteraction to async/await (#8156)Patrick Cloke2020-09-022-15/+15
| |
* | Add StreamStore to mypy (#8232)Erik Johnston2020-09-025-20/+66
| |
* | Re-implement unread counts (again) (#8059)Brendan Abolivier2020-09-0212-122/+457
| |
* | Refactor `_get_e2e_device_keys_for_federation_query_txn` (#8225)Richard van der Hoff2020-09-022-11/+7
| | | | | | | | | | We can use the existing `_get_e2e_device_keys_and_signatures_txn` instead of creating our own txn function
* | Add experimental support for sharding event persister. (#8170)Erik Johnston2020-09-0218-77/+206
| | | | | | | | | | | | This is *not* ready for production yet. Caveats: 1. We should write some tests... 2. The stream token that we use for events can get stalled at the minimum position of all writers. This means that new events may not be processed and e.g. sent down sync streams if a writer isn't writing or is slow.
* | Add /user/{user_id}/shared_rooms/ api (#7785)Will Hunt2020-09-028-1/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add shared_rooms api * Add changelog * Add . * Wrap response in {"rooms": } * linting * Add unstable_features key * Remove options from isort that aren't part of 5.x `-y` and `-rc` are now default behaviour and no longer exist. `dont-skip` is no longer required https://timothycrosley.github.io/isort/CHANGELOG/#500-penny-july-4-2020 * Update imports to make isort happy * Add changelog * Update tox.ini file with correct invocation * fix linting again for isort * Vendor prefix unstable API * Fix to match spec * import Codes * import Codes * Use FORBIDDEN * Update changelog.d/7785.feature Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Implement get_shared_rooms_for_users * a comma * trailing whitespace * Handle the easy feedback * Switch to using runInteraction * Add tests * Feedback * Seperate unstable endpoint from v2 * Add upgrade node * a line * Fix style by adding a blank line at EOF. * Update synapse/storage/databases/main/user_directory.py Co-authored-by: Tulir Asokan <tulir@maunium.net> * Update synapse/storage/databases/main/user_directory.py Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Update UPGRADE.rst Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Fix UPGRADE/CHANGELOG unstable paths unstable unstable unstable Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-authored-by: Tulir Asokan <tulir@maunium.net> Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> Co-authored-by: Tulir Asokan <tulir@maunium.net>
* | Do not try to store invalid data in the stats table (#8226)Patrick Cloke2020-09-022-8/+27
| |
* | Convert the main methods run by the reactor to async. (#8213)Patrick Cloke2020-09-023-21/+18
| |
* | Make _get_e2e_device_keys_and_signatures_txn return an attrs (#8224)Richard van der Hoff2020-09-023-20/+41
| | | | | | | | this makes it a bit clearer what's going on.
* | Fix errors when updating the user directory with invalid data (#8223)Patrick Cloke2020-09-014-1/+19
| |
* | Explain better what GDPR-erased means (#8189)Brendan Abolivier2020-09-012-3/+6
| | | | | | Fixes https://github.com/matrix-org/synapse/issues/8185
* | Convert additional databases to async/await part 3 (#8201)Patrick Cloke2020-09-017-87/+121
| |
* | Convert appservice code to async/await. (#8207)Patrick Cloke2020-09-012-8/+12
| |
* | Rename `_get_e2e_device_keys_txn` (#8222)Richard van der Hoff2020-09-013-6/+9
| | | | | | | | | | ... to `_get_e2e_device_keys_and_signatures_txn`, to better reflect what it does.
* | Convert additional databases to async/await (#8199)Patrick Cloke2020-09-017-137/+147
| |
* | Convert the well known resolver to async (#8214)Patrick Cloke2020-09-015-34/+53
| |
* | Convert additional databases to async/await part 2 (#8200)Patrick Cloke2020-09-0115-81/+111
| |
* | Make MultiWriterIDGenerator work for streams that use negative stream IDs ↵Erik Johnston2020-09-013-11/+134
| | | | | | | | | | (#8203) This is so that we can use it for the backfill events stream.
* | Do not install setuptools 50.0. (#8212)Patrick Cloke2020-09-013-1/+6
| | | | | | This is due to compatibility issues with old Python versions.
* | Move and rename `get_devices_with_keys_by_user` (#8204)Richard van der Hoff2020-09-016-49/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move `get_devices_with_keys_by_user` to `EndToEndKeyWorkerStore` this seems a better fit for it. This commit simply moves the existing code: no other changes at all. * Rename `get_devices_with_keys_by_user` to better reflect what it does. * get_device_stream_token abstract method To avoid referencing fields which are declared in the derived classes, make `get_device_stream_token` abstract, and define that in the classes which define `_device_list_id_gen`.
* | Rename `get_e2e_device_keys` to better reflect its purpose (#8205)Richard van der Hoff2020-08-294-19/+14
| | | | | | | | | | | | | | | | | | | | | | ... and to show that it does something slightly different to `_get_e2e_device_keys_txn`. `include_all_devices` and `include_deleted_devices` were never used (and `include_deleted_devices` was broken, since that would cause `None`s in the result which were not handled in the loop below. Add some typing too.
* | Add a comment about _LimitedHostnameResolverRichard van der Hoff2020-08-291-0/+7
| |
* | Convert ReadWriteLock to async/await. (#8202)Patrick Cloke2020-08-284-33/+39
| |
* | Fix incorrect return signatureAndrew Morgan2020-08-281-1/+1
| |
* | Fix `wait_for_stream_position` for multiple waiters. (#8196)Erik Johnston2020-08-283-5/+6
| | | | | | | | | | | | This fixes a bug where having multiple callers waiting on the same stream and position will cause it to try and compare two deferreds, which fails (due to the sorted list having an entry of `Tuple[int, Deferred]`).
* | Convert `event_push_actions`, `registration`, and `roommember` datastores to ↵Patrick Cloke2020-08-284-160/+169
| | | | | | | | async (#8197)
* | Only return devices with keys from `/federation/v1/user/devices/` (#8198)Richard van der Hoff2020-08-282-3/+2
| | | | | | | | | | There's not much point in returning all the others, and some people have a silly number of devices.
* | Convert state and stream stores and related code to async (#8194)Patrick Cloke2020-08-287-45/+51
| |
* | Ensure that the OpenID Connect remote ID is a string. (#8190)Patrick Cloke2020-08-283-2/+43
| |
* | Convert additional database code to async/await. (#8195)Patrick Cloke2020-08-2811-175/+246
| |
* | Define StateMap as immutable and add a MutableStateMap type. (#8183)Patrick Cloke2020-08-288-32/+52
| |
* | Move and refactor LoginRestServlet helper methods (#8182)Andrew Morgan2020-08-283-55/+94
| | | | | | | | | | | | | | This is split out from https://github.com/matrix-org/synapse/pull/7438, which had gotten rather large. `LoginRestServlet` has a couple helper methods, `login_submission_legacy_convert` and `login_id_thirdparty_from_phone`. They're primarily used for converting legacy user login submissions to "identifier" dicts ([see spec](https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-login)). Identifying information such as usernames or 3PID information used to be top-level in the login body. They're now supposed to be put inside an [identifier](https://matrix.org/docs/spec/client_server/r0.6.1#identifier-types) parameter instead. #7438's purpose is to allow using the new identifier parameter during User-Interactive Authentication, which is currently handled in AuthHandler. That's why I've moved these helper methods there. I also moved the refactoring of these method from #7438 as they're relevant.
* | Do not yield on awaitables in tests. (#8193)Patrick Cloke2020-08-2715-131/+230
| |
* | Convert stats and related calls to async/await (#8192)Patrick Cloke2020-08-278-77/+78
| |
* | Convert simple_delete to async/await. (#8191)Patrick Cloke2020-08-275-37/+90
| |
* | Convert calls of async database methods to async (#8166)Patrick Cloke2020-08-2714-84/+114
| |
* | simple_search_list_txn should return None, not 0. (#8187)Patrick Cloke2020-08-272-4/+4
| |
* | Fix missing _add_persisted_position (#8179)Erik Johnston2020-08-273-3/+52
| | | | | | This was forgotten in #8164.
* | Convert additional database methods to async (select list, search, ↵Patrick Cloke2020-08-278-84/+67
| | | | | | | | insert_many, delete_*) (#8168)
* | Convert simple_update* and simple_select* to async (#8173)Patrick Cloke2020-08-2719-133/+164
| |
* | Reduce run-times of tests by advancing the reactor less (#7757)Andrew Morgan2020-08-277-8/+9
| |
* | Merge branch 'master' into developBrendan Abolivier2020-08-273-1/+13
|\|
| * 1.19.1 v1.19.1 github/release-v1.19.1 release-v1.19.1Brendan Abolivier2020-08-273-1/+13
| |
* | Update debian systemd service to use Type=notify (#8169)Dexter Chua2020-08-272-1/+7
| | | | | | | | | | | | | | | | This ensures systemctl start matrix-synapse returns only after synapse is actually started, which is very useful for automated deployments. Fixes #5761 Signed-off-by: Dexter Chua <dec41@srcf.net>
* | Remove remaining is_guest argument uses from get_room_data calls (#8181)Andrew Morgan2020-08-262-10/+3
| | | | | | | | | | | | | | #8174 removed the `is_guest` parameter from `get_room_data`, at the same time that #8157 was merged using it, colliding together to break unit tests on develop. This PR removes the `is_guest` parameter from the call in the broken test. Uses the same changelog as #8174.
* | Do not propagate typing notifications from shadow-banned users. (#8176)Patrick Cloke2020-08-266-24/+102
| |
* | Remove unused parameter from, and add safeguard in, get_room_data (#8174)Andrew Morgan2020-08-264-10/+14
| | | | | | | | | | | | Small cleanup PR. * Removed the unused `is_guest` argument * Added a safeguard to a (currently) impossible code path, fixing static checking at the same time.
* | Add required Debian dependencies to allow docker builds on the arm platform ↵Christopher May-Townsend2020-08-262-3/+11
| | | | | | | | | | | | (#8144) Signed-off-by: Christopher May-Townsend <chris@maytownsend.co.uk>
* | Allow running mypy directly. (#8175)Patrick Cloke2020-08-263-51/+51
| |
* | Update the test federation client to handle streaming responses (#8130)Richard van der Hoff2020-08-262-8/+28
| | | | | | | | Now that the server supports streaming back JSON responses, it would be nice to show the response as it is streamed, in the test tool.
* | Do not propagate profile changes of shadow-banned users into rooms. (#8157)Patrick Cloke2020-08-265-160/+291
| |
* | Make SlavedIdTracker.advance have same interface as MultiWriterIDGenerator ↵Erik Johnston2020-08-2612-15/+16
| | | | | | | | (#8171)
* | Convert simple_select_one and simple_select_one_onecol to async (#8162)Patrick Cloke2020-08-2625-113/+220
| |
* | Fix rate limiting unit tests. (#8167)Patrick Cloke2020-08-262-13/+15
| | | | | | | | These were passing on the release-v1.19.1 branch but started failing once merged to develop.
* | Add functions to `MultiWriterIdGen` used by events stream (#8164)Erik Johnston2020-08-254-3/+145
| |
* | Do not allow send_nonmember_event to be called with shadow-banned users. (#8158)Patrick Cloke2020-08-252-5/+35
| |
* | Merge tag 'v1.19.1rc1' into developBrendan Abolivier2020-08-255-26/+129
|\| | | | | | | | | | | | | | | | | | | | | Synapse 1.19.1rc1 (2020-08-25) ============================== Bugfixes -------- - Fix a bug introduced in v1.19.0 where appservices with ratelimiting disabled would still be ratelimited when joining rooms. ([\#8139](https://github.com/matrix-org/synapse/issues/8139)) - Fix a bug introduced in v1.19.0 that would cause e.g. profile updates to fail due to incorrect application of rate limits on join requests. ([\#8153](https://github.com/matrix-org/synapse/issues/8153))
| * Changelog fixes v1.19.1rc1Brendan Abolivier2020-08-251-1/+1
| |
| * 1.19.1rc1Brendan Abolivier2020-08-254-3/+11
| |
| * Fix join ratelimiter breaking profile updates and idempotency (#8153)Brendan Abolivier2020-08-244-25/+119
| |
| * Do not apply ratelimiting on joins to appservices (#8139)Will Hunt2020-08-244-6/+119
| | | | | | | | | | | | Add new method ratelimiter.can_requester_do_action and ensure that appservices are exempt from being ratelimited. Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> Co-authored-by: Erik Johnston <erik@matrix.org>
* | Make StreamIdGen `get_next` and `get_next_mult` async (#8161)Erik Johnston2020-08-2514-49/+54
| | | | | | | | This is mainly so that `StreamIdGenerator` and `MultiWriterIdGenerator` will have the same interface, allowing them to be used interchangeably.
* | Wording fixes to 'name' user admin api filter (#8163)Andrew Morgan2020-08-254-5/+7
| | | | | | Some fixes to wording I noticed after merging #7377.
* | Fix missing double-backtick in RST documentAndrew Morgan2020-08-251-1/+1
| |
* | Search in columns 'name' and 'displayname' in the admin users endpoint (#7377)Manuel Stahl2020-08-254-15/+27
| | | | | | | | | | * Search in columns 'name' and 'displayname' in the admin users endpoint Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
* | Add type hints for state. (#8140)Patrick Cloke2020-08-2410-203/+420
| |
* | Stop shadow-banned users from sending non-member events. (#8142)Patrick Cloke2020-08-248-42/+155
| |
* | Allow capping a room's retention policy (#8104)Brendan Abolivier2020-08-246-107/+127
| |
* | Add healthcheck for default localhost 8008 port on /health endpoint. (#8147)Christopher May-Townsend2020-08-243-0/+34
| |
* | Fix flaky shadow-ban tests. (#8152)Patrick Cloke2020-08-242-1/+4
| |
* | Don't fail /submit_token requests on incorrect session ID if ↵Brendan Abolivier2020-08-245-6/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request_token_inhibit_3pid_errors is turned on (#7991) * Don't raise session_id errors on submit_token if request_token_inhibit_3pid_errors is set * Changelog * Also wait some time before responding to /requestToken * Incorporate review * Update synapse/storage/databases/main/registration.py Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Incorporate review Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
* | Do not apply ratelimiting on joins to appservices (#8139)Will Hunt2020-08-214-6/+119
| | | | | | | | | | | | Add new method ratelimiter.can_requester_do_action and ensure that appservices are exempt from being ratelimited. Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> Co-authored-by: Erik Johnston <erik@matrix.org>
* | Micro-optimisations to get_auth_chain_ids (#8132)Richard van der Hoff2020-08-212-23/+18
| |
* | Allow denying or shadow banning registrations via the spam checker (#8034)Patrick Cloke2020-08-2014-18/+258
| |
* | Stop shadow-banned users from sending invites. (#8095)Patrick Cloke2020-08-207-31/+226
| |
* | Be more tolerant of membership events in unknown rooms (#8110)Richard van der Hoff2020-08-203-6/+28
| | | | | | | | It turns out that not all out-of-band membership events are labelled as such, so we need to be more accepting here.
* | Improve the error code when trying to register using a name reserved for ↵Patrick Cloke2020-08-202-1/+4
| | | | | | | | guests. (#8135)