Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into develop | Richard van der Hoff | 2020-02-21 | 1 | -5/+5 |
|\ | |||||
| * | Small grammar fixes to the ACME v1 deprecation notice (#6944) | Andrew Morgan | 2020-02-21 | 1 | -5/+5 |
| | | | | | | Some small fixes to the copy in #6907. | ||||
* | | Do not send alias events when creating / upgrading a room (#6941) | Patrick Cloke | 2020-02-20 | 2 | -40/+15 |
|/ | | | Stop emitting room alias update events during room creation/upgrade. | ||||
* | Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekable | Richard van der Hoff | 2020-02-19 | 5 | -33/+22 |
|\ | | | | | Make room alias lists peekable | ||||
| * | Make room alias lists peekable | Richard van der Hoff | 2020-02-19 | 1 | -1/+3 |
| | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/2432#pullrequestreview-360566830, make room alias lists accessible to users outside world_readable rooms. | ||||
| * | Add `allow_departed_users` param to `check_in_room_or_world_readable` | Richard van der Hoff | 2020-02-19 | 3 | -6/+14 |
| | | | | | | | | | | | | | | ... and set it everywhere it's called. while we're here, rename it for consistency with `check_user_in_room` (and to help check that I haven't missed any instances) | ||||
| * | Refactor the membership check methods in Auth | Richard van der Hoff | 2020-02-18 | 2 | -28/+7 |
| | | | | | | | | | | these were getting a bit unwieldy, so let's combine `check_joined_room` and `check_user_was_in_room` into a single `check_user_in_room`. | ||||
* | | Merge pull request #6945 from matrix-org/babolivier/fix-retention-debug-log | Brendan Abolivier | 2020-02-19 | 1 | -1/+1 |
|\ \ | |/ |/| | Fix log in message retention purge jobs | ||||
| * | Fix log in message retention purge jobs | Brendan Abolivier | 2020-02-18 | 1 | -1/+1 |
| | | |||||
* | | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939) | Richard van der Hoff | 2020-02-18 | 1 | -1/+16 |
| | | | | | | | | | | per matrix-org/matrix-doc#2432 | ||||
* | | Merge pull request #6907 from matrix-org/babolivier/acme-config | Brendan Abolivier | 2020-02-18 | 1 | -1/+15 |
|\ \ | |/ |/| | Add mention and warning about ACME v1 deprecation to the TLS config | ||||
| * | Make the log more noticeable | Brendan Abolivier | 2020-02-18 | 1 | -1/+2 |
| | | |||||
| * | Print the error as an error log and raise the same exception we got | Brendan Abolivier | 2020-02-18 | 1 | -9/+10 |
| | | |||||
| * | Lint | Brendan Abolivier | 2020-02-13 | 1 | -6/+7 |
| | | |||||
| * | Lint | Brendan Abolivier | 2020-02-13 | 1 | -7/+6 |
| | | |||||
| * | Add a comprehensive error when failing to register for an ACME account | Brendan Abolivier | 2020-02-13 | 1 | -1/+13 |
| | | |||||
* | | Stop sending events when creating or deleting aliases (#6904) | Patrick Cloke | 2020-02-18 | 2 | -40/+41 |
| | | | | | | Stop sending events when creating or deleting associations (room aliases). Send an updated canonical alias event if one of the alt_aliases is deleted. | ||||
* | | Raise the default power levels for invites, tombstones and server acls (#6834) | Andrew Morgan | 2020-02-17 | 1 | -1/+9 |
| | | |||||
* | | Filter the results of user directory searching via the spam checker (#6888) | Patrick Cloke | 2020-02-14 | 1 | -2/+12 |
|/ | | | Add a method to the spam checker to filter the user directory results. | ||||
* | Merge branch 'release-v1.10.0' into develop | Richard van der Hoff | 2020-02-11 | 1 | -0/+1 |
|\ | |||||
| * | filter out m.room.aliases from /sync state blocks (#6884) | Matthew Hodgson | 2020-02-10 | 1 | -0/+1 |
| | | | | | | We forgot to filter out aliases from /sync state blocks as well as the timeline. | ||||
* | | Reject device display names that are too long (#6882) | Patrick Cloke | 2020-02-10 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | * Reject device display names that are too long. Too long is currently defined as 100 characters in length. * Add a regression test for rejecting a too long device display name. | ||||
* | | Add support for putting fed user query API on workers (#6873) | Erik Johnston | 2020-02-07 | 1 | -19/+16 |
| | | |||||
* | | Allow moving group read APIs to workers (#6866) | Erik Johnston | 2020-02-07 | 1 | -131/+139 |
| | | |||||
* | | Admin api to add an email address (#6789) | Dirk Klimpel | 2020-02-07 | 2 | -0/+10 |
| | | |||||
* | | Limit the number of events that can be requested when backfilling events (#6864) | Patrick Cloke | 2020-02-06 | 1 | -0/+4 |
| | | | | | | Limit the maximum number of events requested when backfilling events. | ||||
* | | pass room version into FederationClient.send_join (#6854) | Richard van der Hoff | 2020-02-06 | 1 | -2/+1 |
| | | | | | | | | ... which allows us to sanity-check the create event. | ||||
* | | Third party event rules Update (#6781) | PeerD | 2020-02-06 | 1 | -1/+5 |
| | | |||||
* | | Reduce amount of logging at INFO level. (#6862) | Erik Johnston | 2020-02-06 | 4 | -11/+11 |
| | | | | | | | | | | | | | | | | A lot of the things we log at INFO are now a bit superfluous, so lets make them DEBUG logs to reduce the amount we log by default. Co-Authored-By: Brendan Abolivier <babolivier@matrix.org> Co-authored-by: Brendan Abolivier <github@brendanabolivier.com> | ||||
* | | Merge pull request #6823 from matrix-org/rav/redact_changes/5 | Richard van der Hoff | 2020-02-06 | 1 | -6/+2 |
|\ \ | | | | | | | pass room versions around | ||||
| * | | Pass room version object into `FederationClient.get_pdu` | Richard van der Hoff | 2020-02-05 | 1 | -6/+2 |
| | | | |||||
* | | | Merge tag 'v1.10.0rc2' into develop | Erik Johnston | 2020-02-06 | 4 | -17/+69 |
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.10.0rc2 (2020-02-06) ============================== Bugfixes -------- - Fix an issue with cross-signing where device signatures were not sent to remote servers. ([\#6844](https://github.com/matrix-org/synapse/issues/6844)) - Fix to the unknown remote device detection which was introduced in 1.10.rc1. ([\#6848](https://github.com/matrix-org/synapse/issues/6848)) Internal Changes ---------------- - Detect unexpected sender keys on remote encrypted events and resync device lists. ([\#6850](https://github.com/matrix-org/synapse/issues/6850)) | ||||
| * | Check sender_key matches on inbound encrypted events. (#6850) | Erik Johnston | 2020-02-05 | 2 | -14/+66 |
| | | | | | | If they don't then the device lists are probably out of sync. | ||||
| * | Fix detecting unknown devices from remote encrypted events. (#6848) | Erik Johnston | 2020-02-04 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | We were looking at the wrong event type (`m.room.encryption` vs `m.room.encrypted`). Also fixup the duplicate `EvenTypes` entries. Introduced in #6776. | ||||
* | | Merge pull request #6837 from matrix-org/rav/federation_async | Richard van der Hoff | 2020-02-04 | 3 | -235/+211 |
|\ \ | | | | | | | Port much of `synapse.handlers.federation` to async/await. | ||||
| * | | make FederationHandler.send_invite async | Richard van der Hoff | 2020-02-03 | 2 | -6/+4 |
| | | | |||||
| * | | make FederationHandler.on_get_missing_events async | Richard van der Hoff | 2020-02-03 | 1 | -5/+4 |
| | | | |||||
| * | | make FederationHandler.user_joined_room async | Richard van der Hoff | 2020-02-03 | 1 | -3/+3 |
| | | | |||||
| * | | make FederationHandler._clean_room_for_join async | Richard van der Hoff | 2020-02-03 | 1 | -4/+4 |
| | | | |||||
| * | | make FederationHandler._notify_persisted_event async | Richard van der Hoff | 2020-02-03 | 1 | -4/+6 |
| | | | |||||
| * | | make FederationHandler.persist_events_and_notify async | Richard van der Hoff | 2020-02-03 | 1 | -10/+10 |
| | | | |||||
| * | | make FederationHandler._make_and_verify_event async | Richard van der Hoff | 2020-02-03 | 1 | -5/+10 |
| | | | |||||
| * | | make FederationHandler.do_remotely_reject_invite async | Richard van der Hoff | 2020-02-03 | 2 | -8/+11 |
| | | | |||||
| * | | make FederationHandler._check_for_soft_fail async | Richard van der Hoff | 2020-02-03 | 1 | -13/+9 |
| | | | |||||
| * | | make FederationHandler._persist_auth_tree async | Richard van der Hoff | 2020-02-03 | 1 | -11/+7 |
| | | | |||||
| * | | make FederationHandler.do_invite_join async | Richard van der Hoff | 2020-02-03 | 2 | -18/+18 |
| | | | |||||
| * | | make FederationHandler.on_event_auth async | Richard van der Hoff | 2020-02-03 | 1 | -5/+4 |
| | | | |||||
| * | | make FederationHandler.on_exchange_third_party_invite_request async | Richard van der Hoff | 2020-02-03 | 1 | -14/+12 |
| | | | |||||
| * | | make FederationHandler.construct_auth_difference async | Richard van der Hoff | 2020-02-03 | 1 | -3/+4 |
| | | | |||||
| * | | make FederationHandler._update_context_for_auth_events async | Richard van der Hoff | 2020-02-03 | 1 | -10/+10 |
| | | | |||||
| * | | make FederationHandler._update_auth_events_and_context_for_auth async | Richard van der Hoff | 2020-02-03 | 1 | -20/+21 |
| | | | |||||
| * | | make FederationHandler.do_auth async | Richard van der Hoff | 2020-02-03 | 1 | -10/+14 |
| | | | |||||
| * | | make FederationHandler._prep_event async | Richard van der Hoff | 2020-02-03 | 1 | -23/+10 |
| | | | |||||
| * | | make FederationHandler._handle_new_event async | Richard van der Hoff | 2020-02-03 | 1 | -6/+7 |
| | | | |||||
| * | | make FederationHandler._handle_new_events async | Richard van der Hoff | 2020-02-03 | 1 | -8/+6 |
| | | | |||||
| * | | make FederationHandler.on_make_leave_request async | Richard van der Hoff | 2020-02-03 | 1 | -13/+10 |
| | | | |||||
| * | | make FederationHandler.on_send_leave_request async | Richard van der Hoff | 2020-02-03 | 1 | -5/+3 |
| | | | |||||
| * | | make FederationHandler.on_make_join_request async | Richard van der Hoff | 2020-02-03 | 1 | -13/+10 |
| | | | |||||
| * | | make FederationHandler.on_invite_request async | Richard van der Hoff | 2020-02-03 | 1 | -5/+4 |
| | | | |||||
| * | | make FederationHandler.on_send_join_request async | Richard van der Hoff | 2020-02-03 | 1 | -9/+7 |
| | | | |||||
| * | | make FederationHandler.on_query_auth async | Richard van der Hoff | 2020-02-03 | 1 | -7/+6 |
| |/ | |||||
* / | Add typing to SyncHandler (#6821) | Erik Johnston | 2020-02-03 | 1 | -341/+364 |
|/ | | | | Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
* | pass room_version into compute_event_signature (#6807) | Richard van der Hoff | 2020-01-31 | 1 | -1/+4 |
| | |||||
* | Merge pull request #6820 from matrix-org/rav/get_room_version_id | Richard van der Hoff | 2020-01-31 | 4 | -14/+16 |
|\ | | | | | Make `get_room_version` return a RoomVersion object | ||||
| * | s/get_room_version/get_room_version_id/ | Richard van der Hoff | 2020-01-31 | 4 | -14/+16 |
| | | | | | | | | | | ... to make way for a forthcoming get_room_version which returns a RoomVersion object. | ||||
* | | Fix bug with getting missing auth event during join 500'ed (#6810) | Erik Johnston | 2020-01-31 | 1 | -1/+5 |
|/ | |||||
* | pass room version into FederationHandler.on_invite_request (#6805) | Richard van der Hoff | 2020-01-30 | 1 | -3/+3 |
| | |||||
* | Resync remote device list when detected as stale. (#6786) | Erik Johnston | 2020-01-30 | 2 | -4/+24 |
| | |||||
* | Make /directory/room/<alias> handle restrictive power levels | Richard van der Hoff | 2020-01-29 | 1 | -1/+6 |
| | | | | | Fixes a bug where the alias would be added, but `PUT /directory/room/<alias>` would return a 403. | ||||
* | Set the PL for aliases events to 0. | Richard van der Hoff | 2020-01-29 | 1 | -2/+15 |
| | |||||
* | Factor out a `copy_power_levels_contents` method | Richard van der Hoff | 2020-01-29 | 1 | -12/+11 |
| | | | | I'm going to need another copy (hah!) of this. | ||||
* | Fix bug when querying remote user keys that require a resync. (#6796) | Erik Johnston | 2020-01-29 | 1 | -1/+2 |
| | | | | We ended up only returning a single device, rather than all of them. | ||||
* | Detect unknown remote devices and mark cache as stale (#6776) | Erik Johnston | 2020-01-28 | 2 | -2/+75 |
| | | | | We just mark the fact that the cache may be stale in the database for now. | ||||
* | Pass room version object into event_auth.check and check_redaction (#6788) | Richard van der Hoff | 2020-01-28 | 2 | -9/+17 |
| | | | | | | | These are easier to work with than the strings and we normally have one around. This fixes `FederationHander._persist_auth_tree` which was passing a RoomVersion object into event_auth.check instead of a string. | ||||
* | Add `rooms.room_version` column (#6729) | Erik Johnston | 2020-01-27 | 2 | -35/+82 |
| | | | This is so that we don't have to rely on pulling it out from `current_state_events` table. | ||||
* | Validate client_secret parameter (#6767) | Andrew Morgan | 2020-01-24 | 1 | -1/+3 |
| | |||||
* | Remove unnecessary abstractions in admin handler (#6751) | Andrew Morgan | 2020-01-22 | 1 | -62/+0 |
| | |||||
* | Add more logging around message retention policies support (#6717) | Brendan Abolivier | 2020-01-17 | 1 | -0/+13 |
| | | | So we can debug issues like #6683 more easily | ||||
* | Merge pull request #6714 from matrix-org/babolivier/retention_select_event | Brendan Abolivier | 2020-01-17 | 1 | -1/+1 |
|\ | | | | | Fix instantiation of message retention purge jobs | ||||
| * | Fix instantiation of message retention purge jobs | Brendan Abolivier | 2020-01-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When figuring out which topological token to start a purge job at, we need to do the following: 1. Figure out a timestamp before which events will be purged 2. Select the first stream ordering after that timestamp 3. Select info about the first event after that stream ordering 4. Build a topological token from that info In some situations (e.g. quiet rooms with a short max_lifetime), there might not be an event after the stream ordering at step 3, therefore we abort the purge with the error `No event found`. To mitigate that, this patch fetches the first event _before_ the stream ordering, instead of after. | ||||
* | | Merge pull request #6724 from matrix-org/rav/log_saml_attributes | Richard van der Hoff | 2020-01-17 | 1 | -1/+12 |
|\ \ | | | | | | | Log saml assertions rather than the whole response | ||||
| * | | Log saml assertions rather than the whole response | Richard van der Hoff | 2020-01-16 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | ... since the whole response is huge. We even need to break up the assertions, since kibana otherwise truncates them. | ||||
* | | | Delegate remote_user_id mapping to the saml mapping provider (#6723) | Richard van der Hoff | 2020-01-17 | 1 | -6/+21 |
|/ / | | | | | Turns out that figuring out a remote user id for the SAML user isn't quite as obvious as it seems. Factor it out to the SamlMappingProvider so that it's easy to control. | ||||
* | | Add StateMap type alias (#6715) | Erik Johnston | 2020-01-16 | 3 | -28/+31 |
| | | |||||
* | | Port synapse.replication.tcp to async/await (#6666) | Erik Johnston | 2020-01-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | * Port synapse.replication.tcp to async/await * Newsfile * Correctly document type of on_<FOO> functions as async * Don't be overenthusiastic with the asyncing.... | ||||
* | | Add `local_current_membership` table (#6655) | Erik Johnston | 2020-01-15 | 6 | -6/+6 |
|/ | | | | | | | Currently we rely on `current_state_events` to figure out what rooms a user was in and their last membership event in there. However, if the server leaves the room then the table may be cleaned up and that information is lost. So lets add a table that separately holds that information. | ||||
* | Kill off RegistrationError (#6691) | Richard van der Hoff | 2020-01-13 | 1 | -9/+3 |
| | | | This is pretty pointless. Let's just use SynapseError. | ||||
* | Don't assign numeric IDs for empty usernames (#6690) | Richard van der Hoff | 2020-01-13 | 1 | -1/+1 |
| | | | | Fix a bug where we would assign a numeric userid if somebody tried registering with an empty username | ||||
* | Pass client redirect URL into SAML mapping providers | Richard van der Hoff | 2020-01-12 | 1 | -4/+11 |
| | |||||
* | Pass the module_api into the SamlMappingProvider | Richard van der Hoff | 2020-01-12 | 1 | -2/+5 |
| | | | | | ... for consistency with other modules, and because we'll need it sooner or later and it will be a pain to introduce later. | ||||
* | Allow admin users to create or modify users without a shared secret (#6495) | Manuel Stahl | 2020-01-09 | 1 | -0/+9 |
| | | | Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de> | ||||
* | Correctly proxy remote group HTTP errors. (#6654) | Erik Johnston | 2020-01-07 | 1 | -0/+16 |
| | | | | | e.g. if remote returns a 404 then that shouldn't be treated as an error but should be proxied through. | ||||
* | Merge pull request #6652 from matrix-org/babolivier/depth_missing_events | Brendan Abolivier | 2020-01-07 | 1 | -2/+2 |
|\ | | | | | Fix conditions failing if min_depth = 0 | ||||
| * | Fix conditions failing if min_depth = 0 | Brendan Abolivier | 2020-01-07 | 1 | -2/+2 |
| | | | | | | | | This could result in Synapse not fetching prev_events for new events in the room if it has missed some events. | ||||
* | | Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashes | Richard van der Hoff | 2020-01-06 | 2 | -34/+20 |
|\ \ | | | | | | | Remove a bunch of unused code from event creation | ||||
| * | | Remove unused hashes and depths from _update_membership params | Richard van der Hoff | 2020-01-06 | 1 | -13/+4 |
| | | | |||||
| * | | Remove unused hashes and depths from create_event params | Richard van der Hoff | 2020-01-06 | 2 | -17/+12 |
| | | | |||||
| * | | Remove unused hashes and depths from create_new_client_event params | Richard van der Hoff | 2020-01-06 | 1 | -12/+14 |
| | | | |||||
| * | | replace get_prev_events_and_hashes_for_room with get_prev_events_for_room in ↵ | Richard van der Hoff | 2020-01-06 | 1 | -9/+3 |
| | | | | | | | | | | | | create_new_client_event | ||||
| * | | rename get_prev_events_for_room to get_prev_events_and_hashes_for_room | Richard van der Hoff | 2020-01-06 | 2 | -3/+7 |
| | | | | | | | | | | | | ... to make way for a new method which just returns the event ids | ||||
* | | | Fix some test failures when frozen_dicts are enabled (#6642) | Richard van der Hoff | 2020-01-06 | 2 | -6/+11 |
| | | | | | | | | | | | | Fixes #4026 | ||||
* | | | Fix an error which was thrown by the PresenceHandler _on_shutdown handler. ↵ | Richard van der Hoff | 2020-01-06 | 1 | -7/+2 |
|/ / | | | | | | | (#6640) | ||||
* / | Fix power levels being incorrectly set in old and new rooms after a room ↵ | Andrew Morgan | 2020-01-06 | 1 | -7/+10 |
|/ | | | | | | upgrade (#6633) Modify a copy of an upgraded room's PL before sending to the new room | ||||
* | Merge branch 'master' into develop | Richard van der Hoff | 2019-12-20 | 1 | -1/+4 |
|\ | |||||
| * | Fix exceptions when attempting to backfill (#6576) | Richard van der Hoff | 2019-12-20 | 1 | -1/+4 |
| | | | | | | Fixes #6575 | ||||
* | | Change EventContext to use the Storage class (#6564) | Erik Johnston | 2019-12-20 | 5 | -16/+16 |
| | | |||||
* | | Port some admin handlers to async/await (#6559) | Erik Johnston | 2019-12-19 | 2 | -54/+41 |
| | | |||||
* | | Add database config class (#6513) | Erik Johnston | 2019-12-18 | 1 | -1/+1 |
| | | | | | | | | | | This encapsulates config for a given database and is the way to get new connections. | ||||
* | | Merge release-v1.7.1 into develop | Richard van der Hoff | 2019-12-18 | 2 | -2/+6 |
|\| | |||||
| * | Merge pull request #6553 from matrix-org/babolivier/fix-context-filter | Brendan Abolivier | 2019-12-16 | 1 | -2/+5 |
| |\ | | | | | | | Use the filtered version of an event when responding to /context requests for that event | ||||
| | * | Incorporate review | Brendan Abolivier | 2019-12-16 | 1 | -1/+1 |
| | | | |||||
| | * | Use the filtered version of an event when responding to /context requests ↵ | Brendan Abolivier | 2019-12-16 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | for that event Sometimes the filtering function can return a pruned version of an event (on top of either the event itself or an empty list), if it thinks the user should be able to see that there's an event there but not the content of that event. Therefore, the previous logic of 'if filtered is empty then we can use the event we retrieved from the database' is flawed, and we should use the event returned by the filtering function. | ||||
| * | | Exclude rejected state events when calculating state at backwards extrems ↵ | Richard van der Hoff | 2019-12-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | (#6527) This fixes a weird bug where, if you were determined enough, you could end up with a rejected event forming part of the state at a backwards-extremity. Authing that backwards extrem would then lead to us trying to pull the rejected event from the db (with allow_rejected=False), which would fail with a 404. | ||||
| * | | Persist auth/state events at backwards extremities when we fetch them (#6526) | Richard van der Hoff | 2019-12-16 | 1 | -163/+80 |
| | | | | | | | | | | | | The main point here is to make sure that the state returned by _get_state_in_room has been authed before we try to use it as state in the room. | ||||
| * | | sanity-checking for events used in state res (#6531) | Richard van der Hoff | 2019-12-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | When we perform state resolution, check that all of the events involved are in the right room. | ||||
| * | | Check the room_id of events when fetching room state/auth (#6524) | Richard van der Hoff | 2019-12-16 | 1 | -24/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we request the state/auth_events to populate a backwards extremity (on backfill or in the case of missing events in a transaction push), we should check that the returned events are in the right room rather than blindly using them in the room state or auth chain. Given that _get_events_from_store_or_dest takes a room_id, it seems clear that it should be sanity-checking the room_id of the requested events, so let's do it there. | ||||
| * | | Add `include_event_in_state` to _get_state_for_room (#6521) | Richard van der Hoff | 2019-12-16 | 1 | -18/+21 |
| | | | | | | | | | | | | | | | | | | Make it return the state *after* the requested event, rather than the one before it. This is a bit easier and requires fewer calls to get_events_from_store_or_dest. | ||||
| * | | Move get_state methods into FederationHandler (#6503) | Richard van der Hoff | 2019-12-16 | 1 | -6/+95 |
| |/ | | | | | | | | | This is a non-functional refactor as a precursor to some other work. | ||||
* | | Remove unused `get_pagination_rows` methods. (#6557) | Erik Johnston | 2019-12-17 | 3 | -18/+0 |
| | | | | | | Remove unused get_pagination_rows methods | ||||
* | | Add option to allow profile queries without sharing a room (#6523) | Will Hunt | 2019-12-16 | 1 | -1/+5 |
| | | |||||
* | | Exclude rejected state events when calculating state at backwards extrems ↵ | Richard van der Hoff | 2019-12-16 | 1 | -1/+1 |
| | | | | | | | | | | (#6527) This fixes a weird bug where, if you were determined enough, you could end up with a rejected event forming part of the state at a backwards-extremity. Authing that backwards extrem would then lead to us trying to pull the rejected event from the db (with allow_rejected=False), which would fail with a 404. | ||||
* | | Persist auth/state events at backwards extremities when we fetch them (#6526) | Richard van der Hoff | 2019-12-16 | 1 | -167/+80 |
| | | | | | | The main point here is to make sure that the state returned by _get_state_in_room has been authed before we try to use it as state in the room. | ||||
* | | sanity-checking for events used in state res (#6531) | Richard van der Hoff | 2019-12-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | When we perform state resolution, check that all of the events involved are in the right room. | ||||
* | | Merge pull request #6496 from matrix-org/erikj/initial_sync_asnyc | Erik Johnston | 2019-12-13 | 1 | -52/+44 |
|\ \ | | | | | | | Port synapse.handlers.initial_sync to async/await | ||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-12-11 | 8 | -236/+452 |
| |\ \ | | | | | | | | | | | | | erikj/initial_sync_asnyc | ||||
| * | | | Port synapse.handlers.initial_sync to async/await | Erik Johnston | 2019-12-09 | 1 | -52/+44 |
| | | | | |||||
* | | | | look up cross-signing keys from the DB in bulk (#6486) | Hubert Chathi | 2019-12-12 | 1 | -8/+27 |
| | | | | |||||
* | | | | Check the room_id of events when fetching room state/auth (#6524) | Richard van der Hoff | 2019-12-12 | 1 | -23/+51 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | When we request the state/auth_events to populate a backwards extremity (on backfill or in the case of missing events in a transaction push), we should check that the returned events are in the right room rather than blindly using them in the room state or auth chain. Given that _get_events_from_store_or_dest takes a room_id, it seems clear that it should be sanity-checking the room_id of the requested events, so let's do it there. | ||||
* | | | Add `include_event_in_state` to _get_state_for_room (#6521) | Richard van der Hoff | 2019-12-11 | 1 | -22/+28 |
| | | | | | | | | | | | | | | | Make it return the state *after* the requested event, rather than the one before it. This is a bit easier and requires fewer calls to get_events_from_store_or_dest. | ||||
* | | | Merge pull request #6517 from matrix-org/rav/event_auth/13 | Richard van der Hoff | 2019-12-11 | 2 | -98/+88 |
|\ \ \ | | | | | | | | | Port some of FederationHandler to async/await | ||||
| * | | | convert to async: FederationHandler._process_received_pdu | Richard van der Hoff | 2019-12-11 | 1 | -11/+10 |
| | | | | | | | | | | | | | | | | also fix user_joined_room to consistently return deferreds | ||||
| * | | | convert to async: FederationHandler._get_state_for_room | Richard van der Hoff | 2019-12-11 | 1 | -21/+21 |
| | | | | | | | | | | | | | | | | ... and _get_events_from_store_or_dest | ||||
| * | | | convert to async: FederationHandler.on_receive_pdu | Richard van der Hoff | 2019-12-11 | 1 | -27/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | and associated functions: * on_receive_pdu * handle_queued_pdus * get_missing_events_for_pdu | ||||
| * | | | Convert federation backfill to async | Richard van der Hoff | 2019-12-11 | 2 | -39/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PaginationHandler.get_messages is only called by RoomMessageListRestServlet, which is async. Chase the code path down from there: - FederationHandler.maybe_backfill (and nested try_backfill) - FederationHandler.backfill | ||||
* | | | | Merge pull request #6504 from matrix-org/erikj/account_validity_async_await | Erik Johnston | 2019-12-11 | 2 | -55/+45 |
|\ \ \ \ | |/ / / |/| | | | Port handlers.account_validity to async/await. | ||||
| * | | | Port handlers.account_validity to async/await. | Erik Johnston | 2019-12-10 | 2 | -47/+41 |
| | | | | |||||
| * | | | Port handlers.account_data to async/await. | Erik Johnston | 2019-12-10 | 1 | -9/+5 |
| | |/ | |/| | |||||
* | | | Clean up some logging (#6515) | Richard van der Hoff | 2019-12-11 | 1 | -18/+19 |
| | | | | | | | | | | | | This just makes some of the logging easier to follow when things start going wrong. | ||||
* | | | Prevent redacted events from appearing in message search (#6377) | Andrew Morgan | 2019-12-11 | 2 | -4/+8 |
| | | | |||||
* | | | Prevent message search in upgraded rooms we're not in (#6385) | Andrew Morgan | 2019-12-11 | 2 | -11/+27 |
| | | | |||||
* | | | Move get_state methods into FederationHandler (#6503) | Richard van der Hoff | 2019-12-10 | 1 | -6/+95 |
| | | | | | | | | | | | | | | | This is a non-functional refactor as a precursor to some other work. | ||||
* | | | Allow SAML username provider plugins (#6411) | Andrew Morgan | 2019-12-10 | 1 | -28/+170 |
| | | | |||||
* | | | Merge pull request #6506 from matrix-org/erikj/remove_snapshot_cache | Erik Johnston | 2019-12-10 | 1 | -11/+8 |
|\ \ \ | |/ / |/| / | |/ | Remove SnapshotCache in favour of ResponseCache | ||||
| * | Remove SnapshotCache in favour of ResponseCache | Erik Johnston | 2019-12-09 | 1 | -11/+8 |
| | | |||||
* | | Back out perf regression from get_cross_signing_keys_from_cache. (#6494) | Neil Johnson | 2019-12-09 | 1 | -30/+8 |
|/ | | | Back out cross-signing code added in Synapse 1.5.0, which caused a performance regression. | ||||
* | Merge pull request #6493 from matrix-org/erikj/invite_state_config | Erik Johnston | 2019-12-09 | 1 | -1/+3 |
|\ | | | | | Pull out room_invite_state_types config option once. | ||||
| * | Pull out room_invite_state_types config option once. | Erik Johnston | 2019-12-09 | 1 | -1/+3 |
| | | | | | | | | Pulling things out of config is currently surprisingly expensive. | ||||
* | | Merge pull request #6484 from matrix-org/erikj/port_sync_handler | Erik Johnston | 2019-12-09 | 3 | -152/+131 |
|\ \ | |/ |/| | Port SyncHandler to async/await | ||||
| * | Fixup functions to consistently return deferreds | Erik Johnston | 2019-12-06 | 2 | -4/+4 |
| | | |||||
| * | Port SyncHandler to async/await | Erik Johnston | 2019-12-05 | 2 | -151/+130 |
| | | |||||
* | | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925) | Manuel Stahl | 2019-12-05 | 1 | -9/+12 |
|/ | |||||
* | Stronger typing in the federation handler (#6480) | Richard van der Hoff | 2019-12-05 | 1 | -24/+57 |
| | | | | | replace the event_info dict with an attrs thing | ||||
* | Sanity-check the rooms of auth events before pulling them in. (#6472) | Richard van der Hoff | 2019-12-05 | 1 | -9/+25 |
| | |||||
* | get rid of (most of) have_events from ↵ | Richard van der Hoff | 2019-12-04 | 1 | -38/+24 |
| | | | | | | | | | | | | | _update_auth_events_and_context_for_auth (#6468) have_events was a map from event_id to rejection reason (or None) for events which are in our local database. It was used as filter on the list of event_ids being passed into get_events_as_list. However, since get_events_as_list will ignore any event_ids that are unknown or rejected, we can equivalently just leave it to get_events_as_list to do the filtering. That means that we don't have to keep `have_events` up-to-date, and can use `have_seen_events` instead of `get_seen_events_with_rejection` in the one place we do need it. | ||||
* | Merge pull request #6441 from syamgk/fix-parameter-mismatch | Erik Johnston | 2019-12-04 | 1 | -1/+1 |
|\ | | | | | Fix issue #6406 parameter mismatch | ||||
| * | Issue #6406 Fix parameter mismatch | Syam G Krishnan | 2019-12-04 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Syam G Krishnan <syamgk01@gmail.com> | ||||
* | | Merge pull request #6329 from matrix-org/babolivier/context_filters | Brendan Abolivier | 2019-12-04 | 1 | -2/+12 |
|\ \ | | | | | | | Filter state, events_before and events_after in /context requests | ||||
| * \ | Merge branch 'develop' into babolivier/context_filters | Brendan Abolivier | 2019-12-04 | 14 | -192/+395 |
| |\ \ | |||||
| * | | | Incorporate review | Brendan Abolivier | 2019-12-04 | 1 | -2/+1 |
| | | | | |||||
| * | | | Also filter state events | Brendan Abolivier | 2019-11-06 | 1 | -1/+7 |
| | | | | |||||
| * | | | Only filter if a filter was provided | Brendan Abolivier | 2019-11-05 | 1 | -4/+6 |
| | | | | |||||
| * | | | Update copyright | Brendan Abolivier | 2019-11-05 | 1 | -1/+2 |
| | | | | |||||
| * | | | Filter events_before and events_after in /context requests | Brendan Abolivier | 2019-11-05 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | While the current version of the spec doesn't say much about how this endpoint uses filters (see https://github.com/matrix-org/matrix-doc/issues/2338), the current implementation is that some fields of an EventFilter apply (the ones that are used when running the SQL query) and others don't (the ones that are used by the filter itself) because we don't call event_filter.filter(...). This seems counter-intuitive and probably not what we want so this commit fixes it. | ||||
* | | | | Add ephemeral messages support (MSC2228) (#6409) | Brendan Abolivier | 2019-12-03 | 2 | -1/+130 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | Implement part [MSC2228](https://github.com/matrix-org/matrix-doc/pull/2228). The parts that differ are: * the feature is hidden behind a configuration flag (`enable_ephemeral_messages`) * self-destruction doesn't happen for state events * only implement support for the `m.self_destruct_after` field (not the `m.self_destruct` one) * doesn't send synthetic redactions to clients because for this specific case we consider the clients to be able to destroy an event themselves, instead we just censor it (by pruning its JSON) in the database | ||||
* | | | Transfer power level state events on room upgrade (#6237) | Andrew Morgan | 2019-12-02 | 1 | -5/+31 |
| |/ |/| | |||||
* | | Merge pull request #6434 from matrix-org/erikj/msc2367_membership_reasons | Erik Johnston | 2019-11-29 | 3 | -7/+15 |
|\ \ | | | | | | | Implement MSC 2367 - Membership Reasons | ||||
| * | | Propagate reason in remotely rejected invites | Erik Johnston | 2019-11-28 | 3 | -7/+15 |
| | | | |||||
* | | | Discard retention policies when retrieving state | Brendan Abolivier | 2019-11-28 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | | | Purge jobs don't delete the latest event in a room in order to keep the forward extremity and not break the room. On the other hand, get_state_events, when given an at_token argument calls filter_events_for_client to know if the user can see the event that matches that (sync) token. That function uses the retention policies of the events it's given to filter out those that are too old from a client's view. Some clients, such as Riot, when loading a room, request the list of members for the latest sync token it knows about, and get confused to the point of refusing to send any message if the server tells it that it can't get that information. This can happen very easily with the message retention feature turned on and a room with low activity so that the last event sent becomes too old according to the room's retention policy. An easy and clean fix for that issue is to discard the room's retention policies when retrieving state. | ||||
* | | Remove local threepids on account deactivation (#6426) | Andrew Morgan | 2019-11-28 | 1 | -0/+3 |
| | | |||||
* | | add etag and count to key backup endpoints (#5858) | Hubert Chathi | 2019-11-27 | 1 | -50/+80 |
| | | |||||
* | | Merge pull request #6358 from matrix-org/babolivier/message_retention | Brendan Abolivier | 2019-11-27 | 3 | -4/+110 |
|\ \ | | | | | | | Implement message retention policies (MSC1763) | ||||
| * \ | Merge branch 'develop' into babolivier/message_retention | Brendan Abolivier | 2019-11-26 | 9 | -88/+111 |
| |\ \ | |||||
| * | | | Fix 3PID invite exchange | Brendan Abolivier | 2019-11-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Lint | Brendan Abolivier | 2019-11-19 | 1 | -11/+6 |
| | | | | |||||
| * | | | Implement per-room message retention policies | Brendan Abolivier | 2019-11-04 | 3 | -3/+114 |
| | |/ | |/| | |||||
* | | | Merge pull request #6343 from matrix-org/rav/event_auth/4 | Richard van der Hoff | 2019-11-26 | 1 | -37/+44 |
|\ \ \ | |_|/ |/| | | Refactor _update_auth_events_and_context_for_auth | ||||
| * | | remove confusing fixme | Richard van der Hoff | 2019-11-26 | 1 | -6/+0 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/4 | Richard van der Hoff | 2019-11-18 | 6 | -11/+11 |
| |\ \ | |||||
| * | | | Use get_events_as_list rather than lots of calls to get_event | Richard van der Hoff | 2019-11-08 | 1 | -16/+8 |
| | | | | | | | | | | | | | | | | It's more efficient and clearer. | ||||
| * | | | Update some docstrings and comments | Richard van der Hoff | 2019-11-08 | 1 | -8/+31 |
| | | | | |||||
| * | | | Simplify _update_auth_events_and_context_for_auth | Richard van der Hoff | 2019-11-08 | 1 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | | move event_key calculation into _update_context_for_auth_events, since it's only used there. | ||||
* | | | | Merge pull request #6332 from matrix-org/erikj/query_devices_fix | Erik Johnston | 2019-11-26 | 1 | -3/+16 |
|\ \ \ \ | | | | | | | | | | | Fix caching devices for remote servers in worker. | ||||
| * | | | | Fix caching devices for remote servers in worker. | Erik Johnston | 2019-11-05 | 1 | -3/+16 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | When the `/keys/query` API is hit on client_reader worker Synapse may decide that it needs to resync some remote deivces. Usually this happens on master, and then gets cached. However, that fails on workers and so it falls back to fetching devices from remotes directly, which may in turn fail if the remote is down. | ||||
* | | | | Clean up newline quote marks around the codebase (#6362) | Andrew Morgan | 2019-11-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanups | Brendan Abolivier | 2019-11-20 | 1 | -53/+31 |
|\ \ \ \ | |_|_|/ |/| | | | Only do `rc_login` ratelimiting on succesful login. | ||||
| * | | | Apply suggestions from code review | Erik Johnston | 2019-11-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-Authored-By: Brendan Abolivier <babolivier@matrix.org> | ||||
| * | | | Add failed auth ratelimiting to UIA | Erik Johnston | 2019-11-06 | 1 | -1/+32 |
| | | | | |||||
| * | | | Only do `rc_login` ratelimiting on succesful login. | Erik Johnston | 2019-11-06 | 1 | -54/+1 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were doing this in a number of places which meant that some login code paths incremented the counter multiple times. It was also applying ratelimiting to UIA endpoints, which was probably not intentional. In particular, some custom auth modules were calling `check_user_exists`, which incremented the counters, meaning that people would fail to login sometimes. | ||||
* | / | Replace instance variations of homeserver with correct case/spacing | Andrew Morgan | 2019-11-12 | 6 | -11/+11 |
| |/ |/| | |||||
* | | Merge pull request #6295 from matrix-org/erikj/split_purge_history | Erik Johnston | 2019-11-08 | 1 | -2/+4 |
|\ \ | | | | | | | Split purge API into events vs state and add PurgeEventsStorage | ||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-11-04 | 16 | -144/+357 |
| |\| | | | | | | | | | | erikj/split_purge_history | ||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-31 | 15 | -69/+95 |
| |\ \ | | | | | | | | | | | | | erikj/split_purge_history | ||||
| * | | | Split purge API into events vs state | Erik Johnston | 2019-10-30 | 1 | -2/+5 |
| | | | | |||||
* | | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groups | Andrew Morgan | 2019-11-07 | 1 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | Re-add docstring, with caveats detailed | Andrew Morgan | 2019-11-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Transfer upgraded rooms on groups | Andrew Morgan | 2019-11-04 | 1 | -0/+9 |
| | |_|/ | |/| | | |||||
* | | | | raise exception after multiple failures | Andrew Morgan | 2019-11-06 | 1 | -3/+10 |
| | | | | |||||
* | | | | Address review comments | Andrew Morgan | 2019-11-06 | 1 | -12/+12 |
| | | | | |||||
* | | | | Don't forget to ratelimit calls outside of RegistrationHandler | Andrew Morgan | 2019-11-06 | 1 | -2/+2 |
| | | | | |||||
* | | | | Numeric ID checker now checks @0, don't ratelimit on checking | Andrew Morgan | 2019-11-06 | 1 | -16/+25 |
| | | | | |||||
* | | | | Fix bug which caused rejected events to be stored with the wrong room state ↵ | Richard van der Hoff | 2019-11-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6320) Fixes a bug where rejected events were persisted with the wrong state group. Also fixes an occasional internal-server-error when receiving events over federation which are rejected and (possibly because they are backwards-extremities) have no prev_group. Fixes #6289. | ||||
* | | | | Add some checks that we aren't using state from rejected events (#6330) | Richard van der Hoff | 2019-11-05 | 1 | -1/+5 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Raise an exception if accessing state for rejected events Add some sanity checks on accessing state_group etc for rejected events. * Skip calculating push actions for rejected events It didn't actually cause any bugs, because rejected events get filtered out at various later points, but there's not point in trying to calculate the push actions for a rejected event. | ||||
* | | | Factor out an _AsyncEventContextImpl (#6298) | Richard van der Hoff | 2019-11-01 | 1 | -19/+19 |
| | | | | | | | | | | | | | | | | | | The intention here is to make it clearer which fields we can expect to be populated when: notably, that the _event_type etc aren't used for the synchronous impl of EventContext. | ||||
* | | | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy. The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`. The proxy will then be used for * push * url previews * phone-home stats * recaptcha validation * CAS auth validation It will *not* be used for: * Application Services * Identity servers * Outbound federation * In worker configurations, connections from workers to masters Fixes #4198. | ||||
* | | | Remove last usages of deprecated logging.warn method (#6314) | Andrew Morgan | 2019-11-01 | 1 | -1/+1 |
| | | | |||||
* | | | Depublish a room from the public rooms list when it is upgraded (#6232) | Andrew Morgan | 2019-11-01 | 3 | -29/+90 |
| | | | |||||
* | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-31 | 21 | -153/+202 |
|\ \ \ | |||||
| * | | | Update black to 19.10b0 (#6304) | Amber Brown | 2019-11-01 | 13 | -84/+106 |
| | |/ | |/| | | | | * update version of black and also fix the mypy config being overridden | ||||
| * | | Merge pull request #6294 from matrix-org/erikj/add_state_storage | Erik Johnston | 2019-10-31 | 10 | -40/+63 |
| |\ \ | | | | | | | | | Add StateGroupStorage interface | ||||
| | * | | Port to use state storage | Erik Johnston | 2019-10-30 | 10 | -40/+63 |
| | |/ | |||||
| * / | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2019-10-31 | 9 | -29/+33 |
| |/ | | | | | Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated. | ||||
* | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-30 | 5 | -39/+43 |
|\| | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-30 | 4 | -37/+39 |
| |\ | | | | | | | | | | erikj/split_out_persistence_store | ||||
| | * | Fix log line that was printing undefined value (#6278) | Andrew Morgan | 2019-10-30 | 1 | -1/+1 |
| | | | |||||
| | * | Port receipt and read markers to async/wait | Erik Johnston | 2019-10-29 | 2 | -33/+17 |
| | | | |||||
| | * | Improve signature checking on some federation APIs (#6262) | Richard van der Hoff | 2019-10-28 | 1 | -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. | ||||
| | * | Remove repeated calls to config.stats_enabled. | Erik Johnston | 2019-10-25 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | Turns out that fetching variables from the config object is expensive, so doing it once at startup avoids unnecessary work. | ||||
| * | | Use new EventPersistenceStore | Erik Johnston | 2019-10-23 | 2 | -2/+4 |
| |/ | |||||
* | | black | Hubert Chathi | 2019-10-30 | 1 | -1/+3 |
| | | |||||
* | | apply changes as a result of PR review | Hubert Chathi | 2019-10-30 | 1 | -12/+10 |
| | | |||||
* | | don't error if federation query doesn't have cross-signing keys | Hubert Chathi | 2019-10-24 | 1 | -7/+9 |
| | | |||||
* | | black | Hubert Chathi | 2019-10-22 | 1 | -1/+2 |
| | | |||||
* | | vendor-prefix the EDU name until MSC1756 is merged into the spec | Hubert Chathi | 2019-10-22 | 1 | -1/+2 |
| | | |||||
* | | update to work with newer code, and fix formatting | Hubert Chathi | 2019-10-22 | 2 | -5/+6 |
| | | |||||
* | | add missing param | Hubert Chathi | 2019-10-22 | 1 | -1/+1 |
| | | |||||
* | | make black happy | Hubert Chathi | 2019-10-22 | 1 | -5/+7 |
| | | |||||
* | | implement federation parts of cross-signing | Hubert Chathi | 2019-10-22 | 2 | -3/+126 |
|/ | |||||
* | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2 | Hubert Chathi | 2019-10-22 | 1 | -1/+390 |
|\ | | | | | Cross-signing [3/4] -- uploading signatures edition | ||||
| * | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-10-18 | 18 | -851/+1390 |
| |\ | |||||
| * | | fix doc strings | Hubert Chathi | 2019-10-18 | 1 | -9/+13 |
| | | | |||||
| * | | make isort happy | Hubert Chathi | 2019-09-24 | 1 | -1/+0 |
| | | | |||||
| * | | add some comments | Hubert Chathi | 2019-09-24 | 1 | -2/+10 |
| | | | |||||
| * | | drop some logger lines to debug | Hubert Chathi | 2019-09-24 | 1 | -3/+3 |
| | | | |||||
| * | | make changes based on PR feedback | Hubert Chathi | 2019-09-24 | 1 | -107/+159 |
| | | | |||||
| * | | add function docs | Hubert Chathi | 2019-09-07 | 1 | -2/+24 |
| | | | |||||
| * | | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-09-07 | 5 | -114/+280 |
| |\ \ | |||||
| * | | | run black | Hubert Chathi | 2019-09-06 | 1 | -24/+10 |
| | | | | |||||
| * | | | split out signature processing into separate functions | Hubert Chathi | 2019-09-06 | 1 | -195/+204 |
| | | | | |||||
| * | | | avoid modifying input parameter | Hubert Chathi | 2019-09-05 | 1 | -7/+7 |
| | | | | |||||
| * | | | update with newer coding style | Hubert Chathi | 2019-09-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | make black happy | Hubert Chathi | 2019-09-04 | 1 | -78/+69 |
| | | | | |||||
| * | | | allow uploading signatures of master key signed by devices | Hubert Chathi | 2019-09-04 | 1 | -82/+150 |
| | | | | |||||
| * | | | implement device signature uploading/fetching | Hubert Chathi | 2019-09-04 | 1 | -0/+250 |
| | | | | |||||
* | | | | Remove Auth.check method (#6217) | Richard van der Hoff | 2019-10-18 | 1 | -3/+4 |
| |_|/ |/| | | | | | This method was somewhat redundant, and confusing. | ||||
* | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into develop | Hubert Chathi | 2019-10-18 | 3 | -6/+216 |
|\ \ \ | |||||
| * \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 18 | -746/+1387 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-09-07 | 5 | -114/+280 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| * | | | Merge branch 'develop' into cross-signing_keys | Hubert Chathi | 2019-09-04 | 17 | -485/+228 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 16 | -65/+412 |
| |\ \ \ \ | |||||
| * | | | | | black | Hubert Chathi | 2019-08-28 | 1 | -3/+1 |
| | | | | | |