summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Fixed set a user as an admin with the new API (#6928)Andrew Morgan2020-03-241-4/+2
|\ \ \ | | |/ | |/| | | | | | | * commit '9b06d8f8a': Fixed set a user as an admin with the new API (#6928)
| * | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-02-281-4/+2
| | | | | | | | | Fix #6910
* | | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error ↵Andrew Morgan2020-03-242-4/+8
|\| | | | | | | | | | | | | | | | | | | | handling of call to deactivate user (#6990) * commit '8c75b621b': Ensure 'deactivated' parameter is a boolean on user admin API, Fix error handling of call to deactivate user (#6990)
| * | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error ↵Andrew Morgan2020-02-262-4/+8
| | | | | | | | | | | | handling of call to deactivate user (#6990)
* | | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Andrew Morgan2020-03-246-30/+28
|\| | | | | | | | | | | | | | | | | | | | * commit '509e381af': Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957) changelog Increase MAX_EVENTS_BEHIND for replication clients
| * | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-216-30/+28
| |/ | | | | | | Ensure good comprehension hygiene using flake8-comprehensions.
* | Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableAndrew Morgan2020-03-241-6/+6
|\| | | | | | | | | | | | | | | * commit '2fb7794e6': changelog Make room alias lists peekable Add `allow_departed_users` param to `check_in_room_or_world_readable` Refactor the membership check methods in Auth
| * Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableRichard van der Hoff2020-02-191-6/+6
| |\ | | | | | | Make room alias lists peekable
| | * Add `allow_departed_users` param to `check_in_room_or_world_readable`Richard van der Hoff2020-02-191-6/+6
| | | | | | | | | | | | | | | | | | | | | ... and set it everywhere it's called. while we're here, rename it for consistency with `check_user_in_room` (and to help check that I haven't missed any instances)
* | | Move MSC2432 stuff onto unstable prefix (#6948)Andrew Morgan2020-03-242-1/+9
|\| | | | | | | | | | | | | | * commit '880aaac1d': Move MSC2432 stuff onto unstable prefix (#6948)
| * | Move MSC2432 stuff onto unstable prefix (#6948)Richard van der Hoff2020-02-192-1/+9
| |/ | | | | it's not in the spec yet, so needs to be unstable. Also add a feature flag for it. Also add a test for admin users.
* | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Andrew Morgan2020-03-241-0/+23
|\| | | | | | | | | * commit 'adfaea8c6': Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)
| * Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Richard van der Hoff2020-02-181-0/+23
| | | | | | | | | | per matrix-org/matrix-doc#2432
* | Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 ↵Andrew Morgan2020-03-231-1/+0
|\| | | | | | | | | | | | | (#6877) * commit 'dc3f99870': Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 (#6877)
| * Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 ↵Aaron Raimist2020-02-131-1/+0
| | | | | | | | | | | | | | (#6877) Fixes #5528
* | Return a 404 for admin api user lookup if user not found (#6901)Andrew Morgan2020-03-231-1/+4
|\| | | | | | | | | | | * commit 'd8994942f': Return a 404 for admin api user lookup if user not found (#6901) Move the warning at the top of the release changes
| * Return a 404 for admin api user lookup if user not found (#6901)Andrew Morgan2020-02-121-1/+4
| |
* | Admin api to add an email address (#6789)Andrew Morgan2020-03-231-0/+39
|\| | | | | | | | | * commit '56ca93ef5': Admin api to add an email address (#6789)
| * Admin api to add an email address (#6789)Dirk Klimpel2020-02-071-0/+39
| |
* | Allow URL-encoded user IDs on user admin api paths (#6825)Andrew Morgan2020-03-231-2/+2
|\| | | | | | | | | * commit '370080531': Allow URL-encoded user IDs on user admin api paths (#6825)
| * Allow URL-encoded user IDs on user admin api paths (#6825)Andrew Morgan2020-02-031-2/+2
| |
* | MSC2260: Block direct sends of m.room.aliases events (#6794)Andrew Morgan2020-03-231-0/+12
|\| | | | | | | | | * commit '184303b86': MSC2260: Block direct sends of m.room.aliases events (#6794)
| * MSC2260: Block direct sends of m.room.aliases events (#6794)Richard van der Hoff2020-01-301-0/+12
| | | | | | | | | | as per MSC2260
* | Add `rooms.room_version` column (#6729)Andrew Morgan2020-03-231-1/+2
|\| | | | | | | | | * commit '8df862e45': Add `rooms.room_version` column (#6729)
| * Add `rooms.room_version` column (#6729)Erik Johnston2020-01-271-1/+2
| | | | | | This is so that we don't have to rely on pulling it out from `current_state_events` table.
* | Validate client_secret parameter (#6767)Andrew Morgan2020-03-232-7/+16
|\| | | | | | | | | * commit '9f7aaf90b': Validate client_secret parameter (#6767)
| * Validate client_secret parameter (#6767)Andrew Morgan2020-01-242-5/+21
| |
* | a bit of debugging for media storage providers (#6757)Andrew Morgan2020-03-232-0/+7
|\| | | | | | | | | * commit '6b7462a13': a bit of debugging for media storage providers (#6757)
| * a bit of debugging for media storage providers (#6757)Richard van der Hoff2020-01-232-0/+7
| | | | | | | | | | | | * a bit of debugging for media storage providers * changelog
* | Minor fixes to user admin api (#6761)Andrew Morgan2020-03-231-9/+5
|\| | | | | | | | | * commit '5bd3cb726': Minor fixes to user admin api (#6761)
| * Minor fixes to user admin api (#6761)Richard van der Hoff2020-01-231-9/+5
| | | | | | | | * don't insist on a password (this is valid if you have an SSO login) * fix reference to undefined `requester`
* | Remove unnecessary abstractions in admin handler (#6751)Andrew Morgan2020-03-231-10/+9
|\| | | | | | | | | | | | | | | * commit 'ce84dd9e2': Remove unnecessary abstractions in admin handler (#6751) Fixup warning about workers changes Add deprecation headers Fixup changelog
| * Remove unnecessary abstractions in admin handler (#6751)Andrew Morgan2020-01-221-10/+9
| |
* | Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-03-234-2/+100
|\| | | | | | | | | * commit '90a28fb47': Admin API to list, filter and sort rooms (#6720)
| * Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-224-2/+100
| |
* | Merge pull request #6764 from matrix-org/babolivier/fix-thumbnailAndrew Morgan2020-03-231-1/+1
|\| | | | | | | | | | | | | | | * commit 'ae6cf586b': Lint + changelog Remove unused import Add tests for thumbnailing Fix typo in _select_thumbnail
| * Fix typo in _select_thumbnailBrendan Abolivier2020-01-221-1/+1
| |
* | Fix and add test to deprecated quarantine media admin api (#6756)Andrew Morgan2020-03-231-1/+1
|\| | | | | | | | | * commit 'aa9b00fb2': Fix and add test to deprecated quarantine media admin api (#6756)
| * Fix and add test to deprecated quarantine media admin api (#6756)Andrew Morgan2020-01-221-1/+1
| |
* | Fixup synapse.rest to pass mypy (#6732)Andrew Morgan2020-03-239-33/+45
|\| | | | | | | | | * commit 'b0a66ab83': Fixup synapse.rest to pass mypy (#6732)
| * Fixup synapse.rest to pass mypy (#6732)Erik Johnston2020-01-209-33/+45
| |
* | Fix `/events/:event_id` deprecated API. (#6731)Andrew Morgan2020-03-231-1/+1
|\| | | | | | | | | * commit '74b74462f': Fix `/events/:event_id` deprecated API. (#6731)
| * Fix `/events/:event_id` deprecated API. (#6731)Erik Johnston2020-01-201-1/+1
| |
* | Fix changing password via user admin API. (#6730)Andrew Morgan2020-03-231-2/+2
|\| | | | | | | | | * commit 'ceecedc68': Fix changing password via user admin API. (#6730)
| * Fix changing password via user admin API. (#6730)Erik Johnston2020-01-201-2/+2
| |
* | Merge pull request #6714 from matrix-org/babolivier/retention_select_eventAndrew Morgan2020-03-231-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b72bb780': bump version to v1.9.0.dev1 Precise changelog Fixup diff Remove get_room_event_after_stream_ordering entirely Lint Rename changelog Changelog Correctly order when selecting before stream ordering Fix typo Fix instantiation of message retention purge jobs
| * Merge pull request #6714 from matrix-org/babolivier/retention_select_eventBrendan Abolivier2020-01-171-1/+1
| |\ | | | | | | Fix instantiation of message retention purge jobs
| | * Remove get_room_event_after_stream_ordering entirelyBrendan Abolivier2020-01-161-1/+1
| | |
* | | Add org.matrix.e2e_cross_signing to unstable_features in /versions as per ↵Andrew Morgan2020-03-231-0/+2
|\| | | | | | | | | | | | | | | | | | | | MSC1756 (#6712) * commit '38e0e59f4': Add org.matrix.e2e_cross_signing to unstable_features in /versions as per MSC1756 (#6712)
| * | Add org.matrix.e2e_cross_signing to unstable_features in /versions as per ↵Neil Johnson2020-01-161-0/+2
| | | | | | | | | | | | MSC1756 (#6712)
* | | Remove duplicate session check in web fallback servlet (#6702)Andrew Morgan2020-03-231-4/+0
|\| | | | | | | | | | | | | | * commit 'edc244eec': Remove duplicate session check in web fallback servlet (#6702)
| * | Remove duplicate session check in web fallback servlet (#6702)Andrew Morgan2020-01-151-4/+0
| |/
* | Quarantine media by ID or user ID (#6681)Andrew Morgan2020-03-231-2/+66
|\| | | | | | | | | * commit '1177d3f3a': Quarantine media by ID or user ID (#6681)
| * Quarantine media by ID or user ID (#6681)Andrew Morgan2020-01-131-2/+66
| |
* | Allow admin users to create or modify users without a shared secret (#6495)Andrew Morgan2020-03-232-0/+144
|\| | | | | | | | | | | * commit 'd2906fe66': Allow admin users to create or modify users without a shared secret (#6495) Fixup changelog
| * Allow admin users to create or modify users without a shared secret (#6495)Manuel Stahl2020-01-092-0/+144
| | | | | | Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
* | Back out ill-advised notary server hackery (#6657)Andrew Morgan2020-03-201-22/+8
|\| | | | | | | | | * commit '573fee759': Back out ill-advised notary server hackery (#6657)
| * Back out ill-advised notary server hackery (#6657)Richard van der Hoff2020-01-081-22/+8
| | | | | | | | | | | | | | | | | | | | | | This was ill-advised. We can't modify verify_keys here, because the response object has already been signed by the requested key. Furthermore, it's somewhat unnecessary because existing versions of Synapse (which get upset that the notary key isn't present in verify_keys) will fall back to a direct fetch via `/key/v2/server`. Also: more tests for fetching keys via perspectives: it would be nice if we actually tested when our fetcher can't talk to our notary impl.
* | Workaround for error when fetching notary's own key (#6620)Andrew Morgan2020-03-201-8/+22
|\| | | | | | | | | * commit '18674eebb': Workaround for error when fetching notary's own key (#6620)
| * Workaround for error when fetching notary's own key (#6620)Richard van der Hoff2020-01-061-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Kill off redundant SynapseRequestFactory We already get the Site via the Channel, so there's no need for a dedicated RequestFactory: we can just use the right constructor. * Workaround for error when fetching notary's own key As a notary server, when we return our own keys, include all of our signing keys in verify_keys. This is a workaround for #6596.
* | Remove unused, undocumented "content repo" resource (#6628)Andrew Morgan2020-03-202-103/+0
|\| | | | | | | | | * commit '98247c4a0': Remove unused, undocumented "content repo" resource (#6628)
| * Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-032-103/+0
| | | | | | | | | | | | This looks like it got half-killed back in #888. Fixes #6567.
* | Clean up startup for the pusher (#6558)Andrew Morgan2020-03-201-17/+16
|\| | | | | | | | | * commit 'd6752ce5d': Clean up startup for the pusher (#6558)
| * Clean up startup for the pusher (#6558)Richard van der Hoff2019-12-181-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove redundant python2 support code `str.decode()` doesn't exist on python3, so presumably this code was doing nothing * Filter out pushers with corrupt data When we get a row with unparsable json, drop the row, rather than returning a row with null `data`, which will then cause an explosion later on. * Improve logging when we can't start a pusher Log the ID to help us understand the problem * Make email pusher setup more robust We know we'll have a `data` member, since that comes from the database. What we *don't* know is if that is a dict, and if that has a `brand` member, and if that member is a string.
* | 1.7.0rc2Andrew Morgan2020-03-191-6/+6
|\| | | | | | | | | | | | | * commit 'd156912c4': 1.7.0rc2 Back out change preventing setting null avatar URLs Fixup changelogs
| * Back out change preventing setting null avatar URLsErik Johnston2019-12-111-6/+6
| |
* | Better errors regarding changing avatar_url (#6497)Andrew Morgan2020-03-191-3/+8
|\| | | | | | | | | * commit '5e8abe901': Better errors regarding changing avatar_url (#6497)
| * Better errors regarding changing avatar_url (#6497)Andrew Morgan2019-12-091-3/+8
| |
* | Merge pull request #6469 from matrix-org/erikj/make_database_classAndrew Morgan2020-03-191-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'f3ea2f5a0': Remove unused var Fix DB scripts Newsfile Move background update handling out of store Comments Move DB pool and helper functions into dedicated Database class
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-12-0635-727/+509
| |\ | | | | | | | | | erikj/make_database_class
| * | Move background update handling out of storeErik Johnston2019-12-051-1/+1
| | |
* | | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925)Andrew Morgan2020-03-192-56/+31
|\ \ \ | | |/ | |/| | | | | | | * commit '649b6bc08': Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925)
| * | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925)Manuel Stahl2019-12-052-56/+31
| | |
* | | Merge pull request #6483 from matrix-org/erikj/port_rest_v2Andrew Morgan2020-03-1923-516/+375
|\| | | | | | | | | | | | | | | | | * commit 'd085a8a0a': Newsfile Port rest.client.v2
| * | Port rest.client.v2Erik Johnston2019-12-0523-505/+361
| | |
* | | Merge pull request #6482 from matrix-org/erikj/port_rest_v1Andrew Morgan2020-03-1910-172/+118
|\| | | | | | | | | | | | | | | | | | | | * commit 'af5d0ebc7': Newsfile Fixup tests Port rest/v1 to async/await
| * | Port rest/v1 to async/awaitErik Johnston2019-12-0510-166/+117
| |/
* | Merge pull request #6329 from matrix-org/babolivier/context_filtersAndrew Morgan2020-03-191-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-0410-582/+752
| |\
| * | Update copyrightsBrendan Abolivier2019-11-051-0/+3
| | |
* | | Fix: Pillow error when uploading RGBA image (#3325) (#6241)Andrew Morgan2020-03-193-2/+10
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Fix: Pillow error when uploading RGBA image (#3325) (#6241)Filip Štědronský2019-12-021-1/+4
| | | | | | | | | Signed-Off-By: Filip Štědronský <g@regnarg.cz>
| * | Add User-Interactive Auth to /account/3pid/add (#6119)Andrew Morgan2019-11-291-0/+5
| | |
| * | MSC2367 Allow reason field on all member eventsErik Johnston2019-11-281-1/+1
| | |
* | | add etag and count to key backup endpoints (#5858)Andrew Morgan2020-03-181-4/+4
|\| | | | | | | | | | | | | | * commit '0d27aba90': add etag and count to key backup endpoints (#5858)
| * | add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-271-4/+4
| | |
* | | Fix startup error when http proxy is defined. (#6421)Andrew Morgan2020-03-181-2/+2
|\| | | | | | | | | | | | | | * commit 'ef1a85e77': Fix startup error when http proxy is defined. (#6421)
| * | Fix startup error when http proxy is defined. (#6421)Richard van der Hoff2019-11-261-2/+2
| | | | | | | | | | | | | | | Guess I only tested this on python 2 :/ Fixes #6419.
* | | Clean up newline quote marks around the codebase (#6362)Andrew Morgan2020-03-181-1/+1
|\| | | | | | | | | | | | | | | | | * commit '3916e1b97': Clean up newline quote marks around the codebase (#6362) update macOS installation instructions
| * | Clean up newline quote marks around the codebase (#6362)Andrew Morgan2019-11-211-1/+1
| | |
* | | Move admin endpoints into separate files (#6308)Andrew Morgan2020-03-184-555/+621
|\| | | | | | | | | | | | | | * commit '4f5ca455b': Move admin endpoints into separate files (#6308)
| * | Move admin endpoints into separate files (#6308)Manuel Stahl2019-11-204-555/+621
| | |
* | | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanupsAndrew Morgan2020-03-181-17/+94
|\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '83446a18f': Lint Apply suggestions from code review Newsfile Add failed auth ratelimiting to UIA Only do `rc_login` ratelimiting on succesful login.
| * | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanupsBrendan Abolivier2019-11-201-17/+94
| |\ \ | | | | | | | | Only do `rc_login` ratelimiting on succesful login.
| | * | LintBrendan Abolivier2019-11-201-1/+3
| | | |
| | * | Apply suggestions from code reviewErik Johnston2019-11-181-1/+1
| | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-Authored-By: Brendan Abolivier <babolivier@matrix.org>
| | * | Only do `rc_login` ratelimiting on succesful login.Erik Johnston2019-11-061-18/+93
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were doing this in a number of places which meant that some login code paths incremented the counter multiple times. It was also applying ratelimiting to UIA endpoints, which was probably not intentional. In particular, some custom auth modules were calling `check_user_exists`, which incremented the counters, meaning that people would fail to login sometimes.
* | | 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-0513-159/+146
| |\ \ \ | | |/ / | |/| / | | |/
| * | 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
* | | Merge pull request #6301 from matrix-org/babolivier/msc2326Andrew Morgan2020-03-161-0/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-011-0/+3
| |\ \ | | | | | | | | Implement MSC2326 (label based filtering)
| | * | Add unstable feature flagBrendan Abolivier2019-11-011-0/+3
| | | |
| * | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-012-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Update black to 19.10b0 (#6304)Andrew Morgan2020-03-164-11/+12
|\| | | | | | | | | | | | | | | | | | | * commit '020add509': Update black to 19.10b0 (#6304)
| * | | Update black to 19.10b0 (#6304)Amber Brown2019-11-014-11/+12
| | | | | | | | | | | | * update version of black and also fix the mypy config being overridden
* | | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2020-03-168-30/+32
|\| | |
| * | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-318-30/+32
| | | | | | | | | | | | Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated.
* | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitAndrew Morgan2020-03-162-15/+9
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '770d1ef67': Newsfile Port receipt and read markers to async/wait
| * | | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitErik Johnston2019-10-302-15/+9
| |\ \ \ | | | | | | | | | | Port receipt and read markers to async/wait
| | * | | Port receipt and read markers to async/waitErik Johnston2019-10-292-15/+9
| | |/ /
* | | | 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
| * | | Port room rest handlers to async/awaitErik Johnston2019-10-291-94/+72
| |/ /
* | | Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_loggingAndrew Morgan2020-03-162-9/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | Address codestyle concernsMichael Kaye2019-10-242-2/+9
| | |
| * | 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.
* | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Andrew Morgan2020-03-161-1/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1817-346/+585
| |\
| * \ Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-075-168/+346
| |\ \
| * | | update with newer coding styleHubert Chathi2019-09-041-2/+2
| | | |
| * | | make black happyHubert Chathi2019-09-041-0/+1
| | | |
| * | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-041-1/+1
| | | |
| * | | implement device signature uploading/fetchingHubert Chathi2019-09-041-0/+50
| | | |
* | | | Remove Auth.check method (#6217)Andrew Morgan2020-03-161-3/+43
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1817-346/+585
| |\ \ \
| * \ \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-075-168/+346
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| * | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0439-193/+195
| |\ \ \
| * \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2813-173/+367
| |\ \ \ \
| * | | | | apply PR review suggestionsHubert Chathi2019-08-211-1/+1
| | | | | |
| * | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-0139-297/+309
| |\ \ \ \ \
| * | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-251-3/+43
| | | | | | |
* | | | | | | Merge branch 'master' into developAndrew Morgan2020-02-265-114/+84
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #6196 from matrix-org/erikj/awaitErik Johnston2019-10-185-114/+84
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | 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-111-2/+5
| | | | | | | |
| | * | | | | | 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
| | | | | | | |
* | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionAndrew Morgan2020-02-261-1/+1
|\| | | | | | |
| * | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-111-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | make version optional in body of e2e backup version update
| | * | | | | | | make version optional in body of e2e backup version updateHubert Chathi2019-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to agree with latest version of the MSC
* | | | | | | | | cas: support setting display name (#6114)Andrew Morgan2020-02-261-1/+3
|\| | | | | | | |
| * | | | | | | | cas: support setting display name (#6114)Valérian Rousset2019-10-111-1/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | Now, the CAS server can return an attribute stating what's the desired displayname, instead of using the username directly.
* | | | | | | | Merge pull request #6186 from matrix-org/erikj/disable_sql_bytesAndrew Morgan2020-02-261-2/+2
|\| | | | | | |
| * | | | | | | Fix store_url_cache using bytesErik Johnston2019-10-101-2/+2
| | | | | | | |
* | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)Andrew Morgan2020-02-262-22/+31
|\| | | | | | |
| * | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-102-22/+31
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | add M_TOO_LARGE error code for uploading a too large file (#6151)Andrew Morgan2020-02-261-2/+6
|\| | | | | |
| * | | | | | add M_TOO_LARGE error code for uploading a too large file (#6151)Anshul Angaria2019-10-081-2/+6
| | | | | | | | | | | | | | | | | | | | | Fixes #6109
* | | | | | | Log responder we are using. (#6139)Andrew Morgan2020-02-261-1/+1
|\| | | | | |
| * | | | | | Log responder we are using. (#6139)Michael Kaye2019-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | This prevents us logging "Responding to media request with responder %s".
* | | | | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)Andrew Morgan2020-02-261-3/+11
|\| | | | | |
| * | | | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)Robert Swain2019-10-041-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pillow will use nearest neighbour as the resampling algorithm if the source image is either 1-bit or a color palette using 8 bits. If we convert to RGB before scaling, we'll probably get a better result.
* | | | | | | Land improved room list based on room stats (#6019)Andrew Morgan2020-02-261-0/+8
|\| | | | | |
| * | | | | | Land improved room list based on room stats (#6019)Erik Johnston2019-10-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use room_stats and room_state for room directory search
* | | | | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2020-02-261-2/+2
|\| | | | | |
* | | | | | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-spanAndrew Morgan2020-02-251-0/+18
|\| | | | | |
| * | | | | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-spanErik Johnston2019-09-271-0/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add some helpful opentracing tags and remove get_user_by_req span
| | * | | | | | isortErik Johnston2019-09-251-1/+1
| | | | | | | |
| | * | | | | | Add tags for event_id and txn_id in event sendingErik Johnston2019-09-251-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to search for sending event requests.
* | | | | | | | Kill off half-implemented password-reset via sms (#6101)Andrew Morgan2020-02-251-66/+1
|\| | | | | | |
| * | | | | | | Kill off half-implemented password-reset via sms (#6101)Richard van der Hoff2019-09-261-64/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing a password reset via SMS has never worked, and in any case is a silly idea because msisdn recycling is a thing. See also matrix-org/matrix-doc#2303.
* | | | | | | | Stop advertising unsupported flows for registration (#6107)Andrew Morgan2020-02-251-3/+29
|\| | | | | | |
| * | | | | | | Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-251-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If email or msisdn verification aren't supported, let's stop advertising them for registration. Fixes #6100.
* | | | | | | | Refactor code for calculating registration flows (#6106)Andrew Morgan2020-02-251-62/+62
|\| | | | | | |
| * | | | | | | Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-251-62/+62
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge pull request #6037 from matrix-org/rav/saml_mapping_workAndrew Morgan2020-02-251-0/+14
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-243-75/+316
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-1944-425/+732
| |\ \ \ \ \ \ \
| * | | | | | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-131-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to assign unique mxids to saml users based on an incrementing suffix. For that to work, we need to record the allocated mxid in a separate table.
* | | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044)Andrew Morgan2020-02-251-0/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044)Andrew Morgan2019-09-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a m.separate_add_and_bind flag set to True. See MSC2290's Backward Compatibility section for details.
* | | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974)Andrew Morgan2020-02-251-0/+3
|\| | | | | | | |
| * | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974)Andrew Morgan2019-09-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a flag to /versions' unstable_features section indicating that this Synapse understands what an id_access_token is, as per MSC2264. Fixes #5927
* | | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972)Andrew Morgan2020-02-251-1/+13
|\| | | | | | | |
| * | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972)Andrew Morgan2019-09-231-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As MSC2263 states, m.require_identity_server must be set to false when it does not require an identity server to be provided by the client for the purposes of email registration or password reset. Adds an m.require_identity_server flag to /versionss unstable_flags section. This will advertise that Synapse no longer needs id_server as a parameter.
* | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2020-02-251-2/+45
|\| | | | | | | |
| * | | | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2019-09-231-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | First part of solving #6076
* | | | | | | | | Implement MSC2290 (#6043)Andrew Morgan2020-02-252-70/+127
|\| | | | | | | |
| * | | | | | | | Implement MSC2290 (#6043)Andrew Morgan2019-09-232-72/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements MSC2290. This PR adds two new endpoints, /unstable/account/3pid/add and /unstable/account/3pid/bind. Depending on the progress of that MSC the unstable prefix may go away. This PR also removes the blacklist on some 3PID tests which occurs in #6042, as the corresponding Sytest PR changes them to use the new endpoints. Finally, it also modifies the account deactivation code such that it doesn't just try to deactivate 3PIDs that were bound to the user's account, but any 3PIDs that were bound through the homeserver on that user's account.
* | | | | | | | | Disable /register/available if registration is disabled (#6082)Andrew Morgan2020-02-251-0/+5
|\| | | | | | | |
| * | | | | | | | Disable /register/available if registration is disabled (#6082)Andrew Morgan2019-09-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6066 This register endpoint should be disabled if registration is disabled, otherwise we're giving anyone the ability to check if a username exists on a server when we don't need to be. Error code is 403 (Forbidden) as that's the same returned by /register when registration is disabled.
* | | | | | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2020-02-252-64/+252
|\| | | | | | | |
| * | | | | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-202-51/+225
| | | | | | | | |
* | | | | | | | | Remove trailing slash ability from password reset's submit_token endpoint ↵Andrew Morgan2020-02-251-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6074)
| * | | | | | | | Remove trailing slash ability from password reset's submit_token endpoint ↵Andrew Morgan2019-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6074) Remove trailing slash ability from the password reset submit_token endpoint. Since we provide the link in an email, and have never sent it with a trailing slash, there's no point for us to accept them on the endpoint.
* | | | | | | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067)Andrew Morgan2020-02-251-4/+0
|\| | | | | | | |
| * | | | | | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067)Andrew Morgan2019-09-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | As per [MSC2290](https://github.com/matrix-org/matrix-doc/pull/2290/files#diff-05cde9463e9209b701312b3baf2fb2ebR151), we're dropping the bind parameter from `/account/3pid`. This endpoint can now only be used for adding threepid's to the user's account on the homeserver.
* | | | | | | | | Use unstable prefix for 3PID unbind API (#6062)Andrew Morgan2020-02-251-1/+1
|\| | | | | | | |
| * | | | | | | | Use unstable prefix for 3PID unbind API (#6062)J. Ryan Stinnett2019-09-191-1/+1
| | | | | | | | |
* | | | | | | | | Remove POST method from password reset submit_token endpoint (#6056)Andrew Morgan2020-02-251-19/+0
|\| | | | | | | |
| * | | | | | | | Remove POST method from password reset submit_token endpoint (#6056)Andrew Morgan2019-09-191-17/+0
| | |/ / / / / / | |/| | | | | | | | | | | | | | Removes the POST method from `/password_reset/<medium>/submit_token/` as it's only used by phone number verification which Synapse does not support yet.
* | | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2020-02-251-0/+1
|\| | | | | | |
| * | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2019-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a redo of https://github.com/matrix-org/synapse/pull/5897 but with `id_access_token` accepted. Implements [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134) plus Identity Service v2 authentication ala [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140). Identity lookup-related functions were also moved from `RoomMemberHandler` to `IdentityHandler`.
* | | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationAndrew Morgan2020-02-251-1/+2
|\| | | | | | |
| * | | | | | | Add changelogAndrew Morgan2019-09-101-1/+1
| | | | | | | |
| * | | | | | | Use account_threepid_delegate for 3pid validationAndrew Morgan2019-09-101-1/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #5994 from matrix-org/anoa/html_template_fixAndrew Morgan2020-02-252-2/+2
|\| | | | | |
| * | | | | | Apply suggestions from code reviewAndrew Morgan2019-09-062-2/+2
| | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org>
| * | | | | | Fix destructuring assumption bugAndrew Morgan2019-09-062-2/+2
| | | | | | |
* | | | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2020-02-255-162/+305
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987)
| * | | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2019-09-065-162/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987) This is a combination of a few different PRs, finally all being merged into `develop`: * #5875 * #5876 * #5868 (This one added the `/versions` flag but the flag itself was actually [backed out](https://github.com/matrix-org/synapse/commit/891afb57cbdf9867f2848341b29c75d6f35eef5a#diff-e591d42d30690ffb79f63bb726200891) in #5969. What's left is just giving /versions access to the config file, which could be useful in the future) * #5835 * #5969 * #5940 Clients should not actually use the new registration functionality until https://github.com/matrix-org/synapse/pull/5972 is merged. UPGRADE.rst, changelog entries and config file changes should all be reviewed closely before this PR is merged.
* | | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2020-02-251-5/+7
|\| | | | | |
| * | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-051-6/+7
| | | | | | |
* | | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2020-02-251-0/+33
|\| | | | | |
| * | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-051-0/+33
| | |_|_|_|/ | |/| | | | | | | | | | Implements `POST /_matrix/client/r0/account/3pid/unbind` from [MSC2140](https://github.com/matrix-org/matrix-doc/blob/dbkr/tos_2/proposals/2140-terms-of-service-2.md#post-_matrixclientr0account3pidunbind).
* | | | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2020-02-251-2/+0
|\| | | | |
| * | | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-041-2/+0
| | | | | | | | | | | | | | | | | | Removes the `bind_email` and `bind_msisdn` parameters from the `/register` C/S API endpoint as per [MSC2140: Terms of Service for ISes and IMs](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R107).
* | | | | | Ensure the list media admin API is always available (#5966)Andrew Morgan2020-02-251-2/+5
|\| | | | |
| * | | | | Ensure the list media admin API is always available (#5966)Travis Ralston2019-09-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure the list media admin API is always available This API is required for some external media repo implementations to operate (mostly for doing quarantine operations on a room). * changelog
* | | | | | Ensure an auth instance is available to ListMediaInRoom (#5967)Andrew Morgan2020-02-251-0/+1
|\| | | | |
| * | | | | Ensure an auth instance is available to ListMediaInRoom (#5967)Travis Ralston2019-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure an auth instance is available to ListMediaInRoom Fixes https://github.com/matrix-org/synapse/issues/5737 * Changelog
* | | | | | Remove double return statements (#5962)Andrew Morgan2020-02-253-4/+0
|\| | | | |
| * | | | | Remove double return statements (#5962)Andrew Morgan2019-09-033-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all the "double return" statements which were a result of us removing all the instances of ``` defer.returnValue(...) return ``` statements when we switched to python3 fully.
* | | | | | Opentrace device lists (#5853)Andrew Morgan2020-02-252-2/+6
|\| | | | |
| * | | | | Opentrace device lists (#5853)Jorik Schellekens2019-09-032-2/+6
| | | | | | | | | | | | | | | | | | Trace device list changes.
* | | | | | fix thumbnail storage location (#5915)Andrew Morgan2020-02-241-1/+1
|\| | | | |
| * | | | | fix thumbnail storage location (#5915)L0ric02019-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix thumbnail storage location Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> * Add changelog file. Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> * Update Changelog Signed-off-by: Lorenz Steinert <lorenz@steinerts.de>
* | | | | | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2020-02-241-6/+1
|\| | | | |
| * | | | | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-301-6/+1
| | | | | | | | | | | | | | | | | | This reverts commit 4765f0cfd95f6160f32c75481651d125f343cd58.
* | | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2020-02-2437-182/+182
|\| | | | |
| * | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3037-182/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 :)
| * | | | | Add m.id_access_token flag (#5930)Andrew Morgan2019-08-301-1/+6
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Adds a flag to `/versions`' `unstable_features` section indicating that this Synapse understands what an `id_access_token` is, as per https://github.com/matrix-org/synapse/issues/5927#issuecomment-523566043 Fixes #5927
* | | | | Add m.id_access_token flag (#5930)Andrew Morgan2020-02-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Adds a flag to `/versions`' `unstable_features` section indicating that this Synapse understands what an `id_access_token` is, as per https://github.com/matrix-org/synapse/issues/5927#issuecomment-523566043 Fixes #5927
* | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)"Andrew Morgan2020-02-241-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 978f263e7c5d1eb440efaf07abc5009408ade25d, reversing changes made to 4f6ee99818d9c338944a10585d0aea4c7349d456.
* | | | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2020-02-241-2/+4
|\| | | |
* | | | | Merge pull request #5914 from matrix-org/rei/admin_getadminAndrew Morgan2020-02-212-9/+33
|\| | | |
| * | | | Merge pull request #5914 from matrix-org/rei/admin_getadminreivilibre2019-08-282-9/+33
| |\ \ \ \ | | | | | | | | | | | | Add GET method to admin API /users/@user:dom/admin
| | * | | | Add GET method to admin API /users/@user:dom/adminOlivier Wilkinson (reivilibre)2019-08-272-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyAndrew Morgan2020-02-211-13/+15
|\| | | | |
| * | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-271-13/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | Add config option to sign remote key query responses with a separate key.
| | * | | | | Fixup review commentsErik Johnston2019-08-231-2/+2
| | | | | | |
| | * | | | | Only sign when we respond to remote key requestsErik Johnston2019-08-211-13/+15
| | | | | | |
* | | | | | | Merge pull request #5909 from aaronraimist/public_base_urlAndrew Morgan2020-02-211-1/+1
|\| | | | | |
| * | | | | | Merge pull request #5909 from aaronraimist/public_base_urlRichard van der Hoff2019-08-271-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | public_base_url is actually public_baseurl
| | * | | | | public_base_url is actually public_baseurlAaron Raimist2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | | | | Add Admin API capability to set adminship of a user (#5878)Andrew Morgan2020-02-212-0/+78
|\| | | | | |
| * | | | | | Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-272-0/+78
| |/ / / / / | | | | | | | | | | | | Admin API: Set adminship of a user
* | | | | | Merge pull request #5877 from ↵Andrew Morgan2020-02-211-51/+4
|\| | | | | | | | | | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration
| * | | | | Merge pull request #5877 from ↵Richard van der Hoff2019-08-221-53/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration Remove shared secret registration
| | * | | | | Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-221-53/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This type of registration was probably never used. It only includes the user name in the HMAC but not the password. Shared secret registration is still available via client/r0/admin/register. Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
| * | | | | Revert "Add "require_consent" parameter for registration"Brendan Abolivier2019-08-221-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3320aaab3a9bba3f5872371aba7053b41af9d0a0.
| * | | | | Add "require_consent" parameter for registrationHalf-Shot2019-08-221-1/+4
| | | | | |
* | | | | | Opentrace e2e keys (#5855)Andrew Morgan2020-02-211-1/+12
|\| | | | |
| * | | | | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-221-1/+12
| | | | | | | | | | | | | | | | | | Add opentracing tags and logs for e2e keys
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-09 23:34:28 +0000