summary refs log tree commit diff
path: root/tests (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6464 from matrix-org/erikj/make_public_sql_baseAndrew Morgan2020-03-1910-47/+47
|\ | | | | | | | | | | | | * commit 'ddbbfc951': Newsfile Remove underscore from SQLBaseStore functions Don't call SQLBaseStore methods from outside stores
| * Remove underscore from SQLBaseStore functionsErik Johnston2019-12-0410-47/+47
| |
* | Merge pull request #6329 from matrix-org/babolivier/context_filtersAndrew Morgan2020-03-194-100/+384
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c530f9af4': Un-remove room purge test Incorporate review Format changelog Update changelog since this isn't going to be featured in 1.6.0 Also filter state events Only filter if a filter was provided Update copyright Lint Update copyrights Changelog Add tests for /search Merge labels tests for /context and /messages Add test case Filter events_before and events_after in /context requests
| * Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-044-100/+384
| |\ | | | | | | Filter state, events_before and events_after in /context requests
| | * Un-remove room purge testBrendan Abolivier2019-12-041-0/+72
| | |
| | * Merge branch 'babolivier/context_filters' of github.com:matrix-org/synapse ↵Brendan Abolivier2019-12-041-1/+1
| | |\ | | | | | | | | | | | | into babolivier/context_filters
| | | * Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-11-267-19/+399
| | | |\
| | * | \ Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-0420-77/+846
| | |\ \ \ | | | |/ / | | |/| |
| | * | | LintBrendan Abolivier2019-11-051-30/+41
| | | | |
| | * | | Update copyrightsBrendan Abolivier2019-11-054-1/+10
| | | | |
| | * | | Add tests for /searchBrendan Abolivier2019-11-051-44/+143
| | | | |
| | * | | Merge labels tests for /context and /messagesBrendan Abolivier2019-11-051-146/+130
| | | | |
| | * | | Add test caseBrendan Abolivier2019-11-051-0/+182
| | | | |
* | | | | privacy by default for room dir (#6355)Andrew Morgan2020-03-191-0/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb0aeb147': privacy by default for room dir (#6355)
| * | | | privacy by default for room dir (#6355)Neil Johnson2019-12-041-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)Andrew Morgan2020-03-191-0/+101
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '54dd5dc12': Add ephemeral messages support (MSC2228) (#6409)
| * | | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-031-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
* | | | Fix: Pillow error when uploading RGBA image (#3325) (#6241)Andrew Morgan2020-03-191-0/+140
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81731c6e7': Fix: Pillow error when uploading RGBA image (#3325) (#6241) Add User-Interactive Auth to /account/3pid/add (#6119) Lint Changelog Discard retention policies when retrieving state blacklist more tests Newsfile Add tests Propagate reason in remotely rejected invites MSC2367 Allow reason field on all member events
| * | | Add testsErik Johnston2019-11-281-0/+140
| | | |
* | | | Implementation of MSC2314 (#6176)Andrew Morgan2020-03-189-52/+148
|\| | | | | | | | | | | | | | | | | | | * commit '0f87b912a': Implementation of MSC2314 (#6176)
| * | | Implementation of MSC2314 (#6176)Amber Brown2019-11-289-52/+148
| | | |
* | | | add etag and count to key backup endpoints (#5858)Andrew Morgan2020-03-182-4/+35
|\| | | | | | | | | | | | | | | | | | | * commit '0d27aba90': add etag and count to key backup endpoints (#5858)
| * | | add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-272-4/+35
| | | |
* | | | Merge pull request #6358 from matrix-org/babolivier/message_retentionAndrew Morgan2020-03-181-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd31f69afa': clean up buildkite output Don't restrict the tests to v1 rooms Fix worker mode Fix 3PID invite exchange Lint again Lint again Lint Don't apply retention policy based filtering on state events Implement per-room message retention policies
| * | | Merge pull request #6358 from matrix-org/babolivier/message_retentionBrendan Abolivier2019-11-271-0/+293
| |\ \ \ | | | | | | | | | | Implement message retention policies (MSC1763)
| | * \ \ Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-268-19/+351
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Don't restrict the tests to v1 roomsBrendan Abolivier2019-11-261-2/+0
| | | | |
| | * | | Lint againBrendan Abolivier2019-11-191-10/+2
| | | | |
| | * | | LintBrendan Abolivier2019-11-191-50/+23
| | | | |
| | * | | Don't apply retention policy based filtering on state eventsBrendan Abolivier2019-11-061-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 policiesBrendan Abolivier2019-11-041-0/+320
| | | | |
* | | | | Remove assertion and provide a clear warning on startup for missing ↵Andrew Morgan2020-03-181-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public_baseurl (#6379) * commit 'ce578031f': Remove assertion and provide a clear warning on startup for missing public_baseurl (#6379)
| * | | | Remove assertion and provide a clear warning on startup for missing ↵Andrew Morgan2019-11-261-0/+1
| | |/ / | |/| | | | | | | | | | public_baseurl (#6379)
* | | | Improve the performance of structured logging (#6322)Andrew Morgan2020-03-181-0/+2
|\| | | | | | | | | | | | | | | | | | | * commit '9eebd4604': Improve the performance of structured logging (#6322)
| * | | Improve the performance of structured logging (#6322)Amber Brown2019-11-261-0/+2
| | | |
* | | | Merge pull request #6392 from matrix-org/babolivier/fix-1623Andrew Morgan2020-03-181-0/+74
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '78cfc05fc': Lint Changelog Test if a purge can make /messages return 500 responses
| * | | LintBrendan Abolivier2019-11-201-6/+8
| | | |
| * | | Test if a purge can make /messages return 500 responsesBrendan Abolivier2019-11-201-0/+72
| | | |
* | | | Blacklist PurgeRoomTestCase (#6361)Andrew Morgan2020-03-181-0/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'c350bc2f9': Blacklist PurgeRoomTestCase (#6361)
| * | | Blacklist PurgeRoomTestCase (#6361)Andrew Morgan2019-11-131-0/+2
| | | |
* | | | Merge pull request #6295 from matrix-org/erikj/split_purge_historyAndrew Morgan2020-03-182-8/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f713c01e2': Move type annotation into docstring Fix deleting state groups during room purge. Use correct type annotation Change to not require a state_groups.room_id index. Fix up comment Update log line to lie a little less Add state_groups.room_id index Docstrings Fix purge room API Newsfile Split purge API into events vs state
| * | | Merge pull request #6295 from matrix-org/erikj/split_purge_historyErik Johnston2019-11-082-8/+11
| |\ \ \ | | | | | | | | | | Split purge API into events vs state and add PurgeEventsStorage
| | * | | Fix deleting state groups during room purge.Erik Johnston2019-11-061-1/+3
| | | | | | | | | | | | | | | | | | | | And fix the tests to actually test that things got deleted.
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-11-051-0/+51
| | |\ \ \ | | | | |/ | | | |/| | | | | | erikj/split_purge_history
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-11-0412-21/+693
| | |\ \ \ | | | | |/ | | | |/| | | | | | erikj/split_purge_history
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-315-51/+197
| | |\ \ \ | | | | | | | | | | | | | | | | | | erikj/split_purge_history
| | * | | | Split purge API into events vs stateErik Johnston2019-10-301-7/+8
| | | | | |
* | | | | | Fix bug which caused rejected events to be stored with the wrong room state ↵Andrew Morgan2020-03-162-11/+176
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6320) * commit '807ec3bd9': Fix bug which caused rejected events to be stored with the wrong room state (#6320)
| * | | | | Fix bug which caused rejected events to be stored with the wrong room state ↵Richard van der Hoff2019-11-062-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 pull request #6331 from matrix-org/rav/url_preview_limit_titleAndrew Morgan2020-03-161-0/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '02f99906f': Apply suggestions from code review Strip overlong OpenGraph data from url preview
| * | | | | Merge branch 'develop' into rav/url_preview_limit_titleRichard van der Hoff2019-11-0527-99/+1065
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Apply suggestions from code reviewRichard van der Hoff2019-11-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Brendan Abolivier <babolivier@matrix.org> Co-Authored-By: Erik Johnston <erik@matrix.org>
| * | | | | Strip overlong OpenGraph data from url previewRichard van der Hoff2019-11-051-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | ... to stop people causing DoSes with malicious web pages
* | | | | | Remove the psutil dependency (#6318)Andrew Morgan2020-03-161-0/+51
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '4e1c7b79f': Remove the psutil dependency (#6318)
| * | | | | Remove the psutil dependency (#6318)Amber Brown2019-11-051-0/+51
| | |_|_|/ | |/| | | | | | | | * remove psutil and replace with resource
* | | | | Merge pull request #6301 from matrix-org/babolivier/msc2326Andrew Morgan2020-03-165-6/+300
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f496d2587': Incorporate review Factor out an _AsyncEventContextImpl (#6298) Update synapse/storage/data_stores/main/schema/delta/56/event_labels.sql Add more data to the event_labels table and fix the indexes Add unstable feature flag Lint Incorporate review Lint Changelog Add integration tests for /messages Add more integration testing Add integration tests for sync Add unit tests Add index on label Implement filtering Store labels for new events Add database table for keeping track of labels on events
| * | | | Merge pull request #6301 from matrix-org/babolivier/msc2326Brendan Abolivier2019-11-014-5/+297
| |\ \ \ \ | | | | | | | | | | | | Implement MSC2326 (label based filtering)
| | * | | | Incorporate reviewBrendan Abolivier2019-11-013-12/+12
| | | | | |
| | * | | | Incorporate reviewBrendan Abolivier2019-11-013-15/+15
| | | | | |
| | * | | | LintBrendan Abolivier2019-10-303-43/+34
| | | | | |
| | * | | | Add integration tests for /messagesBrendan Abolivier2019-10-301-1/+101
| | | | | |
| | * | | | Add more integration testingBrendan Abolivier2019-10-301-6/+39
| | | | | |
| | * | | | Add integration tests for syncBrendan Abolivier2019-10-302-5/+122
| | | | | |
| | * | | | Add unit testsBrendan Abolivier2019-10-301-0/+51
| | | | | |
| * | | | | Factor out an _AsyncEventContextImpl (#6298)Richard van der Hoff2019-11-011-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 Hoff2019-11-015-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 pull request #5727 from matrix-org/uhoreg/e2e_cross-signing2-part3Andrew Morgan2020-03-162-9/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '53d7680e3': Update synapse/storage/data_stores/main/devices.py rename get_devices_by_remote to get_device_updates_by_remote black apply changes as a result of PR review don't error if federation query doesn't have cross-signing keys move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works with workers black vendor-prefix the EDU name until MSC1756 is merged into the spec fix unit test add news file update to work with newer code, and fix formatting add missing param make black happy don't crash if the user doesn't have cross-signing keys implement federation parts of cross-signing
| * | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-315-51/+197
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | rename get_devices_by_remote to get_device_updates_by_remoteHubert Chathi2019-10-302-8/+8
| | | | | |
| * | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-3015-27/+126
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-247-20/+68
| |\ \ \ \ \
| * | | | | | fix unit testHubert Chathi2019-10-221-1/+3
| | | | | | |
* | | | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storageAndrew Morgan2020-03-164-51/+116
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storageErik Johnston2019-10-313-50/+114
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add StateGroupStorage interface
| | * | | | | | Port to use state storageErik Johnston2019-10-303-50/+114
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge pull request #6307 from matrix-org/erikj/fix_purge_roomAndrew Morgan2020-03-162-1/+83
|\| | | | | |
| * | | | | | Add unit test for /purge_room APIErik Johnston2019-10-312-1/+83
| |/ / / / /
* | | | | | Merge pull request #6240 from matrix-org/erikj/split_out_persistence_storeAndrew Morgan2020-03-1610-22/+41
|\| | | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-307-8/+142
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | erikj/split_out_persistence_store
| * | | | | | Review commentsErik Johnston2019-10-302-6/+9
| | | | | | |
| * | | | | | Use new EventPersistenceStoreErik Johnston2019-10-238-16/+32
| | | | | | |
* | | | | | | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptorAndrew Morgan2020-03-162-3/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Make ObservableDeferred.observe() always return deferred.Erik Johnston2019-10-302-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.
* | | | | | | Merge pull request #6279 from matrix-org/erikj/federation_server_async_awaitAndrew Morgan2020-03-161-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b4465564c': Don't return coroutines Make concurrently_execute work with async/await Newsfile Port federation_server to async/await
| * | | | | | Port federation_server to async/awaitErik Johnston2019-10-291-0/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #6263 from matrix-org/erikj/caches_return_deferredsAndrew Morgan2020-03-161-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '561133c3c': Update docstring Newsfile Quick fix to ensure cache descriptors always return deferreds
| * | | | | Quick fix to ensure cache descriptors always return deferredsErik Johnston2019-10-281-2/+2
| | | | | |
* | | | | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keysAndrew Morgan2020-03-161-0/+75
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'da78f6177': remove unneeded imports switch to using HomeserverTestCase remove some unnecessary lines add changelog delete keys when deleting backups
| * | | | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keysHubert Chathi2019-10-251-0/+75
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | delete keys when deleting backup versions
| | * | | | remove unneeded importsHubert Chathi2019-10-251-3/+1
| | | | | |
| | * | | | switch to using HomeserverTestCaseHubert Chathi2019-10-251-19/+25
| | | | | |
| | * | | | remove some unnecessary linesHubert Chathi2019-10-241-5/+0
| | | | | |
| | * | | | delete keys when deleting backupsHubert Chathi2019-10-241-0/+76
| | | |_|/ | | |/| |
* | | | | Merge pull request #6255 from matrix-org/erikj/stats_configAndrew Morgan2020-03-161-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '87259b3a3': Fix tests Newsfile Remove repeated calls to config.stats_enabled.
| * | | | Fix testsErik Johnston2019-10-251-0/+2
| |/ / /
* | | | Option to suppress resource exceeded alerting (#6173)Andrew Morgan2020-03-162-3/+57
|\| | | | | | | | | | | | | | | | | | | * commit '2794b7905': Option to suppress resource exceeded alerting (#6173)
| * | | Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-242-3/+57
| |/ / | | | | | | | | | The expected use case is to suppress MAU limiting on small instances
* | | Merge pull request #6231 from matrix-org/erikj/refactor_storesAndrew Morgan2020-03-166-17/+11
|\| |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-221-1/+294
| |\| | | | | | | | | | erikj/refactor_stores
| * | Fix postgres unit tests to use prepare_databaseErik Johnston2019-10-221-10/+2
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-221-0/+65
| |\ \ | | | | | | | | | | | | erikj/refactor_stores
| * | | Move storage classes into a main "data store".Erik Johnston2019-10-215-7/+9
| | | | | | | | | | | | | | | | | | | | This is in preparation for having multiple data stores that offer different functionality, e.g. splitting out state or event storage.
* | | | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Andrew Morgan2020-03-161-1/+294
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '276173163': Add changelog entry fix doc strings make isort happy add some comments drop some logger lines to debug make changes based on PR feedback add function docs use something that's the right type for user_id run black split out signature processing into separate functions avoid modifying input parameter fix test update with newer coding style add test make isort happy make black happy allow uploading signatures of master key signed by devices implement device signature uploading/fetching
| * | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-1829-249/+1136
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-073-60/+125
| |\ \ \
| * | | | use something that's the right type for user_idHubert Chathi2019-09-061-1/+1
| | | | |
| * | | | fix testHubert Chathi2019-09-051-1/+3
| | | | |
| * | | | add testHubert Chathi2019-09-041-0/+88
| | | | |
| * | | | make isort happyHubert Chathi2019-09-041-0/+1
| | | | |
| * | | | make black happyHubert Chathi2019-09-041-85/+62
| | | | |
| * | | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-041-1/+226
| | | | |
* | | | | Remove Auth.check method (#6217)Andrew Morgan2020-03-161-0/+65
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93eaeec75': Remove Auth.check method (#6217) add note about database upgrade use the right function for when we're already in runInteraction add user signature stream change cache to slaved device store black use stream ID generator instead of timestamp make isort happy apply PR review suggestions fix formatting add changelog make changes from PR review don't need to return the hidden column any more really fix queries to work with Postgres PostgreSQL, Y U no like? remove extra SQL query param add changelog file apply changes from PR review allow uploading keys for cross-signing allow devices to be marked as "hidden"
| * | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-1829-249/+1136
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-073-60/+125
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| * | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-048-119/+544
| |\ \ \
| * \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2817-56/+944
| |\ \ \ \
| * | | | | fix formattingHubert Chathi2019-08-011-1/+3
| | | | | |
| * | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-0116-106/+279
| |\ \ \ \ \
| * | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-251-0/+63
| | | | | | |
* | | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Andrew Morgan2020-02-261-0/+39
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Erik Johnston2019-10-181-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_storageAndrew Morgan2020-02-261-6/+6
|\| | | | | |
| * | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageHubert Chathi2019-10-111-6/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | make storage layer in charge of interpreting the device key data
| | * | | | | | make storage layer in charge of interpreting the device key dataHubert Chathi2019-10-101-6/+6
| | | | | | | |
* | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionAndrew Morgan2020-02-261-16/+31
|\| | | | | | |
| * | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-111-16/+31
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | make version optional in body of e2e backup version update
| | * | | | | | | change test name to be uniqueHubert Chathi2019-10-101-1/+1
| | | | | | | | |
| | * | | | | | | make version optional in body of e2e backup version updateHubert Chathi2019-10-091-16/+31
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | to agree with latest version of the MSC
* | | | | | | | Fix MAU reaping where reserved users are specified. (#6168)Andrew Morgan2020-02-261-9/+49
|\| | | | | | |
| * | | | | | | Fix MAU reaping where reserved users are specified. (#6168)Neil Johnson2019-10-111-9/+49
| | | | | | | |
* | | | | | | | Merge pull request #6186 from matrix-org/erikj/disable_sql_bytesAndrew Morgan2020-02-261-1/+1
|\| | | | | | |
| * | | | | | | Fix postgres unit testsErik Johnston2019-10-101-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_innerAndrew Morgan2020-02-262-96/+2
|\| | | | | | |
| * | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_innerErik Johnston2019-10-102-96/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add more log context checks when patching inlineCallbacks
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-103-11/+18
| | |\ \ \ \ \ \ \
| | * | | | | | | | Move patch_inline_callbacks into synapse/Erik Johnston2019-10-102-181/+2
| | | | | | | | | |
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-095-53/+182
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | UpdateErik Johnston2019-09-271-8/+15
| | | | | | | | | |
| | * | | | | | | | Patch inlinecallbacks for log contextsErik Johnston2019-09-271-4/+82
| | | | | | | | | |
* | | | | | | | | | Add domain validation when creating room with list of invitees (#6121)Andrew Morgan2020-02-261-0/+9
|\| | | | | | | | |
| * | | | | | | | | Add domain validation when creating room with list of invitees (#6121)werner2912019-10-101-0/+9
| | | | | | | | | |
* | | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)Andrew Morgan2020-02-261-1/+1
|\| | | | | | | | |
| * | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-101-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)Andrew Morgan2020-02-262-2/+2
|\| | | | | | | |
| * | | | | | | | Fix races in room stats (and other) updates. (#6187)Richard van der Hoff2019-10-102-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)Andrew Morgan2020-02-261-9/+16
|\| | | | | | | |
| * | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137)Amber Brown2019-10-101-9/+16
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedAndrew Morgan2020-02-261-4/+1
|\| | | | | | |
| * | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedBrendan Abolivier2019-10-041-0/+81
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't 500 when trying to exchange a revoked 3PID invite
| | * | | | | | | Lint (again)Brendan Abolivier2019-10-031-3/+1
| | | | | | | | |
| | * | | | | | | LintBrendan Abolivier2019-10-031-5/+5
| | | | | | | | |
| | * | | | | | | Add test caseBrendan Abolivier2019-10-031-0/+83
| | | | | | | | |
* | | | | | | | | Land improved room list based on room stats (#6019)Andrew Morgan2020-02-261-39/+0
|\| | | | | | | |
| * | | | | | | | Land improved room list based on room stats (#6019)Erik Johnston2019-10-021-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 developErik Johnston2019-10-022-0/+47
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsAndrew Morgan2020-02-261-0/+11
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsErik Johnston2019-10-021-0/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix errors storing large retry intervals.
| | * | | | | | | | Fix errors storing large retry intervals.Erik Johnston2019-10-021-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).
* | | | | | | | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactionsAndrew Morgan2020-02-261-0/+36
|\| | | | | | | |
| * | | | | | | | Fix fetching censored redactions from DBErik Johnston2019-10-021-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.
* | | | | | | | Merge pull request #6125 from matrix-org/babolivier/deactivation-inviteAndrew Morgan2020-02-261-17/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | okBrendan Abolivier2019-09-271-1/+3
| | | | | | | |
| * | | | | | | LintBrendan Abolivier2019-09-271-7/+1
| | | | | | | |
| * | | | | | | Add test to validate the changeBrendan Abolivier2019-09-271-13/+57
| |/ / / / / /
* | | | | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2020-02-262-2/+9
|\| | | | | |
* | | | | | | Fix dummy event insertion consent bug (#6053)Andrew Morgan2020-02-252-9/+178
|\| | | | | |
| * | | | | | Fix dummy event insertion consent bug (#6053)Neil Johnson2019-09-262-9/+178
| | | | | | | | | | | | | | | | | | | | | Fixes #5905
* | | | | | | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2Andrew Morgan2020-02-251-0/+71
|\| | | | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-09-253-31/+103
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | erikj/cleanup_user_ips_2
| * | | | | | | Test that pruning of old user IPs worksErik Johnston2019-09-241-0/+71
| | | | | | | |
* | | | | | | | Merge pull request #6089 from matrix-org/erikj/cleanup_user_ipsAndrew Morgan2020-02-251-1/+79
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-09-253-31/+103
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | erikj/cleanup_user_ips
| * | | | | | | Test background updateErik Johnston2019-09-231-0/+79
| | | | | | | |
| * | | | | | | Query devices table for last seen info.Erik Johnston2019-09-231-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.
* | | | | | | | Stop advertising unsupported flows for registration (#6107)Andrew Morgan2020-02-251-12/+17
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-251-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)Andrew Morgan2020-02-251-10/+16
|\| | | | | | |
| * | | | | | | Refactor the user-interactive auth handling (#6105)Richard van der Hoff2019-09-251-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)Andrew Morgan2020-02-252-21/+82
|\| | | | | | |
| * | | | | | | Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-252-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.
* | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2020-02-253-3/+30
|\| | | | | |
* | | | | | | Implement MSC2290 (#6043)Andrew Morgan2020-02-251-6/+5
|\| | | | | |
* | | | | | | Add 'failure_ts' column to 'destinations' table (#6016)Andrew Morgan2020-02-253-4/+138
|\| | | | | |
| * | | | | | Add 'failure_ts' column to 'destinations' table (#6016)Richard van der Hoff2019-09-173-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)Andrew Morgan2020-02-251-0/+40
|\| | | | | |
| * | | | | | Fix well-known lookups with the federation certificate whitelist (#5997)Amber Brown2019-09-141-0/+40
| | | | | | |
* | | | | | | Fix for structured logging tests stomping on logs (#6023)Andrew Morgan2020-02-252-6/+23
|\| | | | | |
| * | | | | | Fix for structured logging tests stomping on logs (#6023)Amber Brown2019-09-132-6/+23
| | | | | | |
* | | | | | | Merge pull request #6020 from matrix-org/jaywink/allow-support-users-to-registerAndrew Morgan2020-02-251-0/+18
|\| | | | | |
| * | | | | | Ensure support users can be registered even if MAU limit is reachedJason Robinson2019-09-111-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>
* | | | | | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionAndrew Morgan2020-02-251-0/+25
|\| | | | | |
| * | | | | | Fix commentsErik Johnston2019-09-111-2/+2
| | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * | | | | | Add test for admin redaction ratelimiting.Erik Johnston2019-09-111-0/+25
| | | | | | |
* | | | | | | Fix existing v2 identity server calls (MSC2140) (#6013)Andrew Morgan2020-02-252-1/+1
|\| | | | | |
* | | | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-usersAndrew Morgan2020-02-251-2/+27
|\| | | | | |
| * | | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-usersJason Robinson2019-09-091-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 roomJason Robinson2019-09-091-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_redactionsAndrew Morgan2020-02-251-1/+76
|\| | | | | |
| * | | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-091-1/+76
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Censor redactions in DB after a month
| | * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-09-058-119/+544
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | erikj/censor_redactions
| | * | | | | | Fix testErik Johnston2019-09-051-1/+3
| | | | | | | |
| | * | | | | | Make redaction retention period configurableErik Johnston2019-09-051-1/+3
| | | | | | | |
| | * | | | | | Censor redactions in DB after a monthErik Johnston2019-08-301-0/+71
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Add a build info metric to Prometheus (#6005)Andrew Morgan2020-02-251-2/+20
|\| | | | | |
| * | | | | | Add a build info metric to Prometheus (#6005)Amber Brown2019-09-101-2/+20
| | |_|/ / / | |/| | | |
* | | | | | Servers-known-about statistic (#5981)Andrew Morgan2020-02-253-60/+125
|\| | | | |
| * | | | | Servers-known-about statistic (#5981)Amber Brown2019-09-073-60/+125
| | |/ / / | |/| | |
* | | | | Remove extraneous unittest.DEBUG'sAndrew Morgan2020-02-252-2/+0
| | | | |
* | | | | Increase expected state events in tests for new room by oneAndrew Morgan2020-02-251-1/+6
| | | | |
* | | | | Fix and refactor room and user stats (#5971)Andrew Morgan2020-02-251-111/+532
|\| | | |
| * | | | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-042-113/+538
| | | | | | | | | | | | | | | Previously the stats were not being correctly populated.
* | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2020-02-246-6/+6
|\| | | |
| * | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-306-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 :)
* | | | Revert "Use the v2 lookup API for 3PID invites (#5897)"Andrew Morgan2020-02-244-26/+4
| | | | | | | | | | | | | | | | | | | | This reverts commit 978f263e7c5d1eb440efaf07abc5009408ade25d, reversing changes made to 4f6ee99818d9c338944a10585d0aea4c7349d456.
* | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentAndrew Morgan2020-02-241-0/+1
|\| | |
| * | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-281-0/+1
| |\ \ \ | | | | | | | | | | Exempt support users from consent
| | * | | Fix registration testHalf-Shot2019-08-231-0/+1
| | | | |
* | | | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2020-02-244-4/+26
|\| | | |
* | | | | Config templating (#5900)Andrew Morgan2020-02-213-1/+196
|\| | | |
| * | | | Config templating (#5900)Jorik Schellekens2019-08-283-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)Andrew Morgan2020-02-214-2/+456
|\| | | |
| * | | | Implement a structured logging output system. (#5680)Amber Brown2019-08-284-2/+456
| | | | |
* | | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookupsAndrew Morgan2020-02-214-7/+65
|\| | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-08-222-39/+50
| |\| | | | | | | | | | | | | | | | | | erikj/reliable_lookups
| * | | | Remove test debugsErik Johnston2019-08-203-3/+0
| | | | |
| * | | | Refactor MatrixFederationAgent to retry SRV.Erik Johnston2019-08-152-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
* | | | | Merge pull request #5877 from ↵Andrew Morgan2020-02-211-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Awesome-Technologies/remove_shared_secret_registration
* | | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_failAndrew Morgan2020-02-211-35/+48
|\| | | |
| * | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_failErik Johnston2019-08-221-35/+48
| |\ \ \ \ | | | | | | | | | | | | Retry well known on fail
| | * | | | Change jitter to be a factor rather than absolute valueErik Johnston2019-08-201-2/+2
| | | | | |
| | * | | | Retry well known on fail.Erik Johnston2019-08-151-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 (#5886)Andrew Morgan2020-02-211-4/+2
|\| | | |
| * | | | Refactor the Appservice scheduler codeRichard van der Hoff2019-08-201-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.
* | | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupAndrew Morgan2020-02-202-2/+71
|\| | |
| * | | Retry well-known lookup before expiry.Erik Johnston2019-08-132-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_knownAndrew Morgan2020-02-201-22/+21
|\| | |
| * | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-131-22/+21
| |\ \ \ | | | | | | | | | | Add a lower bound to well-known TTL.
| | * | | Move well known lookup into a separate clasErik Johnston2019-08-071-20/+19
| | | | |
| | * | | Add a lower bound for TTL on well known results.Erik Johnston2019-08-061-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/metaredactionsAndrew Morgan2020-02-201-0/+70
|\| | | |
| * | | | Merge pull request #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-121-0/+70
| |\ \ \ \ | | |/ / / | |/| | | Fix handling of redactions of redactions
| | * | | Handle loops in redaction eventsRichard van der Hoff2019-07-301-0/+70
| | | | |
| * | | | Account validity: allow defining HTML templates to serve the us… (#5807)Brendan Abolivier2019-08-011-0/+37
| |\ \ \ \ | | | | | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt
| | * | | | Add testsBrendan Abolivier2019-08-011-0/+37
| | | |_|/ | | |/| |
* | | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_knownAndrew Morgan2020-02-201-6/+6
|\| | | |
| * | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_knownErik Johnston2019-07-311-6/+6
| |\ \ \ \ | | | | | | | | | | | | Share SSL options for well-known requests
| | * | | | Share SSL options for well-known requestsErik Johnston2019-07-311-6/+6
| | |/ / /
* | | | | Remove DelayedCall debugging from test runs (#5787)Andrew Morgan2020-02-201-6/+0
|\| | | |
| * | | | Remove DelayedCall debugging from test runs (#5787)Amber Brown2019-07-311-6/+0
| |/ / /
* | | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_stateAndrew Morgan2020-02-201-1/+36
|\| | |