summary refs log tree commit diff
path: root/synapse/storage (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge commit 'cca03dbec' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-202-30/+28
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * commit 'cca03dbec': fix typo s/fixes/fix/ Directly import json from the standard library. (#8259) Allow for make_awaitable's return value to be re-used. (#8261) Rename 'populate_stats_process_rooms_2' background job back to 'populate_stats_process_rooms' again (#8243)
| * | Rename 'populate_stats_process_rooms_2' background job back to ↵Andrew Morgan2020-09-082-30/+28
| | | | | | | | | | | | | | | | | | | | | 'populate_stats_process_rooms' again (#8243) Fixes https://github.com/matrix-org/synapse/issues/8238 Alongside the delta file, some changes were also necessary to the codebase to remove references to the now defunct `populate_stats_process_rooms_2` background job. Thankfully the latter doesn't seem to have made it into any documentation yet :)
| * | Merge remote-tracking branch 'origin/release-v1.20.0' into developRichard van der Hoff2020-09-085-35/+111
| |\|
* | | Merge commit '525efab61' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-205-35/+111
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '525efab61': 1.20.0rc1 Systemd docs: configure workers to start after main process. (#8276) Only add rows to the push actions table if the event notifies or should be marked unread (#8274) Avoid table-scanning users at startup (#8271) Fix unread count failing on NULL values (#8270) Add more logging to debug slow startup (#8264) Refuse to upgrade database on worker processes (#8266)
| * | Avoid table-scanning users at startup (#8271)Richard van der Hoff2020-09-071-11/+14
| | | | | | | | | This takes about 10 seconds in the best case; often more.
| * | Fix unread count failing on NULL values (#8270)Brendan Abolivier2020-09-071-1/+6
| | | | | | | | | | | | Fix unread counts making sync fail if the value of the `unread_count` column in `event_push_summary` is `None`.
| * | Add more logging to debug slow startup (#8264)Richard van der Hoff2020-09-074-7/+32
| | | | | | | | | | | | I'm hoping this will provide some pointers for debugging https://github.com/matrix-org/synapse/issues/7968.
| * | Refuse to upgrade database on worker processes (#8266)Richard van der Hoff2020-09-071-17/+61
| | |
* | | Merge commit '7586fdf1e' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-5/+22
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * commit '7586fdf1e': Bump canonicaljson to version 1.4.0 (#8262) Run database updates in a transaction (#8265) Add tests for `last_successful_stream_ordering` (#8258)
| * | Run database updates in a transaction (#8265)Richard van der Hoff2020-09-071-5/+22
| | | | | | | | | Fixes: #6467
* | | Merge commit '77b4711bc' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-203-37/+20
|\| | | | | | | | | | | | | | | | | | | | * commit '77b4711bc': Add cross-signing sigs to the `keys` object (#8234) Unread counts fixes (#8254) Fix a regression from calling read_templates. (#8252)
| * | Merge branch 'release-v1.20.0' into developRichard van der Hoff2020-09-063-37/+20
| |\|
| | * Add cross-signing sigs to the `keys` object (#8234)Richard van der Hoff2020-09-042-34/+17
| | | | | | | | | | | | | | | All the callers want this info in the same place, so let's reduce the duplication by doing it here.
| | * Unread counts fixes (#8254)Brendan Abolivier2020-09-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixup `ALTER TABLE` database queries Make the new columns nullable, because doing otherwise can wedge a server with a big database, as setting a default value rewrites the table. * Switch back to using the notifications count in the push badge Clients are likely to be confused if we send a push but the badge count is the unread messages one, and not the notifications one. * Changelog
* | | Merge commit '7513006b0' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-1/+1
|\| | | | | | | | | | | | | | * commit '7513006b0': In light of #8255, use BIGINTs for destination_rooms (#8256)
| * | In light of #8255, use BIGINTs for destination_rooms (#8256)reivilibre2020-09-041-1/+1
| | |
* | | Merge commit '17fa4c7ca' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-2016-34/+194
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '17fa4c7ca': Catch up after Federation Outage (split, 2): Track last successful stream ordering after transmission (#8247) Catch-up after Federation Outage (split, 1) (#8230) Fix type signature in simple_select_one_onecol and friends (#8241) Stop sub-classing object (#8249)
| * | Catch up after Federation Outage (split, 2): Track last successful stream ↵reivilibre2020-09-042-0/+59
| | | | | | | | | | | | | | | ordering after transmission (#8247) Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| * | Catch-up after Federation Outage (split, 1) (#8230)reivilibre2020-09-044-5/+109
| |/ | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| * Fix type signature in simple_select_one_onecol and friends (#8241)reivilibre2020-09-041-10/+7
| | | | | | Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
| * Stop sub-classing object (#8249)Patrick Cloke2020-09-0412-19/+19
| |
* | Merge commit '9f8abdcc3' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-207-100/+26
|\| | | | | | | | | * commit '9f8abdcc3': Revert "Add experimental support for sharding event persister. (#8170)" (#8242)
| * Revert "Add experimental support for sharding event persister. (#8170)" (#8242)Brendan Abolivier2020-09-047-100/+26
| | | | | | | | | | | | | | * Revert "Add experimental support for sharding event persister. (#8170)" This reverts commit 82c1ee1c22a87b9e6e3179947014b0f11c0a1ac3. * Changelog
* | Merge commit 'be16ee59a' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-44/+65
|\| | | | | | | | | | | | | * commit 'be16ee59a': Add type hints to more handlers (#8244) Remove obsolete order field in `send_new_transaction` (#8245) Split fetching device keys and signatures into two transactions (#8233)
| * Split fetching device keys and signatures into two transactions (#8233)Richard van der Hoff2020-09-031-44/+65
| | | | | | I think this is simpler (and moves stuff out of the db threads)
* | Merge commit '208e1d3eb' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-205-22/+68
|\| | | | | | | | | | | | | | | | | | | * commit '208e1d3eb': Fix typing for `@cached` wrapped functions (#8240) Remove useless changelog about reverting a #8239. Revert pinning of setuptools (#8239) Fix typing for SyncHandler (#8237) wrap `_get_e2e_device_keys_and_signatures_txn` in a non-txn method (#8231) Add an overload for simple_select_one_onecol_txn. (#8235)
| * Fix typing for SyncHandler (#8237)Erik Johnston2020-09-032-5/+5
| |
| * wrap `_get_e2e_device_keys_and_signatures_txn` in a non-txn method (#8231)Richard van der Hoff2020-09-032-17/+39
| | | | | | | | | | We have three things which all call `_get_e2e_device_keys_and_signatures_txn` with their own `runInteraction`. Factor out the common code.
| * Add an overload for simple_select_one_onecol_txn. (#8235)Patrick Cloke2020-09-021-0/+24
| |
* | Merge commit '912e02491' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-15/+14
|\| | | | | | | | | * commit '912e02491': Convert runInteraction to async/await (#8156)
| * Convert runInteraction to async/await (#8156)Patrick Cloke2020-09-021-15/+14
| |
* | Merge commit '112266eaf' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-205-88/+267
|\| | | | | | | | | | | * commit '112266eaf': Add StreamStore to mypy (#8232) Re-implement unread counts (again) (#8059)
| * Add StreamStore to mypy (#8232)Erik Johnston2020-09-022-18/+62
| |
| * Re-implement unread counts (again) (#8059)Brendan Abolivier2020-09-024-70/+205
| |
* | Merge commit '0d4f614fd' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-2010-46/+175
|\| | | | | | | | | | | | | | | | | * commit '0d4f614fd': Refactor `_get_e2e_device_keys_for_federation_query_txn` (#8225) Add experimental support for sharding event persister. (#8170) Add /user/{user_id}/shared_rooms/ api (#7785) Do not try to store invalid data in the stats table (#8226) Convert the main methods run by the reactor to async. (#8213)
| * Refactor `_get_e2e_device_keys_for_federation_query_txn` (#8225)Richard van der Hoff2020-09-021-11/+6
| | | | | | | | | | We can use the existing `_get_e2e_device_keys_and_signatures_txn` instead of creating our own txn function
| * Add experimental support for sharding event persister. (#8170)Erik Johnston2020-09-027-26/+100
| | | | | | | | | | | | This is *not* ready for production yet. Caveats: 1. We should write some tests... 2. The stream token that we use for events can get stalled at the minimum position of all writers. This means that new events may not be processed and e.g. sent down sync streams if a writer isn't writing or is slow.
| * Add /user/{user_id}/shared_rooms/ api (#7785)Will Hunt2020-09-021-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add shared_rooms api * Add changelog * Add . * Wrap response in {"rooms": } * linting * Add unstable_features key * Remove options from isort that aren't part of 5.x `-y` and `-rc` are now default behaviour and no longer exist. `dont-skip` is no longer required https://timothycrosley.github.io/isort/CHANGELOG/#500-penny-july-4-2020 * Update imports to make isort happy * Add changelog * Update tox.ini file with correct invocation * fix linting again for isort * Vendor prefix unstable API * Fix to match spec * import Codes * import Codes * Use FORBIDDEN * Update changelog.d/7785.feature Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Implement get_shared_rooms_for_users * a comma * trailing whitespace * Handle the easy feedback * Switch to using runInteraction * Add tests * Feedback * Seperate unstable endpoint from v2 * Add upgrade node * a line * Fix style by adding a blank line at EOF. * Update synapse/storage/databases/main/user_directory.py Co-authored-by: Tulir Asokan <tulir@maunium.net> * Update synapse/storage/databases/main/user_directory.py Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Update UPGRADE.rst Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Fix UPGRADE/CHANGELOG unstable paths unstable unstable unstable Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-authored-by: Tulir Asokan <tulir@maunium.net> Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> Co-authored-by: Tulir Asokan <tulir@maunium.net>
| * Do not try to store invalid data in the stats table (#8226)Patrick Cloke2020-09-021-8/+26
| |
* | Merge commit 'abeab964d' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-207-112/+172
|\| | | | | | | | | | | | | | | | | | | * commit 'abeab964d': Make _get_e2e_device_keys_and_signatures_txn return an attrs (#8224) Fix errors when updating the user directory with invalid data (#8223) Explain better what GDPR-erased means (#8189) Convert additional databases to async/await part 3 (#8201) Convert appservice code to async/await. (#8207) Rename `_get_e2e_device_keys_txn` (#8222)
| * Make _get_e2e_device_keys_and_signatures_txn return an attrs (#8224)Richard van der Hoff2020-09-022-20/+40
| | | | | | | | this makes it a bit clearer what's going on.
| * Fix errors when updating the user directory with invalid data (#8223)Patrick Cloke2020-09-011-0/+5
| |
| * Convert additional databases to async/await part 3 (#8201)Patrick Cloke2020-09-016-87/+120
| |
| * Rename `_get_e2e_device_keys_txn` (#8222)Richard van der Hoff2020-09-012-6/+8
| | | | | | | | | | ... to `_get_e2e_device_keys_and_signatures_txn`, to better reflect what it does.
* | Merge commit '54f8d73c0' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-206-137/+146
|\| | | | | | | | | * commit '54f8d73c0': Convert additional databases to async/await (#8199)
| * Convert additional databases to async/await (#8199)Patrick Cloke2020-09-016-137/+146
| |
* | Merge commit '5bf8e5f55' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-2014-123/+184
|\| | | | | | | | | | | | | | | | | | | | | * commit '5bf8e5f55': Convert the well known resolver to async (#8214) Convert additional databases to async/await part 2 (#8200) Make MultiWriterIDGenerator work for streams that use negative stream IDs (#8203) Do not install setuptools 50.0. (#8212) Move and rename `get_devices_with_keys_by_user` (#8204) Rename `get_e2e_device_keys` to better reflect its purpose (#8205) Add a comment about _LimitedHostnameResolver
| * Convert additional databases to async/await part 2 (#8200)Patrick Cloke2020-09-0110-50/+90
| |
| * Make MultiWriterIDGenerator work for streams that use negative stream IDs ↵Erik Johnston2020-09-011-11/+28
| | | | | | | | | | (#8203) This is so that we can use it for the backfill events stream.
| * Move and rename `get_devices_with_keys_by_user` (#8204)Richard van der Hoff2020-09-013-48/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move `get_devices_with_keys_by_user` to `EndToEndKeyWorkerStore` this seems a better fit for it. This commit simply moves the existing code: no other changes at all. * Rename `get_devices_with_keys_by_user` to better reflect what it does. * get_device_stream_token abstract method To avoid referencing fields which are declared in the derived classes, make `get_device_stream_token` abstract, and define that in the classes which define `_device_list_id_gen`.
| * Rename `get_e2e_device_keys` to better reflect its purpose (#8205)Richard van der Hoff2020-08-291-14/+6
| | | | | | | | | | | | | | | | | | | | | | ... and to show that it does something slightly different to `_get_e2e_device_keys_txn`. `include_all_devices` and `include_deleted_devices` were never used (and `include_deleted_devices` was broken, since that would cause `None`s in the result which were not handled in the loop below. Add some typing too.
* | Merge commit 'd2ac767de' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-1/+1
|\| | | | | | | | | | | | | * commit 'd2ac767de': Convert ReadWriteLock to async/await. (#8202) Fix incorrect return signature Fix `wait_for_stream_position` for multiple waiters. (#8196)
| * Fix incorrect return signatureAndrew Morgan2020-08-281-1/+1
| |
* | Merge commit 'd58fda99f' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-204-163/+169
|\| | | | | | | | | | | * commit 'd58fda99f': Convert `event_push_actions`, `registration`, and `roommember` datastores to async (#8197) Only return devices with keys from `/federation/v1/user/devices/` (#8198)
| * Convert `event_push_actions`, `registration`, and `roommember` datastores to ↵Patrick Cloke2020-08-283-160/+168
| | | | | | | | async (#8197)
| * Only return devices with keys from `/federation/v1/user/devices/` (#8198)Richard van der Hoff2020-08-281-3/+1
| | | | | | | | | | There's not much point in returning all the others, and some people have a silly number of devices.
* | Merge commit 'aec708517' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-205-44/+49
|\| | | | | | | | | | | * commit 'aec708517': Convert state and stream stores and related code to async (#8194) Ensure that the OpenID Connect remote ID is a string. (#8190)
| * Convert state and stream stores and related code to async (#8194)Patrick Cloke2020-08-285-44/+49
| |
* | Merge commit '5c03134d0' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-207-157/+221
|\| | | | | | | | | | | | | * commit '5c03134d0': Convert additional database code to async/await. (#8195) Define StateMap as immutable and add a MutableStateMap type. (#8183) Move and refactor LoginRestServlet helper methods (#8182)
| * Convert additional database code to async/await. (#8195)Patrick Cloke2020-08-287-157/+221
| |
* | Merge commit 'b49a5b930' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-202-48/+49
|\| | | | | | | | | * commit 'b49a5b930': Convert stats and related calls to async/await (#8192)
| * Convert stats and related calls to async/await (#8192)Patrick Cloke2020-08-272-48/+49
| |
* | Merge commit 'b71d4a094' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-203-35/+85
|\| | | | | | | | | * commit 'b71d4a094': Convert simple_delete to async/await. (#8191)
| * Convert simple_delete to async/await. (#8191)Patrick Cloke2020-08-273-35/+85
| |
* | Merge commit '9b7ac03af' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-2013-80/+109
|\| | | | | | | | | | | | | * commit '9b7ac03af': Convert calls of async database methods to async (#8166) simple_search_list_txn should return None, not 0. (#8187) Fix missing _add_persisted_position (#8179)
| * Convert calls of async database methods to async (#8166)Patrick Cloke2020-08-2711-74/+103
| |
| * simple_search_list_txn should return None, not 0. (#8187)Patrick Cloke2020-08-271-4/+3
| |
| * Fix missing _add_persisted_position (#8179)Erik Johnston2020-08-271-0/+2
| | | | | | This was forgotten in #8164.
* | Merge commit '30426c706' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-205-79/+60
|\| | | | | | | | | * commit '30426c706': Convert additional database methods to async (select list, search, insert_many, delete_*) (#8168)
| * Convert additional database methods to async (select list, search, ↵Patrick Cloke2020-08-275-79/+60
| | | | | | | | insert_many, delete_*) (#8168)
* | Merge commit '4a739c73b' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-2012-86/+114
|\| | | | | | | | | * commit '4a739c73b': Convert simple_update* and simple_select* to async (#8173)
| * Convert simple_update* and simple_select* to async (#8173)Patrick Cloke2020-08-2712-86/+114
| |
* | Merge commit 'a466b6797' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-2016-94/+134
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a466b6797': Reduce run-times of tests by advancing the reactor less (#7757) Update debian systemd service to use Type=notify (#8169) Remove remaining is_guest argument uses from get_room_data calls (#8181) Do not propagate typing notifications from shadow-banned users. (#8176) Remove unused parameter from, and add safeguard in, get_room_data (#8174) Add required Debian dependencies to allow docker builds on the arm platform (#8144) Allow running mypy directly. (#8175) Update the test federation client to handle streaming responses (#8130) Do not propagate profile changes of shadow-banned users into rooms. (#8157) Make SlavedIdTracker.advance have same interface as MultiWriterIDGenerator (#8171) Convert simple_select_one and simple_select_one_onecol to async (#8162)
| * Make SlavedIdTracker.advance have same interface as MultiWriterIDGenerator ↵Erik Johnston2020-08-261-2/+2
| | | | | | | | (#8171)
| * Convert simple_select_one and simple_select_one_onecol to async (#8162)Patrick Cloke2020-08-2616-73/+116
| |
* | Merge commit '56efa9ec7' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-2023-351/+691
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '56efa9ec7': (22 commits) Fix rate limiting unit tests. (#8167) Add functions to `MultiWriterIdGen` used by events stream (#8164) Do not allow send_nonmember_event to be called with shadow-banned users. (#8158) Changelog fixes Make StreamIdGen `get_next` and `get_next_mult` async (#8161) Wording fixes to 'name' user admin api filter (#8163) Fix missing double-backtick in RST document Search in columns 'name' and 'displayname' in the admin users endpoint (#7377) Add type hints for state. (#8140) Stop shadow-banned users from sending non-member events. (#8142) Allow capping a room's retention policy (#8104) Add healthcheck for default localhost 8008 port on /health endpoint. (#8147) Fix flaky shadow-ban tests. (#8152) Don't fail /submit_token requests on incorrect session ID if request_token_inhibit_3pid_errors is turned on (#7991) Do not apply ratelimiting on joins to appservices (#8139) Micro-optimisations to get_auth_chain_ids (#8132) Allow denying or shadow banning registrations via the spam checker (#8034) Stop shadow-banned users from sending invites. (#8095) Be more tolerant of membership events in unknown rooms (#8110) Improve the error code when trying to register using a name reserved for guests. (#8135) ...
| * Add functions to `MultiWriterIdGen` used by events stream (#8164)Erik Johnston2020-08-252-3/+108
| |
| * Make StreamIdGen `get_next` and `get_next_mult` async (#8161)Erik Johnston2020-08-2513-49/+53
| | | | | | | | This is mainly so that `StreamIdGenerator` and `MultiWriterIdGenerator` will have the same interface, allowing them to be used interchangeably.
| * Wording fixes to 'name' user admin api filter (#8163)Andrew Morgan2020-08-251-1/+1
| | | | | | Some fixes to wording I noticed after merging #7377.
| * Search in columns 'name' and 'displayname' in the admin users endpoint (#7377)Manuel Stahl2020-08-251-12/+19
| | | | | | | | | | * Search in columns 'name' and 'displayname' in the admin users endpoint Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
| * Don't fail /submit_token requests on incorrect session ID if ↵Brendan Abolivier2020-08-241-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request_token_inhibit_3pid_errors is turned on (#7991) * Don't raise session_id errors on submit_token if request_token_inhibit_3pid_errors is set * Changelog * Also wait some time before responding to /requestToken * Incorporate review * Update synapse/storage/databases/main/registration.py Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Incorporate review Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * Micro-optimisations to get_auth_chain_ids (#8132)Richard van der Hoff2020-08-211-23/+17
| |
| * Allow denying or shadow banning registrations via the spam checker (#8034)Patrick Cloke2020-08-202-1/+63
| |
| * Be more tolerant of membership events in unknown rooms (#8110)Richard van der Hoff2020-08-201-6/+25
| | | | | | | | It turns out that not all out-of-band membership events are labelled as such, so we need to be more accepting here.
| * Use the JSON encoder without whitespace in more places. (#8124)Patrick Cloke2020-08-205-19/+14
| |
| * Add more types to synapse.storage.database. (#8127)Patrick Cloke2020-08-202-222/+366
| |
* | Merge commit '76c43f086' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-203-22/+26
|\| | | | | | | | | * commit '76c43f086': Do not assume calls to runInteraction return Deferreds. (#8133)
| * Do not assume calls to runInteraction return Deferreds. (#8133)Patrick Cloke2020-08-203-22/+26
| |
* | Merge commit '12aebdfa5' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-1/+10
|\| | | | | | | | | * commit '12aebdfa5': Close the database connection we create during startup (#8131)
| * Close the database connection we create during startup (#8131)Richard van der Hoff2020-08-191-1/+10
| | | | | | ... otherwise it gets leaked.
* | Merge commit 'c9c544cda' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-198-181/+154
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9c544cda': Remove `ChainedIdGenerator`. (#8123) Switch the JSON byte producer from a pull to a push producer. (#8116) Updated docs: Added note about missing 308 redirect support. (#8120) Be stricter about JSON that is accepted by Synapse (#8106) Convert runWithConnection to async. (#8121) Remove the unused inlineCallbacks code-paths in the caching code (#8119) Separate `get_current_token` into two. (#8113) Convert events worker database to async/await. (#8071) Add a link to the matrix-synapse-rest-password-provider. (#8111)
| * Remove `ChainedIdGenerator`. (#8123)Erik Johnston2020-08-192-86/+18
| | | | | | | | | | It's just a thin wrapper around two ID gens to make `get_current_token` and `get_next` return tuples. This can easily be replaced by calling the appropriate methods on the underlying ID gens directly.
| * Be stricter about JSON that is accepted by Synapse (#8106)Patrick Cloke2020-08-192-6/+17
| |
| * Convert runWithConnection to async. (#8121)Patrick Cloke2020-08-191-14/+13
| |
| * Separate `get_current_token` into two. (#8113)Erik Johnston2020-08-192-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | The function is used for two purposes: 1) for subscribers of streams to get a token they can use to get further updates with, and 2) for replication to track position of the writers of the stream. For streams with a single writer the two scenarios produce the same result, however the situation becomes complicated for streams with multiple writers. The current `MultiWriterIdGenerator` does not correctly handle the first case (which is not an issue as its only used for the `caches` stream which nothing subscribes to outside of replication).
| * Convert events worker database to async/await. (#8071)Patrick Cloke2020-08-183-75/+88
| |
* | Merge commit '3c01724b3' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-4/+15
|\| | | | | | | | | | | | | | | | | * commit '3c01724b3': Fix the return type of send_nonmember_events. (#8112) Remove : from allowed client_secret chars (#8101) Rename changelog from bugfix to misc. Iteratively encode JSON responses to avoid blocking the reactor. (#8013) Return the previous stream token if a non-member event is a duplicate. (#8093)
| * Fix the return type of send_nonmember_events. (#8112)Patrick Cloke2020-08-181-4/+15
| |
* | Merge commit '050e20e7c' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-195-29/+24
|\| | | | | | | | | * commit '050e20e7c': Convert some of the general database methods to async (#8100)
| * Convert some of the general database methods to async (#8100)Patrick Cloke2020-08-175-29/+24
| |
* | Merge commit 'e04e465b4' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-1910-431/+390
|\| | | | | | | | | | | | | | | | | | | * commit 'e04e465b4': Use the default templates when a custom template file cannot be found (#8037) Changelog changes Convert stream database to async/await. (#8074) Add a shadow-banned flag to users. (#8092) Convert pusher databases to async/await. (#8075) Convert receipts and events databases to async/await. (#8076)
| * Convert stream database to async/await. (#8074)Patrick Cloke2020-08-173-257/+201
| |
| * Add a shadow-banned flag to users. (#8092)Patrick Cloke2020-08-142-1/+26
| |
| * Convert pusher databases to async/await. (#8075)Patrick Cloke2020-08-142-91/+84
| |
| * Convert receipts and events databases to async/await. (#8076)Patrick Cloke2020-08-143-82/+79
| |
* | Merge commit 'dc22090a6' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-1915-308/+56
|\| | | | | | | | | | | | | | | * commit 'dc22090a6': Add type hints to synapse.handlers.room (#8090) Remove some unused database functions. (#8085) Convert misc database code to async (#8087) Remove a space at the start of a changelog entry.
| * Remove some unused database functions. (#8085)Patrick Cloke2020-08-146-244/+18
| |
| * Convert misc database code to async (#8087)Patrick Cloke2020-08-1410-64/+38
| |
* | Merge commit 'fbe930dad' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-193-241/+98
|\| | | | | | | | | * commit 'fbe930dad': Convert the roommember database to async/await. (#8070)
| * Convert the roommember database to async/await. (#8070)Patrick Cloke2020-08-123-241/+98
| |
* | Merge commit '5ecc8b582' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-153/+180
|\| | | | | | | | | * commit '5ecc8b582': Convert devices database to async/await. (#8069)
| * Convert devices database to async/await. (#8069)Patrick Cloke2020-08-121-153/+180
| |
* | Merge commit 'd68e10f30' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-193-86/+96
|\| | | | | | | | | * commit 'd68e10f30': Convert account data, device inbox, and censor events databases to async/await (#8063)
| * Convert account data, device inbox, and censor events databases to ↵Patrick Cloke2020-08-123-86/+96
| | | | | | | | async/await (#8063)
* | Merge commit 'a3a59bab7' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-197-104/+78
|\| | | | | | | | | * commit 'a3a59bab7': Convert appservice, group server, profile and more databases to async (#8066)
| * Convert appservice, group server, profile and more databases to async (#8066)Patrick Cloke2020-08-127-104/+78
| |
* | Merge commit '9d1e4942a' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-12/+16
|\| | | | | | | | | | | | | | | | | * commit '9d1e4942a': Fix typing for notifier (#8064) Add comment explaining cast Handle optional dependencies for Oidc and Saml Newsfile Change HomeServer definition to work with typing.
| * Merge pull request #8060 from matrix-org/erikj/type_serverErik Johnston2020-08-111-12/+16
| |\ | | | | | | Change HomeServer definition to work with typing.
| | * Change HomeServer definition to work with typing.Erik Johnston2020-08-111-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Duplicating function signatures between server.py and server.pyi is silly. This commit changes that by changing all `build_*` methods to `get_*` methods and changing the `_make_dependency_method` to work work as a descriptor that caches the produced value. There are some changes in other files that were made to fix the typing in server.py.
* | | Merge commit '04faa0bfa' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-192-64/+59
|\| | | | | | | | | | | | | | * commit '04faa0bfa': Convert tags and metrics databases to async/await (#8062)
| * | Convert tags and metrics databases to async/await (#8062)Patrick Cloke2020-08-112-64/+59
| | |
* | | Merge commit 'a0acdfa9e' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-193-187/+130
|\| | | | | | | | | | | | | | * commit 'a0acdfa9e': Converts event_federation and registration databases to async/await (#8061)
| * | Converts event_federation and registration databases to async/await (#8061)Patrick Cloke2020-08-113-164/+125
| |/
* | Merge commit 'db131b6b2' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-4/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db131b6b2': Change the default log config to reduce disk I/O and storage (#8040) Implement login blocking based on SAML attributes (#8052) Add an assertion on prev_events in create_new_client_event (#8041) Typo Lint why mypy why Lint Incorporate review Incorporate review Fix PUT /pushrules to use the right rule IDs Back out the database hack and replace it with a temporary config setting Fix cache name Fix cache invalidation calls Lint Changelog Implement new experimental push rules with a database hack to enable them
| * Implement new experimental push rules (#7997)Brendan Abolivier2020-08-101-4/+12
| |\ | | | | | | With an undocumented configuration setting to enable them for specific users.
| | * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Brendan Abolivier2020-08-06282-1079/+1212
| | |\ | | | | | | | | | | | | babolivier/new_push_rules
| | * | Incorporate reviewBrendan Abolivier2020-08-061-3/+3
| | | |
| | * | Back out the database hack and replace it with a temporary config settingBrendan Abolivier2020-08-032-47/+9
| | | |
| | * | Fix cache nameBrendan Abolivier2020-07-311-1/+1
| | | |
| | * | Fix cache invalidation callsBrendan Abolivier2020-07-311-1/+1
| | | |
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Brendan Abolivier2020-07-3019-346/+503
| | |\ \ | | | | | | | | | | | | | | | babolivier/new_push_rules
| | * | | Implement new experimental push rules with a database hack to enable themBrendan Abolivier2020-07-282-5/+51
| | | | |
* | | | | Merge commit '7f837959e' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-199-252/+199
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f837959e': Convert directory, e2e_room_keys, end_to_end_keys, monthly_active_users database to async (#8042) Convert additional database stores to async/await (#8045)
| * | | | Convert directory, e2e_room_keys, end_to_end_keys, monthly_active_users ↵Patrick Cloke2020-08-075-102/+95
| | | | | | | | | | | | | | | | | | | | database to async (#8042)
| * | | | Convert additional database stores to async/await (#8045)Patrick Cloke2020-08-074-150/+104
| | | | |
* | | | | Merge commit '4dd27e6d1' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-199-45/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '4dd27e6d1': Reduce unnecessary whitespace in JSON. (#7372)
| * | | | Reduce unnecessary whitespace in JSON. (#7372)David Vo2020-08-079-45/+38
| | | | |
* | | | | Merge commit '2ffd6783c' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-194-151/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '2ffd6783c': Revert #7736 (#8039)
| * | | | Revert #7736 (#8039)Brendan Abolivier2020-08-064-151/+2
| | | | |
* | | | | Merge commit 'd4a7829b1' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-3/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4a7829b1': Convert synapse.api to async/await (#8031)
| * | | | Convert synapse.api to async/await (#8031)Patrick Cloke2020-08-061-3/+2
| | |_|/ | |/| |
* | | | Merge commit '66f24449d' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-192-0/+39
|\| | | | | | | | | | | | | | | | | | | * commit '66f24449d': Improve performance of the register endpoint (#8009)
* | | | Merge commit 'a7bdf98d0' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-16287-1127/+1166
|\| | | | | | | | | | | | | | | | | | | * commit 'a7bdf98d0': Rename database classes to make some sense (#8033)
| * | | Rename database classes to make some sense (#8033)Erik Johnston2020-08-05282-1075/+1152
| | | |
* | | | Merge commit 'e19de43eb' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-161-4/+4
|\| | | | | | | | | | | | | | | | | | | * commit 'e19de43eb': Convert streams to async. (#8014)
| * | | Convert streams to async. (#8014)Patrick Cloke2020-08-041-4/+4
| | | |
* | | | Merge commit '5d92a1428' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-162-5/+61
|\| | | | | | | | | | | | | | | | | | | * commit '5d92a1428': Prevent join->join membership transitions changing member count (#7977)
| * | | Prevent join->join membership transitions changing member count (#7977)Andrew Morgan2020-08-032-5/+61
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | `StatsHandler` handles updates to the `current_state_delta_stream`, and updates room stats such as the amount of state events, joined users, etc. However, it counts every new join membership as a new user entering a room (and that user being in another room), whereas it's possible for a user's membership status to go from join -> join, for instance when they change their per-room profile information. This PR adds a check for join->join membership transitions, and bails out early, as none of the further checks are necessary at that point. Due to this bug, membership stats in many rooms have ended up being wildly larger than their true values. I am not sure if we also want to include a migration step which recalculates these statistics (possibly using the `_populate_stats_process_rooms` bg update). Bug introduced in the initial implementation https://github.com/matrix-org/synapse/pull/4338.
* | | Merge commit '394be6a0e' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-161-0/+2
|\| | | | | | | | | | | | | | | | | | | | * commit '394be6a0e': Newsfile Add ratelimiting on joins Add docs for undoing room shutdowns (#7998)
| * | Merge branch 'master' into developOlivier Wilkinson (reivilibre)2020-07-301-1/+1
| |\ \
* | | | Merge commit 'b3a97d6da' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-166-188/+160
|\| | | | | | | | | | | | | | | | | | | * commit 'b3a97d6da': Convert some of the data store to async. (#7976)
| * | | Convert some of the data store to async. (#7976)Patrick Cloke2020-07-306-188/+160
| | | |
* | | | Merge commit '3950ae51e' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-1610-152/+310
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3950ae51e': Ensure that remove_pusher is always async (#7981) Ensure the msg property of HttpResponseException is a string. (#7979) Remove from the event_relations table when purging historical events. (#7978) Add additional logging for SAML sessions. (#7971) Add MSC reference to changelog for #7736 Re-implement unread counts (#7736) Various improvements to the docs (#7899) Convert storage layer to async/await. (#7963) Add an option to disable purge in delete room admin API (#7964) Move some log lines from default logger to sql/transaction loggers (#7952) Use the JSON module from the std library instead of simplejson. (#7936) Fix exit code for `check_line_terminators.sh` (#7970) Option to allow server admins to join complex rooms (#7902) Fix typo in metrics docs (#7966) Add script for finding files with unix line terminators (#7965) Convert the remaining media repo code to async / await. (#7947) Convert a synapse.events to async/await. (#7949) Convert groups and visibility code to async / await. (#7951) Convert push to async/await. (#7948)
| * | | Remove from the event_relations table when purging historical events. (#7978)Patrick Cloke2020-07-291-0/+2
| | | |
| * | | Re-implement unread counts (#7736)Brendan Abolivier2020-07-294-2/+151
| | | |
| * | | Convert storage layer to async/await. (#7963)Patrick Cloke2020-07-283-140/+145
| | | |
| * | | Move some log lines from default logger to sql/transaction loggers (#7952)Andrew Morgan2020-07-281-8/+10
| | | | | | | | | | | | Idea from matrix-org/synapse-dinsic#49
| * | | Convert push to async/await. (#7948)Patrick Cloke2020-07-271-2/+2
| | | |
* | | | Don't push if an user account has expired (#58)Mathieu Velten2020-09-181-0/+17
| | | |
* | | | Merge commit 'a9631b7b4' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | * commit 'a9631b7b4': 1.18.0 Update worker docs with recent enhancements (#7969)
| * | | Update worker docs with recent enhancements (#7969)Erik Johnston2020-07-291-1/+1
| |/ /
* | | Merge commit 'f88c48f3b' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-034-4/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f88c48f3b': 1.18.0rc1 Fix error reporting when using `opentracing.trace` (#7961) Fix typing replication not being handled on master (#7959) Remove hacky error handling for inlineDeferreds. (#7950) Convert tests/rest/admin/test_room.py to unix file endings (#7953) Support oEmbed for media previews. (#7920) Convert state resolution to async/await (#7942) Fix up types and comments that refer to Deferreds. (#7945) Do not convert async functions to Deferreds in the interactive_auth_handler (#7944) Convert more of the media code to async/await (#7873) Return an empty body for OPTIONS requests. (#7886) Downgrade warning on client disconnect to INFO (#7928) Convert presence handler helpers to async/await. (#7939) Update the auth providers to be async. (#7935) Put a cache on `/state_ids` (#7931)
| * | Convert state resolution to async/await (#7942)Patrick Cloke2020-07-244-4/+9
| | |
* | | Merge commit '13d77464c' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-2/+24
|\| | | | | | | | | | | | | | * commit '13d77464c': Follow-up to admin API to re-activate accounts (#7908)
| * | Follow-up to admin API to re-activate accounts (#7908)Patrick Cloke2020-07-221-2/+24
| |/
* | Merge commit 'de119063f' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-0330-146/+264
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'de119063f': (31 commits) Convert room list handler to async/await. (#7912) Element CSS and logo in email templates (#7919) Lint the contrib/ directory in CI and linting scripts, add synctl to linting script (#7914) Remove unused code from synapse.logging.utils. (#7897) Fix a typo in the sample config. (#7890) Fix deprecation warning: import ABC from collections.abc (#7892) Change sample config's postgres user to synapse_user (#7889) Fix deprecation warning due to invalid escape sequences (#7895) Remove Ubuntu Eoan that is now EOL (#7888) Fix the trace function for async functions. (#7872) Add help for creating a user via docker (#7885) Switch to Debian:Slim from Alpine for the docker image (#7839) Stop using 'device_max_stream_id' (#7882) Fix TypeError in synapse.notifier (#7880) Add a default limit (of 100) to get/sync operations. (#7858) Change "unknown room ver" logging to warning. (#7881) Convert device handler to async/await (#7871) Convert synapse.app to async/await. (#7868) Convert _base, profile, and _receipts handlers to async/await (#7860) Add admin endpoint to get members in a room. (#7842) ...
| * Stop using 'device_max_stream_id' (#7882)Erik Johnston2020-07-172-4/+1
| | | | | | | | | | It serves no purpose and updating everytime we write to the device inbox stream means all such transactions will conflict, causing lots of transaction failures and retries.
| * Change "unknown room ver" logging to warning. (#7881)Erik Johnston2020-07-171-1/+1
| | | | | | | | It's somewhat expected for us to have unknown room versions in the database due to room version experiments.
| * Consistently use `db_to_json` to convert from database values to JSON ↵Patrick Cloke2020-07-1621-82/+79
| | | | | | | | objects. (#7849)
| * Merge pull request #7866 from matrix-org/rav/fix_guest_user_idRichard van der Hoff2020-07-168-59/+183
| |\ | | | | | | Fix guest user registration with lots of client readers
| | * Use a postgres sequence to generate guest user IDsRichard van der Hoff2020-07-162-29/+70
| | |
| | * Use SequenceGenerator for state group ID allocationRichard van der Hoff2020-07-164-26/+11
| | |
| | * Use `PostgresSequenceGenerator` from `MultiWriterIdGenerator`Richard van der Hoff2020-07-161-4/+4
| | | | | | | | | | | | partly just to show it works, but alwo to remove a bit of code duplication.
| | * Add some helper classes for generating ID sequencesRichard van der Hoff2020-07-161-0/+98
| | |
* | | Merge commit 'a973bcb8a' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-032-77/+55
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a973bcb8a': Add some tiny type annotations (#7870) Remove obsolete comment. Ensure that calls to `json.dumps` are compatible with the standard library json. (#7836) Avoid brand new rooms in `delete_old_current_state_events` (#7854) Allow accounts to be re-activated from the admin APIs. (#7847) Fix tests Fix typo Newsfile Use get_users_in_room rather than state handler in typing for speed Fix client reader sharding tests (#7853) Convert E2E key and room key handlers to async/await. (#7851) Return the proper 403 Forbidden error during errors with JWT logins. (#7844) remove `retry_on_integrity_error` wrapper for persist_events (#7848)
| * | Avoid brand new rooms in `delete_old_current_state_events` (#7854)Richard van der Hoff2020-07-151-10/+55
| |/ | | | | | | | | | | | | | | When considering rooms to clean up in `delete_old_current_state_events`, skip rooms which we are creating, which otherwise look a bit like rooms we have left. Fixes #7834.
| * remove `retry_on_integrity_error` wrapper for persist_events (#7848)Richard van der Hoff2020-07-151-67/+0
| | | | | | | | | | | | | | | | | | As far as I can tell from the sentry logs, the only time this has actually done anything in the last two years is when we had two master workers running at once, and even then, it made a bit of a mess of it (see https://github.com/matrix-org/synapse/issues/7845#issuecomment-658238739). Generally I feel like this code is doing more harm than good.
* | Merge commit '8d0097bef' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-1/+1
|\| | | | | | | | | * commit '8d0097bef': Fix bug in per-room message retention policies. (#7850)
| * Fix bug in per-room message retention policies. (#7850)Patrick Cloke2020-07-141-1/+1
| |
* | Merge commit '491f0dab1' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-1/+6
|\| | | | | | | | | * commit '491f0dab1': Add delete room admin endpoint (#7613)
| * Add delete room admin endpoint (#7613)Dirk Klimpel2020-07-141-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Delete Room admin API allows server admins to remove rooms from server and block these rooms. `DELETE /_synapse/admin/v1/rooms/<room_id>` It is a combination and improvement of "[Shutdown room](https://github.com/matrix-org/synapse/blob/develop/docs/admin_api/shutdown_room.md)" and "[Purge room](https://github.com/matrix-org/synapse/blob/develop/docs/admin_api/purge_room.md)" API. Fixes: #6425 It also fixes a bug in [synapse/storage/data_stores/main/room.py](synapse/storage/data_stores/main/room.py) in ` get_room_with_stats`. It should return `None` if the room is unknown. But it returns an `IndexError`. https://github.com/matrix-org/synapse/blob/901b1fa561e3cc661d78aa96d59802cf2078cb0d/synapse/storage/data_stores/main/room.py#L99-L105 Related to: - #5575 - https://github.com/Awesome-Technologies/synapse-admin/issues/17 Signed-off-by: Dirk Klimpel dirk@klimpel.org
| * Merge branch 'release-v1.17.0' into developRichard van der Hoff2020-07-101-0/+22
| |\
| | * Merge branch 'master' into release-v1.17.0Richard van der Hoff2020-07-101-0/+22
| | |\
* | | | Merge commit 'f299441cc' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-032-7/+112
|\| | | | | | | | | | | | | | | | | | | * commit 'f299441cc': Add ability to shard the federation sender (#7798)
| * | | Add ability to shard the federation sender (#7798)Erik Johnston2020-07-102-7/+112
| |/ /
* | | Merge commit 'b1beb3ff5' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | * commit 'b1beb3ff5': fix migration, again fix changelog
| * | fix migration, againRichard van der Hoff2020-07-101-1/+1
| | |
* | | Merge commit 'c9f7c683a' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-0/+22
|\| | | | | | | | | | | | | | | | | * commit 'c9f7c683a': 1.16.1 Drop incorrectly-added table `local_rejections_stream`. (#7816)
| * | Drop incorrectly-added table `local_rejections_stream`. (#7816)Richard van der Hoff2020-07-101-0/+22
| | |
* | | Merge commit '43726783e' into dinsicAndrew Morgan2020-08-0318-275/+355
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43726783e': (22 commits) 1.17.0rc1 Fix some spelling mistakes / typos. (#7811) `update_membership` declaration: now always returns an event id. (#7809) Improve stacktraces from exceptions in background processes (#7808) Fix `can only concatenate list (not "tuple") to list` exception (#7810) Pass original request headers from workers to the main process. (#7797) Generate real events when we reject invites (#7804) Add `HomeServer.signing_key` property (#7805) Revert "Update the installation docs on apt-transport-https (#7801)" Do not use simplejson in Synapse. (#7800) Stop passing bytes when dumping JSON (#7799) Update the installation docs on apt-transport-https (#7801) shuffle changelog slightly Change Caddy links (old is deprecated) (#7789) Stop populating unused table `local_invites`. (#7793) Refactor getting replication updates from database v2. (#7740) Add libwebp dependency to Dockerfile (#7791) Add documentation for JWT login type and improve sample config. (#7776) Convert the appservice handler to async/await. (#7775) Don't ignore `set_tweak` actions with no explicit `value`. (#7766) ...
| * | Generate real events when we reject invites (#7804)Richard van der Hoff2020-07-092-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #2181. The basic premise is that, when we fail to reject an invite via the remote server, we can generate our own out-of-band leave event and persist it as an outlier, so that we have something to send to the client.
| * | Do not use simplejson in Synapse. (#7800)Patrick Cloke2020-07-084-16/+8
| | |
| * | Stop populating unused table `local_invites`. (#7793)Richard van der Hoff2020-07-073-80/+24
| | | | | | | | | | | | | | | This table is no longer used, so we may as well stop populating it. Removing it would prevent people rolling back to older releases of Synapse, so that can happen in a future release.
| * | Refactor getting replication updates from database v2. (#7740)Erik Johnston2020-07-078-149/+322
| | |
| * | isort 5 compatibility (#7786)Will Hunt2020-07-053-5/+2
| | | | | | | | | The CI appears to use the latest version of isort, which is a problem when isort gets a major version bump. Rather than try to pin the version, I've done the necessary to make isort5 happy with synapse.
* | | Merge commit '5cdca53aa' into dinsicAndrew Morgan2020-08-033-6/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5cdca53aa': Merge different Resource implementation classes (#7732) Fix inconsistent handling of upper and lower cases of email addresses. (#7021) Allow YAML config file to contain None (#7779) Fix a typo. Move 1.15.2 after 1.16.0rc2. 1.16.0rc2 Remove an extraneous space. Add links to the fixes. Fix tense in the release notes. Hack to add push priority to push notifications (#7765) Add early returns to `_check_for_soft_fail` (#7769) Use symbolic names for replication stream names (#7768) Type checking for `FederationHandler` (#7770) Fix new metric where we used ms instead of seconds (#7771) Fix incorrect error message when database CTYPE was set incorrectly. (#7760) Pin link in CHANGES.md Fixes to CHANGES.md
| * | Use symbolic names for replication stream names (#7768)Richard van der Hoff2020-07-012-5/+9
| | | | | | | | | This makes it much easier to find where streams are referenced.
| * | Fix incorrect error message when database CTYPE was set incorrectly. (#7760)Richard van der Hoff2020-07-011-1/+1
| |/
* | Merge commit 'dc80a0762' into dinsicAndrew Morgan2020-08-035-148/+65
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dc80a0762': 1.16.0rc1 Back out MSC2625 implementation (#7761) Additional configuration options for auto-join rooms (#7763) Add some metrics for inbound and outbound federation processing times (#7755) Explain the purpose of the "tests" conditional dependency requirement (#7751) Add another yield point to state res v2 (#7746) Move flake8 to end. Don't exit script on failure (#7738) Make tox actions work on Debian 10 (#7703) Yield during large v2 state res. (#7735) add org.matrix.login.jwt so that m.login.jwt can be deprecated (#7675) Set Content-Length for Metrics requests (#7730) Sync ignored table names in synapse_port_db to current database schema (#7717) Allow local media to be marked as safe from being quarantined. (#7718) Convert directory handler to async/await (#7727) Speed up state res v2 across large state differences. (#7725)
| * Back out MSC2625 implementation (#7761)Brendan Abolivier2020-07-012-128/+28
| |
| * Allow local media to be marked as safe from being quarantined. (#7718)Patrick Cloke2020-06-224-35/+52
| |
* | Merge commit '5a5cf6460' into dinsicAndrew Morgan2020-08-031-1/+1
|\| | | | | | | | | * commit '5a5cf6460': Fix unread counts in sync
| * Fix unread counts in syncBrendan Abolivier2020-06-171-1/+1
| | | | | | | | | | * Always return an unread_count in get_unread_event_push_actions_by_room_for_user * Don't always expect unread_count to be there so we don't take out sync entirely if something goes wrong
* | Merge commit '46613aaf7' into dinsicAndrew Morgan2020-08-032-27/+127
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46613aaf7': (27 commits) Incorporate review Lint Incorporate review bits Pre-populate the unread_count column Don't update the schema version Use attr instead of a dict Lint Test that a mark_unread action updates the right counter when using a slave store Remove debug logging Test that a mark_unread action updates the right counter Fix summary rotation Log for invalid values of notif Fix SQL Fix schema update Lint Save the count of unread messages to event_push_summary Actually act on mark_unread Appease mypy Lint Use temporary prefixes as per the MSC ...
| * Implement unread counter (MSC2625) (#7673)Brendan Abolivier2020-06-172-27/+127
| |\ | | | | | | Implementation of https://github.com/matrix-org/matrix-doc/pull/2625
| | * Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-1513-81/+62
| | |\
| | * | Incorporate reviewBrendan Abolivier2020-06-151-15/+11
| | | |
| | * | LintBrendan Abolivier2020-06-121-3/+8
| | | |
| | * | Incorporate review bitsBrendan Abolivier2020-06-121-14/+13
| | | |
| | * | Pre-populate the unread_count columnBrendan Abolivier2020-06-121-0/+5
| | | |
| | * | Don't update the schema versionBrendan Abolivier2020-06-122-1/+1
| | | |
| | * | Use attr instead of a dictBrendan Abolivier2020-06-121-21/+31
| | | |
| | * | Fix summary rotationBrendan Abolivier2020-06-121-12/+35
| | | |
| | * | Log for invalid values of notifBrendan Abolivier2020-06-111-0/+6
| | | |
| | * | Fix SQLBrendan Abolivier2020-06-111-3/+3
| | | |
| | * | Fix schema updateBrendan Abolivier2020-06-111-1/+1
| | | |
| | * | LintBrendan Abolivier2020-06-111-1/+2
| | | |
| | * | Save the count of unread messages to event_push_summaryBrendan Abolivier2020-06-113-20/+53
| | | |
| | * | Use temporary prefixes as per the MSCBrendan Abolivier2020-06-101-1/+1
| | | |
| | * | Use a more efficient way of calculating countersBrendan Abolivier2020-06-101-23/+20
| | | |
| | * | Add a new unread_counter to sync responsesBrendan Abolivier2020-06-101-2/+23
| | | |
| | * | Rename dont_push into mark_unreadBrendan Abolivier2020-06-101-3/+2
| | | |
| | * | Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-10294-11621/+18475
| | |\ \
| | * | | Add experimental "dont_push" push action to suppress push for notificationsMatthew Hodgson2019-09-191-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a potential solution to https://github.com/vector-im/riot-web/issues/3374 and https://github.com/vector-im/riot-web/issues/5953 as raised by Mozilla at https://github.com/vector-im/riot-web/issues/10868. This lets you define a push rule action which increases the badge count (unread notification) count on a given room, but doesn't actually send a push for that notification via email or HTTP. We might want to define this as the default behaviour for group chats in future to solve https://github.com/vector-im/riot-web/issues/3268 at last. This is implemented as a string action rather than a tweak because: * Other pushers don't care about the tweak, given they won't ever get pushed * The DB can store the tweak more efficiently using the existing `notify` table. * It avoids breaking the default_notif/highlight_action optimisations. Clients which generate their own notifs (e.g. desktop notifs from Riot/Web would need to be aware of the new push action) to uphold it. An alternative way to do this would be to maintain a `msg_count` alongside `highlight_count` and `notification_count` in `unread_notifications` in sync responses. However, doing this by counting the rows in `events` since the `stream_position` of the user's last read receipt turns out to be painfully slow (~200ms), perhaps due to the size of the events table. So instead, we use the highly optimised existing event_push_actions (and event_push_actions_staging) table to maintain the counts - using the code paths which already exist for tracking unread notification counts efficiently. These queries are typically ~3ms or so. The biggest issues I see here are: * We're slightly repurposing the `notif` field on `event_push_actions` to track whether a given action actually sent a `push` or not. This doesn't seem unreasonable, but it's slightly naughty given that previously the field explicitly tracked whether `notify` was true for the action (and as a result, it was uselessly always set to 1 in the DB). * We're going to put more load on the `event_push_actions` table for all the random group chats which people had previously muted. In practice i don't think there are many of these though. * There isn't an MSC for this yet (although this comment could become one).
* | | | | Merge commit 'f6f7511a4' into dinsicAndrew Morgan2020-08-034-37/+183
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6f7511a4': Refactor getting replication updates from database. (#7636)
| * | | | Refactor getting replication updates from database. (#7636)Erik Johnston2020-06-164-37/+183
| | | | | | | | | | | | | | | The aim here is to make it easier to reason about when streams are limited and when they're not, by moving the logic into the database functions themselves. This should mean we can kill of `db_query_to_update_function` function.
* | | | | Merge commit '231252516' into dinsicAndrew Morgan2020-08-031-4/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '231252516': Fix "argument of type 'ObservableDeferred' is not iterable" error (#7708)
| * | | | Fix "argument of type 'ObservableDeferred' is not iterable" error (#7708)Patrick Cloke2020-06-161-4/+5
| | | | |
* | | | | Merge commit 'a3f11567d' into dinsicAndrew Morgan2020-08-0310-27/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'a3f11567d': Replace all remaining six usage with native Python 3 equivalents (#7704)
| * | | | Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-1610-27/+7
| | |_|/ | |/| |
* | | | Merge commit '03619324f' into dinsicAndrew Morgan2020-08-0313-81/+62
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '03619324f': Create a ListenerConfig object (#7681) Fix changelog wording 1.15.1 Wrap register_device coroutine in an ensureDeferred (#7684) Ensure the body is a string before comparing push rules. (#7701) Ensure etag is a string for GET room_keys/version response (#7691) Update m.id.phone to use 'phone' instead of 'number' (#7687) Fix "There was no active span when trying to log." error (#7698) Enable 3PID add/bind/unbind endpoints on r0 routes Discard RDATA from already seen positions. (#7648) Replace iteritems/itervalues/iterkeys with native versions. (#7692) Fix warnings about losing log context during UI auth. (#7688) Fix a typo when comparing the URI & method during UI Auth. (#7689) Remove "user_id" from GET /presence. (#7606) Increase the default SAML session expirary time to 15 minutes. (#7664) fix typo in sample_config.yaml (#7652) Take out a lock before modifying _CACHES (#7663) Add option to enable encryption by default for new rooms (#7639) Clean-up the fallback login code. (#7657)
| * | | Replace iteritems/itervalues/iterkeys with native versions. (#7692)Patrick Cloke2020-06-1512-80/+61
| | | |
| * | | Fix warnings about losing log context during UI auth. (#7688)Patrick Cloke2020-06-121-1/+1
| | |/ | |/|
* | | Merge branch 'release-v1.15.0' of github.com:matrix-org/synapse into ↵Andrew Morgan2020-06-247-43/+55
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dinsic-release-v1.15.x * 'release-v1.15.0' of github.com:matrix-org/synapse: (55 commits) 1.15.0 Fix some attributions Update CHANGES.md 1.15.0rc1 Revert "1.15.0rc1" 1.15.0rc1 Fix bug in account data replication stream. (#7656) Convert the registration handler to async/await. (#7649) Accept device information at the login fallback endpoint. (#7629) Convert user directory handler and related classes to async/await. (#7640) Add an option to disable autojoin for guest accounts (#6637) Clarifications to the admin api documentation (#7647) Update to the stable SSO prefix for UI Auth. (#7630) Fix type information on `assert_*_is_admin` methods (#7645) Remove some unused constants. (#7644) Typo fixes. Allow new users to be registered via the admin API even if the monthly active user limit has been reached (#7263) Add device management to admin API (#7481) Attempt to fix PhoneHomeStatsTestCase.test_performance_100 being flaky. (#7634) Support CS API v0.6.0 (#6585) ...
| * | Fix bug in account data replication stream. (#7656)Erik Johnston2020-06-093-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure account data stream IDs are unique. The account data stream is shared between three tables, and the maximum allocated ID was tracked in a dedicated table. Updating the max ID happened outside the transaction that allocated the ID, leading to a race where if the server was restarted then the same ID could be allocated but the max ID failed to be updated, leading it to be reused. The ID generators have support for tracking across multiple tables, so we may as well use that instead of a dedicated table. * Fix bug in account data replication stream. If the same stream ID was used in both global and room account data then the getting updates for the replication stream would fail due to `heapq.merge(..)` trying to compare a `str` with a `None`. (This is because you'd have two rows like `(534, '!room')` and `(534, None)` from the room and global account data tables). Fix is just to order by stream ID, since we don't rely on the ordering beyond that. The bug where stream IDs can be reused should be fixed now, so this case shouldn't happen going forward. Fixes #7617
| * | async/await get_user_id_by_threepid (#7620)Andrew Morgan2020-06-032-23/+24
| | | | | | | | | | | | | | | Based on #7619 async's `get_user_id_by_threepid` and its call stack.
| * | Improve performance of _get_state_groups_from_groups_txn (#7567)Dagfinn Ilmari Mannsåker2020-06-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The query keeps showing up in my slow query log. This changes the plan under the top-level Sort node from ``` WindowAgg (cost=280335.88..292963.15 rows=561212 width=80) (actual time=138.651..160.562 rows=27112 loops=1) -> Sort (cost=280335.88..281738.91 rows=561212 width=84) (actual time=138.597..140.622 rows=27112 loops=1) Sort Key: state_groups_state.type, state_groups_state.state_key, state_groups_state.state_group Sort Method: quicksort Memory: 4581kB -> Nested Loop (cost=2.83..226745.22 rows=561212 width=84) (actual time=21.548..47.657 rows=27112 loops=1) -> HashAggregate (cost=2.27..3.28 rows=101 width=8) (actual time=21.526..21.535 rows=20 loops=1) Group Key: state.state_group -> CTE Scan on state (cost=0.00..2.02 rows=101 width=8) (actual time=21.280..21.493 rows=20 loops=1) -> Index Scan using state_groups_state_type_idx on state_groups_state (cost=0.56..2189.40 rows=5557 width=84) (actual time=0.005..0.991 rows=1356 loops=20) Index Cond: (state_group = state.state_group) ``` to ``` Nested Loop (cost=2.83..226745.22 rows=561212 width=84) (actual time=24.194..52.834 rows=27112 loops=1) -> HashAggregate (cost=2.27..3.28 rows=101 width=8) (actual time=24.130..24.138 rows=20 loops=1) Group Key: state.state_group -> CTE Scan on state (cost=0.00..2.02 rows=101 width=8) (actual time=23.887..24.113 rows=20 loops=1) -> Index Scan using state_groups_state_type_idx on state_groups_state (cost=0.56..2189.40 rows=5557 width=84) (actual time=0.016..1.159 rows=1356 loops=20) Index Cond: (state_group = state.state_group) ``` This cuts the execution time from ~190ms to ~130ms, i.e. a reduction of ~30%. The full plans are visualised at https://explain.depesz.com/s/WpbT and https://explain.depesz.com/s/KlEk Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
| * | Use upsert when inserting read receipts (#7607)Dagfinn Ilmari Mannsåker2020-06-011-9/+4
| | | | | | | | | | | | | | | Fixes #7469 Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
| * | Fix incorrect placeholder syntax in database prepartion code (#7575)Andrew Morgan2020-05-271-3/+2
| | | | | | | | | We were using `logger` syntax which isn't supported by `Exception`s.
* | | Add a bulk user info endpoint and deprecate the old one (#46)Andrew Morgan2020-06-191-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | The current `/user/<user_id>/info` API was useful in that it could be used by any user to lookup whether another user was deactivate or expired. However, it was impractical as it only allowed for a single lookup at once. Clients trying to use this API were met with speed issues as they tried to query this information for all users in a room. This PR adds an equivalent CS and Federation API that takes a list of user IDs, and returning a mapping from user ID to info dictionary. Note that the federation in this PR was a bit trickier than in the original #12 as we can no longer use a federation query, as those don't allow for JSON bodies - which we require to pass a list of user IDs. Instead we do the whole thing of adding a method to transport/client and transport/server. This PR also adds unittests. The earlier PR used Sytest, presumably for testing across federation, but as this is Synapse-specific that felt a little gross. Unit tests for the deprecated endpoint have not been added.
* | | Performance improvements to marking expired users as inactive (#47)Andrew Morgan2020-06-192-16/+52
| | | | | | | | | This is a performance-related improvement to #13, which queried and hid active *and* already inactive users, one-by-one. This PR updates the code to query only **active**, expired users, all at once, and then mark them as inactive, all at once.
* | | Merge branch 'release-v1.14.0' of github.com:matrix-org/synapse into ↵Andrew Morgan2020-06-1036-1667/+2295
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dinsic-release-v1.14.x * 'release-v1.14.0' of github.com:matrix-org/synapse: (108 commits) Fix typo in PR link Update debian changelog 1.14.0 Improve changelog wording 1.14.0rc2 Fix sample config docs error (#7581) Fix up comments Fix specifying cache factors via env vars with * in name. (#7580) Don't apply cache factor to event cache. (#7578) Ensure ReplicationStreamer is always started when replication enabled. (#7579) Remove the changes to the debian changelog Not full release yet, this is rc1 Merge event persistence move changelog entries More changelog fix Changelog fixes 1.14.0 Replace device_27_unique_idx bg update with a fg one (#7562) Fix incorrect exception handling in KeyUploadServlet.on_POST (#7563) Fix recording of federation stream token (#7564) Simplify reap_monthly_active_users (#7558) ...
| * | Replace device_27_unique_idx bg update with a fg one (#7562)Richard van der Hoff2020-05-265-62/+94
| | | | | | | | | | | | | | | | | | The bg update never managed to complete, because it kept being interrupted by transactions which want to take a lock. Just doing it in the foreground isn't that bad, and is a good deal simpler.
| * | Simplify reap_monthly_active_users (#7558)Richard van der Hoff2020-05-231-59/+41
| | | | | | | | | | | | | | | | | | we can use `make_in_list_sql_clause` rather than doing our own half-baked equivalent, which has the benefit of working just fine with empty lists. (This has quite a lot of tests, so I think it's pretty safe)
| * | Optimise some references to hs.config (#7546)Richard van der Hoff2020-05-221-8/+20
| | | | | | | | | These are surprisingly expensive, and we only really need to do them at startup.
| * | Add option to move event persistence off master (#7517)Erik Johnston2020-05-226-43/+60
| | |
| * | Add ability to wait for replication streams (#7542)Erik Johnston2020-05-222-3/+5
| | | | | | | | | | | | | | | | | | | | | The idea here is that if an instance persists an event via the replication HTTP API it can return before we receive that event over replication, which can lead to races where code assumes that persisting an event immediately updates various caches (e.g. current state of the room). Most of Synapse doesn't hit such races, so we don't do the waiting automagically, instead we do so where necessary to avoid unnecessary delays. We may decide to change our minds here if it turns out there are a lot of subtle races going on. People probably want to look at this commit by commit.
| * | Retry to sync out of sync device lists (#7453)Brendan Abolivier2020-05-211-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a call to `user_device_resync` fails, we don't currently mark the remote user's device list as out of sync, nor do we retry to sync it. https://github.com/matrix-org/synapse/pull/6776 introduced some code infrastructure to mark device lists as stale/out of sync. This commit uses that code infrastructure to mark device lists as out of sync if processing an incoming device list update makes the device handler realise that the device list is out of sync, but we can't resync right now. It also adds a looping call to retry all failed resync every 30s. This shouldn't cause too much spam in the logs as this commit also removes the "Failed to handle device list update for..." warning logs when catching `NotRetryingDestination`. Fixes #7418
| * | Fix bug in persist events when dealing with non member types. (#7548)Erik Johnston2020-05-211-2/+2
| | | | | | | | | | | | | | | `_is_server_still_joined` will throw if it is given state updates with non-user ID state keys with local user leaves. This is actually rarely a problem since local leaves almost always get persisted by themselves. (I discovered this on a branch that was otherwise broken, so I haven't seen this in the wild)
| * | Merge pull request #7519 from matrix-org/rav/kill_py2_codeRichard van der Hoff2020-05-186-55/+17
| |\ \ | | | | | | | | Kill off some old python 2 code
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-09 23:16:20 +0000