Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | | | | | |||||
* | | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380) | krombel | 2019-10-10 | 1 | -1/+1 |
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixed the weirdness of 400 vs 404 as http status code in the case the filter id is not known by the server. As e.g. matrix-js-sdk expects 404 to catch this situation this leads to unwanted behaviour. | ||||
* | | | | | | | | Fix races in room stats (and other) updates. (#6187) | Richard van der Hoff | 2019-10-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully this will fix the occasional failures we were seeing in the room directory. The problem was that events are not necessarily persisted (and `current_state_delta_stream` updated) in the same order as their stream_id. So for instance current_state_delta 9 might be persisted *before* current_state_delta 8. Then, when the room stats saw stream_id 9, it assumed it had done everything up to 9, and never came back to do stream_id 8. We can solve this easily by only processing up to the stream_id where we know all events have been persisted. | ||||
* | | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137) | Amber Brown | 2019-10-10 | 1 | -9/+16 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revoked | Brendan Abolivier | 2019-10-04 | 1 | -0/+81 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Don't 500 when trying to exchange a revoked 3PID invite | ||||
| * | | | | | | | Lint (again) | Brendan Abolivier | 2019-10-03 | 1 | -3/+1 |
| | | | | | | | | |||||
| * | | | | | | | Lint | Brendan Abolivier | 2019-10-03 | 1 | -5/+5 |
| | | | | | | | | |||||
| * | | | | | | | Add test case | Brendan Abolivier | 2019-10-03 | 1 | -0/+83 |
| | | | | | | | | |||||
* | | | | | | | | Land improved room list based on room stats (#6019) | Erik Johnston | 2019-10-02 | 1 | -39/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use room_stats and room_state for room directory search | ||||
* | | | | | | | | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-02 | 2 | -0/+47 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings | Erik Johnston | 2019-10-02 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix errors storing large retry intervals. | ||||
| | * | | | | | | | Fix errors storing large retry intervals. | Erik Johnston | 2019-10-02 | 1 | -0/+11 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have set the max retry interval to a value larger than a postgres or sqlite int can hold, which caused exceptions when updating the destinations table. To fix postgres we need to change the column to a bigint, and for sqlite we lower the max interval to 2**62 (which is still incredibly long). | ||||
| * / / / / / / | Fix fetching censored redactions from DB | Erik Johnston | 2019-10-02 | 1 | -0/+36 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetching a censored redactions caused an exception due to the code expecting redactions to have a `redact` key, which redacted redactions don't have. | ||||
* | | | | | | | ok | Brendan Abolivier | 2019-09-27 | 1 | -1/+3 |
| | | | | | | | |||||
* | | | | | | | Lint | Brendan Abolivier | 2019-09-27 | 1 | -7/+1 |
| | | | | | | | |||||
* | | | | | | | Add test to validate the change | Brendan Abolivier | 2019-09-27 | 1 | -13/+57 |
|/ / / / / / | |||||
* | | | | | | Fix dummy event insertion consent bug (#6053) | Neil Johnson | 2019-09-26 | 2 | -9/+178 |
| | | | | | | | | | | | | | | | | | | Fixes #5905 | ||||
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-09-25 | 3 | -31/+103 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | erikj/cleanup_user_ips_2 | ||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-09-25 | 3 | -31/+103 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | erikj/cleanup_user_ips | ||||
| | * | | | | | | Stop advertising unsupported flows for registration (#6107) | Richard van der Hoff | 2019-09-25 | 1 | -12/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If email or msisdn verification aren't supported, let's stop advertising them for registration. Fixes #6100. | ||||
| | * | | | | | | Refactor the user-interactive auth handling (#6105) | Richard van der Hoff | 2019-09-25 | 1 | -10/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull the checkers out to their own classes, rather than having them lost in a massive 1000-line class which does everything. This is also preparation for some more intelligent advertising of flows, as per #6100 | ||||
| | * | | | | | | Refactor code for calculating registration flows (#6106) | Richard van der Hoff | 2019-09-25 | 2 | -21/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because, frankly, it looked like it was written by an axe-murderer. This should be a non-functional change, except that where `m.login.dummy` was previously advertised *before* `m.login.terms`, it will now be advertised afterwards. AFAICT that should have no effect, and will be more consistent with the flows that involve passing a 3pid. | ||||
* | | | | | | | | Test that pruning of old user IPs works | Erik Johnston | 2019-09-24 | 1 | -0/+71 |
|/ / / / / / / | |||||
* | | | | | | | Test background update | Erik Johnston | 2019-09-23 | 1 | -0/+79 |
| | | | | | | | |||||
* | | | | | | | Query devices table for last seen info. | Erik Johnston | 2019-09-23 | 1 | -1/+0 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a) simpler than querying user_ips directly and b) means we can purge older entries from user_ips without losing the required info. The storage functions now no longer return the access_token, since it was unused. | ||||
* | | | | | | Add 'failure_ts' column to 'destinations' table (#6016) | Richard van der Hoff | 2019-09-17 | 3 | -4/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | Track the time that a server started failing at, for general analysis purposes. | ||||
* | | | | | | Fix well-known lookups with the federation certificate whitelist (#5997) | Amber Brown | 2019-09-14 | 1 | -0/+40 |
| | | | | | | |||||
* | | | | | | Fix for structured logging tests stomping on logs (#6023) | Amber Brown | 2019-09-13 | 2 | -6/+23 |
| | | | | | | |||||
* | | | | | | Ensure support users can be registered even if MAU limit is reached | Jason Robinson | 2019-09-11 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows support users to be created even on MAU limits via the admin API. Support users are excluded from MAU after creation, so it makes sense to exclude them in creation - except if the whole host is in disabled state. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
* | | | | | | Fix comments | Erik Johnston | 2019-09-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | ||||
* | | | | | | Add test for admin redaction ratelimiting. | Erik Johnston | 2019-09-11 | 1 | -0/+25 |
| | | | | | | |||||
* | | | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users | Jason Robinson | 2019-09-09 | 1 | -2/+27 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Only count real users when checking for auto-creation of auto-join room | ||||
| * | | | | | | Only count real users when checking for auto-creation of auto-join room | Jason Robinson | 2019-09-09 | 1 | -2/+27 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if the first registered user was a "support" or "bot" user, when the first real user registers, the auto-join rooms were not created. Fix to exclude non-real (ie users with a special user type) users when counting how many users there are to determine whether we should auto-create a room. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
* | | | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactions | Erik Johnston | 2019-09-09 | 1 | -1/+76 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Censor redactions in DB after a month | ||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-09-05 | 8 | -119/+544 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | erikj/censor_redactions | ||||
| * | | | | | | Fix test | Erik Johnston | 2019-09-05 | 1 | -1/+3 |
| | | | | | | | |||||
| * | | | | | | Make redaction retention period configurable | Erik Johnston | 2019-09-05 | 1 | -1/+3 |
| | | | | | | | |||||
| * | | | | | | Censor redactions in DB after a month | Erik Johnston | 2019-08-30 | 1 | -0/+71 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Add a build info metric to Prometheus (#6005) | Amber Brown | 2019-09-10 | 1 | -2/+20 |
| |_|/ / / |/| | | | | |||||
* | | | | | Servers-known-about statistic (#5981) | Amber Brown | 2019-09-07 | 3 | -60/+125 |
| |/ / / |/| | | | |||||
* | | | | Fix and refactor room and user stats (#5971) | Erik Johnston | 2019-09-04 | 2 | -113/+538 |
| | | | | | | | | | | | | Previously the stats were not being correctly populated. | ||||
* | | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 6 | -6/+6 |
|/ / / | | | | | | | | | | | | | Python will return a tuple whether there are parentheses around the returned values or not. I'm just sick of my editor complaining about this all over the place :) | ||||
* | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Will Hunt | 2019-08-28 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Exempt support users from consent | ||||
| * | | | Fix registration test | Half-Shot | 2019-08-23 | 1 | -0/+1 |
| | | | | |||||
* | | | | Config templating (#5900) | Jorik Schellekens | 2019-08-28 | 3 | -1/+196 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template config files * Imagine a system composed entirely of x, y, z etc and the basic operations.. Wait George, why XOR? Why not just neq? George: Eh, I didn't think of that.. Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
* | | | | Implement a structured logging output system. (#5680) | Amber Brown | 2019-08-28 | 4 | -2/+456 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-08-22 | 2 | -39/+50 |
|\| | | | | | | | | | | | | | | | erikj/reliable_lookups | ||||
| * | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_fail | Erik Johnston | 2019-08-22 | 1 | -35/+48 |
| |\ \ \ | | | | | | | | | | | Retry well known on fail | ||||
| | * | | | Change jitter to be a factor rather than absolute value | Erik Johnston | 2019-08-20 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Retry well known on fail. | Erik Johnston | 2019-08-15 | 1 | -33/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have recently seen a valid well-known for a domain we want to retry on (non-final) errors a few times, to handle temporary blips in networking/etc. | ||||
| * | | | | Refactor the Appservice scheduler code | Richard van der Hoff | 2019-08-20 | 1 | -4/+2 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the labyrinthine `recoverer_fn` code, and clean up the startup code (it seemed to be previously inexplicably split between `ApplicationServiceScheduler.start` and `_Recoverer.start`). Add some docstrings too. | ||||
* | | | | Remove test debugs | Erik Johnston | 2019-08-20 | 3 | -3/+0 |
| | | | | |||||
* | | | | Refactor MatrixFederationAgent to retry SRV. | Erik Johnston | 2019-08-15 | 2 | -5/+66 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | This refactors MatrixFederationAgent to move the SRV lookup into the endpoint code, this has two benefits: 1. Its easier to retry different host/ports in the same way as HostnameEndpoint. 2. We avoid SRV lookups if we have a free connection in the pool | ||||
* | | | Retry well-known lookup before expiry. | Erik Johnston | 2019-08-13 | 2 | -2/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives a bit of a grace period where we can attempt to refetch a remote `well-known`, while still using the cached result if that fails. Hopefully this will make the well-known resolution a bit more torelant of failures, rather than it immediately treating failures as "no result" and caching that for an hour. | ||||
* | | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_known | Erik Johnston | 2019-08-13 | 1 | -22/+21 |
|\ \ \ | | | | | | | | | Add a lower bound to well-known TTL. | ||||
| * | | | Move well known lookup into a separate clas | Erik Johnston | 2019-08-07 | 1 | -20/+19 |
| | | | | |||||
| * | | | Add a lower bound for TTL on well known results. | Erik Johnston | 2019-08-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It costs both us and the remote server for us to fetch the well known for every single request we send, so we add a minimum cache period. This is set to 5m so that we still honour the basic premise of "refetch frequently". | ||||
* | | | | Merge pull request #5788 from matrix-org/rav/metaredactions | Richard van der Hoff | 2019-08-12 | 1 | -0/+70 |
|\ \ \ \ | |/ / / |/| | | | Fix handling of redactions of redactions | ||||
| * | | | Handle loops in redaction events | Richard van der Hoff | 2019-07-30 | 1 | -0/+70 |
| | | | | |||||
* | | | | Account validity: allow defining HTML templates to serve the us… (#5807) | Brendan Abolivier | 2019-08-01 | 1 | -0/+37 |
|\ \ \ \ | | | | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt | ||||
| * | | | | Add tests | Brendan Abolivier | 2019-08-01 | 1 | -0/+37 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_known | Erik Johnston | 2019-07-31 | 1 | -6/+6 |
|\ \ \ \ | | | | | | | | | | | Share SSL options for well-known requests | ||||
| * | | | | Share SSL options for well-known requests | Erik Johnston | 2019-07-31 | 1 | -6/+6 |
| |/ / / | |||||
* / / / | Remove DelayedCall debugging from test runs (#5787) | Amber Brown | 2019-07-31 | 1 | -6/+0 |
|/ / / | |||||
* | | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_state | Erik Johnston | 2019-07-30 | 1 | -1/+36 |
|\ \ \ | | | | | | | | | Add unit test for current state membership bg update | ||||
| * | | | Add unit test for current state membership bg update | Erik Johnston | 2019-07-23 | 1 | -1/+36 |
| | | | | |||||
* | | | | Remove non-functional 'expire_access_token' setting (#5782) | Richard van der Hoff | 2019-07-30 | 3 | -3/+2 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | The `expire_access_token` didn't do what it sounded like it should do. What it actually did was make Synapse enforce the 'time' caveat on macaroons used as access tokens, but since our access token macaroons never contained such a caveat, it was always a no-op. (The code to add 'time' caveats was removed back in v0.18.5, in #1656) | ||||
* | | | Room Complexity Client Implementation (#5783) | Amber Brown | 2019-07-30 | 1 | -3/+74 |
| | | | |||||
* | | | Convert RedactionTestCase to modern test style (#5768) | Richard van der Hoff | 2019-07-26 | 1 | -36/+38 |
| | | | |||||
* | | | Fix some error cases in the caching layer. (#5749) | Richard van der Hoff | 2019-07-25 | 1 | -3/+87 |
| | | | | | | | | | | | | | | | | | | | | | There was some inconsistent behaviour in the caching layer around how exceptions were handled - particularly synchronously-thrown ones. This seems to be most easily handled by pushing the creation of ObservableDeferreds down from CacheDescriptor to the Cache. | ||||
* | | | Merge tag 'v1.2.0rc2' into develop | Andrew Morgan | 2019-07-24 | 2 | -6/+17 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Bugfixes -------- - Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734)) | ||||
| * | | | Fix servlet metric names (#5734) | Jorik Schellekens | 2019-07-24 | 2 | -6/+17 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * Fix servlet metric names Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Remove redundant check * Cover all return paths | ||||
* | | | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 13 | -25/+25 |
| |/ |/| | |||||
* | | Refactor Keyring._start_key_lookups | Richard van der Hoff | 2019-07-19 | 1 | -29/+0 |
|/ | | | | | There's an awful lot of deferreds and dictionaries flying around here. The whole thing can be made much simpler and achieve the same effect. | ||||
* | Support Prometheus_client 0.4.0+ (#5636) | Amber Brown | 2019-07-18 | 1 | -3/+1 |
| | |||||
* | Remove the ability to query relations when the original event was redacted. ↵ | Andrew Morgan | 2019-07-18 | 1 | -3/+113 |
| | | | | | | | (#5629) Fixes #5594 Forbid viewing relations on an event once it has been redacted. | ||||
* | Ignore redactions of m.room.create events (#5701) | Richard van der Hoff | 2019-07-17 | 1 | -0/+20 |
| | |||||
* | More refactoring in `get_events_as_list` (#5707) | Richard van der Hoff | 2019-07-17 | 2 | -0/+160 |
| | | | | | | | | We can now use `_get_events_from_cache_or_db` rather than going right back to the database, which means that (a) we can benefit from caching, and (b) it opens the way forward to more extensive checks on the original event. We now always require the original event to exist before we will serve up a redaction. |