summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | Numeric ID checker now checks @0, don't ratelimit on checkingAndrew Morgan2019-11-062-20/+29
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into developRichard van der Hoff2019-11-061-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge commit 'feafd98ac' into dinsic-release-v1.5.xAndrew Morgan2020-03-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'feafd98ac': 1.5.1
| * | | | | | | | | 1.5.1 v1.5.1Richard van der Hoff2019-11-061-1/+1
| | | | | | | | | |
* | | | | | | | | | Fix bug which caused rejected events to be stored with the wrong room state ↵Andrew Morgan2020-03-164-92/+108
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#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-064-92/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6320) Fixes a bug where rejected events were persisted with the wrong state group. Also fixes an occasional internal-server-error when receiving events over federation which are rejected and (possibly because they are backwards-extremities) have no prev_group. Fixes #6289.
* | | | | | | | | | Add some checks that we aren't using state from rejected events (#6330)Andrew Morgan2020-03-162-6/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e3ab8afd': Add some checks that we aren't using state from rejected events (#6330)
| * | | | | | | | | Add some checks that we aren't using state from rejected events (#6330)Richard van der Hoff2019-11-052-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Raise an exception if accessing state for rejected events Add some sanity checks on accessing state_group etc for rejected events. * Skip calculating push actions for rejected events It didn't actually cause any bugs, because rejected events get filtered out at various later points, but there's not point in trying to calculate the push actions for a rejected event.
* | | | | | | | | | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_statsAndrew Morgan2020-03-161-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '01ba7b38a': Newsfile Fix phone home stats
| * | | | | | | | | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_statsErik Johnston2019-11-051-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix phone home stats
| | * | | | | | | | | Fix phone home statsErik Johnston2019-11-051-2/+2
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2Andrew Morgan2020-03-161-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5570d1c93': Fix exception when OpenGraph tag values are ints
| * | | | | | | | | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2Richard van der Hoff2019-11-051-1/+2
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | Fix exception when OpenGraph tag values are ints
| | * | | | | | | | Fix exception when OpenGraph tag values are intsRichard van der Hoff2019-11-051-1/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #6331 from matrix-org/rav/url_preview_limit_titleAndrew Morgan2020-03-161-1/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-05143-1693/+3109
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / /
| * | | | | | | | Apply suggestions from code reviewRichard van der Hoff2019-11-051-1/+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-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to stop people causing DoSes with malicious web pages
* | | | | | | | | Improve documentation for EventContext fields (#6319)Andrew Morgan2020-03-162-26/+68
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '408600282': Improve documentation for EventContext fields (#6319)
| * | | | | | | | Improve documentation for EventContext fields (#6319)Richard van der Hoff2019-11-052-26/+68
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Remove the psutil dependency (#6318)Andrew Morgan2020-03-163-83/+94
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4e1c7b79f': Remove the psutil dependency (#6318)
| * | | | | | | Remove the psutil dependency (#6318)Amber Brown2019-11-053-83/+94
| | |/ / / / / | |/| | | | | | | | | | | | * remove psutil and replace with resource
* | | | | | | document the REPLICATE command a bit better (#6305)Andrew Morgan2020-03-163-9/+95
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc6243b4c': document the REPLICATE command a bit better (#6305)
| * | | | | | document the REPLICATE command a bit better (#6305)Richard van der Hoff2019-11-043-9/+95
| | |/ / / / | |/| | | | | | | | | | | | | | | | since I found myself wonder how it works
* | | | | | Merge pull request #6301 from matrix-org/babolivier/msc2326Andrew Morgan2020-03-168-88/+159
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-016-4/+98
| |\ \ \ \ \ | | | | | | | | | | | | | | Implement MSC2326 (label based filtering)
| | * | | | | Incorporate reviewBrendan Abolivier2019-11-014-3/+9
| | | | | | |
| | * | | | | Update synapse/storage/data_stores/main/schema/delta/56/event_labels.sqlBrendan Abolivier2019-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| | * | | | | Add more data to the event_labels table and fix the indexesBrendan Abolivier2019-11-013-5/+21
| | | | | | |
| | * | | | | Add unstable feature flagBrendan Abolivier2019-11-011-0/+3
| | | | | | |
| | * | | | | LintBrendan Abolivier2019-11-012-1/+2
| | | | | | |
| | * | | | | Incorporate reviewBrendan Abolivier2019-11-013-5/+18
| | | | | | |
| | * | | | | LintBrendan Abolivier2019-10-301-7/+1
| | | | | | |
| | * | | | | Add more integration testingBrendan Abolivier2019-10-301-1/+1
| | | | | | |
| | * | | | | Add unit testsBrendan Abolivier2019-10-301-1/+1
| | | | | | |
| | * | | | | Add index on labelBrendan Abolivier2019-10-301-1/+3
| | | | | | |
| | * | | | | Implement filteringBrendan Abolivier2019-10-302-2/+20
| | | | | | |
| | * | | | | Store labels for new eventsBrendan Abolivier2019-10-302-1/+22
| | | | | | |
| | * | | | | Add database table for keeping track of labels on eventsBrendan Abolivier2019-10-291-0/+20
| | | | | | |
| * | | | | | Factor out an _AsyncEventContextImpl (#6298)Richard van der Hoff2019-11-012-84/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schemaAndrew Morgan2020-03-161-0/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa7e52caf': add changelog fix hidden field in devices table for older sqlite
| * | | | | | Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schemaHubert Chathi2019-11-011-0/+42
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | fix hidden field in devices table for older sqlite
| | * | | | | | fix hidden field in devices table for older sqliteHubert Chathi2019-10-311-0/+42
| | | | | | | |
* | | | | | | | Support for routing outbound HTTP requests via a proxy (#6239)Andrew Morgan2020-03-162-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1cb84c648': Support for routing outbound HTTP requests via a proxy (#6239)
| * | | | | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-0110-6/+429
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy. The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`. The proxy will then be used for * push * url previews * phone-home stats * recaptcha validation * CAS auth validation It will *not* be used for: * Application Services * Identity servers * Outbound federation * In worker configurations, connections from workers to masters Fixes #4198.
* | | | | | | | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2020-03-162-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe1f2b452': Remove last usages of deprecated logging.warn method (#6314)
| * | | | | | | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2019-11-012-3/+3
| | | | | | | |
* | | | | | | | Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2020-03-164-30/+91
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ace947e8d': Depublish a room from the public rooms list when it is upgraded (#6232)
| * | | | | | | Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2019-11-014-30/+91
| | | | | | | |
* | | | | | | | Merge pull request #5727 from matrix-org/uhoreg/e2e_cross-signing2-part3Andrew Morgan2020-03-164-38/+229
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | Update synapse/storage/data_stores/main/devices.pyHubert Chathi2019-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| * | | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-31108-380/+803
| |\| | | | | |
| * | | | | | | rename get_devices_by_remote to get_device_updates_by_remoteHubert Chathi2019-10-302-6/+6
| | | | | | | |
| * | | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-3042-1075/+1167
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | blackHubert Chathi2019-10-301-1/+3
| | | | | | | |
| * | | | | | | apply changes as a result of PR reviewHubert Chathi2019-10-302-55/+46
| | | | | | | |
| * | | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-24277-4434/+4751
| |\ \ \ \ \ \ \
| * | | | | | | | don't error if federation query doesn't have cross-signing keysHubert Chathi2019-10-241-7/+9
| | | | | | | | |
| * | | | | | | | move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works with ↵Hubert Chathi2019-10-231-67/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | workers
| * | | | | | | | blackHubert Chathi2019-10-221-1/+2
| | | | | | | | |
| * | | | | | | | vendor-prefix the EDU name until MSC1756 is merged into the specHubert Chathi2019-10-222-2/+4
| | | | | | | | |
| * | | | | | | | update to work with newer code, and fix formattingHubert Chathi2019-10-223-6/+7
| | | | | | | | |
| * | | | | | | | add missing paramHubert Chathi2019-10-221-1/+1
| | | | | | | | |
| * | | | | | | | make black happyHubert Chathi2019-10-222-27/+39
| | | | | | | | |
| * | | | | | | | don't crash if the user doesn't have cross-signing keysHubert Chathi2019-10-221-14/+25
| | | | | | | | |
| * | | | | | | | implement federation parts of cross-signingHubert Chathi2019-10-224-10/+179
| | | | | | | | |
* | | | | | | | | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notifyAndrew Morgan2020-03-165-3/+58
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b4216f96': clean up code a bit make user signatures a separate stream add changelog make notification of signatures work with workers
| * | | | | | | | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-315-3/+58
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | make notification of signatures work with workers
| | * \ \ \ \ \ \ \ Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-31103-376/+742
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | clean up code a bitHubert Chathi2019-10-311-5/+9
| | | | | | | | | | |
| | * | | | | | | | | make user signatures a separate streamHubert Chathi2019-10-305-14/+50
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-3043-1142/+1234
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | make notification of signatures work with workersHubert Chathi2019-10-243-2/+17
| | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | rstrip slashes from url on appservice (#6306)Andrew Morgan2020-03-161-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '42e707c66': rstrip slashes from url on appservice (#6306)
| * | | | | | | | | rstrip slashes from url on appservice (#6306)Will Hunt2019-10-311-1/+3
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Update black to 19.10b0 (#6304)Andrew Morgan2020-03-1637-158/+179
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '020add509': Update black to 19.10b0 (#6304)
| * | | | | | | | Update black to 19.10b0 (#6304)Amber Brown2019-11-0137-158/+179
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | * update version of black and also fix the mypy config being overridden
* | | | | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storageAndrew Morgan2020-03-1619-68/+340
|\| | | | | | |
| * | | | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storageErik Johnston2019-10-3119-66/+338
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add StateGroupStorage interface
| | * | | | | | | Apply suggestions from code review Erik Johnston2019-10-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix docstring Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| | * | | | | | | Port to use state storageErik Johnston2019-10-3016-65/+102
| | | | | | | | |
| | * | | | | | | Add StateGroupStorage interfaceErik Johnston2019-10-303-1/+235
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Expose some homeserver functionality to spam checkers (#6259)Andrew Morgan2020-03-162-1/+64
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a74c03ff': Expose some homeserver functionality to spam checkers (#6259)
| * | | | | | | Expose some homeserver functionality to spam checkers (#6259)Travis Ralston2019-10-312-1/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Offer the homeserver instance to the spam checker * Newsfile * Linting * Expose a Spam Checker API instead of passing the homeserver object * Alter changelog * s/hs/api
* | | | | | | | Merge pull request #6307 from matrix-org/erikj/fix_purge_roomAndrew Morgan2020-03-161-1/+0
|\| | | | | | |
| * | | | | | | Fix /purge_room API.Erik Johnston2019-10-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fails trying to clean the `topic` table which was recently removed.
* | | | | | | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2020-03-1662-145/+159
|\| | | | | | |
| * | | | | | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-3162-145/+159
| | | | | | | | | | | | | | | | | | | | | | | | Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated.
* | | | | | | | fix delete_existing for _persist_events (#6300)Andrew Morgan2020-03-162-5/+2
|\| | | | | | |
| * | | | | | | fix delete_existing for _persist_events (#6300)Richard van der Hoff2019-10-302-5/+2
| |/ / / / / / | | | | | | | | | | | | | | this is part of _retry_on_integrity_error, so should only be on _persist_events_and_state_updates
* | | | | | | Merge pull request #6240 from matrix-org/erikj/split_out_persistence_storeAndrew Morgan2020-03-167-645/+776
|\| | | | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-3045-542/+555
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_out_persistence_store
| * | | | | | | Review commentsErik Johnston2019-10-304-13/+28
| | | | | | | |
| * | | | | | | Use new EventPersistenceStoreErik Johnston2019-10-233-3/+12
| | | | | | | |
| * | | | | | | Add DataStores and Storage classes.Erik Johnston2019-10-233-4/+34
| | | | | | | |
| * | | | | | | Move persist_events out from main data store.Erik Johnston2019-10-232-634/+711
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for splitting out of state_groups_state from the main store into it own one, as persisting events depends on calculating state.
* | | | | | | | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptorAndrew Morgan2020-03-161-4/+5
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptorErik Johnston2019-10-301-4/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make ObservableDeferred.observe() always return deferred.
| | * | | | | | | Clarify docstringErik Johnston2019-10-301-0/+4
| | | | | | | | |
| | * | | | | | | Make ObservableDeferred.observe() always return deferred.Erik Johnston2019-10-301-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Fix log line that was printing undefined value (#6278)Andrew Morgan2020-03-161-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a2276d4d3':
| * | | | | | | | Fix log line that was printing undefined value (#6278)Andrew Morgan2019-10-301-1/+1
| | | | | | | | |
* | | | | | | | | Fix small typo in comment (#6269)Andrew Morgan2020-03-161-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7955abeaa': Fix small typo in comment (#6269)
| * | | | | | | | Fix small typo in comment (#6269)Andrew Morgan2019-10-301-1/+1
| |/ / / / / / /
* | | | | | | | Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2020-03-161-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46c12918a': Fix typo in domain name in account_threepid_delegates config option (#6273)
| * | | | | | | Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2019-10-301-1/+1
| | | | | | | |
* | | | | | | | Handle FileNotFound error in checking git repository version (#6284)Andrew Morgan2020-03-161-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b39ca49db': Handle FileNotFound error in checking git repository version (#6284)
| * | | | | | | Handle FileNotFound error in checking git repository version (#6284)Andrew Morgan2019-10-301-4/+6
| | | | | | | |
* | | | | | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitAndrew Morgan2020-03-166-53/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '770d1ef67': Newsfile Port receipt and read markers to async/wait
| * | | | | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitErik Johnston2019-10-306-53/+32
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Port receipt and read markers to async/wait
| | * \ \ \ \ \ \ Merge branch 'erikj/federation_server_async_await' of ↵Erik Johnston2019-10-291-1/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/receipts_async_await
| | * | | | | | | | Port receipt and read markers to async/waitErik Johnston2019-10-296-53/+32
| | | | | | | | | |
* | | | | | | | | | Merge pull request #6274 from matrix-org/erikj/replication_asyncAndrew Morgan2020-03-166-44/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ba4cc5541': Newsfile Port replication http server endpoints to async/await
| * | | | | | | | | Merge pull request #6274 from matrix-org/erikj/replication_asyncErik Johnston2019-10-306-44/+26
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Port replication http server endpoints to async/await
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-291-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | erikj/replication_async
| | * | | | | | | | | Port replication http server endpoints to async/awaitErik Johnston2019-10-296-44/+26
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #6275 from matrix-org/erikj/port_rest_eventsAndrew Morgan2020-03-161-94/+72
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '72bc6294e': Newsfile Port room rest handlers to async/await
| * | | | | | | | | | Merge pull request #6275 from matrix-org/erikj/port_rest_eventsErik Johnston2019-10-301-94/+72
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Port room rest handlers to async/await
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | erikj/port_rest_events
| | * | | | | | | | | | Port room rest handlers to async/awaitErik Johnston2019-10-291-94/+72
| | | |/ / / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Merge pull request #6279 from matrix-org/erikj/federation_server_async_awaitAndrew Morgan2020-03-162-128/+96
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b4465564c': Don't return coroutines Make concurrently_execute work with async/await Newsfile Port federation_server to async/await
| * | | | | | | | | | Don't return coroutinesErik Johnston2019-10-291-6/+6
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-291-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| / / / / / / | | |_|/ / / / / / | |/| | | | | | | erikj/federation_server_async_await
| | * | | | | | | Merge branch 'master' into developRichard van der Hoff2019-10-291-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | / / | | | | |_|_|/ / | | | |/| | | |
| * | | | | | | Make concurrently_execute work with async/awaitErik Johnston2019-10-291-4/+3
| | | | | | | |
| * | | | | | | Port federation_server to async/awaitErik Johnston2019-10-291-118/+87
| |/ / / / / /
* | | | | | | 1.5.0Andrew Morgan2020-03-161-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9ffcf0f7b': 1.5.0 update ugrade notes Fix changelog name Update UPGRADE.rst Update UPGRADE.rst
| * | | | | | 1.5.0 v1.5.0 github/release-v1.5.0 release-v1.5.0Richard van der Hoff2019-10-291-1/+1
| | | | | | |
* | | | | | | Merge pull request #6263 from matrix-org/erikj/caches_return_deferredsAndrew Morgan2020-03-163-7/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '561133c3c': Update docstring Newsfile Quick fix to ensure cache descriptors always return deferreds
| * | | | | | Merge pull request #6263 from matrix-org/erikj/caches_return_deferredsErik Johnston2019-10-293-7/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Quick fix to ensure cache descriptors always return deferreds
| | * | | | | | Update docstringErik Johnston2019-10-291-3/+2
| | | | | | | |
| | * | | | | | Quick fix to ensure cache descriptors always return deferredsErik Johnston2019-10-283-4/+4
| | | | | | | |
| * | | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-291-4/+8
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge pull request #6268 from matrix-org/erikj/case_insensitive_room_dirAndrew Morgan2020-03-161-4/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1652c8c1f': Add comment as to why we're pinning black in tests Pin black version Newsfile Make room directory search case insensitive
| * | | | | | | Make room directory search case insensitiveErik Johnston2019-10-291-4/+8
| | | | | | | |
* | | | | | | | Add CI for synapse_port_db (#6140)Andrew Morgan2020-03-161-3/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '14504ad57': Add CI for synapse_port_db (#6140)
| * | | | | | | Add CI for synapse_port_db (#6140)Brendan Abolivier2019-10-281-3/+6
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds: * a test sqlite database * a configuration file for the sqlite database * a configuration file for a postgresql database (using the credentials in `.buildkite/docker-compose.pyXX.pgXX.yaml`) as well as a new script named `.buildkite/scripts/test_synapse_port_db.sh` that: 1. installs Synapse 2. updates the test sqlite database to the latest schema and runs background updates on it 3. creates an empty postgresql database 4. run the `synapse_port_db` script to migrate the test sqlite database to the empty postgresql database (with coverage) Step `2` is done via a new script located at `scripts-dev/update_database`. The test sqlite database is extracted from a SyTest run, so that it can be considered as an actual homeserver's database with actual data in it.
| * | | | | | Merge tag 'v1.5.0rc2' into developRichard van der Hoff2019-10-284-8/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.5.0rc2 (2019-10-28) ============================= Bugfixes -------- - Update list of boolean columns in `synapse_port_db`. ([\#6247](https://github.com/matrix-org/synapse/issues/6247)) - Fix /keys/query API on workers. ([\#6256](https://github.com/matrix-org/synapse/issues/6256)) - Improve signature checking on some federation APIs. ([\#6262](https://github.com/matrix-org/synapse/issues/6262)) Internal Changes ---------------- - Move schema delta files to the correct data store. ([\#6248](https://github.com/matrix-org/synapse/issues/6248)) - Small performance improvement by removing repeated config lookups in room stats calculation. ([\#6255](https://github.com/matrix-org/synapse/issues/6255))
* | | | | | | 1.5.0rc2Andrew Morgan2020-03-161-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'c482d4582': 1.5.0rc2
| * | | | | | 1.5.0rc2 v1.5.0rc2Richard van der Hoff2019-10-281-1/+1
| | | | | | |
* | | | | | | Improve signature checking on some federation APIs (#6262)Andrew Morgan2020-03-163-7/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '172f264ed': Improve signature checking on some federation APIs (#6262)
| * | | | | | Improve signature checking on some federation APIs (#6262)Richard van der Hoff2019-10-283-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we check that events sent over /send_join, /send_leave, and /invite, are correctly signed and come from the expected servers.
* | | | | | | Convert EventContext to attrs (#6218)Andrew Morgan2020-03-162-62/+45
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '9aee28927': Convert EventContext to attrs (#6218)
| * | | | | | Convert EventContext to attrs (#6218)Richard van der Hoff2019-10-282-62/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * make EventContext use an attr
* | | | | | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keysAndrew Morgan2020-03-162-0/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-252-0/+33
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | delete keys when deleting backup versions
| | * | | | | | delete keys when deleting backupsHubert Chathi2019-10-242-0/+33
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-251-1/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-251-67/+67
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge pull request #6255 from matrix-org/erikj/stats_configAndrew Morgan2020-03-161-1/+3
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '87259b3a3': Fix tests Newsfile Remove repeated calls to config.stats_enabled.
| * | | | | | | Merge pull request #6255 from matrix-org/erikj/stats_configErik Johnston2019-10-251-1/+3
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Remove repeated calls to config.stats_enabled.
| | * | | | | | Remove repeated calls to config.stats_enabled.Erik Johnston2019-10-251-1/+3
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Turns out that fetching variables from the config object is expensive, so doing it once at startup avoids unnecessary work.
* | | | | | | Merge pull request #6256 from matrix-org/erikj/fix_e2e_workersAndrew Morgan2020-03-161-67/+67
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '67290fa03': Newsfile Fix /keys/query API on workers.
| * | | | | | Fix /keys/query API on workers.Erik Johnston2019-10-251-67/+67
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | The necessary getters were added only to the master store and not the worker stores.
* | | | | | Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_loggingAndrew Morgan2020-03-166-17/+24
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '44ab048cf': Address codestyle concerns Reduce impact of debug logging Delay printf until logging is required. use %r to __repr__ objects Don't encode object as UTF-8 string if not needed.
| * | | | | Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_loggingErik Johnston2019-10-256-17/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | Reduce debug logging overhead
| | * | | | | Address codestyle concernsMichael Kaye2019-10-243-5/+10
| | | | | | |
| | * | | | | Delay printf until logging is required.Michael Kaye2019-10-242-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using % will cause the string to be generated even if debugging is off.
| | * | | | | use %r to __repr__ objectsMichael Kaye2019-10-243-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids calculating __repr__ unless we are going to log.
| | * | | | | Don't encode object as UTF-8 string if not needed.Michael Kaye2019-10-241-2/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | I believe that string formatting ~10-15 sized events will take a proportion of CPU time.
* | | | | | Merge pull request #6250 from ↵Andrew Morgan2020-03-161-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/michaelkaye/make_user_stats_less_verbose * commit '2020f1191': Add missing '.' Add changelog.d Make user/room stats log line less verbose.
| * | | | | Make user/room stats log line less verbose.Michael Kaye2019-10-241-1/+1
| |/ / / /
* | | | | Merge pull request #6248 from matrix-org/erikj/move_schema_filesAndrew Morgan2020-03-162-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e39bc62b8': Newsfile Move schema delta files to the correct data store.
| * | | | Move schema delta files to the correct data store.Erik Johnston2019-10-242-0/+0
| | | | | | | | | | | | | | | | | | | | They were put in the global schema delta directory due to a bad merge.
* | | | | 1.5.0rc1Andrew Morgan2020-03-161-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '8831b04a5': 1.5.0rc1
| * | | | 1.5.0rc1Andrew Morgan2019-10-241-1/+1
| | | | |
* | | | | Option to suppress resource exceeded alerting (#6173)Andrew Morgan2020-03-164-43/+96
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '2794b7905': Option to suppress resource exceeded alerting (#6173)
| * | | | Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-244-43/+96
| | | | | | | | | | | | | | | | | | | | The expected use case is to suppress MAU limiting on small instances
* | | | | Cleanup extra quotes from IDEs (#6236)Andrew Morgan2020-03-161-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '92e88a71d': Cleanup extra quotes from IDEs (#6236)
| * | | | Cleanup extra quotes from IDEs (#6236)Andrew Morgan2019-10-231-2/+1
| |/ / /
* | | | Add config linting script that checks for bool casing (#6203)Andrew Morgan2020-03-169-15/+22
|\| | | | | | | | | | | | | | | | | | | * commit '409c62b27': Add config linting script that checks for bool casing (#6203)
| * | | Add config linting script that checks for bool casing (#6203)Andrew Morgan2019-10-239-15/+22
| | | | | | | | | | | | | | | | | | | | Add a linting script that enforces all boolean values in the default config be lowercase. This has annoyed me for a while so I decided to fix it.
* | | | Merge pull request #6231 from matrix-org/erikj/refactor_storesAndrew Morgan2020-03-16261-4373/+4632
|\| | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-223-13/+479
| |\| | | | | | | | | | | | | | erikj/refactor_stores
| * | | Clean up prepare_database.py a bit and add commentsErik Johnston2019-10-221-7/+30
| | | |
| * | | Delete background_update table creation in main data_storeErik Johnston2019-10-221-21/+0
| | | |
| * | | Move README into synapse/storage/__init__.pyErik Johnston2019-10-222-13/+12
| | | |
| * | | Add a basic README to synapse.storageErik Johnston2019-10-221-0/+13
| | | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-2219-198/+631
| |\ \ \ | | | |/ | | |/| | | | | erikj/refactor_stores
| * | | Fix schema management to work with multiple data stores.Erik Johnston2019-10-211-41/+108
| | | |
| * | | Move storage classes into a main "data store".Erik Johnston2019-10-21261-4324/+4500
| | | | | | | | | | | | | | | | | | | | 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-163-13/+479
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '276173163': Add changelog entry fix doc strings make isort happy add some comments drop some logger lines to debug make changes based on PR feedback add function docs use something that's the right type for user_id run black split out signature processing into separate functions avoid modifying input parameter fix test update with newer coding style add test make isort happy make black happy allow uploading signatures of master key signed by devices implement device signature uploading/fetching
| * | | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Hubert Chathi2019-10-223-13/+479
| |\ \ \ | | |_|/ | |/| | Cross-signing [3/4] -- uploading signatures edition
| | * | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-18152-2508/+5409
| | |\ \
| | * | | fix doc stringsHubert Chathi2019-10-181-9/+13
| | | | |
| | * | | make isort happyHubert Chathi2019-09-241-1/+0
| | | | |
| | * | | add some commentsHubert Chathi2019-09-241-2/+10
| | | | |
| | * | | drop some logger lines to debugHubert Chathi2019-09-241-3/+3
| | | | |
| | * | | make changes based on PR feedbackHubert Chathi2019-09-242-118/+165
| | | | |
| | * | | add function docsHubert Chathi2019-09-071-2/+24
| | | | |
| | * | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-0736-510/+1219
| | |\ \ \
| | * | | | run blackHubert Chathi2019-09-061-24/+10
| | | | | |
| | * | | | split out signature processing into separate functionsHubert Chathi2019-09-061-195/+204
| | | | | |
| | * | | | avoid modifying input parameterHubert Chathi2019-09-051-7/+7
| | | | | |
| | * | | | update with newer coding styleHubert Chathi2019-09-042-3/+3
| | | | | |
| | * | | | make black happyHubert Chathi2019-09-043-93/+79
| | | | | |
| | * | | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-043-84/+152
| | | | | |
| | * | | | implement device signature uploading/fetchingHubert Chathi2019-09-043-0/+338
| | | | | |
* | | | | | Remove Auth.check method (#6217)Andrew Morgan2020-03-1613-32/+580
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93eaeec75': Remove Auth.check method (#6217) add note about database upgrade use the right function for when we're already in runInteraction add user signature stream change cache to slaved device store black use stream ID generator instead of timestamp make isort happy apply PR review suggestions fix formatting add changelog make changes from PR review don't need to return the hidden column any more really fix queries to work with Postgres PostgreSQL, Y U no like? remove extra SQL query param add changelog file apply changes from PR review allow uploading keys for cross-signing allow devices to be marked as "hidden"
| * | | | | Remove Auth.check method (#6217)Richard van der Hoff2019-10-182-21/+5
| | |_|/ / | |/| | | | | | | | This method was somewhat redundant, and confusing.
| * | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into developHubert Chathi2019-10-1812-21/+623
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-18149-2344/+5400
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | use the right function for when we're already in runInteractionHubert Chathi2019-10-181-4/+4
| | | | | |
| | * | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-0736-510/+1219
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | * | | add user signature stream change cache to slaved device storeHubert Chathi2019-09-041-0/+3
| | | | |
| | * | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0496-1261/+1463
| | |\ \ \
| | * \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2898-1378/+3636
| | |\ \ \ \
| | | * \ \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-08-2885-1304/+3405
| | | |\ \ \ \
| | * | | | | | blackHubert Chathi2019-08-281-3/+1
| | | | | | | |
| | * | | | | | use stream ID generator instead of timestampHubert Chathi2019-08-284-23/+23
| | | | | | | |
| | * | | | | | make isort happyHubert Chathi2019-08-211-1/+0
| | | | | | | |
| | * | | | | | apply PR review suggestionsHubert Chathi2019-08-214-53/+46
| | | | | | | |
| | * | | | | | make changes from PR reviewHubert Chathi2019-08-014-49/+75
| | | | | | | |
| | * | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-01187-1954/+2779
| | |\ \ \ \ \ \
| | | * | | | | | don't need to return the hidden column any moreHubert Chathi2019-08-011-1/+1
| | | | | | | | |
| | | * | | | | | really fix queries to work with PostgresHubert Chathi2019-07-311-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (by going back to not using SQL directly)
| | | * | | | | | PostgreSQL, Y U no like?Hubert Chathi2019-07-311-3/+4
| | | | | | | | |
| | | * | | | | | remove extra SQL query paramHubert Chathi2019-07-311-1/+0
| | | | | | | | |
| | | * | | | | | Merge branch 'develop' into cross-signing_hiddenHubert Chathi2019-07-30187-1934/+2767
| | | |\ \ \ \ \ \
| | * | | | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-07-303-21/+17
| | |\| | | | | | |
| | | * | | | | | | apply changes from PR reviewHubert Chathi2019-07-303-20/+17
| | | | | | | | | |
| | * | | | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-2510-12/+558
| | |/ / / / / / /
| | * | | | | | | allow devices to be marked as "hidden"Hubert Chathi2019-07-242-16/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a prerequisite for cross-signing, as it allows us to create other things that live within the device namespace, so they can be used for signatures.
* | | | | | | | | Merge pull request #6214 from matrix-org/rav/event_auth/1Andrew Morgan2020-03-164-153/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47ada4dff': changelog rip out some unreachable code Remove dead check_auth script
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-189-122/+125
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-1829-187/+354
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | rip out some unreachable codeRichard van der Hoff2019-10-174-153/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only possible rejection reason is AUTH_ERROR, so all of this is unreachable.
* | | | | | | | | | | Fix logging config for the docker image (#6197)Andrew Morgan2020-03-161-3/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '560c12226': Fix logging config for the docker image (#6197)
| * | | | | | | | | | Fix logging config for the docker image (#6197)Richard van der Hoff2019-10-181-3/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that loggers that are instantiated before the config is loaded get turned off. Also bring the logging config that is generated by --generate-config into line. Fixes #6194.
* | | | | | | | | | Merge branch 'master' into developAndrew Morgan2020-02-266-114/+113
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into developBrendan Abolivier2019-10-181-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #6196 from matrix-org/erikj/awaitErik Johnston2019-10-186-114/+113
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move rest/admin to use async/await.
| | * | | | | | | | | | Port synapse/rest/client/_base.py to async/awaitErik Johnston2019-10-111-9/+5
| | | | | | | | | | | |
| | * | | | | | | | | | Add maybe_awaitable and fix __init__ bugsErik Johnston2019-10-112-2/+34
| | | | | | | | | | | |
| | * | | | | | | | | | Port synaps/rest/client/users.py to async/awaitErik Johnston2019-10-111-11/+7
| | | | | | | | | | | |
| | * | | | | | | | | | Port synaps/rest/client/server_notice_servlet.py to async/awaitErik Johnston2019-10-111-6/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Port synaps/rest/client/media.py to async/awaitErik Johnston2019-10-111-16/+11
| | | | | | | | | | | |
| | * | | | | | | | | | Port rest/admin/__init__.py to async/awaitErik Johnston2019-10-111-72/+55
| | | | | | | | | | | |
* | | | | | | | | | | | 1.4.1Andrew Morgan2020-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | 1.4.1Brendan Abolivier2019-10-181-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Andrew Morgan2020-02-261-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Erik Johnston2019-10-181-4/+9
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix presence timeouts when synchrotron restarts. Handling timeouts would fail if there was an external process that had timed out, e.g. a synchrotron restarting. This was due to a couple of variable name typoes. Fixes #3715.
| * | | | | | | | | | Merge tag 'v1.4.1rc1' into developRichard van der Hoff2019-10-171-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.4.1rc1 (2019-10-17) ============================= Bugfixes -------- - Fix bug where redacted events were sometimes incorrectly censored in the database, breaking APIs that attempted to fetch such events. ([\#6185](https://github.com/matrix-org/synapse/issues/6185), [5b0e9948](https://github.com/matrix-org/synapse/commit/5b0e9948eaae801643e594b5abc8ee4b10bd194e))
* | | | | | | | | | | 1.4.1rc1Andrew Morgan2020-02-262-10/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | 1.4.1rc1 v1.4.1rc1Richard van der Hoff2019-10-171-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Do the update as a background indexErik Johnston2019-10-172-9/+51
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnetsAndrew Morgan2020-02-261-8/+9
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnetsErik Johnston2019-10-172-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inserting bytes as text in `censor_redactions`
* | | | | | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageAndrew Morgan2020-02-262-12/+16
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageHubert Chathi2019-10-112-12/+16
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | make storage layer in charge of interpreting the device key data
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-11 17:04:28 +0000