Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Default PL100 to enable encryption in a room (#7230) | Andrew Morgan | 2020-04-09 | 2 | -4/+297 |
| | |||||
* | Do not allow a deactivated user to login via SSO. (#7240) | Patrick Cloke | 2020-04-09 | 1 | -3/+39 |
| | |||||
* | bg update to clear out duplicate outbound_device_list_pokes (#7193) | Richard van der Hoff | 2020-04-07 | 1 | -0/+52 |
| | | | | We seem to have some duplicates, which could do with being cleared out. | ||||
* | Move client command handling out of TCP protocol (#7185) | Erik Johnston | 2020-04-06 | 3 | -29/+25 |
| | | | The aim here is to move the command handling out of the TCP protocol classes and to also merge the client and server command handling (so that we can reuse them for redis protocol). This PR simply moves the client paths to the new `ReplicationCommandHandler`, a future PR will move the server paths too. | ||||
* | Server notices: Dissociate room creation/lookup from invite (#7199) | Brendan Abolivier | 2020-04-04 | 1 | -12/+108 |
| | | | | | | | | | Fixes #6815 Before figuring out whether we should alert a user on MAU, we call get_notice_room_for_user to get some info on the existing server notices room for this user. This function, if the room doesn't exist, creates it and invites the user in it. This means that, if we decide later that no server notice is needed, the user gets invited in a room with no message in it. This happens at every restart of the server, since the room ID returned by get_notice_room_for_user is cached. This PR fixes that by moving the inviting bit to a dedicated function, that's only called when the server actually needs to send a notice to the user. A potential issue with this approach is that the room that's created by get_notice_room_for_user doesn't match how that same function looks for an existing room (i.e. it creates a room that doesn't have an invite or a join for the current user in it, so it could lead to a new room being created each time a user syncs), but I'm not sure this is a problem given it's cached until the server restarts, so that function won't run very often. It also renames get_notice_room_for_user into get_or_create_notice_room_for_user to make what it does clearer. | ||||
* | Merge pull request #7190 from matrix-org/rav/one_bg_update_at_a_time | Richard van der Hoff | 2020-04-03 | 2 | -13/+22 |
|\ | | | | | Only run one background update at a time | ||||
| * | Make do_next_background_update return a bool | Richard van der Hoff | 2020-03-31 | 1 | -3/+3 |
| | | | | | | | | returning a None or an int that we don't use is confusing. | ||||
| * | Set a logging context while running the bg updates | Richard van der Hoff | 2020-03-31 | 1 | -4/+7 |
| | | | | | | | | | | This mostly just reduces the amount of "running from sentinel context" spam during unittest setup. | ||||
| * | Make `has_completed_background_updates` async | Richard van der Hoff | 2020-03-31 | 1 | -1/+3 |
| | | | | | | | | (Almost) everywhere that uses it is happy with an awaitable. | ||||
| * | Remove unused `start_background_update` | Richard van der Hoff | 2020-03-31 | 1 | -5/+9 |
| | | | | | | | | This was only used in a unit test, so let's just inline it in the test. | ||||
* | | Fix device list update stream ids going backward (#7158) | Richard van der Hoff | 2020-04-03 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occasionally we could get a federation device list update transaction which looked like: ``` [ {'edu_type': 'm.device_list_update', 'content': {'user_id': '@user:test', 'device_id': 'D2', 'prev_id': [], 'stream_id': 12, 'deleted': True}}, {'edu_type': 'm.device_list_update', 'content': {'user_id': '@user:test', 'device_id': 'D1', 'prev_id': [12], 'stream_id': 11, 'deleted': True}}, {'edu_type': 'm.device_list_update', 'content': {'user_id': '@user:test', 'device_id': 'D3', 'prev_id': [11], 'stream_id': 13, 'deleted': True}} ] ``` Having `stream_ids` which are lower than `prev_ids` looks odd. It might work (I'm not actually sure), but in any case it doesn't seem like a reasonable thing to expect other implementations to support. | ||||
* | | Allow admins to create aliases when they are not in the room (#7191) | Patrick Cloke | 2020-04-01 | 1 | -0/+62 |
|/ | |||||
* | Rewrite prune_old_outbound_device_pokes for efficiency (#7159) | Richard van der Hoff | 2020-03-30 | 1 | -0/+92 |
| | | | | make sure we clear out all but one update for the user | ||||
* | Merge pull request #7157 from matrix-org/rev.outbound_device_pokes_tests | Richard van der Hoff | 2020-03-30 | 10 | -22/+317 |
|\ | | | | | Add tests for outbound device pokes | ||||
| * | Add tests for outbound device pokes | Richard van der Hoff | 2020-03-27 | 2 | -3/+301 |
| | | |||||
| * | Remove spurious "name" parameter to `default_config` | Richard van der Hoff | 2020-03-24 | 9 | -19/+16 |
| | | | | | | | | | | this is never set to anything other than "test", and is a source of unnecessary boilerplate. | ||||
* | | Always whitelist the login fallback for SSO (#7153) | Richard van der Hoff | 2020-03-27 | 1 | -1/+8 |
| | | | | | | | | | | | | | | That fallback sets the redirect URL to itself (so it can process the login token then return gracefully to the client). This would make it pointless to ask the user for confirmation, since the URL the confirmation page would be showing wouldn't be the client's. | ||||
* | | Admin API to join users to a room. (#7051) | Dirk Klimpel | 2020-03-27 | 1 | -0/+288 |
| | | |||||
* | | Add options to prevent users from changing their profile. (#7096) | Dirk Klimpel | 2020-03-27 | 2 | -1/+366 |
| | | |||||
* | | Allow server admins to define and enforce a password policy (MSC2000). (#7118) | Dirk Klimpel | 2020-03-26 | 1 | -0/+179 |
| | | |||||
* | | Validate that the session is not modified during UI-Auth (#7068) | Patrick Cloke | 2020-03-26 | 2 | -2/+69 |
| | | |||||
* | | Move catchup of replication streams to worker. (#7024) | Erik Johnston | 2020-03-25 | 2 | -23/+84 |
| | | | | | | This changes the replication protocol so that the server does not send down `RDATA` for rows that happened before the client connected. Instead, the server will send a `POSITION` and clients then query the database (or master out of band) to get up to date. | ||||
* | | Clean up some LoggingContext stuff (#7120) | Richard van der Hoff | 2020-03-24 | 11 | -56/+68 |
|/ | | | | | | | | | | | | | | | | | | | | | | | * Pull Sentinel out of LoggingContext ... and drop a few unnecessary references to it * Factor out LoggingContext.current_context move `current_context` and `set_context` out to top-level functions. Mostly this means that I can more easily trace what's actually referring to LoggingContext, but I think it's generally neater. * move copy-to-parent into `stop` this really just makes `start` and `stop` more symetric. It also means that it behaves correctly if you manually `set_log_context` rather than using the context manager. * Replace `LoggingContext.alive` with `finished` Turn `alive` into `finished` and make it a bit better defined. | ||||
* | Convert `*StreamRow` classes to inner classes (#7116) | Richard van der Hoff | 2020-03-23 | 1 | -2/+2 |
| | | | | | This just helps keep the rows closer to their streams, so that it's easier to see what the format of each stream is. | ||||
* | Improve database configuration docs (#6988) | Richard van der Hoff | 2020-03-20 | 1 | -20/+2 |
| | | | | | Attempts to clarify the sample config for databases, and add some stuff about tcp keepalives to `postgres.md`. | ||||
* | Change device list streams to have one row per ID (#7010) | Erik Johnston | 2020-03-19 | 1 | -45/+0 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add 'device_lists_outbound_pokes' as extra table. This makes sure we check all the relevant tables to get the current max stream ID. Currently not doing so isn't problematic as the max stream ID in `device_lists_outbound_pokes` is the same as in `device_lists_stream`, however that will change. * Change device lists stream to have one row per id. This will make it possible to process the streams more incrementally, avoiding having to process large chunks at once. * Change device list replication to match new semantics. Instead of sending down batches of user ID/host tuples, send down a row per entity (user ID or host). * Newsfile * Remove handling of multiple rows per ID * Fix worker handling * Comments from review | ||||
| * | Remove handling of multiple rows per ID | Erik Johnston | 2020-02-28 | 1 | -45/+0 |
| | | |||||
* | | Improve get auth chain difference algorithm. (#7095) | Erik Johnston | 2020-03-18 | 2 | -22/+148 |
| | | | | | | | | | | | | | | | | | | | | | | It was originally implemented by pulling the full auth chain of all state sets out of the database and doing set comparison. However, that can take a lot work if the state and auth chains are large. Instead, lets try and fetch the auth chains at the same time and calculate the difference on the fly, allowing us to bail early if all the auth chains converge. Assuming that the auth chains do converge more often than not, this should improve performance. Hopefully. | ||||
* | | Share SSL contexts for non-federation requests (#7094) | Richard van der Hoff | 2020-03-17 | 2 | -13/+22 |
| | | | | | | | | | | | | | | Extends #5794 etc to the SimpleHttpClient so that it also applies to non-federation requests. Fixes #7092. | ||||
* | | Remove special casing of `m.room.aliases` events (#7034) | Patrick Cloke | 2020-03-17 | 2 | -15/+33 |
| | | |||||
* | | Revert "Add options to disable setting profile info for prevent changes. ↵ | Richard van der Hoff | 2020-03-17 | 2 | -335/+1 |
| | | | | | | | | | | | | | | (#7053)" This reverts commit 54dd28621b070ca67de9f773fe9a89e1f4dc19da, reversing changes made to 6640460d054e8f4444046a34bdf638921b31c01e. | ||||
* | | Add options to disable setting profile info for prevent changes. (#7053) | Brendan Abolivier | 2020-03-10 | 2 | -1/+335 |
|\ \ | |||||
| * | | lint, fix tests | dklimpel | 2020-03-09 | 1 | -2/+2 |
| | | | |||||
| * | | updates after review | dklimpel | 2020-03-09 | 2 | -13/+10 |
| | | | |||||
| * | | fix tests | dklimpel | 2020-03-09 | 1 | -2/+2 |
| | | | |||||
| * | | lint | dklimpel | 2020-03-09 | 1 | -10/+8 |
| | | | |||||
| * | | add tests | dklimpel | 2020-03-09 | 2 | -3/+311 |
| | | | |||||
| * | | Add options to disable setting profile info for prevent changes. | dklimpel | 2020-03-08 | 1 | -1/+32 |
| |/ | |||||
* | | Remove special auth and redaction rules for aliases events in experimental ↵ | Patrick Cloke | 2020-03-09 | 2 | -3/+125 |
| | | | | | | | | room ver. (#7037) | ||||
* | | Break down monthly active users by appservice_id (#7030) | Neil Johnson | 2020-03-06 | 1 | -0/+42 |
| | | | | | | | | | | * Break down monthly active users by appservice_id and emit via prometheus. Co-authored-by: Brendan Abolivier <babolivier@matrix.org> | ||||
* | | Allow deleting an alias if the user has sufficient power level (#6986) | Patrick Cloke | 2020-03-04 | 1 | -24/+104 |
| | | |||||
* | | Read the room version from database when fetching events (#6874) | Richard van der Hoff | 2020-03-04 | 1 | -0/+10 |
| | | | | | | | | | | This is a precursor to giving EventBase objects the knowledge of which room version they belong to. | ||||
* | | Merge branch 'master' into develop | Brendan Abolivier | 2020-03-03 | 1 | -0/+111 |
|\ \ | |||||
| * | | Add a whitelist for the SSO confirmation step. | Richard van der Hoff | 2020-03-02 | 1 | -3/+29 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1 | Richard van der Hoff | 2020-03-02 | 1 | -28/+181 |
| |\ \ | |||||
| | * | | Fixed set a user as an admin with the new API (#6928) | Dirk Klimpel | 2020-03-02 | 1 | -28/+181 |
| | | | | | | | | | | | | | | | | Fix #6910 | ||||
| * | | | Add a confirmation step to the SSO login flow | Brendan Abolivier | 2020-03-02 | 1 | -0/+85 |
| |/ / | |||||
* | / | Validate the alt_aliases property of canonical alias events (#6971) | Patrick Cloke | 2020-03-03 | 3 | -37/+191 |
| |/ |/| | |||||
* | | Fixed set a user as an admin with the new API (#6928) | Dirk Klimpel | 2020-02-28 | 1 | -32/+186 |
| | | | | | | Fix #6910 | ||||
* | | set worker_app for frontend proxy test (#7003) | Richard van der Hoff | 2020-02-27 | 1 | -0/+5 |
| | | | | | | to stop the federationhandler trying to do master stuff | ||||
* | | Store room version on invite (#6983) | Richard van der Hoff | 2020-02-26 | 2 | -0/+9 |
| | | | | | | | | | | When we get an invite over federation, store the room version in the rooms table. The general idea here is that, when we pull the invite out again, we'll want to know what room_version it belongs to (so that we can later redact it if need be). So we need to store it somewhere... | ||||
* | | Port PresenceHandler to async/await (#6991) | Erik Johnston | 2020-02-26 | 1 | -6/+12 |
| | | |||||
* | | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error ↵ | Andrew Morgan | 2020-02-26 | 1 | -0/+59 |
| | | | | | | | | handling of call to deactivate user (#6990) | ||||
* | | Merge worker apps into one. (#6964) | Erik Johnston | 2020-02-25 | 2 | -10/+6 |
| | | |||||
* | | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957) | Patrick Cloke | 2020-02-21 | 15 | -105/+87 |
| | | | | | | | | Ensure good comprehension hygiene using flake8-comprehensions. | ||||
* | | Reduce auth chains fetched during v2 state res. (#6952) | Erik Johnston | 2020-02-19 | 1 | -2/+4 |
|/ | | | | | | The state res v2 algorithm only cares about the difference between auth chains, so we can pass in the known common state to the `get_auth_chain` storage function so that it can ignore those events. | ||||
* | Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekable | Richard van der Hoff | 2020-02-19 | 2 | -2/+19 |
|\ | | | | | Make room alias lists peekable | ||||
| * | Make room alias lists peekable | Richard van der Hoff | 2020-02-19 | 1 | -0/+17 |
| | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/2432#pullrequestreview-360566830, make room alias lists accessible to users outside world_readable rooms. | ||||
| * | Refactor the membership check methods in Auth | Richard van der Hoff | 2020-02-18 | 1 | -2/+2 |
| | | | | | | | | | | 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`. | ||||
* | | Move MSC2432 stuff onto unstable prefix (#6948) | Richard van der Hoff | 2020-02-19 | 1 | -3/+13 |
|/ | | | it's not in the spec yet, so needs to be unstable. Also add a feature flag for it. Also add a test for admin users. | ||||
* | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939) | Richard van der Hoff | 2020-02-18 | 2 | -10/+88 |
| | | | | | per matrix-org/matrix-doc#2432 | ||||
* | Merge pull request #6872 from matrix-org/rav/dictproperty | Richard van der Hoff | 2020-02-18 | 1 | -1/+1 |
|\ | | | | | Rewrite _EventInternalMetadata to back it with a dict | ||||
| * | Replace _event_dict_property with DictProperty | Richard van der Hoff | 2020-02-14 | 1 | -1/+1 |
| | | | | | | | | | | this amounts to the same thing, but replaces `_event_dict` with `_dict`, and removes some of the function layers generated by `property`. | ||||
* | | Stop sending events when creating or deleting aliases (#6904) | Patrick Cloke | 2020-02-18 | 1 | -2/+152 |
| | | | | | | 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/+3 |
| | | |||||
* | | Convert the directory handler tests to use HomeserverTestCase (#6919) | Patrick Cloke | 2020-02-14 | 1 | -24/+17 |
|/ | | | Convert directory handler tests to use HomeserverTestCase. | ||||
* | Filter the results of user directory searching via the spam checker (#6888) | Patrick Cloke | 2020-02-14 | 1 | -0/+92 |
| | | | Add a method to the spam checker to filter the user directory results. | ||||
* | Return a 404 for admin api user lookup if user not found (#6901) | Andrew Morgan | 2020-02-12 | 1 | -0/+16 |
| | |||||
* | Reject device display names that are too long (#6882) | Patrick Cloke | 2020-02-10 | 1 | -0/+18 |
| | | | | | | | | * 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 a `make_event_from_dict` method (#6858) | Richard van der Hoff | 2020-02-07 | 9 | -27/+32 |
| | | | | | | | ... and use it in places where it's trivial to do so. This will make it easier to pass room versions into the FrozenEvent constructors. | ||||
* | Add typing to synapse.federation.sender (#6871) | Erik Johnston | 2020-02-07 | 1 | -2/+6 |
| | |||||
* | Admin api to add an email address (#6789) | Dirk Klimpel | 2020-02-07 | 1 | -2/+17 |
| | |||||
* | Pass room_version into `event_from_pdu_json` | Richard van der Hoff | 2020-02-06 | 1 | -2/+4 |
| | | | | It's called from all over the shop, so this one's a bit messy. | ||||
* | Add typing to SyncHandler (#6821) | Erik Johnston | 2020-02-03 | 1 | -1/+4 |
| | | | | Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
* | Merge pull request #6806 from matrix-org/rav/redact_changes/3 | Richard van der Hoff | 2020-01-31 | 2 | -4/+9 |
|\ | | | | | Pass room_version into add_hashes_and_signatures | ||||
| * | Pass room_version into add_hashes_and_signatures | Richard van der Hoff | 2020-01-30 | 1 | -2/+7 |
| | | |||||
| * | Store the room version in EventBuilder | Richard van der Hoff | 2020-01-30 | 1 | -2/+2 |
| | | |||||
* | | s/get_room_version/get_room_version_id/ | Richard van der Hoff | 2020-01-31 | 3 | -3/+5 |
|/ | | | | | ... to make way for a forthcoming get_room_version which returns a RoomVersion object. | ||||
* | MSC2260: Block direct sends of m.room.aliases events (#6794) | Richard van der Hoff | 2020-01-30 | 2 | -33/+15 |
| | | | | | as per MSC2260 | ||||
* | Resync remote device list when detected as stale. (#6786) | Erik Johnston | 2020-01-30 | 1 | -3/+3 |
| | |||||
* | Type defintions for use in refactoring for redaction changes (#6803) | Richard van der Hoff | 2020-01-30 | 1 | -4/+11 |
| | | | | | | | | | | * Bump signedjson to 1.1 ... so that we can use the type definitions * Fix breakage caused by upgrade to signedjson 1.1 Thanks, @illicitonion... | ||||
* | Factor out a `copy_power_levels_contents` method | Richard van der Hoff | 2020-01-29 | 1 | -2/+43 |
| | | | | I'm going to need another copy (hah!) of this. | ||||
* | Pass room version object into event_auth.check and check_redaction (#6788) | Richard van der Hoff | 2020-01-28 | 1 | -7/+4 |
| | | | | | | | 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 | 3 | -2/+18 |
| | | | 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 | -0/+51 |
| | |||||
* | Make 'event.redacts' never raise. (#6771) | Erik Johnston | 2020-01-23 | 1 | -0/+35 |
| | | | | | | There are quite a few places that we assume that a redaction event has a corresponding `redacts` key, which is not always the case. So lets cheekily make it so that event.redacts just returns None instead. | ||||
* | Admin API to list, filter and sort rooms (#6720) | Andrew Morgan | 2020-01-22 | 1 | -4/+389 |
| | |||||
* | Lint + changelog | Brendan Abolivier | 2020-01-22 | 1 | -3/+1 |
| | |||||
* | Remove unused import | Brendan Abolivier | 2020-01-22 | 1 | -1/+1 |
| | |||||
* | Add tests for thumbnailing | Brendan Abolivier | 2020-01-22 | 1 | -3/+45 |
| | |||||
* | Fix and add test to deprecated quarantine media admin api (#6756) | Andrew Morgan | 2020-01-22 | 1 | -4/+11 |
| | |||||
* | Fix `/events/:event_id` deprecated API. (#6731) | Erik Johnston | 2020-01-20 | 2 | -1/+28 |
| | |||||
* | Fix changing password via user admin API. (#6730) | Erik Johnston | 2020-01-20 | 1 | -0/+13 |
| | |||||
* | Log saml assertions rather than the whole response | Richard van der Hoff | 2020-01-16 | 1 | -0/+47 |
| | | | | | | ... since the whole response is huge. We even need to break up the assertions, since kibana otherwise truncates them. | ||||
* | 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.... | ||||
* | Fix purge_room admin API (#6711) | Erik Johnston | 2020-01-15 | 1 | -3/+1 |
| | |||||
* | Implement RedirectException (#6687) | Richard van der Hoff | 2020-01-15 | 1 | -2/+77 |
| | | | | | Allow REST endpoint implemnentations to raise a RedirectException, which will redirect the user's browser to a given location. | ||||
* | Add `local_current_membership` table (#6655) | Erik Johnston | 2020-01-15 | 5 | -17/+14 |
| | | | | | | | 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. | ||||
* | Quarantine media by ID or user ID (#6681) | Andrew Morgan | 2020-01-13 | 2 | -0/+378 |
| | |||||
* | Kill off RegistrationError (#6691) | Richard van der Hoff | 2020-01-13 | 1 | -2/+0 |
| | | | This is pretty pointless. Let's just use SynapseError. | ||||
* | Allow admin users to create or modify users without a shared secret (#6495) | Manuel Stahl | 2020-01-09 | 3 | -338/+467 |
| | | | Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de> | ||||
* | Fix GET request on /_synapse/admin/v2/users endpoint (#6563) | Manuel Stahl | 2020-01-08 | 1 | -0/+41 |
| | | | | Fixes #6552 | ||||
* | Back out ill-advised notary server hackery (#6657) | Richard van der Hoff | 2020-01-08 | 3 | -4/+131 |
| | | | | | | | | | | | This was ill-advised. We can't modify verify_keys here, because the response object has already been signed by the requested key. Furthermore, it's somewhat unnecessary because existing versions of Synapse (which get upset that the notary key isn't present in verify_keys) will fall back to a direct fetch via `/key/v2/server`. Also: more tests for fetching keys via perspectives: it would be nice if we actually tested when our fetcher can't talk to our notary impl. | ||||
* | port BackgroundUpdateTestCase to HomeserverTestCase (#6653) | Richard van der Hoff | 2020-01-07 | 1 | -35/+37 |
| | |||||
* | Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashes | Richard van der Hoff | 2020-01-06 | 2 | -16/+5 |
|\ | | | | | Remove a bunch of unused code from event creation | ||||
| * | Remove unused get_prev_events_and_hashes_for_room | Richard van der Hoff | 2020-01-06 | 1 | -13/+6 |
| | | |||||
| * | Remove unused hashes and depths from create_event params | Richard van der Hoff | 2020-01-06 | 1 | -5/+1 |
| | | |||||
| * | rename get_prev_events_for_room to get_prev_events_and_hashes_for_room | Richard van der Hoff | 2020-01-06 | 1 | -2/+2 |
| | | | | | | | | ... to make way for a new method which just returns the event ids | ||||
* | | Fix exception when fetching notary server's old keys (#6625) | Richard van der Hoff | 2020-01-06 | 1 | -44/+95 |
| | | | | | | | | | | | | Lift the restriction that *all* the keys used for signing v2 key responses be present in verify_keys. Fixes #6596. | ||||
* | | Workaround for error when fetching notary's own key (#6620) | Richard van der Hoff | 2020-01-06 | 2 | -1/+140 |
|/ | | | | | | | | | | | | | | * Kill off redundant SynapseRequestFactory We already get the Site via the Channel, so there's no need for a dedicated RequestFactory: we can just use the right constructor. * Workaround for error when fetching notary's own key As a notary server, when we return our own keys, include all of our signing keys in verify_keys. This is a workaround for #6596. | ||||
* | Kill off redundant SynapseRequestFactory (#6619) | Richard van der Hoff | 2020-01-03 | 1 | -2/+4 |
| | | | | We already get the Site via the Channel, so there's no need for a dedicated RequestFactory: we can just use the right constructor. | ||||
* | Split state groups into a separate data store (#6296) | Erik Johnston | 2019-12-20 | 2 | -2/+2 |
| | |||||
* | Change EventContext to use the Storage class (#6564) | Erik Johnston | 2019-12-20 | 1 | -14/+14 |
| | |||||
* | Clean up startup for the pusher (#6558) | Richard van der Hoff | 2019-12-18 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | * Remove redundant python2 support code `str.decode()` doesn't exist on python3, so presumably this code was doing nothing * Filter out pushers with corrupt data When we get a row with unparsable json, drop the row, rather than returning a row with null `data`, which will then cause an explosion later on. * Improve logging when we can't start a pusher Log the ID to help us understand the problem * Make email pusher setup more robust We know we'll have a `data` member, since that comes from the database. What we *don't* know is if that is a dict, and if that has a `brand` member, and if that member is a string. | ||||
* | Add database config class (#6513) | Erik Johnston | 2019-12-18 | 7 | -95/+100 |
| | | | | | 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 | 1 | -0/+127 |
|\ | |||||
| * | Merge pull request #6553 from matrix-org/babolivier/fix-context-filter | Brendan Abolivier | 2019-12-16 | 1 | -0/+127 |
| |\ | | | | | | | Use the filtered version of an event when responding to /context requests for that event | ||||
| | * | Incorporate review | Brendan Abolivier | 2019-12-16 | 1 | -5/+0 |
| | | | |||||
| | * | Lint | Brendan Abolivier | 2019-12-16 | 1 | -2/+1 |
| | | | |||||
| | * | Add test case | Brendan Abolivier | 2019-12-16 | 1 | -0/+133 |
| | | | |||||
| * | | sanity-checking for events used in state res (#6531) | Richard van der Hoff | 2019-12-16 | 1 | -0/+3 |
| |/ | | | | | | | | | When we perform state resolution, check that all of the events involved are in the right room. | ||||
* | | Add option to allow profile queries without sharing a room (#6523) | Will Hunt | 2019-12-16 | 1 | -0/+2 |
| | | |||||
* | | sanity-checking for events used in state res (#6531) | Richard van der Hoff | 2019-12-13 | 1 | -0/+3 |
| | | | | | | | | | | | | | | When we perform state resolution, check that all of the events involved are in the right room. | ||||
* | | look up cross-signing keys from the DB in bulk (#6486) | Hubert Chathi | 2019-12-12 | 1 | -8/+0 |
| | | |||||
* | | Merge pull request #6511 from matrix-org/erikj/remove_db_config_from_apps | Erik Johnston | 2019-12-12 | 2 | -13/+8 |
|\ \ | | | | | | | Move database config from apps into HomeServer object | ||||
| * | | Remove database config parsing from apps. | Erik Johnston | 2019-12-10 | 2 | -13/+8 |
| |/ | |||||
* | | Merge pull request #6517 from matrix-org/rav/event_auth/13 | Richard van der Hoff | 2019-12-11 | 1 | -5/+9 |
|\ \ | | | | | | | Port some of FederationHandler to async/await | ||||
| * | | convert to async: FederationHandler.on_receive_pdu | Richard van der Hoff | 2019-12-11 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | | and associated functions: * on_receive_pdu * handle_queued_pdus * get_missing_events_for_pdu | ||||
* | | | Merge pull request #6504 from matrix-org/erikj/account_validity_async_await | Erik Johnston | 2019-12-11 | 1 | -2/+1 |
|\ \ \ | |/ / |/| | | Port handlers.account_validity to async/await. | ||||
| * | | Port handlers.account_validity to async/await. | Erik Johnston | 2019-12-10 | 1 | -2/+1 |
| |/ | |||||
* | | Fix race which caused deleted devices to reappear (#6514) | Richard van der Hoff | 2019-12-10 | 1 | -20/+29 |
| | | | | | | | | Stop the `update_client_ips` background job from recreating deleted devices. | ||||
* | | Merge pull request #6505 from matrix-org/erikj/make_deferred_yiedable | Erik Johnston | 2019-12-10 | 1 | -0/+24 |
|\ \ | | | | | | | Fix `make_deferred_yieldable` to work with coroutines | ||||
| * | | Fix make_deferred_yieldable to work with coroutines | Erik Johnston | 2019-12-10 | 1 | -0/+24 |
| |/ | |||||
* | | Merge pull request #6506 from matrix-org/erikj/remove_snapshot_cache | Erik Johnston | 2019-12-10 | 1 | -63/+0 |
|\ \ | |/ |/| | Remove SnapshotCache in favour of ResponseCache | ||||
| * | Remove SnapshotCache in favour of ResponseCache | Erik Johnston | 2019-12-09 | 1 | -63/+0 |
| | | |||||
* | | Back out perf regression from get_cross_signing_keys_from_cache. (#6494) | Neil Johnson | 2019-12-09 | 1 | -0/+8 |
| | | | | | | Back out cross-signing code added in Synapse 1.5.0, which caused a performance regression. | ||||
* | | Merge pull request #6487 from matrix-org/erikj/pass_in_db | Erik Johnston | 2019-12-09 | 6 | -25/+23 |
|\ \ | |/ |/| | Pass in Database object to data stores. | ||||
| * | Fixup tests | Erik Johnston | 2019-12-06 | 6 | -23/+20 |
| | | |||||
| * | Change DataStores to accept 'database' param. | Erik Johnston | 2019-12-06 | 1 | -2/+3 |
| | | |||||
* | | Merge pull request #6484 from matrix-org/erikj/port_sync_handler | Erik Johnston | 2019-12-09 | 4 | -25/+43 |
|\ \ | |/ |/| | Port SyncHandler to async/await | ||||
| * | Fixup functions to consistently return deferreds | Erik Johnston | 2019-12-06 | 2 | -7/+21 |
| | | |||||
| * | Port SyncHandler to async/await | Erik Johnston | 2019-12-05 | 2 | -18/+22 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-12-06 | 3 | -2/+15 |
|\| | | | | | | | erikj/make_database_class | ||||
| * | Fixup tests | Erik Johnston | 2019-12-05 | 3 | -2/+15 |
| | | |||||
* | | Move background update handling out of store | Erik Johnston | 2019-12-05 | 7 | -49/+113 |
| | | |||||
* | | Move DB pool and helper functions into dedicated Database class | Erik Johnston | 2019-12-05 | 14 | -64/+66 |
|/ | |||||
* | Remove underscore from SQLBaseStore functions | Erik Johnston | 2019-12-04 | 10 | -47/+47 |
| | |||||
* | Merge pull request #6329 from matrix-org/babolivier/context_filters | Brendan Abolivier | 2019-12-04 | 4 | -100/+384 |
|\ | | | | | Filter state, events_before and events_after in /context requests | ||||
| * | Un-remove room purge test | Brendan Abolivier | 2019-12-04 | 1 | -0/+72 |
| | | |||||
| * | Merge branch 'babolivier/context_filters' of github.com:matrix-org/synapse ↵ | Brendan Abolivier | 2019-12-04 | 1 | -1/+1 |
| |\ | | | | | | | | | | into babolivier/context_filters | ||||
| | * | Merge branch 'develop' into babolivier/context_filters | Brendan Abolivier | 2019-11-26 | 7 | -19/+399 |
| | |\ | |||||
| * | \ | Merge branch 'develop' into babolivier/context_filters | Brendan Abolivier | 2019-12-04 | 20 | -77/+846 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | Lint | Brendan Abolivier | 2019-11-05 | 1 | -30/+41 |
| | | | | |||||
| * | | | Update copyrights | Brendan Abolivier | 2019-11-05 | 4 | -1/+10 |
| | | | | |||||
| * | | | Add tests for /search | Brendan Abolivier | 2019-11-05 | 1 | -44/+143 |
| | | | | |||||
| * | | | Merge labels tests for /context and /messages | Brendan Abolivier | 2019-11-05 | 1 | -146/+130 |
| | | | | |||||
| * | | | Add test case | Brendan Abolivier | 2019-11-05 | 1 | -0/+182 |
| | | | | |||||
* | | | | privacy by default for room dir (#6355) | Neil Johnson | 2019-12-04 | 1 | -0/+52 |
| | | | | | | | | | | | | | | | | Ensure that the the default settings for the room directory are that the it is hidden from public view by default. | ||||
* | | | | Add ephemeral messages support (MSC2228) (#6409) | Brendan Abolivier | 2019-12-03 | 1 | -0/+101 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | Add tests | Erik Johnston | 2019-11-28 | 1 | -0/+140 |
| | | | |||||
* | | | Implementation of MSC2314 (#6176) | Amber Brown | 2019-11-28 | 9 | -52/+148 |
| | | | |||||
* | | | add etag and count to key backup endpoints (#5858) | Hubert Chathi | 2019-11-27 | 2 | -4/+35 |
| | | | |||||
* | | | Merge pull request #6358 from matrix-org/babolivier/message_retention | Brendan Abolivier | 2019-11-27 | 1 | -0/+293 |
|\ \ \ | | | | | | | | | Implement message retention policies (MSC1763) | ||||
| * \ \ | Merge branch 'develop' into babolivier/message_retention | Brendan Abolivier | 2019-11-26 | 8 | -19/+351 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Don't restrict the tests to v1 rooms | Brendan Abolivier | 2019-11-26 | 1 | -2/+0 |
| | | | | |||||
| * | | | Lint again | Brendan Abolivier | 2019-11-19 | 1 | -10/+2 |
| | | | | |||||
| * | | | Lint | Brendan Abolivier | 2019-11-19 | 1 | -50/+23 |
| | | | | |||||
| * | | | Don't apply retention policy based filtering on state events | Brendan Abolivier | 2019-11-06 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy. | ||||
| * | | | Implement per-room message retention policies | Brendan Abolivier | 2019-11-04 | 1 | -0/+320 |
| | | | | |||||
* | | | | Remove assertion and provide a clear warning on startup for missing ↵ | Andrew Morgan | 2019-11-26 | 1 | -0/+1 |
| |/ / |/| | | | | | | | | public_baseurl (#6379) | ||||
* | | | Improve the performance of structured logging (#6322) | Amber Brown | 2019-11-26 | 1 | -0/+2 |
| | | | |||||
* | | | Lint | Brendan Abolivier | 2019-11-20 | 1 | -6/+8 |
| | | | |||||
* | | | Test if a purge can make /messages return 500 responses | Brendan Abolivier | 2019-11-20 | 1 | -0/+72 |
| | | | |||||
* | | | Blacklist PurgeRoomTestCase (#6361) | Andrew Morgan | 2019-11-13 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #6295 from matrix-org/erikj/split_purge_history | Erik Johnston | 2019-11-08 | 2 | -8/+11 |
|\ \ \ | | | | | | | | | Split purge API into events vs state and add PurgeEventsStorage | ||||
| * | | | Fix deleting state groups during room purge. | Erik Johnston | 2019-11-06 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | And fix the tests to actually test that things got deleted. | ||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-11-05 | 1 | -0/+51 |
| |\ \ \ | | | |/ | | |/| | | | | | erikj/split_purge_history | ||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-11-04 | 12 | -21/+693 |
| |\ \ \ | | | |/ | | |/| | | | | | erikj/split_purge_history | ||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-31 | 5 | -51/+197 |
| |\ \ \ | | | | | | | | | | | | | | | | erikj/split_purge_history | ||||
| * | | | | Split purge API into events vs state | Erik Johnston | 2019-10-30 | 1 | -7/+8 |
| | | | | | |||||
* | | | | | Fix bug which caused rejected events to be stored with the wrong room state ↵ | Richard van der Hoff | 2019-11-06 | 2 | -11/+176 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#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. | ||||
* | | | | | Merge branch 'develop' into rav/url_preview_limit_title | Richard van der Hoff | 2019-11-05 | 27 | -99/+1065 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Remove the psutil dependency (#6318) | Amber Brown | 2019-11-05 | 1 | -0/+51 |
| | |_|/ | |/| | | | | | | * remove psutil and replace with resource | ||||
| * | | | Merge pull request #6301 from matrix-org/babolivier/msc2326 | Brendan Abolivier | 2019-11-01 | 4 | -5/+297 |
| |\ \ \ | | | | | | | | | | | Implement MSC2326 (label based filtering) | ||||
| | * | | | Incorporate review | Brendan Abolivier | 2019-11-01 | 3 | -12/+12 |
| | | | | | |||||
| | * | | | Incorporate review | Brendan Abolivier | 2019-11-01 | 3 | -15/+15 |
| | | | | | |||||
| | * | | | Lint | Brendan Abolivier | 2019-10-30 | 3 | -43/+34 |
| | | | | | |||||
| | * | | | Add integration tests for /messages | Brendan Abolivier | 2019-10-30 | 1 | -1/+101 |
| | | | | | |||||
| | * | | | Add more integration testing | Brendan Abolivier | 2019-10-30 | 1 | -6/+39 |
| | | | | | |||||
| | * | | | Add integration tests for sync | Brendan Abolivier | 2019-10-30 | 2 | -5/+122 |
| | | | | | |||||
| | * | | | Add unit tests | Brendan Abolivier | 2019-10-30 | 1 | -0/+51 |
| | | | | | |||||
| * | | | | Factor out an _AsyncEventContextImpl (#6298) | Richard van der Hoff | 2019-11-01 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -6/+382 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-31 | 5 | -51/+197 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge pull request #6294 from matrix-org/erikj/add_state_storage | Erik Johnston | 2019-10-31 | 3 | -50/+114 |
| | |\ \ \ | | | | | | | | | | | | | Add StateGroupStorage interface | ||||
| | | * | | | Port to use state storage | Erik Johnston | 2019-10-30 | 3 | -50/+114 |
| | | | |/ | | | |/| | |||||
| | * / | | Add unit test for /purge_room API | Erik Johnston | 2019-10-31 | 2 | -1/+83 |
| | |/ / | |||||
| * | | | rename get_devices_by_remote to get_device_updates_by_remote | Hubert Chathi | 2019-10-30 | 2 | -8/+8 |
| | | | | |||||
| * | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-30 | 15 | -27/+126 |
| |\| | | |||||
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-30 | 7 | -8/+142 |
| | |\ \ | | | | | | | | | | | | | | | | erikj/split_out_persistence_store | ||||
| | | * | | Make ObservableDeferred.observe() always return deferred. | Erik Johnston | 2019-10-30 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to use in an async/await world. Also fixes a bug where cache descriptors would occaisonally return a raw value rather than a deferred. | ||||
| | | * | | Port federation_server to async/await | Erik Johnston | 2019-10-29 | 1 | -0/+3 |
| | | |/ | |||||
| | | * | Quick fix to ensure cache descriptors always return deferreds | Erik Johnston | 2019-10-28 | 1 | -2/+2 |
| | | | | |||||
| | | * | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keys | Hubert Chathi | 2019-10-25 | 1 | -0/+75 |
| | | |\ | | | | | | | | | | | delete keys when deleting backup versions | ||||
| | | | * | remove unneeded imports | Hubert Chathi | 2019-10-25 | 1 | -3/+1 |
| | | | | | |||||
| | | | * | switch to using HomeserverTestCase | Hubert Chathi | 2019-10-25 | 1 | -19/+25 |
| | | | | | |||||
| | | | * | remove some unnecessary lines | Hubert Chathi | 2019-10-24 | 1 | -5/+0 |
| | | | | | |||||
| | | | * | delete keys when deleting backups | Hubert Chathi | 2019-10-24 | 1 | -0/+76 |
| | | | | | |||||
| | * | | | Review comments | Erik Johnston | 2019-10-30 | 2 | -6/+9 |
| | | | | | |||||
| | * | | | Use new EventPersistenceStore | Erik Johnston | 2019-10-23 | 8 | -16/+32 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-24 | 7 | -20/+68 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | fix unit test | Hubert Chathi | 2019-10-22 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Apply suggestions from code review | Richard van der Hoff | 2019-11-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Brendan Abolivier <babolivier@matrix.org> Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
* | | | | | Strip overlong OpenGraph data from url preview | Richard van der Hoff | 2019-11-05 | 1 | -0/+34 |
| |_|_|/ |/| | | | | | | | | | | | ... to stop people causing DoSes with malicious web pages | ||||
* | | | | Fix tests | Erik Johnston | 2019-10-25 | 1 | -0/+2 |
| |/ / |/| | | |||||
* | | | Option to suppress resource exceeded alerting (#6173) | Neil Johnson | 2019-10-24 | 2 | -3/+57 |
| |/ |/| | | | | | The expected use case is to suppress MAU limiting on small instances | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-22 | 1 | -1/+294 |
|\| | | | | | | | erikj/refactor_stores | ||||
| * | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-10-18 | 29 | -249/+1136 |
| |\ | |||||
| * \ | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-09-07 | 3 | -60/+125 |
| |\ \ | |||||
| * | | | use something that's the right type for user_id | Hubert Chathi | 2019-09-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix test | Hubert Chathi | 2019-09-05 | 1 | -1/+3 |
| | | | | |||||
| * | | | add test | Hubert Chathi | 2019-09-04 | 1 | -0/+88 |
| | | | | |||||
| * | | | make isort happy | Hubert Chathi | 2019-09-04 | 1 | -0/+1 |
| | | | | |||||
| * | | | make black happy | Hubert Chathi | 2019-09-04 | 1 | -85/+62 |
| | | | | |||||
| * | | | allow uploading signatures of master key signed by devices | Hubert Chathi | 2019-09-04 | 1 | -1/+226 |
| | | | | |||||
* | | | | Fix postgres unit tests to use prepare_database | Erik Johnston | 2019-10-22 | 1 | -10/+2 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-22 | 1 | -0/+65 |
|\ \ \ \ | | |_|/ | |/| | | | | | | erikj/refactor_stores | ||||
| * | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 29 | -249/+1136 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-09-07 | 3 | -60/+125 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| * | | | Merge branch 'develop' into cross-signing_keys | Hubert Chathi | 2019-09-04 | 8 | -119/+544 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 17 | -56/+944 |
| |\ \ \ \ | |||||
| * | | | | | fix formatting | Hubert Chathi | 2019-08-01 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-08-01 | 16 | -106/+279 |
| |\ \ \ \ \ | |||||
| * | | | | | | allow uploading keys for cross-signing | Hubert Chathi | 2019-07-25 | 1 | -0/+63 |
| | | | | | | | |||||
* | | | | | | | Move storage classes into a main "data store". | Erik Johnston | 2019-10-21 | 5 | -7/+9 |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for having multiple data stores that offer different functionality, e.g. splitting out state or event storage. | ||||
* | | | | | | Fix presence timeouts when synchrotron restarts. (#6212) | Erik Johnston | 2019-10-18 | 1 | -0/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix presence timeouts when synchrotron restarts. Handling timeouts would fail if there was an external process that had timed out, e.g. a synchrotron restarting. This was due to a couple of variable name typoes. Fixes #3715. | ||||
* | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage | Hubert Chathi | 2019-10-11 | 1 | -6/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | make storage layer in charge of interpreting the device key data | ||||
| * | | | | | | make storage layer in charge of interpreting the device key data | Hubert Chathi | 2019-10-10 | 1 | -6/+6 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version | Hubert Chathi | 2019-10-11 | 1 | -16/+31 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | make version optional in body of e2e backup version update | ||||
| * | | | | | | | change test name to be unique | Hubert Chathi | 2019-10-10 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | make version optional in body of e2e backup version update | Hubert Chathi | 2019-10-09 | 1 | -16/+31 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | to agree with latest version of the MSC | ||||
* | | | | | | | Fix MAU reaping where reserved users are specified. (#6168) | Neil Johnson | 2019-10-11 | 1 | -9/+49 |
| | | | | | | | |||||
* | | | | | | | Fix postgres unit tests | Erik Johnston | 2019-10-10 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_inner | Erik Johnston | 2019-10-10 | 2 | -96/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add more log context checks when patching inlineCallbacks | ||||
| * \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner | Erik Johnston | 2019-10-10 | 3 | -11/+18 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move patch_inline_callbacks into synapse/ | Erik Johnston | 2019-10-10 | 2 | -181/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner | Erik Johnston | 2019-10-09 | 5 | -53/+182 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Update | Erik Johnston | 2019-09-27 | 1 | -8/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | Patch inlinecallbacks for log contexts | Erik Johnston | 2019-09-27 | 1 | -4/+82 |
| | | | | | | | | | |||||
* | | | | | | | | | Add domain validation when creating room with list of invitees (#6121) | werner291 | 2019-10-10 | 1 | -0/+9 |
| | | | | | | | | |