summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix log line that was printing undefined value (#6278)Andrew Morgan2020-03-161-1/+1
|\ | | | | | | * commit 'a2276d4d3':
| * Fix log line that was printing undefined value (#6278)Andrew Morgan2019-10-301-1/+1
| |
* | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitAndrew Morgan2020-03-162-33/+17
|\| | | | | | | | | | | * commit '770d1ef67': Newsfile Port receipt and read markers to async/wait
| * Port receipt and read markers to async/waitErik Johnston2019-10-292-33/+17
| |
* | Improve signature checking on some federation APIs (#6262)Andrew Morgan2020-03-161-2/+18
|\| | | | | | | | | * commit '172f264ed': Improve signature checking on some federation APIs (#6262)
| * Improve signature checking on some federation APIs (#6262)Richard van der Hoff2019-10-281-2/+18
| | | | | | | | | | Make sure that we check that events sent over /send_join, /send_leave, and /invite, are correctly signed and come from the expected servers.
* | Merge pull request #6255 from matrix-org/erikj/stats_configAndrew Morgan2020-03-161-1/+3
|\| | | | | | | | | | | | | * commit '87259b3a3': Fix tests Newsfile Remove repeated calls to config.stats_enabled.
| * Remove repeated calls to config.stats_enabled.Erik Johnston2019-10-251-1/+3
| | | | | | | | | | Turns out that fetching variables from the config object is expensive, so doing it once at startup avoids unnecessary work.
* | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Andrew Morgan2020-03-161-1/+390
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Hubert Chathi2019-10-221-1/+390
| |\ | | | | | | Cross-signing [3/4] -- uploading signatures edition
| | * Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-1818-851/+1390
| | |\
| | * | fix doc stringsHubert Chathi2019-10-181-9/+13
| | | |
| | * | make isort happyHubert Chathi2019-09-241-1/+0
| | | |
| | * | add some commentsHubert Chathi2019-09-241-2/+10
| | | |
| | * | drop some logger lines to debugHubert Chathi2019-09-241-3/+3
| | | |
| | * | make changes based on PR feedbackHubert Chathi2019-09-241-107/+159
| | | |
| | * | add function docsHubert Chathi2019-09-071-2/+24
| | | |
| | * | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-075-114/+280
| | |\ \
| | * | | run blackHubert Chathi2019-09-061-24/+10
| | | | |
| | * | | split out signature processing into separate functionsHubert Chathi2019-09-061-195/+204
| | | | |
| | * | | avoid modifying input parameterHubert Chathi2019-09-051-7/+7
| | | | |
| | * | | update with newer coding styleHubert Chathi2019-09-041-1/+1
| | | | |
| | * | | make black happyHubert Chathi2019-09-041-78/+69
| | | | |
| | * | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-041-82/+150
| | | | |
| | * | | implement device signature uploading/fetchingHubert Chathi2019-09-041-0/+250
| | | | |
* | | | | Remove Auth.check method (#6217)Andrew Morgan2020-03-164-9/+220
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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"
| * | | | Remove Auth.check method (#6217)Richard van der Hoff2019-10-181-3/+4
| | |_|/ | |/| | | | | | This method was somewhat redundant, and confusing.
| * | | Merge branch 'uhoreg/e2e_cross-signing_merged' into developHubert Chathi2019-10-183-6/+216
| |\ \ \
| | * \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-1818-746/+1387
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-075-114/+280
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | * | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0417-485/+228
| | |\ \ \
| | * \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2816-65/+412
| | |\ \ \ \
| | * | | | | blackHubert Chathi2019-08-281-3/+1
| | | | | | |
| | * | | | | use stream ID generator instead of timestampHubert Chathi2019-08-281-4/+3
| | | | | | |
| | * | | | | make isort happyHubert Chathi2019-08-211-1/+0
| | | | | | |
| | * | | | | apply PR review suggestionsHubert Chathi2019-08-211-42/+34
| | | | | | |
| | * | | | | make changes from PR reviewHubert Chathi2019-08-011-6/+18
| | | | | | |
| | * | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-0132-462/+638
| | |\ \ \ \ \
| | * | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-253-6/+216
| | | | | | | |
* | | | | | | | Merge pull request #6214 from matrix-org/rav/event_auth/1Andrew Morgan2020-03-161-102/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47ada4dff': changelog rip out some unreachable code Remove dead check_auth script
| * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-181-4/+9
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-182-10/+4
| |\ \ \ \ \ \ \
| * | | | | | | | rip out some unreachable codeRichard van der Hoff2019-10-171-102/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only possible rejection reason is AUTH_ERROR, so all of this is unreachable.
* | | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Andrew Morgan2020-02-261-4/+9
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Erik Johnston2019-10-181-4/+9
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-8/+2
|\| | | | | | |
| * | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageHubert Chathi2019-10-111-8/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | make storage layer in charge of interpreting the device key data
| | * | | | | | | make sure we actually return somethingHubert Chathi2019-10-101-0/+5
| | | | | | | | |
| | * | | | | | | make storage layer in charge of interpreting the device key dataHubert Chathi2019-10-101-11/+0
| | | | | | | | |
* | | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionAndrew Morgan2020-02-261-2/+2
|\| | | | | | | |
| * | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-111-2/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | make version optional in body of e2e backup version update
| | * | | | | | | make version optional in body of e2e backup version updateHubert Chathi2019-10-091-2/+2
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | to agree with latest version of the MSC
* | | | | | | | Add domain validation when creating room with list of invitees (#6121)Andrew Morgan2020-02-261-1/+3
|\| | | | | | |
| * | | | | | | Add domain validation when creating room with list of invitees (#6121)werner2912019-10-101-1/+3
| | | | | | | |
* | | | | | | | Fix races in room stats (and other) updates. (#6187)Andrew Morgan2020-02-263-14/+31
|\| | | | | | |
| * | | | | | | Fix races in room stats (and other) updates. (#6187)Richard van der Hoff2019-10-103-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Move tag/push rules room upgrade checking ealier (#6155)Andrew Morgan2020-02-261-18/+44
|\| | | | | | |
| * | | | | | | Move tag/push rules room upgrade checking ealier (#6155)Andrew Morgan2019-10-101-18/+44
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that _local_membership_update doesn't run when you join a new, remote room. It only runs if you're joining a room that your server already knows about. This would explain #4703 and #5295 and why the transfer would work in testing and some rooms, but not others. This would especially hit single-user homeservers. The check has been moved to right after the room has been joined, and works much more reliably. (Though it may still be a bit awkward of a place).
* | | | | | | Remove unused public room list timeout param (#6179)Andrew Morgan2020-02-261-12/+1
|\| | | | | |
| * | | | | | Remove unused public room list timeout param (#6179)Andrew Morgan2019-10-081-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unused public room list timeout param * Add changelog
* | | | | | | Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failureAndrew Morgan2020-02-261-6/+4
|\| | | | | |
| * | | | | | Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failureErik Johnston2019-10-071-6/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't regenerate numeric user ID if registration fails.
| | * | | | | | Remove unused variableErik Johnston2019-10-031-2/+0
| | | | | | | |
| | * | | | | | Don't regenerate numeric user ID if registration fails.Erik Johnston2019-10-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This causes huge amounts of DB IO if registrations start to fail e.g. because the DB is struggling with IO.
* | | | | | | | add some logging to the rooms stats updates, to try to track down a flaky ↵Andrew Morgan2020-02-261-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test (#6167)
| * | | | | | | add some logging to the rooms stats updates, to try to track down a flaky ↵Richard van der Hoff2019-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test (#6167)
| * | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedBrendan Abolivier2019-10-041-2/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Don't 500 when trying to exchange a revoked 3PID invite
| | * | | | | | TypoBrendan Abolivier2019-10-041-1/+1
| | | | | | | |
| | * | | | | | LintBrendan Abolivier2019-10-041-3/+1
| | | | | | | |
| | * | | | | | Incorporate reviewBrendan Abolivier2019-10-041-14/+8
| | | | | | | |
| | * | | | | | Add test caseBrendan Abolivier2019-10-031-1/+1
| | | | | | | |
| | * | | | | | LintBrendan Abolivier2019-10-021-1/+3
| | | | | | | |
| | * | | | | | Don't 500 code when trying to exchange a revoked 3PID inviteBrendan Abolivier2019-10-021-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this is not documented in the spec (but should be), Riot (and other clients) revoke 3PID invites by sending a m.room.third_party_invite event with an empty ({}) content to the room's state. When the invited 3PID gets associated with a MXID, the identity server (which doesn't know about revocations) sends down to the MXID's homeserver all of the undelivered invites it has for this 3PID. The homeserver then tries to talk to the inviting homeserver in order to exchange these invite for m.room.member events. When one of the invite is revoked, the inviting homeserver responds with a 500 error because it tries to extract a 'display_name' property from the content, which is empty. This might cause the invited server to consider that the server is down and not try to exchange other, valid invites (or at least delay it). This fix handles the case of revoked invites by avoiding trying to fetch a 'display_name' from the original invite's content, and letting the m.room.member event fail the auth rules (because, since the original invite's content is empty, it doesn't have public keys), which results in sending a 403 with the correct error message to the invited server.
* | | | | | | | Merge pull request #6152 from matrix-org/erikj/fix_room_listAndrew Morgan2020-02-261-10/+23
|\| | | | | | |
| * | | | | | | Fix public room list pagination.Erik Johnston2019-10-021-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We incorrectly used `room_id` as to bound the result set, even though we order by `joined_members, room_id`, leading to incorrect results after pagination.
* | | | | | | | Land improved room list based on room stats (#6019)Andrew Morgan2020-02-261-234/+89
|\| | | | | | |
| * | | | | | | Land improved room list based on room stats (#6019)Erik Johnston2019-10-021-234/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use room_stats and room_state for room directory search
* | | | | | | | Fix yields and copy instead of move push rules on room upgrade (#6144)Andrew Morgan2020-02-261-2/+2
|\| | | | | | |
| * | | | | | | Fix yields and copy instead of move push rules on room upgrade (#6144)Andrew Morgan2019-10-021-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy push rules during a room upgrade from the old room to the new room, instead of deleting them from the old room. For instance, we've defined upgrading of a room multiple times to be possible, and push rules won't be transferred on the second upgrade if they're deleted during the first. Also fix some missing yields that probably broke things quite a bit.
| * | | | | | Incorporate reviewBrendan Abolivier2019-09-271-4/+2
| | | | | | |
| * | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+3
| | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * | | | | | LintBrendan Abolivier2019-09-271-3/+1
| | | | | | |
| * | | | | | Fixup and add some loggingBrendan Abolivier2019-09-271-1/+9
| | | | | | |
| * | | | | | Reject pending invites on deactivationBrendan Abolivier2019-09-271-0/+31
| | | | | | |
* | | | | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2020-02-262-384/+354
|\| | | | | |
| * | | | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2019-09-272-364/+359
| | | | | | | | | | | | | | | | | | | | | Just to have all the methods that make calls to identity services in one place.
* | | | | | | Fix dummy event insertion consent bug (#6053)Andrew Morgan2020-02-251-27/+72
|\| | | | | |
| * | | | | | Fix dummy event insertion consent bug (#6053)Neil Johnson2019-09-261-27/+72
| | | | | | | | | | | | | | | | | | | | | Fixes #5905
* | | | | | | Enable cleaning up extremities with dummy events by default to prevent undue ↵Andrew Morgan2020-02-251-29/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | build up of forward extremities. (#5884)
| * | | | | | Threepid validity checks on msisdns should not be dependent on ↵Neil Johnson2019-09-251-29/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'threepid_behaviour_email'. (#6104) Fixes #6103
* | | | | | | Stop advertising unsupported flows for registration (#6107)Andrew Morgan2020-02-252-1/+36
|\| | | | | |
| * | | | | | Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-252-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-253-131/+248
|\| | | | | |
| * | | | | | Refactor the user-interactive auth handling (#6105)Richard van der Hoff2019-09-253-131/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge pull request #6037 from matrix-org/rav/saml_mapping_workAndrew Morgan2020-02-251-8/+98
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-241-0/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-243-82/+192
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit '33757bad1' into rav/saml_mapping_workRichard van der Hoff2019-09-201-1/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | More better loggingRichard van der Hoff2019-09-201-1/+2
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-1926-571/+1051
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | better loggingRichard van der Hoff2019-09-191-0/+2
| | | | | | | | | |
| * | | | | | | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-131-8/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to assign unique mxids to saml users based on an incrementing suffix. For that to work, we need to record the allocated mxid in a separate table.
* | | | | | | | | | Add sid to next_link for email validation (#6097)Andrew Morgan2020-02-251-0/+10
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Add sid to next_link for email validation (#6097)J. Ryan Stinnett2019-09-241-0/+10
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2020-02-251-1/+11
|\| | | | | | | |
| * | | | | | | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2019-09-231-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Second part of solving #6076 Fixes #6076 We return a submit_url parameter on calls to POST */msisdn/requestToken so that clients know where to submit token information to.
* | | | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2020-02-252-3/+20
|\| | | | | | | |
| * | | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2019-09-232-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses a SimpleHttpClient instance equipped with the federation_ip_range_blacklist list for requests to identity servers provided by user input. Does not use a blacklist when contacting identity servers specified by account_threepid_delegates. The homeserver trusts the latter and we don't want to prevent homeserver admins from specifying delegates that are on internal IP addresses. Fixes #5935
* | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2020-02-251-0/+34
|\| | | | | | | |
| * | | | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2019-09-231-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | First part of solving #6076
* | | | | | | | | Implement MSC2290 (#6043)Andrew Morgan2020-02-252-53/+87
|\| | | | | | | |
| * | | | | | | | Implement MSC2290 (#6043)Andrew Morgan2019-09-232-52/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements MSC2290. This PR adds two new endpoints, /unstable/account/3pid/add and /unstable/account/3pid/bind. Depending on the progress of that MSC the unstable prefix may go away. This PR also removes the blacklist on some 3PID tests which occurs in #6042, as the corresponding Sytest PR changes them to use the new endpoints. Finally, it also modifies the account deactivation code such that it doesn't just try to deactivate 3PIDs that were bound to the user's account, but any 3PIDs that were bound through the homeserver on that user's account.
* | | | | | | | | Return timeout error to user for identity server calls (#6073)Andrew Morgan2020-02-252-11/+37
|\| | | | | | | |
| * | | | | | | | Return timeout error to user for identity server calls (#6073)Andrew Morgan2019-09-232-11/+37
| | | | | | | | |
* | | | | | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2020-02-251-10/+2
|\| | | | | | | |
| * | | | | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-201-14/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | v2 3PID Invites (part of MSC2140) (#5979)Andrew Morgan2020-02-251-25/+84
|\| | | | | | |
| * | | | | | | v2 3PID Invites (part of MSC2140) (#5979)Andrew Morgan2019-09-171-23/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3PID invites require making a request to an identity server to check that the invited 3PID has an Matrix ID linked, and if so, what it is. These requests are being made on behalf of a user. The user will supply an identity server and an access token for that identity server. The homeserver will then forward this request with the access token (using an `Authorization` header) and, if the given identity server doesn't support v2 endpoints, will fall back to v1 (which doesn't require any access tokens). Requires: ~~#5976~~
* | | | | | | | Fix race condition in room stats. (#6029)Andrew Morgan2020-02-251-4/+10
|\| | | | | | |
| * | | | | | | Fix race condition in room stats. (#6029)Erik Johnston2019-09-171-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broke in #5971 Basically the bug is that if get_current_state_deltas returns no new updates and we then take the max pos, its possible that we miss an update that happens in between the two calls. (e.g. get_current_state_deltas looks up to stream pos 5, then an event persists and so getting the max stream pos returns 6, meaning that next time we check for things with a stream pos bigger than 6)
* | | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2020-02-253-32/+239
|\| | | | | | |
| * | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2019-09-113-35/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a redo of https://github.com/matrix-org/synapse/pull/5897 but with `id_access_token` accepted. Implements [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134) plus Identity Service v2 authentication ala [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140). Identity lookup-related functions were also moved from `RoomMemberHandler` to `IdentityHandler`.
* | | | | | | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionAndrew Morgan2020-02-252-12/+53
|\| | | | | | |
| * | | | | | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionErik Johnston2019-09-112-12/+53
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow use of different ratelimits for admin redactions.
| | * | | | | | | Fix commentsErik Johnston2019-09-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| | * | | | | | | Fix how we check for self redactionErik Johnston2019-09-111-4/+18
| | | | | | | | |
| | * | | | | | | Allow use of different ratelimits for admin redactions.Erik Johnston2019-09-112-12/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful to allow room admins to quickly deal with a large number of abusive messages.
* | | | | | | | | Add note about extra arg to send_membership_event, remove arg in ↵Andrew Morgan2020-02-251-10/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remote_reject_invite (#6009)
| * | | | | | | | Add note about extra arg to send_membership_event, remove arg in ↵Andrew Morgan2019-09-111-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remote_reject_invite (#6009) Some small fixes to `room_member.py` found while doing other PRs. 1. Add requester to the base `_remote_reject_invite` method. 2. `send_membership_event`'s docstring was out of date and took in a `remote_room_hosts` arg that was not used and no calling function provided.
* | | | | | | | | Fix existing v2 identity server calls (MSC2140) (#6013)Andrew Morgan2020-02-251-2/+26
|\| | | | | | | |
| * | | | | | | | Fix existing v2 identity server calls (MSC2140) (#6013)Andrew Morgan2019-09-111-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two things I missed while implementing [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R80). 1. Access tokens should be provided to the identity server as `access_token`, not `id_access_token`, even though the homeserver may accept the tokens as `id_access_token`. 2. Access tokens must be sent to the identity server in a query parameter, the JSON body is not allowed. We now send the access token as part of an `Authorization: ...` header, which fixes both things. The breaking code was added in https://github.com/matrix-org/synapse/pull/5892 Sytest PR: https://github.com/matrix-org/sytest/pull/697
* | | | | | | | | Remove origin parameter from add_display_name_to_third_party_invite and add ↵Andrew Morgan2020-02-251-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | params to docstring (#6010)
| * | | | | | | | Remove origin parameter from add_display_name_to_third_party_invite and add ↵Andrew Morgan2019-09-111-1/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | params to docstring (#6010) Another small fixup noticed during work on a larger PR. The `origin` field of `add_display_name_to_third_party_invite` is not used and likely was just carried over from the `on_PUT` method of `FederationThirdPartyInviteExchangeServlet` which, like all other servlets, provides an `origin` argument. Since it's not used anywhere in the handler function though, we should remove it from the function arguments.
* | | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationAndrew Morgan2020-02-252-40/+43
|\| | | | | | |
| * | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationErik Johnston2019-09-102-41/+43
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use account_threepid_delegate for 3pid validation
| | * | | | | | | Add changelogAndrew Morgan2019-09-101-3/+3
| | | | | | | | |
| | * | | | | | | Use account_threepid_delegate for 3pid validationAndrew Morgan2019-09-102-41/+43
| | | | | | | | |
* | | | | | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-usersAndrew Morgan2020-02-251-8/+4
|\| | | | | | | |
| * | | | | | | | Only count real users when checking for auto-creation of auto-join roomJason Robinson2019-09-091-8/+4
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | Ensure a sid parameter is passed to bind_threepid (#5995)Andrew Morgan2020-02-251-1/+7
|\| | | | | | |
| * | | | | | | Ensure a sid parameter is passed to bind_threepid (#5995)Andrew Morgan2019-09-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | `sid` is required to be part of `three_pid_creds`. We were 500'ing if it wasn't provided instead of returning `M_MISSING_PARAM`.
* | | | | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flagAndrew Morgan2020-02-251-1/+3
|\| | | | | | |
| * | | | | | | Correctly handle non-bool m.federate flagErik Johnston2019-09-061-1/+3
| |/ / / / / /
* | | | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2020-02-253-74/+154
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987)
| * | | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2019-09-063-71/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987) This is a combination of a few different PRs, finally all being merged into `develop`: * #5875 * #5876 * #5868 (This one added the `/versions` flag but the flag itself was actually [backed out](https://github.com/matrix-org/synapse/commit/891afb57cbdf9867f2848341b29c75d6f35eef5a#diff-e591d42d30690ffb79f63bb726200891) in #5969. What's left is just giving /versions access to the config file, which could be useful in the future) * #5835 * #5969 * #5940 Clients should not actually use the new registration functionality until https://github.com/matrix-org/synapse/pull/5972 is merged. UPGRADE.rst, changelog entries and config file changes should all be reviewed closely before this PR is merged.
* | | | | | | Merge pull request #5984 from ↵Andrew Morgan2020-02-251-4/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/joriks/opentracing_link_send_to_edu_contexts
| * | | | | | Merge pull request #5984 from ↵Erik Johnston2019-09-051-4/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/joriks/opentracing_link_send_to_edu_contexts Link the send loop with the edus contexts
| | * | | | | | Link the send loop with the edus contextsJorik Schellekens2019-09-051-4/+1
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contexts were being filtered too early so the send loop wasn't being linked to them unless the destination was whitelisted.
* | | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2020-02-251-42/+120
|\| | | | | |
| * | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-051-41/+119
| | | | | | |
* | | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2020-02-251-1/+2
|\| | | | | |
| * | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-051-1/+2
| |/ / / / / | | | | | | | | | | | | Implements `POST /_matrix/client/r0/account/3pid/unbind` from [MSC2140](https://github.com/matrix-org/matrix-doc/blob/dbkr/tos_2/proposals/2140-terms-of-service-2.md#post-_matrixclientr0account3pidunbind).
* | | | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2020-02-251-44/+6
|\| | | | |
| * | | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-041-44/+6
| | | | | | | | | | | | | | | | | | Removes the `bind_email` and `bind_msisdn` parameters from the `/register` C/S API endpoint as per [MSC2140: Terms of Service for ISes and IMs](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R107).
* | | | | | Fix and refactor room and user stats (#5971)Andrew Morgan2020-02-252-182/+134
|\| | | | |
| * | | | | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-041-175/+132
| | | | | | | | | | | | | | | | | | Previously the stats were not being correctly populated.
| * | | | | code cleanupsAndrew Morgan2019-09-031-7/+2
| | | | | |
* | | | | | Ensure the list media admin API is always available (#5966)Andrew Morgan2020-02-251-3/+1
|\| | | | |
| * | | | | Fix docstringAndrew Morgan2019-09-031-2/+1
| | | | | |
| * | | | | Remove unnecessary variable declarationAndrew Morgan2019-09-031-1/+0
| | | | | |
* | | | | | Ensure an auth instance is available to ListMediaInRoom (#5967)Andrew Morgan2020-02-251-1/+1
|\| | | | |
| * | | | | fix typoMatthew Hodgson2019-09-031-1/+1
| | | | | |
* | | | | | Remove double return statements (#5962)Andrew Morgan2020-02-255-7/+0
|\| | | | |
| * | | | | Remove double return statements (#5962)Andrew Morgan2019-09-035-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all the "double return" statements which were a result of us removing all the instances of ``` defer.returnValue(...) return ``` statements when we switched to python3 fully.
* | | | | | Opentrace device lists (#5853)Andrew Morgan2020-02-252-3/+68
|\| | | | |
| * | | | | Opentrace device lists (#5853)Jorik Schellekens2019-09-032-3/+68
| | | | | | | | | | | | | | | | | | Trace device list changes.
* | | | | | Remove unused methods from c/s api v1 in register.py (#5963)Andrew Morgan2020-02-241-185/+0
|\| | | | |
| * | | | | Remove unused methods from c/s api v1 in register.py (#5963)Andrew Morgan2019-09-021-104/+0
| | | | | | | | | | | | | | | | | | These methods were part of the v1 C/S API. Remove them as they are no longer used by any code paths.
* | | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2020-02-2410-19/+21
|\| | | | |
| * | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3010-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)" (#5937)Andrew Morgan2019-08-302-132/+9
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | This reverts commit 71fc04069a5770a204c3514e0237d7374df257a8. This broke 3PID invites as #5892 was required for it to work correctly.
* | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)"Andrew Morgan2020-02-242-256/+176
| | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+4
|\| | | |
| * | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-281-1/+4
| |\ \ \ \ | | | | | | | | | | | | Exempt support users from consent
| | * | | | Apply suggestions from code reviewWill Hunt2019-08-231-2/+2
| | | | | | | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org>
| | * | | | Exempt bot usersHalf-Shot2019-08-231-1/+1
| | | | | |
| | * | | | Return user_type in get_user_by_idHalf-Shot2019-08-231-1/+4
| | | | | |
* | | | | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2020-02-242-176/+256
|\| | | | |
| * | | | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2019-08-282-9/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/5861 Adds support for the v2 lookup API as defined in [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134). Currently this is only used for 3PID invites. Sytest PR: https://github.com/matrix-org/sytest/pull/679
* | | | | | Implement a structured logging output system. (#5680)Andrew Morgan2020-02-211-2/+3
|\| | | | |
| * | | | | Implement a structured logging output system. (#5680)Amber Brown2019-08-281-2/+3
| | | | | |
* | | | | | Merge pull request #5914 from matrix-org/rei/admin_getadminAndrew Morgan2020-02-211-0/+9
|\| | | | |
| * | | | | Merge pull request #5914 from matrix-org/rei/admin_getadminreivilibre2019-08-281-0/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | Add GET method to admin API /users/@user:dom/admin
| | * | | | | Add GET method to admin API /users/@user:dom/adminOlivier Wilkinson (reivilibre)2019-08-271-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | | | | | | Merge pull request #5859 from matrix-org/rei/msc2197Andrew Morgan2020-02-211-1/+28
|\| | | | | |
| * | | | | | Merge pull request #5859 from matrix-org/rei/msc2197reivilibre2019-08-281-1/+28
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | MSC2197 Search Filters over Federation
| | * | | | | | Support MSC2197 outbound with unstable prefixOlivier Wilkinson (reivilibre)2019-08-151-1/+28
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limitAndrew Morgan2020-02-211-1/+1
|\| | | | | |
| * | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limitRichard van der Hoff2019-08-271-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Increase profile display name limit
| | * | | | | Increase max display name limitNeil Johnson2019-08-241-1/+1
| | | |/ / / | | |/| | |
* | | | | | Add Admin API capability to set adminship of a user (#5878)Andrew Morgan2020-02-211-0/+10
|\| | | | |
| * | | | | Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-271-0/+10
| |/ / / / | | | | | | | | | | Admin API: Set adminship of a user
* | | | | Propagate opentracing contexts through EDUs (#5852)Andrew Morgan2020-02-211-6/+21
|\| | | |
| * | | | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-221-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | Propagate opentracing contexts through EDUs Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| * | | | Revert "Add "require_consent" parameter for registration"Brendan Abolivier2019-08-221-12/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 3320aaab3a9bba3f5872371aba7053b41af9d0a0.
| * | | | Add "require_consent" parameter for registrationHalf-Shot2019-08-221-2/+12
| | | | |
* | | | | Opentrace e2e keys (#5855)Andrew Morgan2020-02-212-3/+77
|\| | | |
| * | | | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-222-3/+77
| | | | | | | | | | | | | | | Add opentracing tags and logs for e2e keys
* | | | | Servlet to purge old rooms (#5845)Andrew Morgan2020-02-211-0/+17
|\| | | |
| * | | | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-221-0/+17
| | | | |
* | | | | Merge pull request #5860 from matrix-org/erikj/update_5704_commentsAndrew Morgan2020-02-211-17/+5
|\| | | |
| * | | | Merge pull request #5860 from matrix-org/erikj/update_5704_commentsErik Johnston2019-08-191-17/+5
| |\ \ \ \ | | | | | | | | | | | | Remove logging for #5407 and update comments
| | * | | | Remove logging for #5407 and update commentsErik Johnston2019-08-151-17/+5
| | |/ / /
* | | | | Don't create broken room when power_level_content_override.users does not ↵Andrew Morgan2020-02-201-1/+13
|\| | | | | | | | | | | | | | | | | | | contain creator_id. (#5633)
| * | | | Don't create broken room when power_level_content_override.users does not ↵Michael Telatynski2019-08-151-1/+13
| |/ / / | | | | | | | | | | | | contain creator_id. (#5633)
* | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncAndrew Morgan2020-02-201-6/+37
|\| | |
| * | | Handle TimelineBatch being limited and empty.Erik Johnston2019-08-061-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | This hopefully addresses #5407 by gracefully handling an empty but limited TimelineBatch. We also add some logging to figure out how this is happening.
| * | | Account validity: allow defining HTML templates to serve the us… (#5807)Brendan Abolivier2019-08-011-1/+9
| |\ \ \ | | | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt
| | * | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-1/+9
| | | |/ | | |/|
* | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomAndrew Morgan2020-02-201-1/+3
|\| | |
| * | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomErik Johnston2019-08-011-1/+3
| |\ \ \ | | | | | | | | | | Deny redaction of events in a different room.
| | * | | Deny redaction of events in a different room.Erik Johnston2019-07-311-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | We already correctly filter out such redactions, but we should also deny them over the CS API.
* | | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsAndrew Morgan2020-02-202-32/+60
|\| | | |
| * | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsErik Johnston2019-08-012-32/+60
| |\ \ \ \ | | |/ / / | |/| | | Handle RequestSendFailed exception correctly in more places.
| | * | | Don't log as exception when failing durig backfillErik Johnston2019-07-301-0/+3
| | | | |
| | * | | Correctly handle errors doing requests to group serversErik Johnston2019-07-291-32/+57
| | | | |
* | | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2020-02-201-1/+0
|\| | | |
| * | | | Remove duplicate return statementAndrew Morgan2019-07-311-1/+0
| | |/ / | |/| |
* | | | Merge pull request #5789 from matrix-org/erikj/fix_error_handling_keysAndrew Morgan2020-02-201-4/+3
|\| | |
| * | | Unwrap errorErik Johnston2019-07-301-1/+2
| | | |
| * | | Fix error handling when fetching remote device keysErik Johnston2019-07-301-3/+1
| | | |
* | | | Remove non-functional 'expire_access_token' setting (#5782)Andrew Morgan2020-02-201-1/+1
|\| | |
| * | | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-202-4/+105
|\| | |
| * | | Room Complexity Client Implementation (#5783)Amber Brown2019-07-302-4/+105
| |/ /
* | | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqliteAndrew Morgan2020-02-202-2/+2
|\| |
| * | Move some timeout checking logs to DEBUG #5785 Amber Brown2019-07-302-2/+2
| | |
* | | Update the device list cache when keys/query is called (#5693)Andrew Morgan2020-02-202-82/+136
|\| |
| * | Update the device list cache when keys/query is called (#5693)Jorik Schellekens2019-07-292-74/+136
| | |
| * | Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatchRichard van der Hoff2019-07-261-2/+35
| |\ \ | | | | | | | | Log when we receive a /make_* request from a different origin
* | \ \ Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Andrew Morgan2020-02-191-2/+35
|\ \ \ \
| * \ \ \ Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Richard van der Hoff2019-07-261-2/+35
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-261-2/+35
| | | |/ | | |/|
| * / | Log when we receive receipt from a different originErik Johnston2019-07-261-13/+22
| |/ /
* | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatchAndrew Morgan2020-02-191-13/+22
|\ \ \ | | |/ | |/|
| * | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatchErik Johnston2019-07-241-13/+22
| |\ \ | | | | | | | | Log when we receive receipt from a different origin
| | * | Log when we receive receipt from a different originErik Johnston2019-07-231-13/+22
| | |/
* | | Stop trying to fetch events with event_id=None. (#5753)Andrew Morgan2020-02-191-1/+7
|\| |
| * | Stop trying to fetch events with event_id=None. (#5753)Richard van der Hoff2019-07-241-1/+7
| | | | | | | | | | | | | | | | | | | | | `None` is not a valid event id, so queuing up a database fetch for it seems like a silly thing to do. I considered making `get_event` return `None` if `event_id is None`, but then its interaction with `allow_none` seemed uninituitive, and strong typing ftw.
* | | Replace returnValue with return (#5736)Andrew Morgan2020-02-1932-364/+330
|\| |
| * | Replace returnValue with return (#5736)Amber Brown2019-07-2332-364/+330
| |/
* | Ignore redactions of m.room.create events (#5701)Andrew Morgan2020-02-191-9/+24
|\|
| * Ignore redactions of m.room.create events (#5701)Richard van der Hoff2019-07-171-9/+24
| |
* | Return a different error from Invalid Password when a user is deactivated ↵Andrew Morgan2020-02-171-0/+9
|\| | | | | | | (#5674)
| * Return a different error from Invalid Password when a user is deactivated ↵Andrew Morgan2019-07-151-0/+9
| | | | | | | | | | (#5674) Return `This account has been deactivated` instead of `Invalid password` when a user is deactivated.
* | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataAndrew Morgan2020-02-171-0/+183
|\|
| * Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataErik Johnston2019-07-151-0/+183
| |\ | | | | | | Add basic function to get all data for a user out of synapse
| | * pep8Erik Johnston2019-07-051-4/+0
| | |
| | * Remove FileExfiltrationWriterErik Johnston2019-07-051-63/+0
| | |
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-08 12:55:49 +0000