summary refs log tree commit diff
path: root/tests (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6279 from matrix-org/erikj/federation_server_async_awaitAndrew Morgan2020-03-161-0/+3
|\ | | | | | | | | | | | | | | * commit 'b4465564c': Don't return coroutines Make concurrently_execute work with async/await Newsfile Port federation_server to async/await
| * Port federation_server to async/awaitErik Johnston2019-10-291-0/+3
| |
* | Merge pull request #6263 from matrix-org/erikj/caches_return_deferredsAndrew Morgan2020-03-161-2/+2
|\| | | | | | | | | | | | | * commit '561133c3c': Update docstring Newsfile Quick fix to ensure cache descriptors always return deferreds
| * Quick fix to ensure cache descriptors always return deferredsErik Johnston2019-10-281-2/+2
| |
* | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keysAndrew Morgan2020-03-161-0/+75
|\| | | | | | | | | | | | | | | | | * commit 'da78f6177': remove unneeded imports switch to using HomeserverTestCase remove some unnecessary lines add changelog delete keys when deleting backups
| * Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keysHubert Chathi2019-10-251-0/+75
| |\ | | | | | | delete keys when deleting backup versions
| | * remove unneeded importsHubert Chathi2019-10-251-3/+1
| | |
| | * switch to using HomeserverTestCaseHubert Chathi2019-10-251-19/+25
| | |
| | * remove some unnecessary linesHubert Chathi2019-10-241-5/+0
| | |
| | * delete keys when deleting backupsHubert Chathi2019-10-241-0/+76
| | |
* | | Merge pull request #6255 from matrix-org/erikj/stats_configAndrew Morgan2020-03-161-0/+2
|\| | | | | | | | | | | | | | | | | | | | * commit '87259b3a3': Fix tests Newsfile Remove repeated calls to config.stats_enabled.
| * | Fix testsErik Johnston2019-10-251-0/+2
| |/
* | Option to suppress resource exceeded alerting (#6173)Andrew Morgan2020-03-162-3/+57
|\| | | | | | | | | * commit '2794b7905': Option to suppress resource exceeded alerting (#6173)
| * Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-242-3/+57
| | | | | | | | The expected use case is to suppress MAU limiting on small instances
* | Merge pull request #6231 from matrix-org/erikj/refactor_storesAndrew Morgan2020-03-166-17/+11
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-221-1/+294
| |\ | | | | | | | | | erikj/refactor_stores
| * | Fix postgres unit tests to use prepare_databaseErik Johnston2019-10-221-10/+2
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-221-0/+65
| |\ \ | | | | | | | | | | | | erikj/refactor_stores
| * | | Move storage classes into a main "data store".Erik Johnston2019-10-215-7/+9
| | | | | | | | | | | | | | | | | | | | This is in preparation for having multiple data stores that offer different functionality, e.g. splitting out state or event storage.
* | | | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Andrew Morgan2020-03-161-1/+294
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '276173163': Add changelog entry fix doc strings make isort happy add some comments drop some logger lines to debug make changes based on PR feedback add function docs use something that's the right type for user_id run black split out signature processing into separate functions avoid modifying input parameter fix test update with newer coding style add test make isort happy make black happy allow uploading signatures of master key signed by devices implement device signature uploading/fetching
| * | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-1829-249/+1136
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-073-60/+125
| |\ \ \
| * | | | use something that's the right type for user_idHubert Chathi2019-09-061-1/+1
| | | | |
| * | | | fix testHubert Chathi2019-09-051-1/+3
| | | | |
| * | | | add testHubert Chathi2019-09-041-0/+88
| | | | |
| * | | | make isort happyHubert Chathi2019-09-041-0/+1
| | | | |
| * | | | make black happyHubert Chathi2019-09-041-85/+62
| | | | |
| * | | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-041-1/+226
| | | | |
* | | | | Remove Auth.check method (#6217)Andrew Morgan2020-03-161-0/+65
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93eaeec75': Remove Auth.check method (#6217) add note about database upgrade use the right function for when we're already in runInteraction add user signature stream change cache to slaved device store black use stream ID generator instead of timestamp make isort happy apply PR review suggestions fix formatting add changelog make changes from PR review don't need to return the hidden column any more really fix queries to work with Postgres PostgreSQL, Y U no like? remove extra SQL query param add changelog file apply changes from PR review allow uploading keys for cross-signing allow devices to be marked as "hidden"
| * | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-1829-249/+1136
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-073-60/+125
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| * | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-048-119/+544
| |\ \ \
| * \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2817-56/+944
| |\ \ \ \
| * | | | | fix formattingHubert Chathi2019-08-011-1/+3
| | | | | |
| * | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-0116-106/+279
| |\ \ \ \ \
| * | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-251-0/+63
| | | | | | |
* | | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Andrew Morgan2020-02-261-0/+39
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Erik Johnston2019-10-181-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix presence timeouts when synchrotron restarts. Handling timeouts would fail if there was an external process that had timed out, e.g. a synchrotron restarting. This was due to a couple of variable name typoes. Fixes #3715.
* | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageAndrew Morgan2020-02-261-6/+6
|\| | | | | |
| * | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageHubert Chathi2019-10-111-6/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | make storage layer in charge of interpreting the device key data
| | * | | | | | make storage layer in charge of interpreting the device key dataHubert Chathi2019-10-101-6/+6
| | | | | | | |
* | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionAndrew Morgan2020-02-261-16/+31
|\| | | | | | |
| * | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-111-16/+31
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | make version optional in body of e2e backup version update
| | * | | | | | | change test name to be uniqueHubert Chathi2019-10-101-1/+1
| | | | | | | | |
| | * | | | | | | make version optional in body of e2e backup version updateHubert Chathi2019-10-091-16/+31
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | to agree with latest version of the MSC
* | | | | | | | Fix MAU reaping where reserved users are specified. (#6168)Andrew Morgan2020-02-261-9/+49
|\| | | | | | |
| * | | | | | | Fix MAU reaping where reserved users are specified. (#6168)Neil Johnson2019-10-111-9/+49
| | | | | | | |
* | | | | | | | Merge pull request #6186 from matrix-org/erikj/disable_sql_bytesAndrew Morgan2020-02-261-1/+1
|\| | | | | | |
| * | | | | | | Fix postgres unit testsErik Johnston2019-10-101-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_innerAndrew Morgan2020-02-262-96/+2
|\| | | | | | |
| * | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_innerErik Johnston2019-10-102-96/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add more log context checks when patching inlineCallbacks
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-103-11/+18
| | |\ \ \ \ \ \ \
| | * | | | | | | | Move patch_inline_callbacks into synapse/Erik Johnston2019-10-102-181/+2
| | | | | | | | | |
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-095-53/+182
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | UpdateErik Johnston2019-09-271-8/+15
| | | | | | | | | |
| | * | | | | | | | Patch inlinecallbacks for log contextsErik Johnston2019-09-271-4/+82
| | | | | | | | | |
* | | | | | | | | | Add domain validation when creating room with list of invitees (#6121)Andrew Morgan2020-02-261-0/+9
|\| | | | | | | | |
| * | | | | | | | | Add domain validation when creating room with list of invitees (#6121)werner2912019-10-101-0/+9
| | | | | | | | | |
* | | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)Andrew Morgan2020-02-261-1/+1
|\| | | | | | | | |
| * | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-101-1/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixed the weirdness of 400 vs 404 as http status code in the case the filter id is not known by the server. As e.g. matrix-js-sdk expects 404 to catch this situation this leads to unwanted behaviour.
* | | | | | | | | Fix races in room stats (and other) updates. (#6187)Andrew Morgan2020-02-262-2/+2
|\| | | | | | | |
| * | | | | | | | Fix races in room stats (and other) updates. (#6187)Richard van der Hoff2019-10-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully this will fix the occasional failures we were seeing in the room directory. The problem was that events are not necessarily persisted (and `current_state_delta_stream` updated) in the same order as their stream_id. So for instance current_state_delta 9 might be persisted *before* current_state_delta 8. Then, when the room stats saw stream_id 9, it assumed it had done everything up to 9, and never came back to do stream_id 8. We can solve this easily by only processing up to the stream_id where we know all events have been persisted.
* | | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137)Andrew Morgan2020-02-261-9/+16
|\| | | | | | | |
| * | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137)Amber Brown2019-10-101-9/+16
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedAndrew Morgan2020-02-261-4/+1
|\| | | | | | |
| * | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedBrendan Abolivier2019-10-041-0/+81
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't 500 when trying to exchange a revoked 3PID invite
| | * | | | | | | Lint (again)Brendan Abolivier2019-10-031-3/+1
| | | | | | | | |
| | * | | | | | | LintBrendan Abolivier2019-10-031-5/+5
| | | | | | | | |
| | * | | | | | | Add test caseBrendan Abolivier2019-10-031-0/+83
| | | | | | | | |
* | | | | | | | | Land improved room list based on room stats (#6019)Andrew Morgan2020-02-261-39/+0
|\| | | | | | | |
| * | | | | | | | Land improved room list based on room stats (#6019)Erik Johnston2019-10-021-39/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use room_stats and room_state for room directory search
| * | | | | | | | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-022-0/+47
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsAndrew Morgan2020-02-261-0/+11
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsErik Johnston2019-10-021-0/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix errors storing large retry intervals.
| | * | | | | | | | Fix errors storing large retry intervals.Erik Johnston2019-10-021-0/+11
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have set the max retry interval to a value larger than a postgres or sqlite int can hold, which caused exceptions when updating the destinations table. To fix postgres we need to change the column to a bigint, and for sqlite we lower the max interval to 2**62 (which is still incredibly long).
* | | | | | | | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactionsAndrew Morgan2020-02-261-0/+36
|\| | | | | | | |
| * | | | | | | | Fix fetching censored redactions from DBErik Johnston2019-10-021-0/+36
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetching a censored redactions caused an exception due to the code expecting redactions to have a `redact` key, which redacted redactions don't have.
* | | | | | | | Merge pull request #6125 from matrix-org/babolivier/deactivation-inviteAndrew Morgan2020-02-261-17/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | okBrendan Abolivier2019-09-271-1/+3
| | | | | | | |
| * | | | | | | LintBrendan Abolivier2019-09-271-7/+1
| | | | | | | |
| * | | | | | | Add test to validate the changeBrendan Abolivier2019-09-271-13/+57
| |/ / / / / /
* | | | | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2020-02-262-2/+9
|\| | | | | |
* | | | | | | Fix dummy event insertion consent bug (#6053)Andrew Morgan2020-02-252-9/+178
|\| | | | | |
| * | | | | | Fix dummy event insertion consent bug (#6053)Neil Johnson2019-09-262-9/+178
| | | | | | | | | | | | | | | | | | | | | Fixes #5905
* | | | | | | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2Andrew Morgan2020-02-251-0/+71
|\| | | | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-09-253-31/+103
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | erikj/cleanup_user_ips_2
| * | | | | | | Test that pruning of old user IPs worksErik Johnston2019-09-241-0/+71
| | | | | | | |
* | | | | | | | Merge pull request #6089 from matrix-org/erikj/cleanup_user_ipsAndrew Morgan2020-02-251-1/+79
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-09-253-31/+103
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | erikj/cleanup_user_ips
| * | | | | | | Test background updateErik Johnston2019-09-231-0/+79
| | | | | | | |
| * | | | | | | Query devices table for last seen info.Erik Johnston2019-09-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a) simpler than querying user_ips directly and b) means we can purge older entries from user_ips without losing the required info. The storage functions now no longer return the access_token, since it was unused.
* | | | | | | | Stop advertising unsupported flows for registration (#6107)Andrew Morgan2020-02-251-12/+17
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-251-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If email or msisdn verification aren't supported, let's stop advertising them for registration. Fixes #6100.
* | | | | | | | Refactor the user-interactive auth handling (#6105)Andrew Morgan2020-02-251-10/+16
|\| | | | | | |
| * | | | | | | Refactor the user-interactive auth handling (#6105)Richard van der Hoff2019-09-251-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull the checkers out to their own classes, rather than having them lost in a massive 1000-line class which does everything. This is also preparation for some more intelligent advertising of flows, as per #6100
* | | | | | | | Refactor code for calculating registration flows (#6106)Andrew Morgan2020-02-252-21/+82
|\| | | | | | |
| * | | | | | | Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-252-21/+82
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because, frankly, it looked like it was written by an axe-murderer. This should be a non-functional change, except that where `m.login.dummy` was previously advertised *before* `m.login.terms`, it will now be advertised afterwards. AFAICT that should have no effect, and will be more consistent with the flows that involve passing a 3pid.
* | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2020-02-253-3/+30
|\| | | | | |
* | | | | | | Implement MSC2290 (#6043)Andrew Morgan2020-02-251-6/+5
|\| | | | | |
* | | | | | | Add 'failure_ts' column to 'destinations' table (#6016)Andrew Morgan2020-02-253-4/+138
|\| | | | | |
| * | | | | | Add 'failure_ts' column to 'destinations' table (#6016)Richard van der Hoff2019-09-173-4/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Track the time that a server started failing at, for general analysis purposes.
* | | | | | | Fix well-known lookups with the federation certificate whitelist (#5997)Andrew Morgan2020-02-251-0/+40
|\| | | | | |
| * | | | | | Fix well-known lookups with the federation certificate whitelist (#5997)Amber Brown2019-09-141-0/+40
| | | | | | |
* | | | | | | Fix for structured logging tests stomping on logs (#6023)Andrew Morgan2020-02-252-6/+23
|\| | | | | |
| * | | | | | Fix for structured logging tests stomping on logs (#6023)Amber Brown2019-09-132-6/+23
| | | | | | |
* | | | | | | Merge pull request #6020 from matrix-org/jaywink/allow-support-users-to-registerAndrew Morgan2020-02-251-0/+18
|\| | | | | |
| * | | | | | Ensure support users can be registered even if MAU limit is reachedJason Robinson2019-09-111-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows support users to be created even on MAU limits via the admin API. Support users are excluded from MAU after creation, so it makes sense to exclude them in creation - except if the whole host is in disabled state. Signed-off-by: Jason Robinson <jasonr@matrix.org>
* | | | | | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionAndrew Morgan2020-02-251-0/+25
|\| | | | | |
| * | | | | | Fix commentsErik Johnston2019-09-111-2/+2
| | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * | | | | | Add test for admin redaction ratelimiting.Erik Johnston2019-09-111-0/+25
| | | | | | |
* | | | | | | Fix existing v2 identity server calls (MSC2140) (#6013)Andrew Morgan2020-02-252-1/+1
|\| | | | | |
* | | | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-usersAndrew Morgan2020-02-251-2/+27
|\| | | | | |
| * | | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-usersJason Robinson2019-09-091-2/+27
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Only count real users when checking for auto-creation of auto-join room
| | * | | | | | Only count real users when checking for auto-creation of auto-join roomJason Robinson2019-09-091-2/+27
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if the first registered user was a "support" or "bot" user, when the first real user registers, the auto-join rooms were not created. Fix to exclude non-real (ie users with a special user type) users when counting how many users there are to determine whether we should auto-create a room. Signed-off-by: Jason Robinson <jasonr@matrix.org>
* | | | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactionsAndrew Morgan2020-02-251-1/+76
|\| | | | | |
| * | | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-091-1/+76
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Censor redactions in DB after a month
| | * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-09-058-119/+544
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | erikj/censor_redactions
| | * | | | | | Fix testErik Johnston2019-09-051-1/+3
| | | | | | | |
| | * | | | | | Make redaction retention period configurableErik Johnston2019-09-051-1/+3
| | | | | | | |
| | * | | | | | Censor redactions in DB after a monthErik Johnston2019-08-301-0/+71
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Add a build info metric to Prometheus (#6005)Andrew Morgan2020-02-251-2/+20
|\| | | | | |
| * | | | | | Add a build info metric to Prometheus (#6005)Amber Brown2019-09-101-2/+20
| | |_|/ / / | |/| | | |
* | | | | | Servers-known-about statistic (#5981)Andrew Morgan2020-02-253-60/+125
|\| | | | |
| * | | | | Servers-known-about statistic (#5981)Amber Brown2019-09-073-60/+125
| | |/ / / | |/| | |
* | | | | Remove extraneous unittest.DEBUG'sAndrew Morgan2020-02-252-2/+0
| | | | |
* | | | | Increase expected state events in tests for new room by oneAndrew Morgan2020-02-251-1/+6
| | | | |
* | | | | Fix and refactor room and user stats (#5971)Andrew Morgan2020-02-251-111/+532
|\| | | |
| * | | | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-042-113/+538
| | | | | | | | | | | | | | | Previously the stats were not being correctly populated.
* | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2020-02-246-6/+6
|\| | | |
| * | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-306-6/+6
| |/ / / | | | | | | | | | | | | | | | | Python will return a tuple whether there are parentheses around the returned values or not. I'm just sick of my editor complaining about this all over the place :)
* | | | Revert "Use the v2 lookup API for 3PID invites (#5897)"Andrew Morgan2020-02-244-26/+4
| | | | | | | | | | | | | | | | | | | | This reverts commit 978f263e7c5d1eb440efaf07abc5009408ade25d, reversing changes made to 4f6ee99818d9c338944a10585d0aea4c7349d456.
* | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentAndrew Morgan2020-02-241-0/+1
|\| | |
| * | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-281-0/+1
| |\ \ \ | | | | | | | | | | Exempt support users from consent
| | * | | Fix registration testHalf-Shot2019-08-231-0/+1
| | | | |
* | | | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2020-02-244-4/+26
|\| | | |
* | | | | Config templating (#5900)Andrew Morgan2020-02-213-1/+196
|\| | | |
| * | | | Config templating (#5900)Jorik Schellekens2019-08-283-1/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template config files * Imagine a system composed entirely of x, y, z etc and the basic operations.. Wait George, why XOR? Why not just neq? George: Eh, I didn't think of that.. Co-Authored-By: Erik Johnston <erik@matrix.org>
* | | | | Implement a structured logging output system. (#5680)Andrew Morgan2020-02-214-2/+456
|\| | | |
| * | | | Implement a structured logging output system. (#5680)Amber Brown2019-08-284-2/+456
| | | | |
* | | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookupsAndrew Morgan2020-02-214-7/+65
|\| | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-08-222-39/+50
| |\| | | | | | | | | | | | | | | | | | erikj/reliable_lookups
| * | | | Remove test debugsErik Johnston2019-08-203-3/+0
| | | | |
| * | | | Refactor MatrixFederationAgent to retry SRV.Erik Johnston2019-08-152-5/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors MatrixFederationAgent to move the SRV lookup into the endpoint code, this has two benefits: 1. Its easier to retry different host/ports in the same way as HostnameEndpoint. 2. We avoid SRV lookups if we have a free connection in the pool
* | | | | Merge pull request #5877 from ↵Andrew Morgan2020-02-211-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Awesome-Technologies/remove_shared_secret_registration
* | | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_failAndrew Morgan2020-02-211-35/+48
|\| | | |
| * | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_failErik Johnston2019-08-221-35/+48
| |\ \ \ \ | | | | | | | | | | | | Retry well known on fail
| | * | | | Change jitter to be a factor rather than absolute valueErik Johnston2019-08-201-2/+2
| | | | | |
| | * | | | Retry well known on fail.Erik Johnston2019-08-151-33/+46
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | If we have recently seen a valid well-known for a domain we want to retry on (non-final) errors a few times, to handle temporary blips in networking/etc.
* | | | | Refactor the Appservice scheduler code (#5886)Andrew Morgan2020-02-211-4/+2
|\| | | |
| * | | | Refactor the Appservice scheduler codeRichard van der Hoff2019-08-201-4/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the labyrinthine `recoverer_fn` code, and clean up the startup code (it seemed to be previously inexplicably split between `ApplicationServiceScheduler.start` and `_Recoverer.start`). Add some docstrings too.
* | | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupAndrew Morgan2020-02-202-2/+71
|\| | |
| * | | Retry well-known lookup before expiry.Erik Johnston2019-08-132-2/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives a bit of a grace period where we can attempt to refetch a remote `well-known`, while still using the cached result if that fails. Hopefully this will make the well-known resolution a bit more torelant of failures, rather than it immediately treating failures as "no result" and caching that for an hour.
* | | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownAndrew Morgan2020-02-201-22/+21
|\| | |
| * | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-131-22/+21
| |\ \ \ | | | | | | | | | | Add a lower bound to well-known TTL.
| | * | | Move well known lookup into a separate clasErik Johnston2019-08-071-20/+19
| | | | |
| | * | | Add a lower bound for TTL on well known results.Erik Johnston2019-08-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It costs both us and the remote server for us to fetch the well known for every single request we send, so we add a minimum cache period. This is set to 5m so that we still honour the basic premise of "refetch frequently".
* | | | | Merge pull request #5788 from matrix-org/rav/metaredactionsAndrew Morgan2020-02-201-0/+70
|\| | | |
| * | | | Merge pull request #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-121-0/+70
| |\ \ \ \ | | |/ / / | |/| | | Fix handling of redactions of redactions
| | * | | Handle loops in redaction eventsRichard van der Hoff2019-07-301-0/+70
| | | | |
| * | | | Account validity: allow defining HTML templates to serve the us… (#5807)Brendan Abolivier2019-08-011-0/+37
| |\ \ \ \ | | | | | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt
| | * | | | Add testsBrendan Abolivier2019-08-011-0/+37
| | | |_|/ | | |/| |
* | | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_knownAndrew Morgan2020-02-201-6/+6
|\| | | |
| * | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_knownErik Johnston2019-07-311-6/+6
| |\ \ \ \ | | | | | | | | | | | | Share SSL options for well-known requests
| | * | | | Share SSL options for well-known requestsErik Johnston2019-07-311-6/+6
| | |/ / /
* | | | | Remove DelayedCall debugging from test runs (#5787)Andrew Morgan2020-02-201-6/+0
|\| | | |
| * | | | Remove DelayedCall debugging from test runs (#5787)Amber Brown2019-07-311-6/+0
| |/ / /
* | | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_stateAndrew Morgan2020-02-201-1/+36
|\| | |
| * | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_stateErik Johnston2019-07-301-1/+36
| |\ \ \ | | | | | | | | | | Add unit test for current state membership bg update
| | * | | Add unit test for current state membership bg updateErik Johnston2019-07-231-1/+36
| | | | |
* | | | | Remove non-functional 'expire_access_token' setting (#5782)Andrew Morgan2020-02-203-3/+2
|\| | | |
| * | | | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-303-3/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The `expire_access_token` didn't do what it sounded like it should do. What it actually did was make Synapse enforce the 'time' caveat on macaroons used as access tokens, but since our access token macaroons never contained such a caveat, it was always a no-op. (The code to add 'time' caveats was removed back in v0.18.5, in #1656)
* | | | Room Complexity Client Implementation (#5783)Andrew Morgan2020-02-201-3/+74
|\| | |
| * | | Room Complexity Client Implementation (#5783)Amber Brown2019-07-301-3/+74
| | | |
* | | | Convert RedactionTestCase to modern test style (#5768)Andrew Morgan2020-02-191-36/+38
|\| | |
| * | | Convert RedactionTestCase to modern test style (#5768)Richard van der Hoff2019-07-261-36/+38
| | | |
* | | | Fix some error cases in the caching layer. (#5749)Andrew Morgan2020-02-191-3/+87
|\| | |
| * | | Fix some error cases in the caching layer. (#5749)Richard van der Hoff2019-07-251-3/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There was some inconsistent behaviour in the caching layer around how exceptions were handled - particularly synchronously-thrown ones. This seems to be most easily handled by pushing the creation of ObservableDeferreds down from CacheDescriptor to the Cache.
| * | | Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-242-6/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfixes -------- - Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734))
* | \ \ \ Fix servlet metric names (#5734)Andrew Morgan2020-02-192-6/+17
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix servlet metric names (#5734)Jorik Schellekens2019-07-242-6/+17
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix servlet metric names Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Remove redundant check * Cover all return paths
* | | | Replace returnValue with return (#5736)Andrew Morgan2020-02-1913-25/+25
|\ \ \ \ | | |/ / | |/| |
| * | | Replace returnValue with return (#5736)Amber Brown2019-07-2313-25/+25
| | |/ | |/|
* | | Fix stack overflow in Keyring (#5724)Andrew Morgan2020-02-191-29/+0
|\| |
| * | Refactor Keyring._start_key_lookupsRichard van der Hoff2019-07-191-29/+0
| |/ | | | | | | | | There's an awful lot of deferreds and dictionaries flying around here. The whole thing can be made much simpler and achieve the same effect.
* | Support Prometheus_client 0.4.0+ (#5636)Andrew Morgan2020-02-191-3/+1
|\|
| * Support Prometheus_client 0.4.0+ (#5636)Amber Brown2019-07-181-3/+1
| |
* | Remove the ability to query relations when the original event was redacted. ↵Andrew Morgan2020-02-191-3/+113
|\| | | | | | | (#5629)
| * Remove the ability to query relations when the original event was redacted. ↵Andrew Morgan2019-07-181-3/+113
| | | | | | | | | | | | | | (#5629) Fixes #5594 Forbid viewing relations on an event once it has been redacted.
* | Ignore redactions of m.room.create events (#5701)Andrew Morgan2020-02-191-0/+20
|\|
| * Ignore redactions of m.room.create events (#5701)Richard van der Hoff2019-07-171-0/+20
| |
* | More refactoring in `get_events_as_list` (#5707)Andrew Morgan2020-02-192-0/+160
|\|
| * More refactoring in `get_events_as_list` (#5707)Richard van der Hoff2019-07-172-0/+160
| | | | | | | | | | | | | | | | We can now use `_get_events_from_cache_or_db` rather than going right back to the database, which means that (a) we can benefit from caching, and (b) it opens the way forward to more extensive checks on the original event. We now always require the original event to exist before we will serve up a redaction.
* | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataAndrew Morgan2020-02-172-1/+211
|\|
| * Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataErik Johnston2019-07-152-1/+211
| |\ | | | | | | Add basic function to get all data for a user out of synapse
| | * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-07-0522-82/+234
| | |\ | | | | | | | | | | | | erikj/admin_exfiltrate_data
| | * | Fixup from review comments.Erik Johnston2019-07-041-5/+5
| | | |
| | * | Add basic function to get all data for a user out of synapseErik Johnston2019-07-022-1/+211
| | | |
* | | | Implement access token expiry (#5660)Andrew Morgan2020-02-175-11/+136
|\| | |
| * | | Implement access token expiry (#5660)Richard van der Hoff2019-07-125-11/+136
| | | | | | | | | | | | | | | | Record how long an access token is valid for, and raise a soft-logout once it expires.
* | | | Add a mechanism for per-test configs (#5657)Andrew Morgan2020-02-171-1/+54
|\| | |
| * | | Add a mechanism for per-test configs (#5657)Richard van der Hoff2019-07-121-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | It's useful to be able to tweak the homeserver config to be used for each test. This PR adds a mechanism to do so.
* | | | Clean up exception handling for access_tokens (#5656)Andrew Morgan2020-02-171-7/+24
|\| | |
| * | | Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-111-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, let's get rid of `TOKEN_NOT_FOUND_HTTP_STATUS`. It was a hack we did at one point when it was possible to return either a 403 or a 401 if the creds were missing. We always return a 401 in these cases now (thankfully), so it's not needed. Let's also stop abusing `AuthError` for these cases. Honestly they have nothing that relates them to the other places that `AuthError` is used, other than the fact that they are loosely under the 'Auth' banner. It makes no sense for them to share exception classes. Instead, let's add a couple of new exception classes: `InvalidClientTokenError` and `MissingClientTokenError`, for the `M_UNKNOWN_TOKEN` and `M_MISSING_TOKEN` cases respectively - and an `InvalidClientCredentialsError` base class for the two of them.
* | | | Inline issue_access_token (#5659)Andrew Morgan2020-02-171-1/+1
|\| | |
| * | | Inline issue_access_token (#5659)Richard van der Hoff2019-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is only used in one place, so it's clearer if we inline it and reduce the API surface. Also, fixes a buglet where we would create an access token even if we were about to block the user (we would never return the AT, so the user could never use it, but it was still created and added to the db.)
* | | | Merge pull request #5658 from matrix-org/babolivier/is-jsonAndrew Morgan2020-02-171-4/+4
|\| | |
* | | | Remove access-token support from RegistrationStore.register (#5642)Andrew Morgan2020-02-176-58/+24
|\| | |
| * | | Remove access-token support from RegistrationStore.register (#5642)Richard van der Hoff2019-07-106-58/+24
| | | | | | | | | | | | | | | | | | | | The 'token' param is no longer used anywhere except the tests, so let's kill that off too.
* | | | Merge pull request #5638 from matrix-org/babolivier/invite-jsonAndrew Morgan2020-02-171-4/+5
|\| | |
* | | | Include the original event in /relations (#5626)Andrew Morgan2020-02-171-0/+5
|\| | |
| * | | Include the original event in /relations (#5626)Andrew Morgan2019-07-091-0/+5
| | | | | | | | | | | | When asking for the relations of an event, include the original event in the response. This will mostly be used for efficiently showing edit history, but could be useful in other circumstances.
| * | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfBrendan Abolivier2019-07-091-0/+47
| |\ \ \ | | | | | | | | | | Allow newly-registered users to lookup their own profiles
| | * | | LintBrendan Abolivier2019-07-081-2/+2
| | | | |
| | * | | Add test caseBrendan Abolivier2019-07-081-0/+47
| | | | |
* | | | | Remove access-token support from RegistrationHandler.register (#5641)Andrew Morgan2020-02-171-25/+28
|\| | | |
| * | | | Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-081-25/+28
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nothing uses this now, so we can remove the dead code, and clean up the API. Since we're changing the shape of the return value anyway, we take the opportunity to give the method a better name.
* | | | Move get_or_create_user to test code (#5628)Andrew Morgan2020-02-171-9/+59
|\| | |
| * | | Move get_or_create_user to test code (#5628)Richard van der Hoff2019-07-081-9/+59
| | | | | | | | | | | | This is only used in tests, so...
* | | | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2020-02-171-6/+18
|\| | |
| * | | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2019-07-051-6/+18
| | |/ | |/| | | | | | | | | | Riot team would like some extra fields as part of m.replace, so here you go. Fixes: #5598
* | | Fixes to the federation rate limiter (#5621)Andrew Morgan2020-02-173-6/+137
|\| |
| * | Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-053-6/+137
| | | | | | | | | | | | | | | | | | | | | - Put the default window_size back to 1000ms (broken by #5181) - Make the `rc_federation` config actually do something - fix an off-by-one error in the 'concurrent' limit - Avoid creating an unused `_PerHostRatelimiter` object for every single incoming request
* | | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-143-4/+3
| | |
* | | Fix signedjson deleted methodAndrew Morgan2020-02-141-4/+12
| | |
* | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-1419-65/+65
|\| |
| * | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-0419-65/+65
| | |
* | | Fix media repo breaking (#5593)Andrew Morgan2020-02-142-12/+33
|\| |
| * | Fix media repo breaking (#5593)Amber Brown2019-07-022-12/+33
| |/
* | Make the http server handle coroutine-making REST servlets (#5475)Andrew Morgan2020-02-142-18/+47
|\|
| * Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-292-18/+47
| |
* | Update the TLS cipher string and provide configurability for TLS on outgoing ↵Andrew Morgan2020-02-141-1/+114
|\| | | | | | | federation (#5550)
| * Update the TLS cipher string and provide configurability for TLS on outgoing ↵Amber Brown2019-06-281-1/+114
| | | | | | | | federation (#5550)
| * Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
| |
* | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Andrew Morgan2020-02-134-4/+4
|\|
| * Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Richard van der Hoff2019-06-244-4/+4
| | | | | | | | | | | | * Pull config_dir_path and data_dir_path calculation out of read_config_files * Pass config_dir_path and data_dir_path into read_config
* | Run Black. (#5482)Andrew Morgan2020-02-1313-99/+97
|\|
| * Run Black. (#5482)Amber Brown2019-06-2056-710/+684
| |
* | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-1158-979/+803
| |
* | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsAndrew Morgan2020-02-101-1/+1
|\|
| * Run as background process and fix commentsErik Johnston2019-06-191-1/+1
| |
* | Add experimental option to reduce extremities.Andrew Morgan2020-02-101-0/+41
|\|
| * Add experimental option to reduce extremities.Erik Johnston2019-06-181-0/+41
| | | | | | | | | | | | | | Adds new config option `cleanup_extremities_with_dummy_events` which periodically sends dummy events to rooms with more than 10 extremities. THIS IS REALLY EXPERIMENTAL.
* | Merge commit 'dd927b29e' into dinsic-release-v1.1.0Andrew Morgan2020-02-101-23/+70
|\|
| * Merge pull request #5388 from matrix-org/erikj/fix_email_pushErik Johnston2019-06-171-23/+70
| |\ | | | | | | Fix email notifications for unnamed rooms with multiple people
| | * Add testErik Johnston2019-06-071-1/+28
| | |
| | * Refactor email testsErik Johnston2019-06-071-22/+42
| | |
| * | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-141-0/+79
| |\ \ | | | | | | | | Allow server admins to define implementations of extra rules for allowing or denying incoming events
* | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveAndrew Morgan2020-02-101-10/+10
|\| | |
| * | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveErik Johnston2019-06-141-10/+10
| |\ \ \ | | | | | | | | | | Prometheus histograms are cumalative
| | * | | Prometheus histograms are cumalativeErik Johnston2019-06-141-10/+10
| | | | |