summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Add a worker store for search insertion. (#7516)Erik Johnston2020-05-153-47/+52
| | | | | This is required as both event persistence and the background update needs access to this function. It should be perfectly safe for two workers to write to that table at the same time.
* Prevent 0-member/null room_version rooms from appearing in group room ↵Andrew Morgan2020-05-152-14/+79
| | | | queries (#7465)
* Move event stream handling out of slave store. (#7491)Erik Johnston2020-05-158-116/+161
| | | | | This allows us to have the logic on both master and workers, which is necessary to move event persistence off master. We also combine the instantiation of ID generators from DataStore and slave stores to the base worker stores. This allows us to select which process writes events independently of the master/worker splits.
* Add type hints to event_auth code. (#7505)Patrick Cloke2020-05-153-32/+48
|
* Fix a small typo in the arguments of simple_update in ↵Andrew Morgan2020-05-152-1/+2
| | | | update_remote_profile_cache (#7511)
* Formatting for reverse-proxy docs (#7514)Richard van der Hoff2020-05-152-68/+79
| | | also a small clarification to nginx
* Add Caddy 2 example (#7463)Jeff Peeler2020-05-152-1/+12
| | | | | | | | | | The specific headers that are passed using this new configuration format are Host and X-Forwarded-For, which should be all that's required. Note that for production another matcher should be added in the first section to properly handle the base_url lookup: reverse_proxy /.well-known/matrix/* http://localhost:8008 Signed-off-by: Jeff Peeler <jpeeler@gmail.com>
* Update the room member handler to use async/await. (#7507)Patrick Cloke2020-05-153-74/+59
|
* Implement room version 6 (MSC2240). (#7506)Patrick Cloke2020-05-155-41/+14
|
* Ignore incoming presence updates when presence is disabled (#7508)Andrew Morgan2020-05-152-2/+5
|
* Strictly enforce canonicaljson requirements in a new room version (#7381)Patrick Cloke2020-05-147-5/+137
|
* Merge branch 'master' into developRichard van der Hoff2020-05-149-65/+294
|\
| * remove spurious changelog filesRichard van der Hoff2020-05-142-2/+0
| | | | | | | | | | These PRs have gone straight to `master` and aren't really relevant to the release, so it doesn't make sense to have changelog entries for them.
| * Notes on using git (#7496)Richard van der Hoff2020-05-145-58/+261
| | | | | | | | | | | | | | * general updates to CONTRIBUTING.md * notes on updating your PR * Notes on squash-merging or otherwise * document git branching model
| * Update reverse_proxy.mdRichard van der Hoff2020-05-051-4/+4
| | | | | | a couple of cleanups
| * Add a section about support to the top of the README (#7392)Brendan Abolivier2020-05-012-0/+12
| | | | | | | | | | Continuation of #7379 Adds a section in the README telling people to go to #synapse:matrix.org instead of using github issues. I'm not entirely sure about placing it above the install section but then people are likely to first seek support when installing (if something goes boom), and it's probably better to have it as high as possible anyway so people actually see it.
| * Make it clearer that #synapse:matrix.org is our support channel (#7379)Brendan Abolivier2020-05-014-3/+19
| | | | | | | | | | | | | | This PR moves the "support is in #synapse:matrix.org" in the bug report template outside of the comment as some people seem to ignore what's in the comments, and phrase it a bit more like the support request template. It also adds a default issue template that says the same thing. It's also adding a notice about the security disclosure to both the default template and the bug report one. It also adds a badge to the top of the README with an alt text saying about the same message if the badge doesn't load (e.g. if matrix.org is slow). Fixes #6826
* | Enforce MSC2209: auth rules for notifications in power level event (#7502)Patrick Cloke2020-05-144-3/+65
| | | | | | | | In a new room version, the "notifications" key of power level events are subject to restricted auth rules.
* | Workaround for failure to wrap reason in Failure (#7473)Andrew Morgan2020-05-142-0/+8
| |
* | Fix b'GET' in prometheus metrics (#7503)Richard van der Hoff2020-05-142-2/+5
| |
* | Allow expired accounts to logout (#7443)Andrew Morgan2020-05-145-22/+140
| |
* | Move EventStream handling into default ReplicationDataHandler (#7493)Erik Johnston2020-05-145-36/+40
| | | | | | This is so that the logic can happen on both master and workers when we move event persistence out.
* | Add `instance_map` config and route replication calls (#7495)Erik Johnston2020-05-143-6/+33
| |
* | Merge tag 'v1.13.0rc2' into developRichard van der Hoff2020-05-147-68/+95
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.13.0rc2 (2020-05-14) ============================== Bugfixes -------- - Fix a long-standing bug which could cause messages not to be sent over federation, when state events with state keys matching user IDs (such as custom user statuses) were received. ([\#7376](https://github.com/matrix-org/synapse/issues/7376)) - Restore compatibility with non-compliant clients during the user interactive authentication process, fixing a problem introduced in v1.13.0rc1. ([\#7483](https://github.com/matrix-org/synapse/issues/7483)) Internal Changes ---------------- - Fix linting errors in new version of Flake8. ([\#7470](https://github.com/matrix-org/synapse/issues/7470))
| * | 1.13.0rc2 v1.13.0rc2Richard van der Hoff2020-05-141-3/+2
| | |
| * | 1.13.0rc2Richard van der Hoff2020-05-145-4/+17
| | |
| * | Stop `get_joined_users` corruption from custom statuses (#7376)Richard van der Hoff2020-05-143-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | Fix a bug where the `get_joined_users` cache could be corrupted by custom status events (or other state events with a state_key matching the user ID). The bug was introduced by #2229, but has largely gone unnoticed since then. Fixes #7099, #7373.
| * | Do not validate that the client dict is stable during UI Auth. (#7483)Patrick Cloke2020-05-134-65/+29
| | | | | | | | | | | | This backs out some of the validation for the client dictionary and logs if this changes during a user interactive authentication session instead.
| * | Fix new flake8 errors (#7489)Patrick Cloke2020-05-137-12/+19
| | | | | | | | | | | | This is a cherry-pick of 1a1da60ad2c9172fe487cd38a164b39df60f4cb5 (#7470) to the release-v1.13.0 branch.
* | | Allow censoring of events to happen on workers. (#7492)Erik Johnston2020-05-134-8/+4
| | | | | | | | | This is safe as we can now write to cache invalidation stream on workers, and is required for when we move event persistence off master.
* | | Fix copypasted comment (#7477)Paul Tötterman2020-05-132-1/+2
| | | | | | | | | Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
* | | Clean up replication unit tests. (#7490)Erik Johnston2020-05-138-51/+16
| | |
* | | SpellingErik Johnston2020-05-132-2/+2
| | |
* | | Shuffle persist event data store functions. (#7440)Erik Johnston2020-05-1319-1235/+1376
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The aim here is to get to a stage where we have a `PersistEventStore` that holds all the write methods used during event persistence, so that we can take that class out of the `DataStore` mixin and instansiate it separately. This will allow us to instansiate it on processes other than master, while also ensuring it is only available on processes that are configured to write to events stream. This is a bit of an architectural change, where we end up with multiple classes per data store (rather than one per data store we have now). We end up having: 1. Storage classes that provide high level APIs that can talk to multiple data stores. 2. Data store modules that consist of classes that must point at the same database instance. 3. Classes in a data store that can be instantiated on processes depending on config.
* | | Have all instances correctly respond to REPLICATE command. (#7475)Erik Johnston2020-05-134-48/+51
| | | | | | | | | | | | | | | Before all streams were only written to from master, so only master needed to respond to `REPLICATE` commands. Before all instances wrote to the cache invalidation stream, but didn't respond to `REPLICATE`. This was a bug, which could lead to missed rows from cache invalidation stream if an instance is restarted, however all the caches would be empty in that case so it wasn't a problem.
* | | Fix Redis reconnection logic (#7482)Erik Johnston2020-05-133-2/+15
| | | | | | | | | Proactively send out `POSITION` commands (as if we had just received a `REPLICATE`) when we connect to Redis. This is important as other instances won't notice we've connected to issue a `REPLICATE` command (unlike for direct TCP connections). This is only currently an issue if master process reconnects without restarting (if it restarts then it won't have written anything and so other instances probably won't have missed anything).
* | | Update documentation about SSO mapping providers (#7458)Patrick Cloke2020-05-123-77/+147
| | |
* | | Fix new flake8 errors (#7470)Erik Johnston2020-05-127-12/+19
| | |
* | | Convert federation handler to async/await. (#7459)Patrick Cloke2020-05-113-21/+17
| | |
* | | Convert search code to async/await. (#7460)Patrick Cloke2020-05-112-24/+21
| | |
* | | Allow configuration of Synapse's cache without using synctl or environment ↵Amber Brown2020-05-1132-146/+620
| | | | | | | | | | | | variables (#6391)
* | | Remove unused store method get_hosts_in_room (#7448)Andrew Morgan2020-05-112-10/+1
| | |
* | | Merge branch 'release-v1.13.0' into developAndrew Morgan2020-05-11150-320/+582
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * release-v1.13.0: Don't UPGRADE database rows RST indenting Put rollback instructions in upgrade notes Fix changelog typo Oh yeah, RST Absolute URL it is then Fix upgrade notes link Provide summary of upgrade issues in changelog. Fix ) Move next version notes from changelog to upgrade notes Changelog fixes 1.13.0rc1 Documentation on setting up redis (#7446) Rework UI Auth session validation for registration (#7455) Fix errors from malformed log line (#7454) Drop support for redis.dbid (#7450)
| * | Don't UPGRADE database rows v1.13.0rc1Andrew Morgan2020-05-111-1/+1
| | |
| * | RST indentingAndrew Morgan2020-05-111-2/+2
| | |
| * | Put rollback instructions in upgrade notesAndrew Morgan2020-05-111-0/+19
| | |
| * | Fix changelog typoAndrew Morgan2020-05-111-1/+1
| | |
| * | Oh yeah, RSTAndrew Morgan2020-05-111-2/+1
| | |
| * | Absolute URL it is thenAndrew Morgan2020-05-111-1/+2
| | |
| * | Fix upgrade notes linkAndrew Morgan2020-05-111-1/+1
| | |
| * | Provide summary of upgrade issues in changelog. Fix )Andrew Morgan2020-05-112-12/+33
| | |
| * | Move next version notes from changelog to upgrade notesAndrew Morgan2020-05-112-14/+15
| | |
| * | Changelog fixesAndrew Morgan2020-05-111-3/+3
| | |
| * | 1.13.0rc1Andrew Morgan2020-05-11144-143/+139
| | |
| * | Documentation on setting up redis (#7446)Neil Johnson2020-05-112-60/+108
| | |
| * | Rework UI Auth session validation for registration (#7455)Patrick Cloke2020-05-086-102/+280
| | | | | | | | | | | | Be less strict about validation of UI authentication sessions during registration to match client expecations.
| * | Fix errors from malformed log line (#7454)Richard van der Hoff2020-05-072-1/+2
| | |
| * | Drop support for redis.dbid (#7450)Richard van der Hoff2020-05-073-4/+2
| | | | | | | | | Since we only use pubsub, the dbid is irrelevant.
* | | Extend spam checker to allow for multiple modules (#7435)Andrew Morgan2020-05-086-60/+95
| | |
* | | Implement OpenID Connect-based login (#7256)Quentin Gliech2020-05-0821-12/+2163
| | |
* | | Add room details admin endpoint (#7317)Manuel Stahl2020-05-077-1/+165
| | |
* | | Merge branch 'release-v1.13.0' into developBrendan Abolivier2020-05-0710-18/+65
|\| |
| * | Add a configuration setting for the dummy event threshold (#7422)Brendan Abolivier2020-05-074-1/+31
| | | | | | | | | Add dummy_events_threshold which allows configuring the number of forward extremities a room needs for Synapse to send forward extremities in it.
| * | Improve per-block CPU and DB usage metrics (#7426)Patrick Cloke2020-05-062-12/+27
| | |
| * | Port group attestation renewal slow down from matrix-org-hotfixes (#7442)Andrew Morgan2020-05-062-4/+3
| | |
| * | Make redis go faster with hiredis (#7439)Richard van der Hoff2020-05-062-1/+4
| | | | | | | | | | | | | | | For the record, the reason we need this is as follows: each RDATA command comes down the redis pipe as a subscription message. txredisapi as written needs at least three reactor ticks to read each subscription message from the tcp buffer. Hence, once the process gets loaded, it starts getting behind, and eventually redis knifes the connection. it then takes ages for the master to work its way through the backlog, before it reconnects again, during which any commands from any workers are dropped.
* | | Fixes typo (bellow -> below) (#7449)Patrick Cloke2020-05-073-2/+3
| | |
* | | Add more type hints to SAML handler. (#7445)Patrick Cloke2020-05-073-12/+18
| | |
* | | Support any process writing to cache invalidation stream. (#7436)Erik Johnston2020-05-0726-231/+226
| | |
* | | Merge pull request #7398 from Starbix/alpine-3.11Brendan Abolivier2020-05-072-1/+2
|\ \ \ | | | | | | | | Update docker runtime image to Alpine v3.11
| * | | Update runtime docker image to Alpine v3.11Cédric Laubacher2020-05-032-1/+2
| | | |
* | | | Merge branch 'release-v1.13.0' into developRichard van der Hoff2020-05-0614-150/+264
|\ \ \ \ | | |/ / | |/| |
| * | | Stop Auth methods from polling the config on every req. (#7420)Andrew Morgan2020-05-067-106/+168
| | | |
| * | | Merge pull request #7423 from matrix-org/erikj/faster_device_lists_fetchErik Johnston2020-05-064-10/+26
| |\ \ \ | | | | | | | | | | Speed up fetching device lists changes in sync.
| | * \ \ Merge branch 'release-v1.13.0' into erikj/faster_device_lists_fetchRichard van der Hoff2020-05-0566-691/+847
| | |\ \ \
| | * | | | Update changelog.d/7423.miscRichard van der Hoff2020-05-051-1/+1
| | | | | |
| | * | | | NewsfileErik Johnston2020-05-051-0/+1
| | | | | |
| | * | | | Speed up fetching device lists changes in sync.Erik Johnston2020-05-053-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we copy `users_who_share_room` needlessly about three times, which is expensive when the set is large (which it can easily be).
| * | | | | Merge pull request #7427 from matrix-org/rav/fix_dropped_messagesRichard van der Hoff2020-05-063-34/+70
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix lost events on replication reconnection
| | * \ \ \ \ Merge branch 'release-v1.13.0' into rav/fix_dropped_messagesRichard van der Hoff2020-05-052-1/+2
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'release-v1.13.0' into rav/fix_dropped_messagesRichard van der Hoff2020-05-0566-690/+847
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | changelogRichard van der Hoff2020-05-051-0/+1
| | | | | | |
| | * | | | | Wait for a POSITION on the right connection before accepting RDATARichard van der Hoff2020-05-052-19/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... otherwise we can believe we're up to date when we're not.
| | * | | | | Wait to subscribe before sending REPLICATERichard van der Hoff2020-05-052-20/+35
| | | |/ / / | | |/| | |
* | | | | | Merge pull request #7428 from matrix-org/rav/cross_signing_keys_cacheRichard van der Hoff2020-05-062-77/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make get_e2e_cross_signing_key delegate to get_e2e_cross_signing_keys_bulk
| * | | | | | Make get_e2e_cross_signing_key delegate to get_e2e_cross_signing_keys_bulkRichard van der Hoff2020-05-062-54/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... mostly because the latter has a cache.
| * | | | | | Fix batching for fetching cross-signing keysRichard van der Hoff2020-05-061-23/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | There's no point carefully dividing a list into batches, and then completely ignoring the batches.
* | | | | | Merge branch 'release-v1.13.0' into developRichard van der Hoff2020-05-068-9/+170
|\| | | | |
| * | | | | Move logs about discarded RDATA to debug (#7421)Brendan Abolivier2020-05-052-1/+2
| | |/ / / | |/| | |
| * | | | Add backwards compatibility codepath to LoggingContext. (#7408)Patrick Cloke2020-05-052-0/+42
| | | | |
| * | | | Fix bug in EventContext.deserialize. (#7393)Erik Johnston2020-05-054-8/+126
| | | | | | | | | | | | | | | | | | | | This caused `prev_state_ids` to be incorrect if the state event was not replacing an existing state entry.
* | | | | Merge pull request #7429 from matrix-org/rav/upsert_for_device_listRichard van der Hoff2020-05-064-48/+115
|\ \ \ \ \ | | | | | | | | | | | | use an upsert to update device_lists_outbound_last_success
| * \ \ \ \ Merge branch 'develop' into rav/upsert_for_device_listRichard van der Hoff2020-05-0674-777/+1242
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Fix typing annotations in synapse/federation (#7382)Richard van der Hoff2020-05-054-21/+34
| | | | | | | | | | | | | | | | | | | | | | | | We're pretty close to having mypy working for `synapse.federation`, so let's finish the job.
* | | | | | Fix catchup-on-reconnect for the Federation Stream (#7374)Richard van der Hoff2020-05-0511-48/+158
| | | | | | | | | | | | | | | | | | | | | | | | looks like we managed to break this during the refactorathon.
* | | | | | Add MultiWriterIdGenerator. (#7281)Erik Johnston2020-05-044-2/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used to coordinate stream IDs across multiple writers. Functions as the equivalent of both `StreamIdGenerator` and `SlavedIdTracker`.
* | | | | | Merge branch 'release-v1.13.0' into developBrendan Abolivier2020-05-045-5/+14
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix ordering in MANIFEST.inBrendan Abolivier2020-05-041-6/+6
| | | | | |
| * | | | | Merge pull request #7404 from matrix-org/babolivier/fix_manifestBrendan Abolivier2020-05-042-3/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix MANIFEST.in
| | * | | | | Fix MANIFEST.inBrendan Abolivier2020-05-042-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An update of check-manifest shone some light on some issues with MANIFEST.in, specifically that we didn't ignore/prune the contrib directory, and that we were using prune instead of exclude for files. This fixes both issues. Fixes #7403
| * | | | | | Fix redis password support. (#7401)Erik Johnston2020-05-043-0/+7
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | We forgot to set the password on the subscriber connection, as well as not calling super methods for overridden connectionMade/connectionLost functions.
* / | | | | Convert the room handler to async/await. (#7396)Patrick Cloke2020-05-042-24/+19
|/ / / / /
* | | | | Convert synapse.server_notices to async/await. (#7394)Patrick Cloke2020-05-013-11/+8
| | | | |
* | | | | Convert the synapse.notifier module to async/await. (#7395)Patrick Cloke2020-05-012-10/+8
| | | | |
* | | | | Wait for current_state_events_membership before populate_stats_process_rooms ↵Richard van der Hoff2020-05-013-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#7387) populate_stats_process_rooms was added in #5971 / v1.4.0; current_state_events_membership was added in #5706 / v1.3.0. Fixes #7380.
* | | | | Thread through instance name to replication client. (#7369)Erik Johnston2020-05-0112-41/+101
|/ / / / | | | | | | | | For in memory streams when fetching updates on workers we need to query the source of the stream, which currently is hard coded to be master. This PR threads through the source instance we received via `POSITION` through to the update function in each stream, which can then be passed to the replication client for in memory streams.
* | | | Use `stream.current_token()` and remove `stream_positions()` (#7172)Erik Johnston2020-05-0119-154/+30
| | | | | | | | | | | | | | | | We move the processing of typing and federation replication traffic into their handlers so that `Stream.current_token()` points to a valid token. This allows us to remove `get_streams_to_replicate()` and `stream_positions()`.
* | | | async/await is_server_admin (#7363)Andrew Morgan2020-05-0122-438/+410
| | | |
* | | | Further improvements to requesting the public rooms list on a homeserver ↵Andrew Morgan2020-05-013-23/+71
| |/ / |/| | | | | | | | which has it set to private (#7368)
| * | use an upsert to update device_lists_outbound_last_successRichard van der Hoff2020-05-064-18/+72
| | |
| * | Better type annotations for simple_upsert_txnRichard van der Hoff2020-05-061-30/+43
|/ / | | | | | | most of these params don't really need to be lists.
* | Workaround for assertion errors from db_query_to_update_function (#7378)Richard van der Hoff2020-05-012-2/+2
| | | | | | Hopefully this is no worse than what we have on master...
* | Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-3014-125/+434
| | | | | | | | | | By persisting the user interactive authentication sessions to the database, this fixes situations where a user hits different works throughout their auth session and also allows sessions to persist through restarts of Synapse.
* | Apply federation check for /publicRooms with filter list (#7367)Andrew Morgan2020-04-302-1/+6
| |
* | Add instance name to RDATA/POSITION commands (#7364)Erik Johnston2020-04-2910-50/+95
| | | | | | | | | | This is primarily for allowing us to send those commands from workers, but for now simply allows us to ignore echoed RDATA/POSITION commands that we sent (we get echoes of sent commands when using redis). Currently we log a WARNING on the master process every time we receive an echoed RDATA.
* | Don't relay REMOTE_SERVER_UP cmds to same conn. (#7352)Erik Johnston2020-04-296-25/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For direct TCP connections we need the master to relay REMOTE_SERVER_UP commands to the other connections so that all instances get notified about it. The old implementation just relayed to all connections, assuming that sending back to the original sender of the command was safe. This is not true for redis, where commands sent get echoed back to the sender, which was causing master to effectively infinite loop sending and then re-receiving REMOTE_SERVER_UP commands that it sent. The fix is to ensure that we only relay to *other* connections and not to the connection we received the notification from. Fixes #7334.
* | Fix limit logic for EventsStream (#7358)Richard van der Hoff2020-04-2914-67/+658
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Factor out functions for injecting events into database I want to add some more flexibility to the tools for injecting events into the database, and I don't want to clutter up HomeserverTestCase with them, so let's factor them out to a new file. * Rework TestReplicationDataHandler This wasn't very easy to work with: the mock wrapping was largely superfluous, and it's useful to be able to inspect the received rows, and clear out the received list. * Fix AssertionErrors being thrown by EventsStream Part of the problem was that there was an off-by-one error in the assertion, but also the limit logic was too simple. Fix it all up and add some tests.
* | Fix fallback value for account_threepid_delegates.email (#7316)Andrew Morgan2020-04-292-3/+9
| |
* | Clean up admin api docs (#7361)Andrew Morgan2020-04-282-18/+43
| |
* | Return total number of users and profile attributes in admin users endpoint ↵Manuel Stahl2020-04-286-36/+100
| | | | | | | | | | (#6881) Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
* | Add some replication tests (#7278)Erik Johnston2020-04-283-11/+299
| | | | | | | | | | | | | | Specifically some tests for the typing stream, which means we test streams that fetch missing updates via HTTP (rather than via the DB). We also shuffle things around a bit so that we create two separate `HomeServer` objects, rather than trying to insert a slaved store into places. Note: `test_typing.py` is heavily inspired by `test_receipts.py`
* | Fix typo 'datbases' in ConfigErrorAndrew Morgan2020-04-281-1/+1
| |
* | Fix collation for postgres for unit tests (#7359)Richard van der Hoff2020-04-282-1/+5
| | | | | | | | When running the UTs against a postgres deatbase, we need to set the collation correctly.
* | Run replication streamers on workers (#7146)Erik Johnston2020-04-283-22/+25
| | | | | | Currently we never write to streams from workers, but that will change soon
* | Fix incorrect metrics reporting for renew_attestations (#7344)Richard van der Hoff2020-04-272-10/+10
| | | | | | | | We need to wait for the renewals to finish, so that the metrics are correctly reported.
* | Document monitoring workers (#7357)Brendan Abolivier2020-04-272-0/+26
| | | | | | It doesn't seem to be documented anywhere and means that you suddenly start losing metrics without any obvious reason when you go from monolith to workers (e.g. #7312).
* | Add some explanation to application_services.md (#7091)lub2020-04-272-0/+5
| | | | | | Signed-off-by: Simon Körner <git@lubiland.de>
* | Don't crash when one of the configuration files is empty (#7341)Brendan Abolivier2020-04-272-0/+7
| | | | | | | | | | If the admin adds a `.yaml` file that's either empty or doesn't parse into a dict to a config directory (e.g. `conf.d` for debs installs), stuff like https://github.com/matrix-org/synapse/issues/7322 would happen. This PR checks that the file is correctly parsed into a dict, or ignores it with a warning if it parses into any other type (including `None` for empty files). Fixes https://github.com/matrix-org/synapse/issues/7322
* | Add documentation to the sample config about the templates for SSO. (#7343)Patrick Cloke2020-04-243-0/+49
| |
* | Convert some of the federation handler methods to async/await. (#7338)Patrick Cloke2020-04-242-25/+25
| |
* | Merge pull request #7337 from matrix-org/rav/fix_update_limit_assertionRichard van der Hoff2020-04-245-44/+147
|\ \ | | | | | | Fix assertions being thrown by the EventsStream update function
| * | changelogRichard van der Hoff2020-04-241-0/+1
| | |
| * | Fix EventsStream raising assertions when it falls behindRichard van der Hoff2020-04-242-30/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Figuring out how to correctly limit updates from this stream without dropping entries is far more complicated than just counting the number of rows being returned. We need to consider each query separately and, if any one query hits the limit, truncate the results from the others. I think this also fixes some potentially long-standing bugs where events or state changes could get missed if we hit the limit on either query.
| * | Make it clear that the limit for an update_function is a targetRichard van der Hoff2020-04-231-5/+9
| | |
| * | Remove 'limit' param from `get_repl_stream_updates` APIRichard van der Hoff2020-04-232-9/+8
| | | | | | | | | | | | | | | there doesn't seem to be much point in passing this limit all around, since both sides agree it's meant to be 100.
* | | Merge branch 'master' into developPatrick Cloke2020-04-233-1/+16
|\ \ \ | |/ / |/| / | |/
| * Merge tag 'v1.12.4'Patrick Cloke2020-04-2313-59/+360
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse v1.12.4 Features: * Always send users their own device updates. (#7160) * Add support for handling GET requests for account_data on a worker. (#7311) Bugfixes: * Fix a bug that prevented cross-signing with users on worker-mode synapses. (#7255) * Do not treat display names as globs in push rules. (#7271) * Fix a bug with cross-signing devices belonging to remote users who did not share a room with any user on the local homeserver. (#7289)
| | * 1.12.4 v1.12.4 github/release-v1.12.4 release-v1.12.4Patrick Cloke2020-04-233-1/+13
| | |
* | | Revert "Revert "Merge pull request #7315 from ↵Brendan Abolivier2020-04-237-3/+121
| | | | | | | | | | | | | | | | | | matrix-org/babolivier/request_token"" This reverts commit 1adf6a55870aa08de272591ff49db9dc49738076.
* | | Merge branch 'master' into developBrendan Abolivier2020-04-233-3/+75
|\| |
| * | Revert "Merge pull request #7315 from matrix-org/babolivier/request_token"Brendan Abolivier2020-04-237-121/+3
| | | | | | | | | | | | | | | This reverts commit 6f4319368b3afab661c55367b9348f9b77bc04a5, reversing changes made to 0d775fcc2d0c7b6a07dad5430256d4d6c75a9f0d.
| * | Merge pull request #7315 from matrix-org/babolivier/request_tokenBrendan Abolivier2020-04-237-3/+121
| |\ \ | | | | | | | | Config option to inhibit 3PID errors on /requestToken
| | * | Config option to inhibit 3PID errors on /requestTokenBrendan Abolivier2020-04-227-3/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a request_token_inhibit_errors configuration flag (disabled by default) which, if enabled, change the behaviour of all /requestToken endpoints so that they return a 200 and a fake sid if the 3PID was/was not found associated with an account (depending on the endpoint), instead of an error. Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * | | Improve example TURN configuration in documentation (#7284)nataraj-hates-MS-for-stealing-github2020-04-171-1/+1
| | | |
| * | | Add some warnings and notes about slow upgrade (#7275)Richard van der Hoff2020-04-152-2/+74
| | | | | | | | | | | | | | | | | | | | Fixes #7144.
* | | | Stop the master relaying USER_SYNC for other workers (#7318)Richard van der Hoff2020-04-2210-159/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Long story short: if we're handling presence on the current worker, we shouldn't be sending USER_SYNC commands over replication. In an attempt to figure out what is going on here, I ended up refactoring some bits of the presencehandler code, so the first 4 commits here are non-functional refactors to move this code slightly closer to sanity. (There's still plenty to do here :/). Suggest reviewing individual commits. Fixes (I hope) #7257.
* | | | Fix replication metrics when using redis (#7325)Erik Johnston2020-04-223-37/+30
| | | |
* | | | Merge tag 'v1.12.4rc1' into developRichard van der Hoff2020-04-227-6/+18
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.12.4rc1 (2020-04-22) ============================== Features -------- - Always send users their own device updates. ([\#7160](https://github.com/matrix-org/synapse/issues/7160)) - Add support for handling GET requests for `account_data` on a worker. ([\#7311](https://github.com/matrix-org/synapse/issues/7311)) Bugfixes -------- - Fix a bug that prevented cross-signing with users on worker-mode synapses. ([\#7255](https://github.com/matrix-org/synapse/issues/7255)) - Do not treat display names as globs in push rules. ([\#7271](https://github.com/matrix-org/synapse/issues/7271)) - Fix a bug with cross-signing devices belonging to remote users who did not share a room with any user on the local homeserver. ([\#7289](https://github.com/matrix-org/synapse/issues/7289))
| * | | formatting for the changelog v1.12.4rc1Richard van der Hoff2020-04-221-1/+1
| | | |
| * | | 1.12.4rc1Richard van der Hoff2020-04-226-5/+18
| | | |
| * | | 1.12.4rc1Richard van der Hoff2020-04-221-1/+1
| | | |
* | | | Another go at fixing one-word commands (#7326)Richard van der Hoff2020-04-223-1/+44
| | | | | | | | | | | | I messed this up last time I tried (#7239 / e13c6c7).
* | | | fix changelog nameRichard van der Hoff2020-04-221-0/+0
| | | |
* | | | Extend StreamChangeCache to support multiple entities per stream ID (#7303)Richard van der Hoff2020-04-226-56/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First some background: StreamChangeCache is used to keep track of what "entities" have changed since a given stream ID. So for example, we might use it to keep track of when the last to-device message for a given user was received [1], and hence whether we need to pull any to-device messages from the database on a sync [2]. Now, it turns out that StreamChangeCache didn't support more than one thing being changed at a given stream_id (this was part of the problem with #7206). However, it's entirely valid to send to-device messages to more than one user at a time. As it turns out, this did in fact work, because *some* methods of StreamChangeCache coped ok with having multiple things changing on the same stream ID, and it seems we never actually use the methods which don't work on the stream change caches where we allow multiple changes at the same stream ID. But that feels horribly fragile, hence: let's update StreamChangeCache to properly support this, and add some typing and some more tests while we're at it. [1]: https://github.com/matrix-org/synapse/blob/release-v1.12.3/synapse/storage/data_stores/main/deviceinbox.py#L301 [2]: https://github.com/matrix-org/synapse/blob/release-v1.12.3/synapse/storage/data_stores/main/deviceinbox.py#L47-L51
* | | | Extend room admin api with additional attributes (#7225)Dirk Klimpel2020-04-226-604/+869
| | | |
* | | | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-227-18/+197
|\| | |
| * | | Do not treat display names as globs for push rules. (#7271)Patrick Cloke2020-04-224-30/+106
| | | |
| * | | Query missing cross-signing keys on local sig upload (#7289)Andrew Morgan2020-04-223-18/+180
| | | |
| * | | Fix changelog fileRichard van der Hoff2020-04-212-1/+1
| | | | | | | | | | | | | | | | I updated the PR and forgot to update the changelog.
| * | | Support GET account_data requests on a worker (#7311)Richard van der Hoff2020-04-214-0/+17
| | | |
* | | | Add ability to run replication protocol over redis. (#7040)Erik Johnston2020-04-2212-36/+342
| | | | | | | | | | | | This is configured via the `redis` config options.
* | | | Reduce logging verbosity of URL cache cleanup. (#7295)Michael Kaye2020-04-222-2/+8
| | | |
* | | | import urllib.parse when using urllib.parse.quote (#7319)Andrew Morgan2020-04-222-1/+2
| | | |
* | | | Reduce federation logging on success (#7321)Michael Kaye2020-04-222-8/+15
| | | | | | | | | | | | | | | | Splitting based on the response code means we can avoid double logging here and identical information from line 164 while still logging at info if we don't get a good response and need to retry.
* | | | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-203-141/+12
|\| | |
| * | | Revert "Query missing cross-signing keys on local sig upload"Richard van der Hoff2020-04-203-141/+12
| | | | | | | | | | | | | | | | | | | | | | | | This was incorrectly merged to the release branch before it was ready. This reverts commit 72fe2affb6ac86d433b80b6452da57052365aa26.
* | | | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-203-12/+141
|\| | |
| * | | Always send the user updates to their own device list (#7160)David Baker2020-04-203-3/+19
| | | |
| * | | Query missing cross-signing keys on local sig uploadAndrew Morgan2020-04-173-12/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog Save retrieved keys to the db lint Fix and de-brittle remote result dict processing Use query_user_devices instead, assume only master, self_signing key types Make changelog more useful Remove very specific exception handling Wrap get_verify_key_from_cross_signing_key in a try/except Note that _get_e2e_cross_signing_verify_key can raise a SynapseError lint Add comment explaining why this is useful Only fetch master and self_signing key types Fix log statements, docstrings Remove extraneous items from remote query try/except lint Factor key retrieval out into a separate function Send device updates, modeled after SigningKeyEduUpdater._handle_signing_key_updates Update method docstring
| * | | Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-142-7/+12
| | | |
* | | | Fix indention in generated config file (#7300)Lars Franke2020-04-203-48/+49
| | | | | | | | | | | | | | | | | | | | | | | | Also adjust sample_config.yaml Signed-off-by: Lars Franke <frcl@mailbox.org>
* | | | Reject unknown UI auth sessions (instead of silently generating a new one) ↵Patrick Cloke2020-04-202-65/+95
| | | | | | | | | | | | | | | | (#7268)
* | | | On catchup, process each row with its own stream id (#7286)Richard van der Hoff2020-04-203-5/+72
| | | | | | | | | | | | | | | | | | | | | | | | Other parts of the code (such as the StreamChangeCache) assume that there will not be multiple changes with the same stream id. This code was introduced in #7024, and I hope this fixes #7206.
* | | | Use a template for the SSO success page to allow for customization. (#7279)Patrick Cloke2020-04-176-37/+66
| | | |
* | | | Added explicit Python build tools to snap requirements (#7213)James2020-04-172-0/+5
| | | | | | | | | | | | Signed-off-by: James Hebden <james@ec0.io>
* | | | Improve type checking in `replication.tcp.Stream` (#7291)Richard van der Hoff2020-04-175-122/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The general idea here is to get rid of the type: ignore annotations on all of the current_token and update_function assignments, which would have caught #7290. After a bit of experimentation, it seems like the least-awful way to do this is to pass the offending functions in as parameters to the Stream constructor. Unfortunately that means that the concrete implementations no longer have the same constructor signature as Stream itself, which means that it gets hard to correctly annotate STREAMS_MAP. I've also introduced a couple of new types, to take out some duplication.
* | | | Clarify the comments for media_storage_providers options (#7272)Tristan Lins2020-04-173-8/+7
| | | |
* | | | Do not treat display names as globs for push rules. (#7271)Patrick Cloke2020-04-164-30/+106
| | | |
* | | | Fix 'generator object is not subscriptable' error (#7290)Richard van der Hoff2020-04-162-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Some of the query functions return generators rather than lists, so we can't index into the result. Happily we already have a copy of the results. (think this was introduced in #7024)
* | | | Convert auth handler to async/await (#7261)Patrick Cloke2020-04-1510-170/+224
| | | |
* | | | Add notes to the changelog about an additional SSO template. (#7259)Patrick Cloke2020-04-152-4/+9
| | | |
* | | | Allow specifying the value of Accept-Language header for URL previews (#7265)Andrew Morgan2020-04-155-2/+116
| | | |
* | | | Fix a potentially-huge sql query (#7274)Richard van der Hoff2020-04-152-7/+17
| | | | | | | | | | | | | | | | | | | | We could end up looking up tens of thousands of events, which could cause large amounts of data to be logged to the postgres log.
* | | | Fix the parameters of a test fixture (#7243)Zay11Zay2020-04-142-1/+2
| | | |
* | | | Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-142-7/+12
| | | |
* | | | Add setting to nginx configuration to allow larger file uploads (#7251)Ryan Hovland2020-04-132-0/+4
| | | |
* | | | Check on room creation if the user is allowed to publish the room to the ↵PeerD2020-04-132-0/+8
| | | | | | | | | | | | | | | | room directory. (#7260)
* | | | typosMatthew Hodgson2020-04-112-2/+2
| | | |
* | | | Default PL100 to enable encryption in a room (#7230)Andrew Morgan2020-04-094-4/+299
| | | |
* | | | Do not allow a deactivated user to login via SSO. (#7240)Patrick Cloke2020-04-098-10/+110
| | | |
* | | | Unblacklist /upgrade creates a new room (#7228)Andrew Morgan2020-04-092-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | This commit was originally merged in #7228 but reverted in #7254 as the associated sytest was not ready yet. Now that it is, we can merge this again.
* | | | Add matrix-synapse-shared-secret-auth as an example password provider (#7248)Andrew Morgan2020-04-092-0/+2
| | | |
* | | | Revert "Unblacklist /upgrade creates a new room (#7228)" (#7254)Andrew Morgan2020-04-092-1/+2
| | | | | | | | | | | | This reverts commit 59f0ca8b87c15a314859d94978d90a8aa0e7543b.
* | | | Unblacklist /upgrade creates a new room (#7228)Andrew Morgan2020-04-092-2/+1
| | | |
* | | | Fix --help commandline argument (#7249)Richard van der Hoff2020-04-092-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't really remember why this was so complicated; I think it dates back to the time when we had to instantiate the Config classes before we could call `add_arguments` - ie before #5597. In any case, I don't think there's a good reason for it any more, and the impact of it being complicated is that `--help` doesn't work correctly.
* | | | Make it clearer to the user that they haven't overridden onLogin/Register ↵Andrew Morgan2020-04-093-3/+3
| | | | | | | | | | | | | | | | (#7237)
* | | | Upgrade jQuery to 3.x on fallback login/registration screens (#7236)Andrew Morgan2020-04-099-16/+15
| | | |
* | | | Fix bad merge of CHANGES.mdRichard van der Hoff2020-04-081-5/+1
| | | |
* | | | Remove redundant checks on `daemonize` from synctl (#7233)Richard van der Hoff2020-04-082-9/+12
| | | | | | | | | | | | | | | | | | | | We pass --daemonize on the commandline, which (since at least #4853) overrides whatever the config file, so there is no need for it to be set in the config file.
* | | | Make systemd-with-workers doc official (#7234)Richard van der Hoff2020-04-0810-194/+134
| | | | | | | | | | | | | | | | Simplify and update this documentation, and make it part of the core dist.
* | | | Fix changelog for #7235Brendan Abolivier2020-04-082-1/+1
| | | |
* | | | Add documentation to password_providers config option (#7238)Andrew Morgan2020-04-084-4/+32
| | | |
* | | | bg update to clear out duplicate outbound_device_list_pokes (#7193)Richard van der Hoff2020-04-076-13/+234
| | | | | | | | | | | | | | | | We seem to have some duplicates, which could do with being cleared out.
* | | | Merge pull request #7239 from matrix-org/rav/replication_cleanupRichard van der Hoff2020-04-074-32/+36
|\ \ \ \ | | | | | | | | | | Miscellaneous cleanups to replication code
| * | | | changelogRichard van der Hoff2020-04-071-0/+1
| | | | |
| * | | | Handle one-word replication commands correctlyRichard van der Hoff2020-04-071-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | `REPLICATE` is now a valid command, and it's nice if you can issue it from the console without remembering to call it `REPLICATE ` with a trailing space.
| * | | | Fix warnings about not calling superclass constructorRichard van der Hoff2020-04-071-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate `SimpleCommand` from `Command`, so that things which don't want to use the `data` property don't have to, and thus fix the warnings PyCharm was giving me about not calling `__init__` in the base class.
| * | | | Remove vestigal references to SYNC replication commandRichard van der Hoff2020-04-072-14/+0
| | | | | | | | | | | | | | | | | | | | We've ripped pretty much all of this out: let's remove the remains.
* | | | | Convert delete_url_cache_media to async/await. (#7241)Patrick Cloke2020-04-072-2/+3
| | | | |
* | | | | Add typing information to federation_server. (#7219)Patrick Cloke2020-04-073-66/+109
| | | | |
* | | | | Fix typo in the login fallback javascript (#7235)Brendan Abolivier2020-04-072-1/+2
|/ / / / | | | | | | | | | | | | | | | | * Fix typo in the login fallback javascript * Changelog
* | | | Remove sent outbound device list pokes from the database (#7192)Richard van der Hoff2020-04-073-2/+24
| | | | | | | | | | | | They just get in the way.
* | | | Fix race in replication (#7226)Erik Johnston2020-04-074-49/+68
| | | | | | | | | | | | | | | | Fixes a race between handling `POSITION` and `RDATA` commands. We do this by simply linearizing handling of them.
* | | | Move server command handling out of TCP protocol (#7187)Erik Johnston2020-04-074-269/+237
| | | | | | | | | | | | This completes the merging of server and client command processing.
* | | | Add information about .well-known to Debian installation. (#7227)Patrick Cloke2020-04-063-7/+18
| | | |
* | | | Remove stream before/after debug log lines (#7207)Andrew Morgan2020-04-062-2/+1
| | | |
* | | | Improve error responses when a remote server doesn't allow you to access its ↵Andrew Morgan2020-04-063-24/+33
| | | | | | | | | | | | | | | | public rooms list (#6899)
* | | | Move client command handling out of TCP protocol (#7185)Erik Johnston2020-04-0612-371/+378
| | | | | | | | | | | | The aim here is to move the command handling out of the TCP protocol classes and to also merge the client and server command handling (so that we can reuse them for redis protocol). This PR simply moves the client paths to the new `ReplicationCommandHandler`, a future PR will move the server paths too.
* | | | Server notices: Dissociate room creation/lookup from invite (#7199)Brendan Abolivier2020-04-044-22/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6815 Before figuring out whether we should alert a user on MAU, we call get_notice_room_for_user to get some info on the existing server notices room for this user. This function, if the room doesn't exist, creates it and invites the user in it. This means that, if we decide later that no server notice is needed, the user gets invited in a room with no message in it. This happens at every restart of the server, since the room ID returned by get_notice_room_for_user is cached. This PR fixes that by moving the inviting bit to a dedicated function, that's only called when the server actually needs to send a notice to the user. A potential issue with this approach is that the room that's created by get_notice_room_for_user doesn't match how that same function looks for an existing room (i.e. it creates a room that doesn't have an invite or a join for the current user in it, so it could lead to a new room being created each time a user syncs), but I'm not sure this is a problem given it's cached until the server restarts, so that function won't run very often. It also renames get_notice_room_for_user into get_or_create_notice_room_for_user to make what it does clearer.
* | | | Support CAS in UI Auth flows. (#7186)Patrick Cloke2020-04-035-83/+131
| | | |
* | | | Extend web_client_location to handle absolute URLs (#7006)Martin Milata2020-04-034-9/+30
| | | | | | | | | | | | | | | | | | | | Log warning when filesystem path is used. Signed-off-by: Martin Milata <martin@martinmilata.cz>
* | | | Add some benchmarks for LruCache (#6446)Amber Brown2020-04-035-5/+91
| | | |
* | | | Convert http.HTTPStatus objects to their int equivalent (#7188)Andrew Morgan2020-04-032-1/+9
| | | |
* | | | Reduce the number of calls to `resource.getrusage` (#7183)Richard van der Hoff2020-04-032-39/+64
| | | | | | | | | | | | Let's just call `getrusage` once on each logcontext change, rather than twice.
* | | | Merge pull request #7190 from matrix-org/rav/one_bg_update_at_a_timeRichard van der Hoff2020-04-036-72/+99
|\ \ \ \ | | | | | | | | | | Only run one background update at a time
| * | | | Update docstring per review commentsRichard van der Hoff2020-04-031-1/+1
| | | | |
| * | | | review commentRichard van der Hoff2020-04-021-1/+1
| | | | |
| * | | | changelogRichard van der Hoff2020-03-311-0/+1
| | | | |
| * | | | Only run one background update at a timeRichard van der Hoff2020-03-313-27/+68
| | | | |
| * | | | Make do_next_background_update return a boolRichard van der Hoff2020-03-312-10/+8
| | | | | | | | | | | | | | | | | | | | returning a None or an int that we don't use is confusing.
| * | | | Set a logging context while running the bg updatesRichard van der Hoff2020-03-311-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | This mostly just reduces the amount of "running from sentinel context" spam during unittest setup.
| * | | | Make `has_completed_background_updates` asyncRichard van der Hoff2020-03-312-5/+6
| | | | | | | | | | | | | | | | | | | | (Almost) everywhere that uses it is happy with an awaitable.
| * | | | Remove unused `start_background_update`Richard van der Hoff2020-03-312-26/+9
| | | | | | | | | | | | | | | | | | | | This was only used in a unit test, so let's just inline it in the test.
* | | | | Remove some `run_in_background` calls in replication code (#7203)Richard van der Hoff2020-04-032-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By running this stuff with `run_in_background`, it won't be correctly reported against the relevant CPU usage stats. Fixes #7202
* | | | | Merge branch 'master' into developRichard van der Hoff2020-04-034-7/+62
|\ \ \ \ \
| * | | | | Revert "Revert "Merge pull request #7153 from ↵Richard van der Hoff2020-04-034-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/sso_whitelist_login_fallback"" This reverts commit 0122ef1037c8bfe826ea09d9fc7cd63fb9c59fd1.
| * | | | | Revert "Revert "Improve the UX of the login fallback when using SSO (#7152)""Richard van der Hoff2020-04-033-22/+32
| | |_|/ / | |/| | | | | | | | | | | | | This reverts commit 8d4cbdeaa9765ae0d87ec82b053f12ed8162f6f5.
| * | | | Merge tag 'v1.12.3'Richard van der Hoff2020-04-035-10/+46
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.12.3 (2020-04-03) =========================== - Remove the the pin to Pillow 7.0 which was introduced in Synapse 1.12.2, and correctly fix the issue with building the Debian packages. ([\#7212](https://github.com/matrix-org/synapse/issues/7212))
| | * | | tweak changelog v1.12.3 github/release-v1.12.3 release-v1.12.3Richard van der Hoff2020-04-031-5/+2
| | | | |
| | * | | 1.12.3Richard van der Hoff2020-04-034-4/+16
| | | | |
| | * | | Fix the debian build in a better way. (#7212)Richard van der Hoff2020-04-034-9/+36
| | | | |
| * | | | Merge tag 'v1.12.2'Richard van der Hoff2020-04-034-2/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.12.2 (2020-04-02) =========================== This release fixes [an issue](https://github.com/matrix-org/synapse/issues/7208) with building the debian packages. No other significant changes since 1.12.1.
| | * | | Fix changelog wording v1.12.2 github/release-v1.12.2 release-v1.12.2Andrew Morgan2020-04-021-1/+1
| | | | |
| | * | | 1.12.2Andrew Morgan2020-04-023-1/+17
| | | | |
| | * | | Pin Pillow>=4.3.0,<7.1.0 to fix dep issueAndrew Morgan2020-04-021-1/+3
| | | | |
| | * | | 1.12.1Andrew Morgan2020-04-023-1/+13
| | | | |
| * | | | Revert "Merge pull request #7153 from ↵Richard van der Hoff2020-04-034-28/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/sso_whitelist_login_fallback" This was incorrectly merged to master. This reverts commit 319c41f573eb14a966367b60b2e6e93bf6b028d9, reversing changes made to 229eb81498b0fe1da81e9b5b333a0285acde9446.
| * | | | Revert "Improve the UX of the login fallback when using SSO (#7152)"Richard van der Hoff2020-04-033-32/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was incorrectly merged to `master` instead of develop. This reverts commit 90246344e340bce3417fb330da6be9338a701c5c.
* | | | | Fix device list update stream ids going backward (#7158)Richard van der Hoff2020-04-033-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occasionally we could get a federation device list update transaction which looked like: ``` [ {'edu_type': 'm.device_list_update', 'content': {'user_id': '@user:test', 'device_id': 'D2', 'prev_id': [], 'stream_id': 12, 'deleted': True}}, {'edu_type': 'm.device_list_update', 'content': {'user_id': '@user:test', 'device_id': 'D1', 'prev_id': [12], 'stream_id': 11, 'deleted': True}}, {'edu_type': 'm.device_list_update', 'content': {'user_id': '@user:test', 'device_id': 'D3', 'prev_id': [11], 'stream_id': 13, 'deleted': True}} ] ``` Having `stream_ids` which are lower than `prev_ids` looks odd. It might work (I'm not actually sure), but in any case it doesn't seem like a reasonable thing to expect other implementations to support.
* | | | | Merge branch 'master' into developAndrew Morgan2020-04-024-4/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: 1.12.1 Note where bugs were introduced 1.12.1rc1 Newsfile Rewrite changelog Add changelog Only import sqlite3 when type checking Fix another instance Only setdefault for signatures if device has key_json Fix starting workers when federation sending not split out. Attempt to clarify Python version requirements (#7161) Improve the UX of the login fallback when using SSO (#7152) Update the wording of the config comment Lint Changelog Regenerate sample config Whitelist the login fallback by default for SSO