summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Support PyJWT v2.0.0. (#8986)Patrick Cloke2020-12-222-4/+13
| | | | Tests were broken due to an API changing. The code used in Synapse proper should be compatible with both versions already.
* Refactor the CAS handler in prep for using the abstracted SSO code. (#8958)Patrick Cloke2020-12-184-69/+162
| | | | | | This makes the CAS handler look more like the SAML/OIDC handlers: * Render errors to users instead of throwing JSON errors. * Internal reorganization.
* Send the location of the web client to the IS when inviting via 3PIDs. (#8930)Patrick Cloke2020-12-184-0/+34
| | | | Adds a new setting `email.invite_client_location` which, if defined, is passed to the identity server during invites.
* Allow server admin to get admin bit in rooms where local user is an admin ↵Erik Johnston2020-12-185-3/+294
| | | | | | | (#8756) This adds an admin API that allows a server admin to get power in a room if a local user has power in a room. Will also invite the user if they're not in the room and its a private room. Can specify another user (rather than the admin user) to be granted power. Co-authored-by: Matthew Hodgson <matthew@matrix.org>
* Fix mainline ordering in state res v2 (#8971)Erik Johnston2020-12-183-2/+58
| | | | | | This had two effects 1) it'd give the wrong answer and b) would iterate *all* power levels in the auth chain of each event. The latter of which can be *very* expensive for certain types of IRC bridge rooms that have large numbers of power level changes.
* Implement a username picker for synapse (#8942)Richard van der Hoff2020-12-1814-59/+683
| | | | | | | | | | | | | | The final part (for now) of my work to implement a username picker in synapse itself. The idea is that we allow `UsernameMappingProvider`s to return `localpart=None`, in which case, rather than redirecting the browser back to the client, we redirect to a username-picker resource, which allows the user to enter a username. We *then* complete the SSO flow (including doing the client permission checks). The static resources for the username picker itself (in https://github.com/matrix-org/synapse/tree/rav/username_picker/synapse/res/username_picker) are essentially lifted wholesale from https://github.com/matrix-org/matrix-synapse-saml-mozilla/tree/master/matrix_synapse_saml_mozilla/res. As the comment says, we might want to think about making them customisable, but that can be a follow-up. Fixes #8876.
* Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-1810-49/+193
|
* Ensure that a URL exists in the content during push. (#8965)Patrick Cloke2020-12-183-2/+7
| | | | This fixes an KeyError exception, after this PR the content is just considered unknown.
* Merge remote-tracking branch 'origin/erikj/as_mau_block' into developErik Johnston2020-12-187-9/+86
|\
| * Update tests/test_mau.pyErik Johnston2020-12-171-1/+2
| | | | | | Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * Correctly handle AS registerations and add testErik Johnston2020-12-175-9/+77
| |
| * NewsfileErik Johnston2020-12-171-0/+1
| |
| * Don't MAU limit AS ghost usersErik Johnston2020-12-171-0/+7
| |
* | Try and drop stale extremities. (#8929)Erik Johnston2020-12-186-18/+523
| | | | | | | | If we see stale extremities while persisting events, and notice that they don't change the result of state resolution, we drop them.
* | Clean up tox.ini (#8963)Richard van der Hoff2020-12-173-19/+34
| | | | | | ... and disable coverage tracking for mypy and friends.
* | Fix `UsersListTestCase` (#8964)Richard van der Hoff2020-12-172-6/+5
| |
* | Use the simple dictionary in full text search for the user directory (#8959)Brendan Abolivier2020-12-173-12/+36
| | | | | | | | | | * Use the simple dictionary in fts for the user directory * Clarify naming
* | Fix a bug that deactivated users appear in the directory (#8933)Dirk Klimpel2020-12-174-4/+95
| | | | | | | | | | | | | | | | | | | | Fixes a bug that deactivated users appear in the directory when their profile information was updated. To change profile information of deactivated users is neccesary for example you will remove displayname or avatar. But they should not appear in directory. They are deactivated. Co-authored-by: Erik Johnston <erikj@jki.re>
* | Make search statement in List Room and User Admin API case-insensitive (#8931)Dirk Klimpel2020-12-177-11/+125
| |
* | Add a maximum size for well-known lookups. (#8950)Patrick Cloke2020-12-165-18/+80
| |
* | Push login completion down into SsoHandler (#8941)Richard van der Hoff2020-12-165-86/+80
| | | | | | This is another part of my work towards fixing #8876. It moves some of the logic currently in the SAML and OIDC handlers - in particular the call to `AuthHandler.complete_sso_login` down into the `SsoHandler`.
* | Fix the sample config location for the ip_range_whitelist setting. (#8954)Patrick Cloke2020-12-164-24/+25
| | | | | | | | Move it from the federation section to the server section to match ip_range_blacklist.
* | Convert internal pusher dicts to attrs classes. (#8940)Patrick Cloke2020-12-1617-204/+266
| | | | | | This improves type hinting and should use less memory.
* | Merge pull request #8951 from matrix-org/rav/username_picker_2Richard van der Hoff2020-12-163-82/+106
|\ \ | | | | | | More preparatory refactoring of the OidcHandler tests
| * | changelogRichard van der Hoff2020-12-151-0/+1
| | |
| * | Make `_make_callback_with_userinfo` asyncRichard van der Hoff2020-12-151-68/+83
| | | | | | | | | | | | | | | | | | ... so that we can test its behaviour when it raises. Also pull it out to the top level so that I can use it from other test classes.
| * | Remove spurious mocking of complete_sso_loginRichard van der Hoff2020-12-151-2/+0
| | | | | | | | | | | | The tests that need this all do it already.
| * | Test `get_extra_attributes` fallbackRichard van der Hoff2020-12-152-12/+22
| | | | | | | | | | | | | | | despite the warnings saying "don't implement get_extra_attributes", we had implemented it, so the tests weren't doing what we thought they were.
* | | Merge pull request #8946 from matrix-org/rav/refactor_send_requestRichard van der Hoff2020-12-1660-1028/+776
|\ \ \ | | | | | | | | Remove `Request` return value from `make_request`
| * | | lintRichard van der Hoff2020-12-155-7/+3
| | | |
| * | | changelogRichard van der Hoff2020-12-151-0/+1
| | | |
| * | | Remove spurious "SynapseRequest" result from `make_request"Richard van der Hoff2020-12-1559-983/+742
| | | | | | | | | | | | | | | | This was never used, so let's get rid of it.
| * | | Remove redundant reading of SynapseRequest.argsRichard van der Hoff2020-12-151-9/+1
| | | | | | | | | | | | | | | | this didn't seem to be doing a lot, so remove it.
| * | | Skip redundant check on `request.args`Richard van der Hoff2020-12-151-2/+1
| | | |
| * | | remove 'response' result from `_get_shared_rooms`Richard van der Hoff2020-12-151-8/+9
| | | |
| * | | Replace `request.code` with `channel.code`Richard van der Hoff2020-12-158-22/+22
| |/ / | | | | | | | | | | | | | | | The two are equivalent, but really we want to check the HTTP result that got returned to the channel, not the code that the Request object *intended* to return to the channel.
* | | Fix generate_log_config script (#8952)Richard van der Hoff2020-12-162-1/+4
| | | | | | | | | It used to write an empty file if you gave it a -o arg.
* | | Do not assume that the contents dictionary includes history_visibility. (#8945)Patrick Cloke2020-12-169-28/+58
|/ /
* | Preparatory refactoring of the SamlHandlerTestCase (#8938)Richard van der Hoff2020-12-155-54/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | * move simple_async_mock to test_utils ... so that it can be re-used * Remove references to `SamlHandler._map_saml_response_to_user` from tests This method is going away, so we can no longer use it as a test point. Instead, factor out a higher-level method which takes a SAML object, and verify correct behaviour by mocking out `AuthHandler.complete_sso_login`. * changelog
* | Fix handling of stream tokens for push. (#8943)Patrick Cloke2020-12-156-50/+18
| | | | | | | | Removes faulty assertions and fixes the logic to ensure the max stream token is always set.
* | Fix startup failure with localdb_enabled: False (#8937)Richard van der Hoff2020-12-143-14/+36
| |
* | Various clean-ups to the logging context code (#8935)Patrick Cloke2020-12-1411-39/+20
| |
* | Preparatory refactoring of the OidcHandlerTestCase (#8911)Richard van der Hoff2020-12-142-141/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove references to handler._auth_handler (and replace them with hs.get_auth_handler) * Factor out a utility function for building Requests * Remove mocks of `OidcHandler._map_userinfo_to_user` This method is going away, so mocking it out is no longer a valid approach. Instead, we mock out lower-level methods (eg _remote_id_from_userinfo), or simply allow the regular implementation to proceed and update the expectations accordingly. * Remove references to `OidcHandler._map_userinfo_to_user` from tests This method is going away, so we can no longer use it as a test point. Instead we build mock "callback" requests which we pass into `handle_oidc_callback`, and verify correct behaviour by mocking out `AuthHandler.complete_sso_login`.
* | Allow spam-checker modules to be provide async methods. (#8890)David Teller2020-12-1119-73/+98
| | | | | | | | Spam checker modules can now provide async methods. This is implemented in a backwards-compatible manner.
* | Add type hints to the push module. (#8901)Patrick Cloke2020-12-119-86/+159
| |
* | Honour AS ratelimit settings for /login requests (#8920)Erik Johnston2020-12-114-10/+27
| | | | | | | | Fixes #8846.
* | Improve tests for structured logging. (#8916)Patrick Cloke2020-12-112-27/+47
| |
* | Add number of local devices to Room Details Admin API (#8886)Dirk Klimpel2020-12-116-27/+138
| |
* | Don't ratelimit autojoining of rooms (#8921)Erik Johnston2020-12-114-11/+34
| | | | | | Fixes #8866
* | Don't publish `latest` docker image until all archs are built (#8909)Richard van der Hoff2020-12-102-3/+5
| |
* | Fix deadlock on SIGHUP (#8918)Erik Johnston2020-12-102-1/+6
| | | | | | Fixes #8892
* | Refactor `SsoHandler.get_mxid_from_sso` (#8900)Richard van der Hoff2020-12-103-28/+51
| | | | | | | | | | | | | | * Factor out _call_attribute_mapper and _register_mapped_user This is mostly an attempt to simplify `get_mxid_from_sso`. * Move mapping_lock down into SsoHandler.
* | Fix buglet in DirectRenderJsonResource (#8897)Richard van der Hoff2020-12-102-3/+6
| | | | | | | | this was using `canonical_json` without setting it, so when you used it as a standalone class, you would get exceptions.
* | Deprecate Shutdown Room and Purge Room Admin API (#8829)Dirk Klimpel2020-12-105-11/+63
| | | | | | | | | | Deprecate both APIs in favour of the Delete Room API. Related: #8663 and #8810
* | Default to blacklisting reserved IP ranges and add a whitelist. (#8870)Patrick Cloke2020-12-0910-89/+172
| | | | | | | | This defaults `ip_range_blacklist` to reserved IP ranges and also adds an `ip_range_whitelist` setting to override it.
* | Skip the SAML tests if xmlsec1 isn't available. (#8905)Patrick Cloke2020-12-092-0/+24
| |
* | Combine related media admin API docs (#8839)Dirk Klimpel2020-12-093-50/+87
| | | | | | | | | | | | Related: #8810 Also a few small improvements. Signed-off-by: Dirk Klimpel dirk@klimpel.org
* | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2020-12-092-3/+6
|\ \
| * \ Merge pull request #8906 from matrix-org/rav/fix_multiarch_buildsRichard van der Hoff2020-12-092-3/+6
| |\ \ | | | | | | | | Pin the docker version for multiarch builds
| | * | Pin the docker version for multiarch buildsRichard van der Hoff2020-12-092-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that letting CircleCI use its default docker version (17.09.0-ce, apparently) did not interact well with multiarch builds: in particular, we saw weird effects where running an amd64 build at the same time as an arm64 build caused the arm64 builds to fail with: Error while loading /usr/sbin/dpkg-deb: No such file or directory
* | | | Merge branch 'release-v1.24.0' into developErik Johnston2020-12-091-1/+2
|\ \ \ \
| * | | | Add 'xmlsec1' to dependency list release-v1.24.0Erik Johnston2020-12-091-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'master' into developErik Johnston2020-12-092-0/+60
|\ \ \ \ | | |/ / | |/| |
| * | | Merge tag 'v1.23.1'Erik Johnston2020-12-092-0/+60
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.23.1 (2020-12-09) =========================== Due to the two security issues highlighted below, server administrators are encouraged to update Synapse. We are not aware of these vulnerabilities being exploited in the wild. Security advisory ----------------- The following issues are fixed in v1.23.1 and v1.24.0. - There is a denial of service attack ([CVE-2020-26257](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-26257)) against the federation APIs in which future events will not be correctly sent to other servers over federation. This affects all servers that participate in open federation. (Fixed in [#8776](https://github.com/matrix-org/synapse/pull/8776)). - Synapse may be affected by OpenSSL [CVE-2020-1971](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-1971). Synapse administrators should ensure that they have the latest versions of the cryptography Python package installed. To upgrade Synapse along with the cryptography package: * Administrators using the [`matrix.org` Docker image](https://hub.docker.com/r/matrixdotorg/synapse/) or the [Debian/Ubuntu packages from `matrix.org`](https://github.com/matrix-org/synapse/blob/master/INSTALL.md#matrixorg-packages) should ensure that they have version 1.24.0 or 1.23.1 installed: these images include the updated packages. * Administrators who have [installed Synapse from source](https://github.com/matrix-org/synapse/blob/master/INSTALL.md#installing-from-source) should upgrade the cryptography package within their virtualenv by running: ```sh <path_to_virtualenv>/bin/pip install 'cryptography>=3.3' ``` * Administrators who have installed Synapse from distribution packages should consult the information from their distributions. Bugfixes -------- - Fix a bug in some federation APIs which could lead to unexpected behaviour if different parameters were set in the URI and the request body. ([\#8776](https://github.com/matrix-org/synapse/issues/8776)) Internal Changes ---------------- - Add a maximum version for pysaml2 on Python 3.5. ([\#8898](https://github.com/matrix-org/synapse/issues/8898))
| | * | 1.23.1 v1.23.1 release-v1.23.1Erik Johnston2020-12-095-3/+59
| | | |
| | * | Fix installing pysaml2 on Python 3.5. (#8898)Patrick Cloke2020-12-092-1/+6
| | | | | | | | | | | | This pins pysaml2 to < 6.4.0 on Python 3.5, as the last known working version.
| | * | Consistently use room_id from federation request body (#8776)Richard van der Hoff2020-12-095-54/+49
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Consistently use room_id from federation request body Some federation APIs have a redundant `room_id` path param (see https://github.com/matrix-org/matrix-doc/issues/2330). We should make sure we consistently use either the path param or the body param, and the body param is easier. * Kill off some references to "context" Once upon a time, "rooms" were known as "contexts". I think this kills of the last references to "contexts".
* | | Merge branch 'master' into developErik Johnston2020-12-094-2/+58
|\| |
| * | 1.24.0 v1.24.0Erik Johnston2020-12-094-2/+53
| | |
| * | Fix installing pysaml2 on Python 3.5. (#8898)Patrick Cloke2020-12-082-1/+6
| | | | | | | | | This pins pysaml2 to < 6.4.0 on Python 3.5, as the last known working version.
* | | Add X-Robots-Tag header to stop crawlers from indexing media (#8887)Aaron Raimist2020-12-083-0/+19
| | | | | | | | | | | | | | | | | | | | | Fixes / related to: https://github.com/matrix-org/synapse/issues/6533 This should do essentially the same thing as a robots.txt file telling robots to not index the media repo. https://developers.google.com/search/reference/robots_meta_tag Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | Better formatting for config errors from modules (#8874)Richard van der Hoff2020-12-0813-37/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is that the parse_config method of extension modules can raise either a ConfigError or a JsonValidationError, and it will be magically turned into a legible error message. There's a few components to it: * Separating the "path" and the "message" parts of a ConfigError, so that we can fiddle with the path bit to turn it into an absolute path. * Generally improving the way ConfigErrors get printed. * Passing in the config path to load_module so that it can wrap any exceptions that get caught appropriately.
* | | Simplify the flow for SSO UIA (#8881)Richard van der Hoff2020-12-087-40/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | * SsoHandler: remove inheritance from BaseHandler * Simplify the flow for SSO UIA We don't need to do all the magic for mapping users when we are doing UIA, so let's factor that out.
* | | Clarify config template comments (#8891)Richard van der Hoff2020-12-084-16/+9
| | |
* | | Call set_avatar_url with target_user, not user_id (#8872)Will Hunt2020-12-073-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Call set_avatar_url with target_user, not user_id Fixes https://github.com/matrix-org/synapse/issues/8871 * Create 8872.bugfix * Update synapse/rest/admin/users.py Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> * Testing * Update changelog.d/8872.bugfix Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
* | | Do not raise a 500 exception when previewing empty media. (#8883)Patrick Cloke2020-12-073-12/+22
| | |
* | | Add type hints for HTTP and email pushers. (#8880)Patrick Cloke2020-12-078-101/+168
| | |
* | | Add type hints to the push mailer module. (#8882)Patrick Cloke2020-12-073-40/+85
| | |
* | | Add authentication to replication endpoints. (#8853)Patrick Cloke2020-12-047-15/+184
| | | | | | | | | | | | Authentication is done by checking a shared secret provided in the Synapse configuration file.
* | | Pass room_id to get_auth_chain_difference (#8879)Erik Johnston2020-12-046-17/+33
| | | | | | | | | | | | | | | This is so that we can choose which algorithm to use based on the room ID.
* | | Add additional validation to pusher URLs. (#8865)Patrick Cloke2020-12-046-30/+106
| | | | | | | | | | | | Pusher URLs now must end in `/_matrix/push/v1/notify` per the specification.
* | | Do not 500 if the content-length is not provided when uploading media. (#8862)Patrick Cloke2020-12-042-1/+2
| | | | | | | | | Instead return the proper 400 error.
* | | Merge tag 'v1.24.0rc2' into developPatrick Cloke2020-12-049-18/+81
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.24.0rc2 (2020-12-04) ============================== Bugfixes -------- - Fix a regression in v1.24.0rc1 which failed to allow SAML mapping providers which were unable to redirect users to an additional page. ([\#8878](https://github.com/matrix-org/synapse/issues/8878)) Internal Changes ---------------- - Add support for the `prometheus_client` newer than 0.9.0. Contributed by Jordan Bancino. ([\#8875](https://github.com/matrix-org/synapse/issues/8875))
| * | Minor update to CHANGES. v1.24.0rc2Patrick Cloke2020-12-041-1/+1
| | |
| * | 1.24.0rc2Patrick Cloke2020-12-044-3/+16
| | |
| * | Fix a regression that mapping providers should be able to redirect users. ↵Patrick Cloke2020-12-046-8/+60
| | | | | | | | | | | | | | | (#8878) This was broken in #8801.
| * | Remove version pin prometheus_client dependency (#8875)Jordan Bancino2020-12-043-9/+7
| | | | | | | | | | | | | | | | | | | | | This removes the version pin of the `prometheus_client` dependency, in direct response to #8831. If merged, this will close #8831 As far as I can tell, no other changes are needed, but as I'm no synapse expert, I'm relying heavily on CI and maintainer reviews for this. My very primitive test of synapse with prometheus_client v0.9.0 on my home server didn't bring up any issues, so we'll see what happens. Signed-off-by: Jordan Bancino
* | | Fix a buglet in the SAML username mapping provider doc (#8873)Richard van der Hoff2020-12-042-1/+4
| | | | | | | | | the constructor is called with a `module_api`.
* | | Fix errorcode for disabled registration (#8867)Richard van der Hoff2020-12-033-1/+3
| | | | | | | | | | | | The spec says we should return `M_FORBIDDEN` when someone tries to register and registration is disabled.
* | | Merge pull request #8861 from matrix-org/rav/remove_unused_mocksRichard van der Hoff2020-12-037-143/+7
|\ \ \ | | | | | | | | Remove some unnecessary mocking from the unit tests
| * \ \ Merge remote-tracking branch 'origin/develop' into rav/remove_unused_mocksRichard van der Hoff2020-12-0215-111/+367
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #8858 from matrix-org/rav/sso_uiaRichard van der Hoff2020-12-0213-73/+366
|\ \ \ \ | | | | | | | | | | UIA: offer only available auth flows
| * | | | newsfileRichard van der Hoff2020-12-021-0/+1
| | | | |
| * | | | UIA: offer only available auth flowsRichard van der Hoff2020-12-026-33/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During user-interactive auth, do not offer password auth to users with no password, nor SSO auth to users with no SSO. Fixes #7559.
| * | | | Factor out FakeResponse from test_oidcRichard van der Hoff2020-12-022-16/+28
| | | | |
| * | | | fix up various test casesRichard van der Hoff2020-12-025-17/+38
| | | | | | | | | | | | | | | | | | | | | | | | | A few test cases were relying on being able to mount non-client servlets on the test resource. it's better to give them their own Resources.
| * | | | Add `create_resource_dict` method to HomeserverTestCaseRichard van der Hoff2020-12-021-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than using a single JsonResource, construct a resource tree, as we do in the prod code, and allow testcases to add extra resources by overriding `create_resource_dict`.
* | | | | remove unused FakeResponse (#8864)Richard van der Hoff2020-12-022-26/+1
| | | | |
| | * | | changelogRichard van der Hoff2020-12-021-0/+1
| | | | |
| | * | | remove unused DeferredMockCallableRichard van der Hoff2020-12-021-90/+1
| | | | |
| | * | | remove unused `resource_for_federation`Richard van der Hoff2020-12-022-18/+13
| | | | | | | | | | | | | | | | | | | | This is now only used in `test_typing`, so move it there.
| | * | | Remove redundant mockingRichard van der Hoff2020-12-025-36/+5
| |/ / / |/| | |
* | | | Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-0243-115/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces the `federation_ip_range_blacklist` configuration setting with an `ip_range_blacklist` setting with wider scope. It now applies to: * Federation * Identity servers * Push notifications * Checking key validitity for third-party invite events The old `federation_ip_range_blacklist` setting is still honored if present, but with reduced scope (it only applies to federation and identity servers).
* | | | Correctly handle unpersisted events when calculating auth chain difference. ↵Erik Johnston2020-12-024-5/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#8827) We do state res with unpersisted events when calculating the new current state of the room, so that should be the only thing impacted. I don't think this is tooooo big of a deal as: 1. the next time a state event happens in the room the current state should correct itself; 2. in the common case all the unpersisted events' auth events will be pulled in by other state, so will still return the correct result (or one which is sufficiently close to not affect the result); and 3. we mostly use the state at an event to do important operations, which isn't affected by this.
* | | | Add missing prometheus rules for persisted events (#8802)Johanna Dorothea Reichmann2020-12-022-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The official dashboard uses data from these rules, but they were never added to the synapse-v2.rules. They are mentioned in this issue: https://github.com/matrix-org/synapse/issues/7917#issuecomment-661330409, but never got added to the rules. Adding them results in all graphs in the "Event persist rate" section to function as intended. Signed-off-by: Johanna Dorothea Reichmann <transcaffeine@finallycoffee.eu>
* | | | Add additional validation for the admin register endpoint. (#8837)David Florness2020-12-022-0/+4
| |/ / |/| | | | | Raise a proper 400 error if the `mac` field is missing.
* | | Minor changes to the CHANGES doc. v1.24.0rc1Patrick Cloke2020-12-021-1/+1
| | |
* | | Minor fixes to changelog.Patrick Cloke2020-12-021-5/+5
| | |
* | | 1.24.0rc1Patrick Cloke2020-12-0255-54/+73
|/ /
* | Fix a regression when grandfathering SAML users. (#8855)Patrick Cloke2020-12-026-48/+94
| | | | | | | | | | | | This was broken in #8801 when abstracting code shared with OIDC. After this change both SAML and OIDC have a concept of grandfathering users, but with different implementations.
* | Add basic SAML tests for mapping users. (#8800)Patrick Cloke2020-12-025-19/+156
| |
* | Create a `PasswordProvider` wrapper object (#8849)Richard van der Hoff2020-12-023-57/+152
| | | | | | | | The idea here is to abstract out all the conditional code which tests which methods a given password provider has, to provide a consistent interface.
* | Allow specifying room version in 'RestHelper.create_room_as' and add typing ↵Andrew Morgan2020-12-022-2/+26
| | | | | | | | | | (#8854) This PR adds a `room_version` argument to the `RestHelper`'s `create_room_as` function for tests. I plan to use this for testing knocking, which currently uses an unstable room version.
* | Support "identifier" dicts in UIA (#8848)Richard van der Hoff2020-12-015-147/+190
| | | | | | | | | | | | | | | | | | | | The spec requires synapse to support `identifier` dicts for `m.login.password` user-interactive auth, which it did not (instead, it required an undocumented `user` parameter.) To fix this properly, we need to pull the code that interprets `identifier` into `AuthHandler.validate_login` so that it can be called from the UIA code. Fixes #5665.
* | Add missing `ordering` to background updates (#8850)Richard van der Hoff2020-12-015-12/+13
| | | | | | | | | | | | | | It's important that we make sure our background updates happen in a defined order, to avoid disasters like #6923. Add an ordering to all of the background updates that have landed since #7190.
* | Allow Date header through CORS (#8804)Nicolas Chamo2020-12-012-1/+2
| |
* | Don't offer password login when it is disabled (#8835)Richard van der Hoff2020-12-013-4/+115
| | | | | | Fix a minor bug where we would offer "m.login.password" login if a custom auth provider supported it, even if password login was disabled.
* | Add some tests for `password_auth_providers` (#8819)Richard van der Hoff2020-12-013-0/+488
| | | | | | | | These things seemed to be completely untested, so I added a load of tests for them.
* | Fix broken testcase (#8851)Richard van der Hoff2020-12-012-1/+1
| | | | | | | | This test was broken by #8565. It doesn't need to set set `self.clock` here anyway - that is done by `setUp`.
* | Fix typo in password_auth_providers docAndrew Morgan2020-12-011-0/+1
| | | | | | | | A word got removed accidentally in 83434df3812650f53c60e91fb23c2079db0fb5b8.
* | Simplify appservice login code (#8847)Richard van der Hoff2020-11-302-6/+22
| | | | | | we don't need to support legacy login dictionaries here.
* | Allow per-room profile to be used for server notice user (#8799)Mathieu Velten2020-11-302-1/+10
| | | | | | | | This applies even if the feature is disabled at the server level with `allow_per_room_profiles`. The server notice not being a real user it doesn't have an user profile.
* | Drop (almost) unused index on event_json (#8845)Richard van der Hoff2020-11-303-1/+21
| |
* | Add a config option to change whether unread push notification counts are ↵Andrew Morgan2020-11-306-9/+207
| | | | | | | | | | | | | | | | per-message or per-room (#8820) This PR adds a new config option to the `push` section of the homeserver config, `group_unread_count_by_room`. By default Synapse will group push notifications by room (so if you have 1000 unread messages, if they lie in 55 rooms, you'll see an unread count on your phone of 55). However, it is also useful to be able to send out the true count of unread messages if desired. If `group_unread_count_by_room` is set to `false`, then with the above example, one would see an unread count of 1000 (email anyone?).
* | Simplify the way the `HomeServer` object caches its internal attributes. ↵Jonathan de Jong2020-11-3011-35/+39
| | | | | | | | | | (#8565) Changes `@cache_in_self` to use underscore-prefixed attributes.
* | Add `force_purge` option to delete-room admin api. (#8843)Richard van der Hoff2020-11-304-12/+34
| |
* | Remove special case of pretty printing JSON responses for curl (#8833)Tulir Asokan2020-11-272-24/+6
| | | | | | | | | | * Remove special case of pretty printing JSON responses for curl Signed-off-by: Tulir Asokan <tulir@maunium.net>
* | Add typing to membership Replication class methods (#8809)Andrew Morgan2020-11-272-22/+45
| | | | | | | | | | This PR grew out of #6739, and adds typing to some method arguments You'll notice that there are a lot of `# type: ignores` in here. This is due to the base methods not matching the overloads here. This is necessary to stop mypy complaining, but a better solution is #8828.
* | Update example prometheus console (#8824)Dirk Klimpel2020-11-262-51/+51
| | | | | | | | Signed-off-by: Dirk Klimpel dirk@klimpel.org
* | Defer SIGHUP handlers to reactor. (#8817)Erik Johnston2020-11-262-1/+10
| | | | | | | | | | | | | | | | | | We can get a SIGHUP at any point, including times where we are not in a sane state. By deferring calling the handlers until the next reactor tick we ensure that we don't get unexpected conflicts, e.g. trying to flush logs from the signal handler while the code was in the process of writing a log entry. Fixes #8769.
* | Strip trailing / from server_url in register_new_matrix_user (#8823)Dmitry Borodaenko2020-11-262-1/+2
| | | | | | | | | | | | | | | | | | When server URL provided to register_new_matrix_user includes path component (e.g. "http://localhost:8008/"), the command fails with "ERROR! Received 400 Bad Request". Stripping trailing slash from the server_url command argument makes sure combined endpoint URL remains valid. Signed-off-by: Dmitry Borodaenko angdraug@debian.org
* | Improve documentation how to configure prometheus for workers (#8822)Dirk Klimpel2020-11-263-20/+65
| |
* | Remove deprecated `/_matrix/client/*/admin` endpoints (#8785)Dirk Klimpel2020-11-2516-68/+176
| | | | | | These are now only available via `/_synapse/admin/v1`.
* | Fix the formatting of push config section (#8818)Andrew Morgan2020-11-253-29/+40
| | | | | | This PR updates the push config's formatting to better align with our [code style guidelines](https://github.com/matrix-org/synapse/blob/develop/docs/code_style.md#configuration-file-format).
* | Speed up remote invite rejection database call (#8815)Andrew Morgan2020-11-253-6/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | This is another PR that grew out of #6739. The existing code for checking whether a user is currently invited to a room when they want to leave the room looks like the following: https://github.com/matrix-org/synapse/blob/f737368a26bb9eea401fcc3a5bdd7e0b59e91f09/synapse/handlers/room_member.py#L518-L540 It calls `get_invite_for_local_user_in_room`, which will actually query *all* rooms the user has been invited to, before iterating over them and matching via the room ID. It will then return a tuple of a lot of information which we pull the event ID out of. I need to do a similar check for knocking, but this code wasn't very efficient. I then tried to write a different implementation using `StateHandler.get_current_state` but this actually didn't work as we haven't *joined* the room yet - we've only been invited to it. That means that only certain tables in Synapse have our desired `invite` membership state. One of those tables is `local_current_membership`. So I wrote a store method that just queries that table instead
* | Add additional type hints to HTTP client. (#8812)Patrick Cloke2020-11-255-149/+142
| | | | | | | | This also removes some duplicated code between the simple HTTP client and matrix federation client.
* | Support trying multiple localparts for OpenID Connect. (#8801)Patrick Cloke2020-11-256-136/+330
| | | | | | | | Abstracts the SAML and OpenID Connect code which attempts to regenerate the localpart of a matrix ID if it is already in use.
* | Add type hints to matrix federation client / agent. (#8806)Patrick Cloke2020-11-256-195/+231
| |
* | Clarify documentation of the admin list media API (#8795)Dirk Klimpel2020-11-242-0/+2
| | | | | | Clarify that the list media API only shows media from unencrypted events.
* | Add a script to sign arbitrary json objects. (#8772)Richard van der Hoff2020-11-243-0/+129
| |
* | Update turn-howto (#8779)Richard van der Hoff2020-11-242-8/+124
| | | | | | Some hopefully-useful notes on setting up a turnserver.
* | Properly report user-agent/IP during registration of SSO users. (#8784)Patrick Cloke2020-11-236-122/+173
| | | | | | | | | | This also expands type-hints to the SSO and registration code. Refactors the CAS code to more closely match OIDC/SAML.
* | Fix synctl and duplicate worker spawning (#8798)Waylon Cude2020-11-232-0/+8
| | | | | | | | | | | | | | | | | | Synctl did not check if a worker thread was already running when using `synctl start` and would naively start a fresh copy. This would sometimes lead to cases where many duplicate copies of a single worker would run. This fix adds a pid check when starting worker threads and synctl will now refuse to start individual workers if they're already running.
* | Improve logging of the mapping from SSO IDs to Matrix IDs. (#8773)Andrew Morgan2020-11-233-5/+13
| |
* | INSTALL: Fix setting content-type on well-known (#8793)Daniele Sluijters2020-11-232-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `add_header` nginx will literally add a header. If a `content-type` header is already configured (for example through a server wide default), this means we end up with 2 content-type headers, like so: ``` content-type: text/html content-type: application/json access-control-allow-origin: * ``` That doesn't make sense. Instead, we want the content type of that block to only be `application/json` which we can achieve using `default_type` instead. Signed-off-by: Daniele Sluijters <daenney@users.noreply.github.com>
* | fix MDMatthew Hodgson2020-11-221-2/+2
| |
* | fix ancient changelog to be MDMatthew Hodgson2020-11-221-150/+146
| |
* | Improve error checking for OIDC/SAML mapping providers (#8774)Patrick Cloke2020-11-197-29/+137
| | | | | | | | | | | | Checks that the localpart returned by mapping providers for SAML and OIDC are valid before registering new users. Extends the OIDC tests for existing users and invalid data.
* | SAML: Allow specifying the IdP entityid to use. (#8630)Ben Banfield-Zanin2020-11-194-1/+21
| | | | | | | | If the SAML metadata includes multiple IdPs it is necessary to specify which IdP to redirect users to for authentication.
* | Consistently use room_id from federation request body (#8776)Richard van der Hoff2020-11-195-54/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | * Consistently use room_id from federation request body Some federation APIs have a redundant `room_id` path param (see https://github.com/matrix-org/matrix-doc/issues/2330). We should make sure we consistently use either the path param or the body param, and the body param is easier. * Kill off some references to "context" Once upon a time, "rooms" were known as "contexts". I think this kills of the last references to "contexts".
* | Improve appservice handler to send only the most recent read receipts when ↵Will Hunt2020-11-184-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no stream_id is stored. (#8744) * Make this line debug (it's noisy) * Don't include from_key for presence if we are at 0 * Limit read receipts for all rooms to 100 * changelog.d/8744.bugfix * Allow from_key to be None * Update 8744.bugfix * The from_key is superflous * Update comment
* | Fix tests on develop (#8777)Erik Johnston2020-11-182-16/+1
| | | | | | This was broken due to #8617 and #8761.
* | SAML: Document allowing a clock/time difference from IdP (#8731)Marcus Schopen2020-11-183-0/+13
| | | | | | | | Updates the sample configuration with the pysaml2 configuration for accepting clock skew/drift between the homeserver and IdP.
* | Merge branch 'master' into developErik Johnston2020-11-186-4/+28
|\|
| * Update changelog v1.23.0 release-v1.23.0Erik Johnston2020-11-181-1/+1
| |
| * Fix formatting in upgradesErik Johnston2020-11-181-1/+1
| |
| * Update changelogErik Johnston2020-11-181-0/+4
| |
| * 1.23.0Erik Johnston2020-11-184-2/+16
| |
| * Cap the version of prometheus_client to <v0.9.0 in the dockerfile (#8767)Andrew Morgan2020-11-173-1/+7
| | | | | | Short-term fix for https://github.com/matrix-org/synapse/issues/8766.
* | Merge pull request #8761 from matrix-org/rav/test_request_renderingRichard van der Hoff2020-11-1759-813/+103
|\ \ | | | | | | Make `make_request` actually render the request
| * | changelogRichard van der Hoff2020-11-161-0/+1
| | |
| * | Remove redundant `HomeserverTestCase.render`Richard van der Hoff2020-11-1644-629/+0
| | |
| * | Remove redundant calls to `render()`Richard van der Hoff2020-11-1613-106/+32
| | |
| * | Make `make_request` actually render the requestRichard van der Hoff2020-11-169-68/+57
| | | | | | | | | | | | | | | | | | remove the stubbing out of `request.process`, so that `requestReceived` also renders the request via the appropriate resource. Replace render() with a stub for now.
| * | Fix the URL in the URL preview testsRichard van der Hoff2020-11-161-19/+22
| | | | | | | | | | | | the preview resource is mointed at preview_url, not url_preview
* | | Abstract shared SSO code. (#8765)Patrick Cloke2020-11-176-120/+159
| | | | | | | | | De-duplicates code between the SAML and OIDC implementations.
* | | a comma too much (#8771)chagai952020-11-172-1/+2
| | | | | | | | | Signed-off-by: Chagai Friedlander chagai95@gmail.com
* | | Use TYPE_CHECKING instead of magic MYPY variable. (#8770)Patrick Cloke2020-11-174-9/+7
| | |
* | | Add admin API for logging in as a user (#8617)Erik Johnston2020-11-1725-87/+475
|/ /
* | Merge pull request #8757 from matrix-org/rav/pass_site_to_make_requestRichard van der Hoff2020-11-1617-88/+228
|\ \ | | | | | | Pass a Site into `make_request`
| * | fixup testRichard van der Hoff2020-11-161-0/+1
| | |
| * | Merge branch 'develop' into rav/pass_site_to_make_requestRichard van der Hoff2020-11-1689-120/+147
| |\ \
| * | | changelogRichard van der Hoff2020-11-151-0/+1
| | | |
| * | | use global make_request() directly where we have a custom ResourceRichard van der Hoff2020-11-1511-60/+154
| | | | | | | | | | | | | | | | | | | | | | | | Where we want to render a request against a specific Resource, call the global make_request() function rather than the one in HomeserverTestCase, allowing us to pass in an appropriate `Site`.
| * | | fix dict handling for make_request()Richard van der Hoff2020-11-152-3/+2
| | | |
| * | | pass a Site into make_requestRichard van der Hoff2020-11-154-20/+68
| | | |
| * | | pass a Site into RestHelperRichard van der Hoff2020-11-152-6/+7
| | | |
* | | | Move `wait_until_result` into `FakeChannel` (#8758)Richard van der Hoff2020-11-163-25/+24
| | | | | | | | | | | | | | | | FakeChannel has everything we need, and this more accurately models the real flow.
* | | | Generalise _locally_reject_invite (#8751)Andrew Morgan2020-11-162-17/+20
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | `_locally_reject_invite` generates an out-of-band membership event which can be passed to clients, but not other homeservers. This is used when we fail to reject an invite over federation. If this happens, we instead just generate a leave event locally and send it down /sync, allowing clients to reject invites even if we can't reach the remote homeserver. A similar flow needs to be put in place for rescinding knocks. If we're unable to contact any remote server from the room we've tried to knock on, we'd still like to generate and store the leave event locally. Hence the need to reuse, and thus generalise, this method. Separated from #6739.
* | | Rename `create_test_json_resource` to `create_test_resource` (#8759)Richard van der Hoff2020-11-167-23/+16
| | | | | | | | | | | | | | | The root resource isn't necessarily a JsonResource, so rename this method accordingly, and update a couple of test classes to use the method rather than directly manipulating self.resource.
* | | Add a `custom_headers` param to `make_request` (#8760)Richard van der Hoff2020-11-164-11/+24
| | | | | | | | | | | | Some tests want to set some custom HTTP request headers, so provide a way to do that before calling requestReceived().
* | | Clarify the usecase for an msisdn delegate (#8734)Adrian Wannenmacher2020-11-143-4/+7
| | | | | | | | | Signed-off-by: Adrian Wannenmacher <tfld@tfld.dev>
* | | Generalise _maybe_store_room_on_invite (#8754)Andrew Morgan2020-11-134-13/+18
| |/ |/| | | | | | | | | | | | | | | There's a handy function called maybe_store_room_on_invite which allows us to create an entry in the rooms table for a room and its version for which we aren't joined to yet, but we can reference when ingesting events about. This is currently used for invites where we receive some stripped state about the room and pass it down via /sync to the client, without us being in the room yet. There is a similar requirement for knocking, where we will eventually do the same thing, and need an entry in the rooms table as well. Thus, reusing this function works, however its name needs to be generalised a bit. Separated out from #6739.
* | Fix changelog v1.23.0rc1Erik Johnston2020-11-131-4/+4
| |
* | Fix changelogErik Johnston2020-11-131-2/+2
| |
* | 1.23.0rc1Erik Johnston2020-11-1371-70/+87
|/
* Migrate documentation `docs/admin_api/event_reports` to markdown (#8742)Dirk Klimpel2020-11-133-165/+173
| | | Related to #8714. `event_reports.rst` was introduced in Synapse 1.21.0.
* SAML: add <mdui:UIInfo> element examples (#8718)Marcus Schopen2020-11-133-0/+45
| | | add some mdui:UIInfo element examples for saml2_config in homeserver.yaml
* Updating README.rst (#8746)chagai952020-11-132-6/+11
| | | Minor corrections and advice... Should help beginners.
* Add metrics for tracking 3PID /requestToken requests. (#8712)Erik Johnston2020-11-134-0/+33
| | | | | | The main use case is to see how many requests are being made, and how many are second/third/etc attempts. If there are large number of retries then that likely indicates a delivery problem.
* Fix port script so that it can be run again after failure. (#8755)Erik Johnston2020-11-132-30/+55
| | | | | | | If the script fails (or is CTRL-C'ed) between porting some of the events table and copying of the sequences then the port script will immediately die if run again due to the postgres DB having inconsistencies between sequences and tables. The fix is to move the porting of sequences to before porting the tables, so that there is never a period where the Postgres DB is inconsistent. To do that we need to change how we port the sequences so that it calculates the values from the SQLite DB rather than the Postgres DB. Fixes #8619
* Cache event ID to auth event IDs lookups (#8752)Erik Johnston2020-11-132-12/+71
| | | | | This should hopefully speed up `get_auth_chain_difference` a bit in the case of repeated state res on the same rooms. `get_auth_chain_difference` does a breadth first walk of the auth graphs by repeatedly looking up events' auth events. Different state resolutions on the same room will end up doing a lot of the same event to auth events lookups, so by caching them we should speed things up in cases of repeated state resolutions on the same room.
* Enable reconnection in DB pool (#8726)Erik Johnston2020-11-122-1/+7
| | | | | | `adbapi.ConnectionPool` let's you turn on auto reconnect of DB connections. This is off by default. As far as I can tell if its not enabled dead connections never get removed from the pool. Maybe helps #8574
* Fix port script fails when DB has no backfilled events. (#8729)Erik Johnston2020-11-112-7/+6
| | | Fixes #8618
* Fix port script to handle foreign key constraints (#8730)Erik Johnston2020-11-113-6/+63
|
* Check support room has only two users before sending a notice (#8728)Will Hunt2020-11-112-1/+2
| | | | | | | | | | | * Check support room has only two users * Create 8728.bugfix * Update synapse/server_notices/server_notices_manager.py Co-authored-by: Erik Johnston <erik@matrix.org> Co-authored-by: Erik Johnston <erik@matrix.org>
* Better error message when a remote resource uses invalid Content-Type (#8719)Andrew Morgan2020-11-112-2/+9
|
* Catch exceptions in password_providers (#8636)Nicolai Søborg2020-11-112-4/+10
| | | Signed-off-by: Nicolai Søborg <git@xn--sb-lka.org>
* Notes on SSO logins and media_repository worker (#8701)Marcus Schopen2020-11-062-0/+6
| | | | | | | If SSO login is used (e.g. SAML) in a multi worker setup, it should be mentioned that currently all SAML logins must run on the same worker, see https://github.com/matrix-org/synapse/issues/7530 Also, if you are using different ports (for example 443 and 8448) in a reverse proxy for client and federation, the path `/_matrix/media` on the client and federation port must point to the listener of the `media_repository` worker, otherwise you'll get a 404 on the federation port for the path `/_matrix/media`, if a remote server is trying to get the media object on federation port, see https://github.com/matrix-org/synapse/issues/8695
* Add documentation about documentation to CONTRIBUTING.md (#8714)Andrew Morgan2020-11-062-0/+19
| | | | | | This PR adds some documentation that: * Describes who the audience for the `docs/`, `docs/dev/` and `docs/admin/` directories are, as well as Synapse's wiki page. * Stresses that we'd like all documentation to be down in markdown.
* Fix SIGHUP handler (#8697)Richard van der Hoff2020-11-062-3/+3
| | | | | | | Fixes: ``` builtins.TypeError: _reload_logging_config() takes 1 positional argument but 2 were given ```
* Add an admin API for users' media statistics (#8700)Dirk Klimpel2020-11-056-0/+820
| | | | | | | | Add `GET /_synapse/admin/v1/statistics/users/media` to get statisics about local media usage by users. Related to #6094 It is the first API for statistics. Goal is to avoid/reduce usage of sql queries like [Wiki analyzing Synapse](https://github.com/matrix-org/synapse/wiki/SQL-for-analyzing-Synapse-PostgreSQL-database-stats) Signed-off-by: Dirk Klimpel dirk@klimpel.org
* Add `displayname` to Shared-Secret Registration for admins (#8722)Dirk Klimpel2020-11-055-9/+138
| | | Add `displayname` to Shared-Secret Registration for admins to `POST /_synapse/admin/v1/register`
* Consolidate purge table lists to prevent desyncronisation (#8713)Andrew Morgan2020-11-042-67/+39
| | | I idly noticed that these lists were out of sync with each other, causing us to miss a table in a test case (`local_invites`). Let's consolidate this list instead to prevent this from happening in the future.
* Remove the "draft" status of the Room Details Admin API (#8702)Dirk Klimpel2020-11-032-3/+2
| | | Fixes #8550
* Block clients from sending server ACLs that lock the local server out. (#8708)Erik Johnston2020-11-035-9/+80
| | | Fixes #4042
* Document how to set up multiple event persisters (#8706)Erik Johnston2020-11-032-0/+13
|
* grammarMatthew Hodgson2020-11-021-1/+1
|
* Improve error messages of non-str displayname/avatar_url (#8705)Andrew Morgan2020-11-022-2/+7
| | | | | | | | This PR fixes two things: * Corrects the copy/paste error of telling the client their displayname is wrong when they are submitting an `avatar_url`. * Returns a `M_INVALID_PARAM` instead of `M_UNKNOWN` for non-str type parameters. Reported by @t3chguy.
* Add base pushrule to notify for jitsi conferences (#8286)David Baker2020-11-022-0/+25
| | | This could be customised to trigger a different kind of notification in the future, but for now it's a normal non-highlight one.
* Use Python 3.8 in Docker images by default (#8698)Dan Callahan2020-11-022-1/+2
| | | | | | | This bumps us closer to current Python without going all the way to 3.9. Fixes #8674 Signed-off-by: Dan Callahan <danc@element.io>
* Improve start time by adding index to e2e_cross_signing_keys (#8694)Erik Johnston2020-11-024-2/+36
| | | We do a `SELECT MAX(stream_id) FROM e2e_cross_signing_keys` on startup.
* typoMatthew Hodgson2020-11-021-1/+1
|
* Fix typos in systemd-with-workers docAndrew Morgan2020-11-021-2/+2
|
* Fix typo in workers docAndrew Morgan2020-11-021-1/+1
|
* Fix error handling around when completing an AS transaction (#8693)Brendan Abolivier2020-10-302-1/+2
|
* Merge branch 'master' into developErik Johnston2020-10-305-3/+17
|\
| * Fix changelog v1.22.1 release-v1.22.1Erik Johnston2020-10-301-2/+2
| |
| * use correct versionErik Johnston2020-10-302-2/+2
| |
| * 1.22.1Erik Johnston2020-10-304-2/+16
| |
* | Merge branch 'release-v1.22.1' into developErik Johnston2020-10-300-0/+0
|\|
| * Merge pull request #8678 from matrix-org/rav/fix_frozen_eventsRichard van der Hoff2020-10-307-40/+32
| | | | | | Fix serialisation errors when using third-party event rules.
| * Tie together matches_user_in_member_list and get_users_in_room caches (#8676)Will Hunt2020-10-302-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | * Tie together matches_user_in_member_list and get_users_in_room * changelog * Remove type to fix mypy * Add `on_invalidate` to the function signature in the hopes that may make things work well * Remove **kwargs * Update 8676.bugfix
* | Improve the sample config for SSO (OIDC, SAML, and CAS). (#8635)Patrick Cloke2020-10-305-104/+157
| |
* | Implement and use an @lru_cache decorator (#8595)Richard van der Hoff2020-10-304-61/+272
| | | | | | We don't always need the full power of a DeferredCache.
* | Fail test cases if they fail to await all awaitables (#8690)Patrick Cloke2020-10-303-2/+39
| |
* | Fix race for concurrent downloads of remote media. (#8682)Erik Johnston2020-10-306-71/+431
| | | | | | Fixes #6755
* | Fix optional parameter in stripped state storage method (#8688)Andrew Morgan2020-10-302-1/+2
| | | | | | Missed in #8671.
* | Fix unit tests (#8689)Erik Johnston2020-10-292-1/+2
| | | | | | | | | | * Fix unit tests * Newsfile
* | Tie together matches_user_in_member_list and get_users_in_room caches (#8676)Will Hunt2020-10-292-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | * Tie together matches_user_in_member_list and get_users_in_room * changelog * Remove type to fix mypy * Add `on_invalidate` to the function signature in the hopes that may make things work well * Remove **kwargs * Update 8676.bugfix
* | Gracefully handle a pending logging connection during shutdown. (#8685)Patrick Cloke2020-10-295-10/+36
| |
* | Add ability for access tokens to belong to one user but grant access to ↵Erik Johnston2020-10-2922-138/+197
| | | | | | | | | | | | | | | | | | | | another user. (#8616) We do it this way round so that only the "owner" can delete the access token (i.e. `/logout/all` by the "owner" also deletes that token, but `/logout/all` by the "target user" doesn't). A future PR will add an API for creating such a token. When the target user and authenticated entity are different the `Processed request` log line will be logged with a: `{@admin:server as @bob:server} ...`. I'm not convinced by that format (especially since it adds spaces in there, making it harder to use `cut -d ' '` to chop off the start of log lines). Suggestions welcome.
* | Fix cache call signature to accept `on_invalidate`. (#8684)Erik Johnston2020-10-293-16/+35
| | | | | | Cached functions accept an `on_invalidate` function, which we failed to add to the type signature. It's rarely used in the files that we have typed, which is why we haven't noticed it before.
* | Use `%r` rather than `%s` for stringifying events (#8679)Richard van der Hoff2020-10-292-2/+3
| | | | | | | | otherwise non-state events get written as `<FrozenEvent ... state_key='None'>` which is indistinguishable from state events with the actual state_key `None`.
* | Optimise createRoom with multiple invites (#8559)Richard van der Hoff2020-10-293-13/+25
| | | | | | | | | | By not dropping the membership lock between invites, we can stop joins from grabbing the lock when we're half-done and slowing the whole thing down.
* | Support generating structured logs in addition to standard logs. (#8607)Patrick Cloke2020-10-2919-1011/+706
| | | | | | | | | | | | | | This modifies the configuration of structured logging to be usable from the standard Python logging configuration. This also separates the formatting of logs from the transport allowing JSON logs to files or standard logs to sockets.
* | Don't require hiredis to run unit tests (#8680)Erik Johnston2020-10-292-1/+11
| |
* | Merge pull request #8678 from matrix-org/rav/fix_frozen_eventsRichard van der Hoff2020-10-287-40/+32
|\ \ | | | | | | Fix serialisation errors when using third-party event rules.
| * | remove unused importsRichard van der Hoff2020-10-281-2/+0
| | |
| * | Remove frozendict_json_encoder and support frozendicts everywhereRichard van der Hoff2020-10-287-38/+32
| |/ | | | | | | | | | | Not being able to serialise `frozendicts` is fragile, and it's annoying to have to think about which serialiser you want. There's no real downside to supporting frozendicts, so let's just have one json encoder.
* | Add type hints to application services. (#8655)Patrick Cloke2020-10-285-79/+122
| |
* | Add an admin APIs to allow server admins to list users' pushers (#8610)Dirk Klimpel2020-10-285-1/+259
| | | | | | Add an admin API `GET /_synapse/admin/v1/users/<user_id>/pushers` like https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-pushers
* | Run mypy as part of the lint.sh script. (#8633)kleph2020-10-283-2/+4
| |
* | Don't pull event from DB when handling replication traffic. (#8669)Erik Johnston2020-10-285-31/+87
| | | | | | | | | | I was trying to make it so that we didn't have to start a background task when handling RDATA, but that is a bigger job (due to all the code in `generic_worker`). However I still think not pulling the event from the DB may help reduce some DB usage due to replication, even if most workers will simply go and pull that event from the DB later anyway. Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
* | Tell Black to format code for Python 3.5 (#8664)Dan Callahan2020-10-2710-11/+12
| | | | | | | | | | | | | | | | This allows trailing commas in multi-line arg lists. Minor, but we might as well keep our formatting current with regard to our minimum supported Python version. Signed-off-by: Dan Callahan <danc@element.io>
* | Minor updates to docs on how to run tests (#8666)Dan Callahan2020-10-273-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test runner isn't present in the `[all]` set of extras, so the previous instructions did not work without also installing `[test]`. Note that this does not include the `[lint]` extras, since those do not install on all supported Python versions (specifically, isort 5.x requires Python 3.6, while we still support 3.5). Instructions for that are included in our pull request template, so we should be fine there. I've also dropped the `--no-use-pep517` arg to `pip install` since it seems to have been added to address a temporary regression in pip 19.1 which was fixed in pip 19.1.1 the following month. Lastly, updated the example output of the test suite to set more realistic expectations around run time. Signed-off-by: Dan Callahan <danc@element.io>
* | Note support for Python 3.9 (#8665)Dan Callahan2020-10-274-2/+4
| | | | | | | | | | As expected, all tests pass locally without modification. Signed-off-by: Dan Callahan <danc@element.io>
* | Cross-link documentation to the prometheus recording rules. (#8667)Michael Kaye2020-10-273-1/+4
| |
* | Abstract code for stripping room state into a separate method (#8671)Andrew Morgan2020-10-273-29/+61
| | | | | | | | | | | | | | | | | | | | | | This is a requirement for [knocking](https://github.com/matrix-org/synapse/pull/6739), and is abstracting some code that was originally used by the invite flow. I'm separating it out into this PR as it's a fairly contained change. For a bit of context: when you invite a user to a room, you send them [stripped state events](https://matrix.org/docs/spec/server_server/unstable#put-matrix-federation-v2-invite-roomid-eventid) as part of `invite_room_state`. This is so that their client can display useful information such as the room name and avatar. The same requirement applies to knocking, as it would be nice for clients to be able to display a list of rooms you've knocked on - room name and avatar included. The reason we're sending membership events down as well is in the case that you are invited to a room that does not have an avatar or name set. In that case, the client should use the displayname/avatar of the inviter. That information is located in the inviter's membership event. This is optional as knocks don't really have any user in the room to link up to. When you knock on a room, your knock is sent by you and inserted into the room. It wouldn't *really* make sense to show the avatar of a random user - plus it'd be a data leak. So I've opted not to send membership events to the client here. The UX on the client for when you knock on a room without a name/avatar is a separate problem. In essence this is just moving some inline code to a reusable store method.
* | Don't unnecessarily start bg process in replication sending loop. (#8670)Erik Johnston2020-10-272-0/+11
| |