summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Servlet to purge old rooms (#5845)Andrew Morgan2020-02-212-0/+59
|\| |
| * | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-222-0/+59
| |/
* | Fix up password reset template config names (#5863)Andrew Morgan2020-02-201-2/+2
|\|
| * Fix up password reset template config names (#5863)Andrew Morgan2019-08-151-2/+2
| | | | | | | | | | Fixes #5833 The emailconfig code was attempting to pull incorrect config file names. This corrects that, while also marking a difference between a config file variable that's a filepath versus a str containing HTML.
* | Don't load the media repo when configured to use an external media repo (#5754)Andrew Morgan2020-02-204-91/+143
|\|
| * Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-134-91/+143
| |
* | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2020-02-201-3/+11
|\|
| * Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-061-3/+11
| | | | | | | | | | Part of fixing matrix-org/sytest#652 Sytest PR: matrix-org/sytest#667
* | Account validity: allow defining HTML templates to serve the us… (#5807)Andrew Morgan2020-02-201-3/+3
|\|
| * LintBrendan Abolivier2019-08-011-4/+2
| |
| * Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-6/+17
| |
| * Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-243-9/+39
| |\ | | | | | | | | | | | | | | | | | | Bugfixes -------- - Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734))
* | \ Fix servlet metric names (#5734)Andrew Morgan2020-02-193-9/+39
|\ \ \ | | |/ | |/|
| * | Fix servlet metric names (#5734)Jorik Schellekens2019-07-243-9/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix servlet metric names Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Remove redundant check * Cover all return paths
* | | Replace returnValue with return (#5736)Andrew Morgan2020-02-1939-288/+270
|\ \ \ | | |/ | |/|
| * | Replace returnValue with return (#5736)Amber Brown2019-07-2339-288/+270
| |/
* | Remove the ability to query relations when the original event was redacted. ↵Andrew Morgan2020-02-191-32/+43
|\| | | | | | | (#5629)
| * Remove the ability to query relations when the original event was redacted. ↵Andrew Morgan2019-07-181-32/+43
| | | | | | | | | | | | | | (#5629) Fixes #5594 Forbid viewing relations on an event once it has been redacted.
* | Implement access token expiry (#5660)Andrew Morgan2020-02-171-1/+1
|\|
| * fix typo: backgroud -> backgroundAndrew Morgan2019-07-121-1/+1
| |
* | Clean up exception handling for access_tokens (#5656)Andrew Morgan2020-02-172-4/+15
|\|
| * Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-112-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, let's get rid of `TOKEN_NOT_FOUND_HTTP_STATUS`. It was a hack we did at one point when it was possible to return either a 403 or a 401 if the creds were missing. We always return a 401 in these cases now (thankfully), so it's not needed. Let's also stop abusing `AuthError` for these cases. Honestly they have nothing that relates them to the other places that `AuthError` is used, other than the fact that they are loosely under the 'Auth' banner. It makes no sense for them to share exception classes. Instead, let's add a couple of new exception classes: `InvalidClientTokenError` and `MissingClientTokenError`, for the `M_UNKNOWN_TOKEN` and `M_MISSING_TOKEN` cases respectively - and an `InvalidClientCredentialsError` base class for the two of them.
* | Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2020-02-171-2/+12
|\|
| * Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-2/+12
| | | | | | | | | | | | | | A fix for PR #5626, which returned the original event content as part of a call to /relations. Only problem was that we were attempting to aggregate the relations on top of it when we did so. We now set bundle_aggregations to False in the get_event call. We also do this when pulling the relation events as well, because edits of edits are not something we'd like to support here.
* | Include the original event in /relations (#5626)Andrew Morgan2020-02-171-3/+5
|\|
| * Include the original event in /relations (#5626)Andrew Morgan2019-07-091-3/+5
| | | | | | When asking for the relations of an event, include the original event in the response. This will mostly be used for efficiently showing edit history, but could be useful in other circumstances.
* | Remove access-token support from RegistrationHandler.register (#5641)Andrew Morgan2020-02-173-18/+10
|\|
| * Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-083-18/+10
| | | | | | | | | | | | | | | | Nothing uses this now, so we can remove the dead code, and clean up the API. Since we're changing the shape of the return value anyway, we take the opportunity to give the method a better name.
* | Factor out some redundant code in the login impl (#5639)Andrew Morgan2020-02-171-39/+10
|\|
| * Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-081-39/+10
| | | | | | | | | | | | | | | | * Factor out some redundant code in the login impl Also fixes a redundant access_token which was generated during jwt login. * changelog
* | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-141-4/+3
| |
* | Fix account_validity incorrect email response contentAndrew Morgan2020-02-141-2/+5
| |
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-146-18/+14
|\|
| * Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-046-18/+14
| |
* | Fix media repo breaking (#5593)Andrew Morgan2020-02-141-0/+1
|\|
| * Fix media repo breaking (#5593)Amber Brown2019-07-021-0/+1
| |
* | Complete the SAML2 implementation (#5422)Andrew Morgan2020-02-142-43/+48
|\|
| * Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-022-43/+48
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * SAML2 Improvements and redirect stuff Signed-off-by: Alexander Trost <galexrt@googlemail.com> * Code cleanups and simplifications. Also: share the saml client between redirect and response handlers. * changelog * Revert redundant changes to static js * Move all the saml stuff out to a centralised handler * Add support for tracking SAML2 sessions. This allows us to correctly handle `allow_unsolicited: False`. * update sample config * cleanups * update sample config * rename BaseSSORedirectServlet for consistency * Address review comments
| | * Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-019-122/+75
| | |\
| | * | rename BaseSSORedirectServlet for consistencyRichard van der Hoff2019-06-271-3/+3
| | | |
| | * | Move all the saml stuff out to a centralised handlerRichard van der Hoff2019-06-262-44/+4
| | | |
| | * | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-2657-1432/+1275
| | |\ \
| | * | | Code cleanups and simplifications.Richard van der Hoff2019-06-112-45/+42
| | | | | | | | | | | | | | | | | | | | Also: share the saml client between redirect and response handlers.
| | * | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-1039-321/+531
| | |\ \ \
| | * | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-021-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Trost <galexrt@googlemail.com>
* | | | | | Fix JWT login with new users (#5586)Andrew Morgan2020-02-141-6/+3
|\| | | | |
| * | | | | Fix JWT login with new users (#5586)PauRE2019-07-021-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
* | | | | | fix async/await consentresource (#5585)Andrew Morgan2020-02-141-1/+3
|\| | | | |
| * | | | | fix async/await consentresource (#5585)Amber Brown2019-07-011-1/+3
| | |_|_|/ | |/| | | | | | | | Fixes #5582
* | | | | Make the http server handle coroutine-making REST servlets (#5475)Andrew Morgan2020-02-148-120/+73
|\| | | |
| * | | | Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-298-120/+73
| | | | |
* | | | | Fix JWT login (#5555)Andrew Morgan2020-02-141-1/+1
|\| | | |
| * | | | Fix JWT login (#5555)PauRE2019-06-271-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix JWT login with register Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Add pyjwt conditional dependency Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Added changelog file Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Improved changelog description Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
| * | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
| | | |
* | | | Run Black. (#5482)Andrew Morgan2020-02-133-13/+13
|\| | |
| * | | Run Black. (#5482)Amber Brown2019-06-2057-1426/+1254
| | | |
* | | | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-1157-1476/+1291
| | | |
* | | | Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0Andrew Morgan2020-02-107-24/+174
|\ \ \ \
| * | | | Fix resetting password via a phone number (#21) dinsic_2020-02-10Andrew Morgan2020-01-241-1/+1
| | | | |
| * | | | Validate client_secret parameter according to spec (#20)Andrew Morgan2020-01-222-1/+19
| | | | |
| * | | | Add the ability to restrict max avatar filesize and content-type (#19)Andrew Morgan2019-12-121-2/+3
| | | | |
| * | | | Capatilise letters after a - in new user displaynames (#14)Andrew Morgan2019-12-021-16/+58
| | | | |
| * | | | Add a /user/:user_id/info servlet to give user deactivated/expired ↵Andrew Morgan2019-11-141-0/+89
| | | | | | | | | | | | | | | | | | | | information (#12)
| * | | | 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.
| * | | | Revert "Merge pull request #5932 from ↵Brendan Abolivier2019-09-091-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_template_encode" This reverts commit 84e695f506faf54982b9e19dceb9c02acffad95f, reversing changes made to 99eec6d2d5cc76e645c3fd7ca6cda85b2bab6feb.
| * | | | Revert "Ensure the password reset template is correctly converted to binary"Brendan Abolivier2019-09-091-2/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 665dd9f7f8db2f8d38f454d4d5b96efcf163a5db.
| * | | | Ensure the password reset template is correctly converted to binaryBrendan Abolivier2019-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | Regardless of the Python version
* | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_fileAndrew Morgan2020-02-101-2/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_fileErik Johnston2019-06-141-2/+4
| |\ \ \ \ | | | | | | | | | | | | Don't log exception when failing to fetch remote content.
| | * | | | Don't log exception when failing to fetch remote content.Erik Johnston2019-06-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, let's not log stack traces when we stop processing becuase the response body was too large.
* | | | | | Remove Python 2.7 support. (#5425)Andrew Morgan2020-02-101-4/+15
|\| | | | | | |_|/ / / |/| | | |
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-111-4/+5
| |\ \ \ \
| * | | | | Don't warn user about password reset disabling through config code (#5387)Andrew Morgan2019-06-111-4/+15
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the warning about password resets being disabled to the point where a user actually tries to reset their password. Is this an appropriate place for it to happen? Also removed the disabling of msisdn password resets when you don't have an email config, as that just doesn't make sense. Also change the error a user receives upon disabled passwords to specify that only email-based password reset is disabled.
| * | | | Merge pull request #5363 from ↵Brendan Abolivier2019-06-101-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | matrix-org/babolivier/account_validity_send_mail_auth Don't check whether the user's account is expired on /send_mail requests
* | | | | Fix encoding for account validity HTML files on Python 2Brendan Abolivier2019-08-291-1/+3
| | | | |
* | | | | LintBrendan Abolivier2019-08-011-1/+1
| | | | |
* | | | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-6/+15
| | | | |
* | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
| | | | |
* | | | | LintBrendan Abolivier2019-06-121-1/+0
| | | | |
* | | | | Fix path for password policy endpointsBrendan Abolivier2019-06-121-2/+2
| | | | |
* | | | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-1241-345/+558
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Change password reset links to /_matrix.Erik Johnston2019-06-111-4/+5
| |/ / /
| * | | Add ability to perform password reset via email without trusting the ↵Andrew Morgan2019-06-061-5/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identity server (#5377) Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option. This PR is a culmination of 3 smaller PRs which have each been separately reviewed: * #5308 * #5345 * #5368
| * | | Neilj/add r0.5 to versions (#5360)Neil Johnson2019-06-051-0/+1
| | | | | | | | | | | | * Update _matrix/client/versions to reference support for r0.5.0
| * | | Merge pull request #5333 from ↵Richard van der Hoff2019-06-041-10/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | matrix-org/rav/server_keys/09_improve_notary_server Fixes for the key-notary server
| | * | | Notary server: make requests to origins in parallelRichard van der Hoff2019-06-041-10/+2
| | | | | | | | | | | | | | | | | | | | ... else we're guaranteed to time out.
| * | | | Hawkowl/fix missing auth (#5328)Amber Brown2019-06-041-0/+1
| |/ / /
| * | / Unify v1 and v2 REST client APIs (#5226)Amber Brown2019-06-0337-305/+287
| | |/ | |/|
| * | Fix ignored filter field in `/messages` endpointEisha Chen-yen-su2019-05-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug which were causing the "event_format" field to be ignored in the filter of requests to the `/messages` endpoint of the CS API. Signed-off-by: Eisha Chen-yen-su <chenyensu0@gmail.com>
| * | Merge pull request #5256 from aaronraimist/logout-correct-errorErik Johnston2019-05-301-18/+9
| |\ \ | | | | | | | | Show correct error when logging out and access token is missing
| | * | LintAaron Raimist2019-05-291-2/+0
| | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| | * | Get rid of try exceptAaron Raimist2019-05-271-16/+9
| | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| | * | Show correct error when logging out and access token is missingAaron Raimist2019-05-241-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | | Implement the SHHS complexity API (#5216)Amber Brown2019-05-301-3/+9
| | | |
| * | | Serve CAS login over r0 (#5286)Amber Brown2019-05-301-2/+2
| | | |
| * | | Fix error when downloading thumbnail with width/height param missing (#5258)Aaron Raimist2019-05-291-2/+2
| |/ / | | | | | | | | | | | | | | | | | | Fix error when downloading thumbnail with width/height param missing Fixes #2748 Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_eventsErik Johnston2019-05-241-0/+3
| |\ \ | | | | | | | | Don't bundle aggregations with events in /sync or /events or state queries
| | * | Don't bundle events in /sync or /eventsErik Johnston2019-05-211-0/+3
| | | | | | | | | | | | | | | | | | | | As we'll send down the annotations too anyway, so this just ends up confusing clients.
| * | | Merge pull request #5244 from matrix-org/rav/server_keys/00-factor-out-fetchersErik Johnston2019-05-231-3/+3
| |\ \ \ | | | | | | | | | | Factor out KeyFetchers from KeyRing
| | * | | Fix remote_key_resourceRichard van der Hoff2019-05-231-3/+3
| | |/ /
| * / / Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-2/+3
| |/ / | | | | | | | | | | | | Replaces DEFAULT_ROOM_VERSION constant with a method that first checks the config, then returns a hardcoded value if the option is not present. That hardcoded value is now located in the server.py config file.
* | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-115-5/+401
|\| |
| * | Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-202-0/+340
| |\ \ | | | | | | | | Land basic reaction and edit support.
| | * | Move parsing of tokens out of storage layerErik Johnston2019-05-161-0/+19
| | | |
| | * | Check that event is visible in new APIsErik Johnston2019-05-161-2/+15
| | | |
| | * | Add aggregations APIErik Johnston2019-05-161-1/+140
| | | |
| | * | Actually implement idempotencyErik Johnston2019-05-151-1/+8
| | | |
| | * | Add simple pagination APIErik Johnston2019-05-151-0/+50
| | | |
| | * | Add simple send_relation API and track in DBErik Johnston2019-05-152-0/+112
| | | |
| * | | Fix image orientation when generating thumbnail (#5039)PauRE2019-05-162-0/+44
| | | |
| * | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_onlyDavid Baker2019-05-161-5/+17
| |\ \ \ | | | | | | | | | | Re-order registration stages to do msisdn & email auth last
| | * \ \ Merge remote-tracking branch 'origin/develop' into ↵David Baker2019-05-131-0/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | dbkr/add_dummy_flow_to_recaptcha_only
| | * | | | Re-order flows so that email auth is done lastDavid Baker2019-05-101-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's more natural for the user if the bit that takes them away from the registration flow comes last. Adding the dummy stage allows us to do the stages in this order without the ambiguity.
| | * | | | CommentDavid Baker2019-05-101-0/+4
| | | | | |
| | * | | | Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the client to complete the email last which is more natual for the user. Without this stage, if the client would complete the recaptcha (and terms, if enabled) stages and then the registration request would complete because you've now completed a flow, even if you were intending to complete the flow that's the same except has email auth at the end. Adding a dummy auth stage to the recaptcha-only flow means it's always unambiguous which flow the client was trying to complete. Longer term we should think about changing the protocol so the client explicitly says which flow it's trying to complete. vector-im/riot-web#9586
* | | | | | Merge branch 'babolivier/account_validity_send_mail_auth' into dinsic dinsic_2019-06-10Brendan Abolivier2019-06-101-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Don't check whether the user's account is expired on /send_mail requestsBrendan Abolivier2019-06-051-1/+1
| |/ / / /
* | | | | Merge pull request #5214 from matrix-org/babolivier/password-policyBrendan Abolivier2019-05-223-2/+65
|\ \ \ \ \ | | | | | | | | | | | | Allow server admins to define and enforce a password policy (MSC2000)
| * | | | | Remove unused importBrendan Abolivier2019-05-201-2/+0
| | | | | |
| * | | | | First implementation of MSC2000Brendan Abolivier2019-05-203-2/+67
| |/ / / /
* | | | | Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17Brendan Abolivier2019-05-1712-90/+109
|\| | | |
| * | | | Merge pull request #5187 from ↵David Baker2019-05-161-18/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/dbkr/only_check_threepid_not_in_use_if_actually_registering Only check 3pids not in use when registering
| | * | | | Only check 3pids not in use when registeringDavid Baker2019-05-141-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We checked that 3pids were not already in use before we checked if we were going to return the account previously registered in the same UI auth session, in which case the 3pids will definitely be in use. https://github.com/vector-im/riot-web/issues/9586
| * | | | | Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-10/+13
| | | | | |
| * | | | | Drop support for v2_alpha API prefix (#5190)Richard van der Hoff2019-05-156-24/+19
| | |_|_|/ | |/| | |
| * | | | NewsfileErik Johnston2019-05-141-6/+6
| | | | |
| * | | | Allow client event serialization to be asyncErik Johnston2019-05-144-43/+48
| |/ / /
| * | / Migrate all tests to use the dict-based config format instead of hanging ↵Amber Brown2019-05-131-0/+1
| | |/ | |/| | | | | | | items off HomeserverConfig (#5171)
* | | Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14Brendan Abolivier2019-05-1412-155/+499
|\| |
| * | URL preview blacklisting fixes (#5155)Andrew Morgan2019-05-101-0/+10
| |/ | | | | Prevents a SynapseError being raised inside of a IResolutionReceiver and instead opts to just return 0 results. This thus means that we have to lump a failed lookup and a blacklisted lookup together with the same error message, but the substitute should be generic enough to cover both cases.
| * Revert 085ae346ace418e0fc043ac5f568f85ebf80038eDavid Baker2019-05-101-1/+1
| | | | | | | | Accidentally went straight to develop
| * Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the client to complete the email last which is more natual for the user. Without this stage, if the client would complete the recaptcha (and terms, if enabled) stages and then the registration request would complete because you've now completed a flow, even if you were intending to complete the flow that's the same except has email auth at the end. Adding a dummy auth stage to the recaptcha-only flow means it's always unambiguous which flow the client was trying to complete. Longer term we should think about changing the protocol so the client explicitly says which flow it's trying to complete. https://github.com/vector-im/riot-web/issues/9586
| * add options to require an access_token to GET /profile and /publicRooms on ↵Matthew Hodgson2019-05-082-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CS API (#5083) This commit adds two config options: * `restrict_public_rooms_to_local_users` Requires auth to fetch the public rooms directory through the CS API and disables fetching it through the federation API. * `require_auth_for_profile_requests` When set to `true`, requires that requests to `/profile` over the CS API are authenticated, and only returns the user's profile if the requester shares a room with the profile's owner, as per MSC1301. MSC1301 also specifies a behaviour for federation (only returning the profile if the server asking for it shares a room with the profile's owner), but that's currently really non-trivial to do in a not too expensive way. Next step is writing down a MSC that allows a HS to specify which user sent the profile query. In this implementation, Synapse won't send a profile query over federation if it doesn't believe it already shares a room with the profile's owner, though. Groups have been intentionally omitted from this commit.
| * Remove the requirement to authenticate for /admin/server_version. (#5122)Richard van der Hoff2019-05-071-10/+5
| | | | | | | | | | | | | | | | | | This endpoint isn't much use for its intended purpose if you first need to get yourself an admin's auth token. I've restricted it to the `/_synapse/admin` path to make it a bit easier to lock down for those concerned about exposing this information. I don't imagine anyone is using it in anger currently.
| * Add admin api for sending server_notices (#5121)Richard van der Hoff2019-05-023-3/+118
| |
| * Factor out an "assert_requester_is_admin" function (#5120)Richard van der Hoff2019-05-022-75/+79
| | | | | | | | Rather than copying-and-pasting the same four lines hundreds of times
| * fix examplesRichard van der Hoff2019-05-011-4/+4
| |
| * Move admin api impl to its own packageRichard van der Hoff2019-05-012-4/+3
| | | | | | | | It doesn't really belong under rest/client/v1 any more.
| * Move admin API to a new prefixRichard van der Hoff2019-05-012-22/+60
| |
| * Move admin API away from ClientV1RestServletRichard van der Hoff2019-05-011-33/+33
| |
| * Remove log error for .well-known/matrix/client (#4972)Michael Kaye2019-04-241-1/+1
| |
| * Prevent "producer not unregistered" message (#5009)Amber Brown2019-04-241-0/+4
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-04-179-89/+70
| |\ | | | | | | | | | babolivier/account_expiration
| | * Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-172-0/+64
| | |\ | | | | | | | | Send out emails with links to extend an account's validity period
| | * \ Merge pull request #5071 from matrix-org/babolivier/3pid-checkBrendan Abolivier2019-04-171-0/+18
| | |\ \ | | | | | | | | | | Make sure we're not registering the same 3pid twice
| | | * | Make sure we're not registering the same 3pid twiceBrendan Abolivier2019-04-171-0/+18
| | | | |
| | * | | Merge pull request #5070 from matrix-org/erikj/postpathErik Johnston2019-04-171-8/+8
| | |\ \ \ | | | | | | | | | | | | Remove usage of request.postpath
| | | * | | Remove usage of request.postpathErik Johnston2019-04-161-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an undocumented variable in twisted, and relies on the servlet being mounted in the right way. This also breaks getting push rules on workers.
| | * | | | Merge pull request #5063 from matrix-org/erikj/move_endpointsErik Johnston2019-04-151-0/+7
| | |\| | | | | | | | | | | | | | | Move some rest endpoints to client reader
| | | * | | Only handle GET requests for /push_rulesErik Johnston2019-04-151-0/+7
| | | | | |
| * | | | | Add management endpoints for account validityBrendan Abolivier2019-04-172-1/+69
| | |_|_|/ | |/| | |
| * | | | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-172-0/+64
| | |_|/ | |/| |
* | | | Incorporate reviewBrendan Abolivier2019-05-091-4/+3
| | | |
* | | | Incorporate reviewBrendan Abolivier2019-05-071-0/+2
| | | |
* | | | Update synapse/rest/client/v2_alpha/account.pyAndrew Morgan2019-05-011-1/+1
| | | | | | | | | | | | Co-Authored-By: babolivier <contact@brendanabolivier.com>
* | | | Update synapse/rest/client/v2_alpha/account.pyAndrew Morgan2019-05-011-1/+1
| | | | | | | | | | | | Co-Authored-By: babolivier <contact@brendanabolivier.com>
* | | | Fixed return valueBrendan Abolivier2019-04-301-2/+2
| | | |
* | | | FixesBrendan Abolivier2019-04-301-4/+7
| | | |
* | | | Fix methodBrendan Abolivier2019-04-301-1/+1
| | | |
* | | | Register servletsBrendan Abolivier2019-04-301-0/+2
| | | |
* | | | Add bulk lookupBrendan Abolivier2019-04-301-1/+26
| | | |
* | | | Move lookup endpoint to CS API (and s/is_server/id_server/)Brendan Abolivier2019-04-304-108/+32
| | | |
* | | | [DINSIC] Add ability to proxy identity lookups (#5048)Andrew Morgan2019-04-163-0/+108
| | | |
* | | | Merge branch 'develop' into dinsicAndrew Morgan2019-04-157-81/+37
|\ \ \ \ | | |/ / | |/| |
| * | | Remove periods from copyright headers (#5046)Andrew Morgan2019-04-112-2/+2
| | |/ | |/|
| * | Add admin API for group deletionErik Johnston2019-04-031-0/+26
| | |
| * | Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-031-1/+1
| | |
| * | Remove presence lists (#4989)Neil Johnson2019-04-031-67/+0
| | | | | | | | | Remove presence list support as per MSC 1819
| * | Merge pull request #4982 from matrix-org/erikj/msc1915Erik Johnston2019-04-031-2/+3
| |\ \ | | | | | | | | Implement MSC1915 - 3PID unbind APIs
| | * | Add unbind API to /r0 as it is now stabalisedErik Johnston2019-04-011-1/+1
| | | |
| | * | Allowing specifying IS to use in unbind API.Erik Johnston2019-04-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default the homeserver will use the identity server used during the binding of the 3PID to unbind the 3PID. However, we need to allow clients to explicitly ask the homeserver to unbind via a particular identity server, for the case where the 3PID was bound out of band from the homeserver. Implements MSC915.
| * | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-012-7/+5
| |/ / | | | | | | | | | Collect all the things that make room-versions different to one another into one place, so that it's easier to define new room versions.
| * / remove log line for password (#4965)Neil Johnson2019-03-281-2/+0
| |/ | | | | | | Remove log line for password.
* | Merge branch 'master' of github.com:matrix-org/synapse into dinsicErik Johnston2019-04-051-4/+45
|\|
| * Support 3PID login in password providers (#4931)Andrew Morgan2019-03-261-4/+45
| | | | | | | | | | Adds a new method, check_3pid_auth, which gives password providers the chance to allow authentication with third-party identifiers such as email or msisdn.
* | Fix registration with register_mxid_from_3pid enabled (#5011) dinsic_2019-04-04_1Erik Johnston2019-04-041-1/+1
| |
* | Add config option to use email as display name for new usersErik Johnston2019-04-031-14/+17
| |
* | Add 3PID invite support to spam checkerErik Johnston2019-03-211-1/+2
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dinsic-mergedErik Johnston2019-03-215-58/+230
|\|
| * Merge pull request #4904 from matrix-org/erikj/fix_shutdownErik Johnston2019-03-211-20/+35
| |\ | | | | | | Fixup shutdown room API
| | * Use flagsErik Johnston2019-03-201-2/+4
| | |
| | * Gracefully handle failing to kick userErik Johnston2019-03-201-19/+27
| | |
| | * Log new room IDErik Johnston2019-03-201-1/+6
| | |
| * | Add option to disable searching in the user dirErik Johnston2019-03-191-0/+6
| |/ | | | | | | We still populate it, as it can still be accessed via the admin API.
| * Add ratelimiting on login (#4821)Brendan Abolivier2019-03-152-2/+12
| | | | | | Add two ratelimiters on login (per-IP address and per-userID).
| * fix incorrect encoding of filenames with spaces in (#2090)Matthew Hodgson2019-03-111-3/+51
| | | | | | | | fixes https://github.com/vector-im/riot-web/issues/3155
| * Send message after room has been shutdownErik Johnston2019-03-061-11/+11
| | | | | | | | | | | | | | | | Currently the explanation message is sent to the abuse room before any users are forced joined, which means it tends to get lost in the backlog of joins. So instead we send the message *after* we've forced joined everyone.
| * Make registration ratelimiter separate from the main events oneBrendan Abolivier2019-03-061-1/+1
| |
| * Revert "Split ratelimiters in two (one for events, one for registration)"Brendan Abolivier2019-03-061-1/+1
| | | | | | | | This reverts commit d7dbad3526136cfc9fdbd568635be5016fb637db.
| * Split ratelimiters in two (one for events, one for registration)Brendan Abolivier2019-03-051-1/+1
| |
| * Merge pull request #4772 from jbweston/jbweston/server-version-apiErik Johnston2019-03-051-0/+23
| |\ | | | | | | Add 'server_version' endpoint to admin API
| | * Add 'server_version' endpoint to admin APIJoseph Weston2019-03-011-0/+23
| | | | | | | | | | | | | | | This is required because the 'Server' HTTP header is not always passed through proxies.
| * | Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-051-4/+29
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rate-limiting for registration * Add unit test for registration rate limiting * Add config parameters for rate limiting on auth endpoints * Doc * Fix doc of rate limiting function Co-Authored-By: babolivier <contact@brendanabolivier.com> * Incorporate review * Fix config parsing * Fix linting errors * Set default config for auth rate limiting * Fix tests * Add changelog * Advance reactor instead of mocked clock * Move parameters to registration specific config and give them more sensible default values * Remove unused config options * Don't mock the rate limiter un MAU tests * Rename _register_with_store into register_with_store * Make CI happy * Remove unused import * Update sample config * Fix ratelimiting test for py2 * Add non-guest test
| * Fix parsing of Content-Disposition headers (#4763)Richard van der Hoff2019-02-271-20/+65
| | | | | | | | | | | | | | | | | | | | | | * Fix parsing of Content-Disposition headers TIL: filenames in content-dispostion headers can contain semicolons, and aren't %-encoded. * fix python2 incompatibility * Fix docstrings
* | IsortErik Johnston2019-03-151-1/+1
| |
* | Merge branch 'master' of github.com:matrix-org/synapse into ↵Erik Johnston2019-03-1529-1102/+941
|\| | | | | | | erikj/dinsic-merged-master
| * Don't log stack trace when client has gone away during media download (#4738)Erik Johnston2019-02-251-2/+9
| | | | | | | | | | | | | | | | * Don't log stack trace when client has gone away during media download * Newsfile * Fixup newsfile
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-10 20:58:53 +0000