Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Andrew Morgan | 2022-01-19 | 3 | -30/+30 |
|\ | |||||
| * | Fix missing app variable in mail subject (#11745) | David Robertson | 2022-01-13 | 1 | -2/+2 |
| | | | | | | | | | | documentation claims that you can use the %(app)s variable in password_reset and email_validation subjects, but if you do you end up with an error 500 Co-authored-by: br4nnigan <10244835+br4nnigan@users.noreply.github.com> | ||||
| * | Use auto_attribs/native type hints for attrs classes. (#11692) | Patrick Cloke | 2022-01-13 | 2 | -28/+28 |
| | | |||||
* | | Merge branch 'release-v1.50' into matrix-org-hotfixes | Olivier Wilkinson (reivilibre) | 2022-01-05 | 6 | -43/+46 |
|\| | |||||
| * | Re-apply: Move glob_to_regex and re_word_boundary to matrix-python-common ↵ | reivilibre | 2022-01-05 | 1 | -3/+4 |
| | | | | | | | | | | #11505 (#11687) Co-authored-by: Sean Quah <seanq@element.io> | ||||
| * | Add type hints to event_push_actions. (#11594) | Patrick Cloke | 2021-12-21 | 4 | -38/+36 |
| | | |||||
| * | Ensure emails are canonicalized before fetching associated user. (#11547) | Patrick Cloke | 2021-12-10 | 1 | -1/+4 |
| | | | | | | | | This should fix pushers with an email in non-canonical form is used as the pushkey. | ||||
| * | Add a constant for receipt types (m.read). (#11531) | Patrick Cloke | 2021-12-08 | 1 | -1/+2 |
| | | | | | | And expand some type hints in the receipts storage module. | ||||
* | | Merge branch 'release-v1.49' into matrix-org-hotfixes | Sean Quah | 2021-12-07 | 4 | -34/+187 |
|\| | |||||
| * | Revert "Move `glob_to_regex` and `re_word_boundary` to ↵ | Sean Quah | 2021-12-07 | 1 | -4/+3 |
| | | | | | | | | | | | | `matrix-python-common` (#11505) (#11527) This reverts commit a77c36989785c0d5565ab9a1169f4f88e512ce8a. | ||||
| * | Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505) | Sean Quah | 2021-12-06 | 1 | -3/+4 |
| | | |||||
| * | Improved push typing (#11409) | Marcus | 2021-11-30 | 4 | -34/+187 |
| | | | | | | Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com> | ||||
* | | Merge branch 'release-v1.47' into matrix-org-hotfixes | Olivier Wilkinson (reivilibre) | 2021-11-09 | 2 | -6/+8 |
|\| | |||||
| * | Add remaining type hints to `synapse.events`. (#11098) | Patrick Cloke | 2021-11-02 | 2 | -6/+8 |
| | | |||||
* | | Merge branch 'release-v1.45' into matrix-org-hotfixes | Brendan Abolivier | 2021-10-12 | 5 | -9/+23 |
|\| | |||||
| * | disallow-untyped-defs for synapse.push (#11023) | David Robertson | 2021-10-11 | 4 | -8/+22 |
| | | |||||
| * | Relax `ignore-missing-imports` for modules that have stubs now and update ↵ | David Robertson | 2021-10-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | mypy (#11006) Updating mypy past version 0.9 means that third-party stubs are no-longer distributed with typeshed. See http://mypy-lang.blogspot.com/2021/06/mypy-0900-released.html for details. We therefore pull in stub packages in setup.py Additionally, some modules that we were previously ignoring import failures for now have stubs. So let's use them. The rest of this change consists of fixups to make the newer mypy + stubs pass CI. Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2021-09-28 | 3 | -3/+5 |
|\| | |||||
| * | Encode JSON responses on a thread in C, mk2 (#10905) | Erik Johnston | 2021-09-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Currently we use `JsonEncoder.iterencode` to write JSON responses, which ensures that we don't block the main reactor thread when encoding huge objects. The downside to this is that `iterencode` falls back to using a pure Python encoder that is *much* less efficient and can easily burn a lot of CPU for huge responses. To fix this, while still ensuring we don't block the reactor loop, we encode the JSON on a threadpool using the standard `JsonEncoder.encode` functions, which is backed by a C library. Doing so, however, requires `respond_with_json` to have access to the reactor, which it previously didn't. There are two ways of doing this: 1. threading through the reactor object, which is a bit fiddly as e.g. `DirectServeJsonResource` doesn't currently take a reactor, but is exposed to modules and so is a PITA to change; or 2. expose the reactor in `SynapseRequest`, which requires updating a bunch of servlet types. I went with the latter as that is just a mechanical change, and I think makes sense as a request already has a reactor associated with it (via its http channel). | ||||
| * | Use direct references for configuration variables (part 4). (#10893) | Patrick Cloke | 2021-09-23 | 1 | -1/+3 |
| | | |||||
| * | Use direct references for some configuration variables (part 3) (#10885) | Patrick Cloke | 2021-09-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This avoids the overhead of searching through the various configuration classes by directly referencing the class that the attributes are in. It also improves type hints since mypy can now resolve the types of the configuration variables. | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | David Robertson | 2021-09-22 | 4 | -11/+11 |
|\| | |||||
| * | Use direct references for some configuration variables (part 2) (#10812) | Patrick Cloke | 2021-09-15 | 4 | -11/+11 |
| | | |||||
* | | Merge branch 'release-v1.43' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2021-09-14 | 1 | -7/+7 |
|\| | | | | | | | matrix-org-hotfixes | ||||
| * | Use direct references for some configuration variables (#10798) | Patrick Cloke | 2021-09-13 | 1 | -7/+7 |
| | | | | | | | | Instead of proxying through the magic getter of the RootConfig object. This should be more performant (and is more explicit). | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2021-09-10 | 1 | -1/+23 |
|\| | |||||
| * | Correctly include room avatars in email notifications (#10658) | David Robertson | 2021-09-01 | 1 | -1/+23 |
| | | | | | | | | | | | | | | | | Judging by the template, this was intended ages ago, but we never actually passed an avatar URL to the template. So let's provide one. Closes #1546. Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Olivier Wilkinson (reivilibre) | 2021-08-03 | 2 | -2/+17 |
|\| | |||||
| * | Remove shebang line from module files (#10415) | V02460 | 2021-07-29 | 1 | -1/+0 |
| | | | | | | Signed-off-by: Kai A. Hiller <V02460@gmail.com> | ||||
| * | Update the notification email subject when invited to a space. (#10426) | Patrick Cloke | 2021-07-21 | 1 | -1/+17 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Andrew Morgan | 2021-07-20 | 1 | -16/+8 |
|\| | |||||
| * | Add a module type for account validity (#9884) | Brendan Abolivier | 2021-07-16 | 1 | -16/+8 |
| | | | | | | | | | | This adds an API for third-party plugin modules to implement account validity, so they can provide this feature instead of Synapse. The module implementing the current behaviour for this feature can be found at https://github.com/matrix-org/synapse-email-account-validity. To allow for a smooth transition between the current feature and the new module, hooks have been added to the existing account validity endpoints to allow their behaviours to be overridden by a module. | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2021-07-16 | 9 | -21/+21 |
|\| | |||||
| * | Use inline type hints in various other places (in `synapse/`) (#10380) | Jonathan de Jong | 2021-07-15 | 9 | -21/+21 |
| | | |||||
* | | Merge branch 'release-v1.38' into matrix-org-hotfixes | Brendan Abolivier | 2021-07-06 | 1 | -2/+2 |
|\| | |||||
| * | Move methods involving event authentication to EventAuthHandler. (#10268) | Patrick Cloke | 2021-07-01 | 1 | -2/+2 |
| | | | | | | Instead of mixing them with user authentication methods. | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2021-05-25 | 1 | -45/+8 |
|\| | |||||
| * | Split multiplart email sending into a dedicated handler (#9977) | Brendan Abolivier | 2021-05-17 | 1 | -45/+8 |
| | | | | | | Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | ||||
* | | Merge branch 'release-v1.33.2' into matrix-org-hotfixes | Brendan Abolivier | 2021-05-11 | 1 | -52/+3 |
|\| | |||||
| * | Merge pull request from GHSA-x345-32rc-8h85 | Richard van der Hoff | 2021-05-11 | 1 | -52/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tests for push rule pattern matching * tests for acl pattern matching * factor out common `re.escape` * Factor out common re.compile * Factor out common anchoring code * add word_boundary support to `glob_to_regex` * Use `glob_to_regex` in push rule evaluator NB that this drops support for character classes. I don't think anyone ever used them. * Improve efficiency of globs with multiple wildcards The idea here is that we compress multiple `*` globs into a single `.*`. We also need to consider `?`, since `*?*` is as hard to implement efficiently as `**`. * add assertion on regex pattern * Fix mypy * Simplify glob_to_regex * Inline the glob_to_regex helper function Signed-off-by: Dan Callahan <danc@element.io> * Moar comments Signed-off-by: Dan Callahan <danc@element.io> Co-authored-by: Dan Callahan <danc@element.io> | ||||
* | | Revert "improve efficiency of _glob_to_re" | Brendan Abolivier | 2021-05-11 | 1 | -2/+1 |
| | | | | | | | | This reverts commit edac710bc0c4dc1cd226d9ffe73a00b42c2b67d8. | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Andrew Morgan | 2021-04-27 | 3 | -73/+105 |
|\| | |||||
| * | Only store data in caches, not "smart" objects (#9845) | Erik Johnston | 2021-04-23 | 1 | -69/+92 |
| | | |||||
| * | Limit length of accepted email addresses (#9855) | Erik Johnston | 2021-04-22 | 1 | -1/+8 |
| | | |||||
| * | Port "Allow users to click account renewal links multiple times without ↵ | Andrew Morgan | 2021-04-19 | 1 | -3/+5 |
| | | | | | | | | | | hitting an 'Invalid Token' page #74" from synapse-dinsic (#9832) This attempts to be a direct port of https://github.com/matrix-org/synapse-dinsic/pull/74 to mainline. There was some fiddling required to deal with the changes that have been made to mainline since (mainly dealing with the split of `RegistrationWorkerStore` from `RegistrationStore`, and the changes made to `self.make_request` in test code). | ||||
* | | improve efficiency of _glob_to_re | Richard van der Hoff | 2021-04-19 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Andrew Morgan | 2021-04-19 | 12 | -12/+0 |
|\| | |||||
| * | Remove redundant "coding: utf-8" lines (#9786) | Jonathan de Jong | 2021-04-14 | 12 | -12/+0 |
| | | | | | | | | | | | | | | Part of #9744 Removes all redundant `# -*- coding: utf-8 -*-` lines from files, as python 3 automatically reads source code as utf-8 now. `Signed-off-by: Jonathan de Jong <jonathan@automatia.nl>` | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2021-03-24 | 7 | -8/+8 |
|\| | |||||
| * | Import HomeServer from the proper module. (#9665) | Patrick Cloke | 2021-03-23 | 7 | -7/+7 |
| | | |||||
| * | Fixed code misc. quality issues (#9649) | Ankit Dobhal | 2021-03-22 | 1 | -1/+1 |
| | | | | | | | | | | - Merge 'isinstance' calls. - Remove unnecessary dict call outside of comprehension. - Use 'sys.exit()' calls. | ||||
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2021-03-16 | 1 | -2/+2 |
|\| | |||||
| * | Fix additional type hints from Twisted 21.2.0. (#9591) | Patrick Cloke | 2021-03-12 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/release-v1.29.0' into matrix-org-hotfixes | Erik Johnston | 2021-03-04 | 1 | -2/+3 |
|\| | |||||
| * | Fix additional type hints from Twisted upgrade. (#9518) | Patrick Cloke | 2021-03-03 | 1 | -2/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2021-02-26 | 2 | -8/+28 |
|\| | |||||
| * | Test that we require validated email for email pushers (#9496) | Erik Johnston | 2021-02-25 | 1 | -0/+6 |
| | | |||||
| * | Clean up `ShardedWorkerHandlingConfig` (#9466) | Erik Johnston | 2021-02-24 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Split ShardedWorkerHandlingConfig This is so that we have a type level understanding of when it is safe to call `get_instance(..)` (as opposed to `should_handle(..)`). * Remove special cases in ShardedWorkerHandlingConfig. `ShardedWorkerHandlingConfig` tried to handle the various different ways it was possible to configure federation senders and pushers. This led to special cases that weren't hit during testing. To fix this the handling of the different cases is moved from there and `generic_worker` into the worker config class. This allows us to have the logic in one place and allows the rest of the code to ignore the different cases. | ||||
| * | Fix deleting pushers when using sharded pushers. (#9465) | Erik Johnston | 2021-02-22 | 2 | -7/+19 |
| | | |||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2021-02-17 | 5 | -66/+214 |
|\| | |||||
| * | Update black, and run auto formatting over the codebase (#9381) | Eric Eastwood | 2021-02-16 | 4 | -28/+37 |
| | | | | | | | | | | | | | | - Update black version to the latest - Run black auto formatting over the codebase - Run autoformatting according to [`docs/code_style.md `](https://github.com/matrix-org/synapse/blob/80d6dc9783aa80886a133756028984dbf8920168/docs/code_style.md) - Update `code_style.md` docs around installing black to use the correct version | ||||
| * | Fix some typos. | Patrick Cloke | 2021-02-12 | 1 | -1/+1 |
| | | |||||
| * | Handle empty rooms when generating email notifications. (#9257) | Patrick Cloke | 2021-02-04 | 1 | -37/+176 |
| | | | | | | | | | | | | Fixes some exceptions if the room state isn't quite as expected. If the expected state events aren't found, try to find them in the historical room state. If they still aren't found, fallback to a reasonable, although ugly, value. | ||||
* | | Merge remote-tracking branch 'origin/release-v1.27.0' into matrix-org-hotfixes | Erik Johnston | 2021-02-02 | 1 | -124/+189 |
|\| | |||||
| * | Refactor email summary generation. (#9260) | Patrick Cloke | 2021-02-01 | 1 | -122/+173 |
| | | | | | | | | | | | | * Fixes a case where no summary text was returned. * The use of messages_from_person vs. messages_from_person_and_others was tweaked to depend on whether there was 1 sender or multiple senders, not based on if there was 1 room or multiple rooms. | ||||
| * | Clean-up the template loading code. (#9200) | Patrick Cloke | 2021-01-27 | 1 | -2/+16 |
| | | | | | | | | | | * Enables autoescape by default for HTML files. * Adds a new read_template method for reading a single template. * Some logic clean-up. | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2021-01-26 | 1 | -15/+11 |
|\| | |||||
| * | Handle missing content keys when calculating presentable names. (#9165) | Patrick Cloke | 2021-01-25 | 1 | -15/+11 |
| | | | | | | | | Treat the content as untrusted and do not assume it is of the proper form. | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2021-01-07 | 1 | -4/+8 |
|\| | |||||
| * | Improve the performance of calculating ignored users in large rooms (#9024) | Patrick Cloke | 2021-01-07 | 1 | -4/+8 |
| | | | | | | | | | | | | This allows for efficiently finding which users ignore a particular user. Co-authored-by: Erik Johnston <erik@matrix.org> | ||||
* | | Merge branch 'release-v1.25.0' of github.com:matrix-org/synapse into ↵ | Patrick Cloke | 2021-01-05 | 4 | -14/+7 |
|\| | | | | | | | matrix-org-hotfixes | ||||
| * | Fix-up assertions about last stream token in push (#9020) | Patrick Cloke | 2021-01-05 | 4 | -14/+7 |
| | | | | | | The last stream token is always known and we do not need to handle none. | ||||
* | | Merge remote-tracking branch 'origin/release-v1.25.0' into matrix-org-hotfixes | Richard van der Hoff | 2021-01-05 | 6 | -116/+172 |
|\| | |||||
| * | Ensure that a URL exists in the content during push. (#8965) | Patrick Cloke | 2020-12-18 | 1 | -1/+5 |
| | | | | | | | | This fixes an KeyError exception, after this PR the content is just considered unknown. | ||||
| * | Convert internal pusher dicts to attrs classes. (#8940) | Patrick Cloke | 2020-12-16 | 5 | -115/+167 |
| | | | | | | This improves type hinting and should use less memory. | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Patrick Cloke | 2020-12-15 | 4 | -40/+17 |
|\| | |||||
| * | Fix handling of stream tokens for push. (#8943) | Patrick Cloke | 2020-12-15 | 4 | -40/+17 |
| | | | | | | | | Removes faulty assertions and fixes the logic to ensure the max stream token is always set. | ||||
* | | Merge branch 'develop' into matrix-org-hotfixes | Patrick Cloke | 2020-12-15 | 13 | -226/+421 |
|\| | |||||
| * | Add type hints to the push module. (#8901) | Patrick Cloke | 2020-12-11 | 6 | -80/+155 |
| | | |||||
| * | Add type hints for HTTP and email pushers. (#8880) | Patrick Cloke | 2020-12-07 | 6 | -101/+164 |
| | | |||||
| * | Add type hints to the push mailer module. (#8882) | Patrick Cloke | 2020-12-07 | 1 | -40/+83 |
| | | |||||
| * | Add additional validation to pusher URLs. (#8865) | Patrick Cloke | 2020-12-04 | 2 | -3/+16 |
| | | | | | | | | Pusher URLs now must end in `/_matrix/push/v1/notify` per the specification. | ||||
| * | Apply an IP range blacklist to push and key revocation requests. (#8821) | Patrick Cloke | 2020-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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). | ||||
* | | Merge branch 'release-v1.24.0' of github.com:matrix-org/synapse into ↵ | Patrick Cloke | 2020-12-02 | 2 | -7/+22 |
|\| | | | | | | | matrix-org-hotfixes | ||||
| * | Add a config option to change whether unread push notification counts are ↵ | Andrew Morgan | 2020-11-30 | 2 | -7/+22 |
| | | | | | | | | | | | | | | | | 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?). | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2020-11-13 | 1 | -0/+24 |
|\| | |||||
| * | Add base pushrule to notify for jitsi conferences (#8286) | David Baker | 2020-11-02 | 1 | -0/+24 |
| | | | | | | This could be customised to trigger a different kind of notification in the future, but for now it's a normal non-highlight one. | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2020-10-30 | 1 | -13/+24 |
|\| | |||||
| * | Implement and use an @lru_cache decorator (#8595) | Richard van der Hoff | 2020-10-30 | 1 | -13/+24 |
| | | | | | | We don't always need the full power of a DeferredCache. | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2020-10-27 | 4 | -18/+47 |
|\| | |||||
| * | Start fewer opentracing spans (#8640) | Erik Johnston | 2020-10-26 | 1 | -2/+16 |
| | | | | | | | | | | | | | | #8567 started a span for every background process. This is good as it means all Synapse code that gets run should be in a span (unless in the sentinel logging context), but it means we generate about 15x the number of spans as we did previously. This PR attempts to reduce that number by a) not starting one for send commands to Redis, and b) deferring starting background processes until after we're sure they're necessary. I don't really know how much this will help. | ||||
| * | Fix typos and spelling errors. (#8639) | Patrick Cloke | 2020-10-23 | 2 | -3/+3 |
| | | |||||
| * | Fix email notifications for invites without local state. (#8627) | Erik Johnston | 2020-10-23 | 1 | -13/+28 |
| | | | | | | | | This can happen if e.g. the room invited into is no longer on the server (or if all users left the room). | ||||
* | | Merge remote-tracking branch 'origin/release-v1.21.3' into matrix-org-hotfixes | Erik Johnston | 2020-10-22 | 3 | -15/+21 |
|\| | |||||
| * | Add `DeferredCache.get_immediate` method (#8568) | Richard van der Hoff | 2020-10-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | * Add `DeferredCache.get_immediate` method A bunch of things that are currently calling `DeferredCache.get` are only really interested in the result if it's completed. We can optimise and simplify this case. * Remove unused 'default' parameter to DeferredCache.get() * another get_immediate instance | ||||
| * | Include a simple message in email notifications that include encrypted ↵ | Patrick Cloke | 2020-10-19 | 1 | -5/+11 |
| | | | | | | | | content (#8545) | ||||
| * | Apply suggestions from code review | Richard van der Hoff | 2020-10-16 | 1 | -1/+1 |
| | | | | | | Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> | ||||
| * | type annotations for LruCache | Richard van der Hoff | 2020-10-16 | 1 | -7/+9 |
| | | |||||
| * | Make LruCache register its own metrics (#8561) | Richard van der Hoff | 2020-10-16 | 1 | -3/+1 |
| | | | | | | | | | | rather than have everything that instantiates an LruCache manage metrics separately, have LruCache do it itself. | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2020-10-14 | 3 | -4/+22 |
|\| | |||||
| * | Fix not sending events over federation when using sharded event persisters ↵ | Erik Johnston | 2020-10-14 | 3 | -4/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#8536) * Fix outbound federaion with multiple event persisters. We incorrectly notified federation senders that the minimum persisted stream position had advanced when we got an `RDATA` from an event persister. Notifying of federation senders already correctly happens in the notifier, so we just delete the offending line. * Change some interfaces to use RoomStreamToken. By enforcing use of `RoomStreamTokens` we make it less likely that people pass in random ints that they got from somewhere random. | ||||
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-10-01 | 1 | -2/+2 |
|\| | |||||
| * | Enable mypy checking for unreachable code and fix instances. (#8432) | Patrick Cloke | 2020-10-01 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-10-01 | 5 | -7/+38 |
|\| | |||||
| * | Don't push if an user account has expired (#8353) | Mathieu Velten | 2020-09-23 | 1 | -0/+18 |
| | | |||||
| * | Simplify super() calls to Python 3 syntax. (#8344) | Patrick Cloke | 2020-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | This converts calls like super(Foo, self) -> super(). Generated with: sed -i "" -Ee 's/super\([^\(]+\)/super()/g' **/*.py | ||||
| * | Clean up `Notifier.on_new_room_event` code path (#8288) | Erik Johnston | 2020-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | The idea here is that we pass the `max_stream_id` to everything, and only use the stream ID of the particular event to figure out *when* the max stream position has caught up to the event and we can notify people about it. This is to maintain the distinction between the position of an item in the stream (i.e. event A has stream ID 513) and a token that can be used to partition the stream (i.e. give me all events after stream ID 352). This distinction becomes important when the tokens are more complicated than a single number, which they will be once we start tracking the position of multiple writers in the tokens. The valid operations here are: 1. Is a position before or after a token 2. Fetching all events between two tokens 3. Merging multiple tokens to get the "max", i.e. `C = max(A, B)` means that for all positions P where P is before A *or* before B, then P is before C. Future PR will change the token type to a dedicated type. | ||||
| * | Show a confirmation page during user password reset (#8004) | Andrew Morgan | 2020-09-10 | 1 | -1/+1 |
| | | | | | | | | | | This PR adds a confirmation step to resetting your user password between clicking the link in your email and your password actually being reset. This is to better align our password reset flow with the industry standard of requiring a confirmation from the user after email validation. | ||||
| * | Fixup pusher pool notifications (#8287) | Erik Johnston | 2020-09-09 | 3 | -5/+18 |
| | | | | | | | | | | `pusher_pool.on_new_notifications` expected a min and max stream ID, however that was not what we were passing in. Instead, let's just pass it the current max stream ID and have it track the last stream ID it got passed. I believe that it mostly worked as we called the function for every event. However, it would break for events that got persisted out of order, i.e, that were persisted but the max stream ID wasn't incremented as not all preceding events had finished persisting, and push for that event would be delayed until another event got pushed to the effected users. | ||||
| * | Revert "Fixup pusher pool notifications" | Erik Johnston | 2020-09-09 | 3 | -18/+5 |
| | | | | | | | | This reverts commit e7fd336a53a4ca489cdafc389b494d5477019dc0. | ||||
| * | Fixup pusher pool notifications | Erik Johnston | 2020-09-09 | 3 | -5/+18 |
| | | |||||
* | | Merge remote-tracking branch 'origin/release-v1.20.0' into matrix-org-hotfixes | Richard van der Hoff | 2020-09-07 | 1 | -1/+6 |
|\| | |||||
| * | Only add rows to the push actions table if the event notifies or should be ↵ | Brendan Abolivier | 2020-09-07 | 1 | -1/+6 |
| | | | | | | | | marked unread (#8274) | ||||
* | | Merge branch 'release-v1.20.0' into matrix-org-hotfixes | Richard van der Hoff | 2020-09-07 | 8 | -9/+9 |
|\| | |||||
| * | Unread counts fixes (#8254) | Brendan Abolivier | 2020-09-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixup `ALTER TABLE` database queries Make the new columns nullable, because doing otherwise can wedge a server with a big database, as setting a default value rewrites the table. * Switch back to using the notifications count in the push badge Clients are likely to be confused if we send a push but the badge count is the unread messages one, and not the notifications one. * Changelog | ||||
| * | Stop sub-classing object (#8249) | Patrick Cloke | 2020-09-04 | 7 | -8/+8 |
| | | |||||
* | | Merge branch 'develop' into matrix-org-hotfixes | Brendan Abolivier | 2020-09-03 | 2 | -29/+65 |
|\| | |||||
| * | Re-implement unread counts (again) (#8059) | Brendan Abolivier | 2020-09-02 | 2 | -29/+65 |
| | | |||||
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-08-18 | 2 | -95/+8 |
|\| | |||||
| * | Use the default templates when a custom template file cannot be found (#8037) | Andrew Morgan | 2020-08-17 | 2 | -95/+8 |
| | | | | | | Fixes https://github.com/matrix-org/synapse/issues/6583 | ||||
* | | Merge branch 'develop' into matrix-org-hotfixes | Brendan Abolivier | 2020-08-13 | 3 | -13/+222 |
|\| | |||||
| * | Implement new experimental push rules (#7997) | Brendan Abolivier | 2020-08-10 | 1 | -8/+208 |
| |\ | | | | | | | With an undocumented configuration setting to enable them for specific users. | ||||
| | * | Incorporate review | Brendan Abolivier | 2020-08-06 | 1 | -16/+4 |
| | | | |||||
| | * | Lint | Brendan Abolivier | 2020-07-30 | 1 | -19/+32 |
| | | | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Brendan Abolivier | 2020-07-30 | 6 | -148/+97 |
| | |\ | | | | | | | | | | | | | babolivier/new_push_rules | ||||
| | * | | Implement new experimental push rules with a database hack to enable them | Brendan Abolivier | 2020-07-28 | 1 | -9/+208 |
| | | | | |||||
| * | | | Revert #7736 (#8039) | Brendan Abolivier | 2020-08-06 | 1 | -4/+13 |
| | | | | |||||
| * | | | Convert synapse.api to async/await (#8031) | Patrick Cloke | 2020-08-06 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-07-31 | 6 | -150/+97 |
|\| | | |||||
| * | | Re-implement unread counts (#7736) | Brendan Abolivier | 2020-07-29 | 1 | -13/+4 |
| | | | |||||
| * | | Convert push to async/await. (#7948) | Patrick Cloke | 2020-07-27 | 6 | -139/+95 |
| | | | |||||
* | | | Merge branch 'release-v1.18.0' into matrix-org-hotfixes | Richard van der Hoff | 2020-07-28 | 1 | -1/+3 |
|\| | | |||||
| * | | Convert state resolution to async/await (#7942) | Patrick Cloke | 2020-07-24 | 1 | -1/+3 |
| |/ | |||||
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-07-24 | 2 | -69/+70 |
|\| | |||||
| * | Add ability to run multiple pusher instances (#7855) | Erik Johnston | 2020-07-16 | 1 | -36/+42 |
| | | | | | | This reuses the same scheme as federation sender sharding | ||||
| * | Allow email subjects to be customised through Synapse's configuration (#7846) | Brendan Abolivier | 2020-07-14 | 1 | -31/+20 |
| | | |||||
| * | Correctly pass app_name to all email templates. (#7829) | Erik Johnston | 2020-07-14 | 1 | -2/+8 |
| | | | | | | We didn't do this for e.g. registration emails. | ||||
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-07-09 | 2 | -7/+41 |
|\| | |||||
| * | Don't ignore `set_tweak` actions with no explicit `value`. (#7766) | reivilibre | 2020-07-06 | 1 | -4/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix spec compliance; tweaks without values are valid (default to True, which is only concretely specified for `highlight`, but it seems only reasonable to generalise) * Changelog for 7766. * Add documentation to `tweaks_for_actions` May as well tidy up when I'm here. * Add a test for `tweaks_for_actions` | ||||
| * | Hack to add push priority to push notifications (#7765) | reivilibre | 2020-07-01 | 1 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove obsolete comment about ancient temporary code Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Implement hack to set push priority based on whether the tweaks indicate the event might cause effects. * Changelog for 7765 Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Antilint * Add tests for push priority Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Update synapse/push/httppusher.py Co-authored-by: Brendan Abolivier <babolivier@matrix.org> * Antilint * Remove needless invites from tests. Co-authored-by: Brendan Abolivier <babolivier@matrix.org> | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Andrew Morgan | 2020-07-01 | 2 | -9/+3 |
|\| | |||||
| * | Back out MSC2625 implementation (#7761) | Brendan Abolivier | 2020-07-01 | 2 | -9/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2020-06-25 | 1 | -0/+2 |
|\| | |||||
| * | add a comment | Richard van der Hoff | 2020-06-18 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2020-06-17 | 1 | -1/+1 |
|\| | |||||
| * | Fix unread counts in sync | Brendan Abolivier | 2020-06-17 | 1 | -1/+1 |
| | | | | | | | | | | * Always return an unread_count in get_unread_event_push_actions_by_room_for_user * Don't always expect unread_count to be there so we don't take out sync entirely if something goes wrong | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2020-06-17 | 5 | -21/+20 |
|\| | |||||
| * | Implement unread counter (MSC2625) (#7673) | Brendan Abolivier | 2020-06-17 | 2 | -3/+9 |
| |\ | | | | | | | Implementation of https://github.com/matrix-org/matrix-doc/pull/2625 | ||||
| | * | Merge branch 'develop' into babolivier/mark_unread | Brendan Abolivier | 2020-06-15 | 1 | -8/+6 |
| | |\ | |||||
| | * | | Incorporate review bits | Brendan Abolivier | 2020-06-12 | 1 | -7/+6 |
| | | | | |||||
| | * | | Actually act on mark_unread | Brendan Abolivier | 2020-06-11 | 1 | -3/+7 |
| | | | | |||||
| | * | | Add a new unread_counter to sync responses | Brendan Abolivier | 2020-06-10 | 1 | -1/+4 |
| | | | | |||||
| * | | | Refactor getting replication updates from database. (#7636) | Erik Johnston | 2020-06-16 | 1 | -3/+1 |
| | | | | | | | | | | | | The aim here is to make it easier to reason about when streams are limited and when they're not, by moving the logic into the database functions themselves. This should mean we can kill of `db_query_to_update_function` function. | ||||
| * | | | Replace all remaining six usage with native Python 3 equivalents (#7704) | Dagfinn Ilmari Mannsåker | 2020-06-16 | 2 | -5/+2 |
| | | | | |||||
| * | | | Ensure the body is a string before comparing push rules. (#7701) | Patrick Cloke | 2020-06-15 | 1 | -2/+2 |
| | |/ | |/| | |||||
| * | | Replace iteritems/itervalues/iterkeys with native versions. (#7692) | Patrick Cloke | 2020-06-15 | 1 | -8/+6 |
| |/ | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2020-05-26 | 2 | -69/+53 |
|\| | |||||
| * | Convert sending mail to async/await. (#7557) | Erik Johnston | 2020-05-22 | 2 | -69/+53 |
| | | | | | | | | Mainly because sometimes the email push code raises exceptions where the stack traces have gotten lost, which is hopefully fixed by this. | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2020-05-21 | 3 | -11/+8 |
|\| | |||||
| * | remove miscellaneous PY2 code | Richard van der Hoff | 2020-05-15 | 1 | -8/+3 |
| | | |||||
| * | Fix new flake8 errors (#7470) | Erik Johnston | 2020-05-12 | 1 | -2/+5 |
| | | |||||
| * | Allow configuration of Synapse's cache without using synctl or environment ↵ | Amber Brown | 2020-05-11 | 2 | -3/+5 |
| | | | | | | | | variables (#6391) | ||||
* | | Merge branch 'release-v1.13.0' into matrix-org-hotfixes | Richard van der Hoff | 2020-05-14 | 1 | -2/+5 |
|\ \ | |||||
| * | | Fix new flake8 errors (#7489) | Patrick Cloke | 2020-05-13 | 1 | -2/+5 |
| |/ | | | | | | | This is a cherry-pick of 1a1da60ad2c9172fe487cd38a164b39df60f4cb5 (#7470) to the release-v1.13.0 branch. | ||||
| * | Do not treat display names as globs for push rules. (#7271) | Patrick Cloke | 2020-04-16 | 1 | -30/+39 |
| | | |||||
* | | Merge branch 'release-v1.12.4' into matrix-org-hotfixes | Richard van der Hoff | 2020-04-22 | 1 | -30/+39 |
|\ \ | |||||
| * | | Do not treat display names as globs for push rules. (#7271) | Patrick Cloke | 2020-04-22 | 1 | -30/+39 |
| |/ | |||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-03-19 | 1 | -9/+18 |
|\| | |||||
| * | Fix concurrent modification errors in pusher metrics (#7106) | Richard van der Hoff | 2020-03-19 | 1 | -9/+18 |
| | | | | | | add a lock to try to make this metric actually work | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-03-19 | 1 | -1/+23 |
|\| | |||||
| * | Add prometheus metrics for the number of active pushers (#7103) | Richard van der Hoff | 2020-03-19 | 1 | -1/+23 |
| | | |||||
* | | Merge branch 'develop' into matrix-org-hotfixes | Brendan Abolivier | 2020-03-09 | 1 | -1/+3 |
|\| | |||||
| * | Fix undefined `room_id` in `make_summary_text` | Brendan Abolivier | 2020-03-09 | 1 | -1/+3 |
| | | | | | | | | | | This would break notifications about un-named rooms when processing notifications in a batch. | ||||
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-02-27 | 5 | -40/+28 |
|\| | |||||
| * | No longer use room alias events to calculate room names for push ↵ | Patrick Cloke | 2020-02-21 | 1 | -22/+14 |
| | | | | | | | | notifications. (#6966) | ||||
| * | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957) | Patrick Cloke | 2020-02-21 | 4 | -18/+14 |
| | | | | | | | | Ensure good comprehension hygiene using flake8-comprehensions. | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2020-02-18 | 1 | -1/+1 |
|\| | |||||
| * | Reduce amount of logging at INFO level. (#6862) | Erik Johnston | 2020-02-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | A lot of the things we log at INFO are now a bit superfluous, so lets make them DEBUG logs to reduce the amount we log by default. Co-Authored-By: Brendan Abolivier <babolivier@matrix.org> Co-authored-by: Brendan Abolivier <github@brendanabolivier.com> | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Brendan Abolivier | 2020-01-22 | 1 | -1/+1 |
|\| | |||||
| * | Add `local_current_membership` table (#6655) | Erik Johnston | 2020-01-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Currently we rely on `current_state_events` to figure out what rooms a user was in and their last membership event in there. However, if the server leaves the room then the table may be cleaned up and that information is lost. So lets add a table that separately holds that information. | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-01-06 | 3 | -11/+15 |
|\| | |||||
| * | Change EventContext to use the Storage class (#6564) | Erik Johnston | 2019-12-20 | 1 | -2/+2 |
| | | |||||
| * | Clean up startup for the pusher (#6558) | Richard van der Hoff | 2019-12-18 | 2 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove redundant python2 support code `str.decode()` doesn't exist on python3, so presumably this code was doing nothing * Filter out pushers with corrupt data When we get a row with unparsable json, drop the row, rather than returning a row with null `data`, which will then cause an explosion later on. * Improve logging when we can't start a pusher Log the ID to help us understand the problem * Make email pusher setup more robust We know we'll have a `data` member, since that comes from the database. What we *don't* know is if that is a dict, and if that has a `brand` member, and if that member is a string. | ||||
* | | Merge branch 'release-v1.7.0' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2019-12-10 | 1 | -9/+1 |
|\| | | | | | | | matrix-org-hotfixes | ||||
| * | Don't call SQLBaseStore methods from outside stores | Erik Johnston | 2019-12-04 | 1 | -9/+1 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-11-26 | 2 | -5/+4 |
|\| | |||||
| * | Clean up newline quote marks around the codebase (#6362) | Andrew Morgan | 2019-11-21 | 2 | -5/+4 |
| | | |||||
* | | Change /push/v1/notify IP to 10.103.0.7 | Andrew Morgan | 2019-11-26 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-11-19 | 7 | -34/+32 |
|\| | |||||
| * | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy. The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`. The proxy will then be used for * push * url previews * phone-home stats * recaptcha validation * CAS auth validation It will *not* be used for: * Application Services * Identity servers * Outbound federation * In worker configurations, connections from workers to masters Fixes #4198. | ||||
| * | Update black to 19.10b0 (#6304) | Amber Brown | 2019-11-01 | 4 | -22/+17 |
| | | | | | | * update version of black and also fix the mypy config being overridden | ||||
| * | Merge pull request #6294 from matrix-org/erikj/add_state_storage | Erik Johnston | 2019-10-31 | 3 | -6/+9 |
| |\ | | | | | | | Add StateGroupStorage interface | ||||
| | * | Port to use state storage | Erik Johnston | 2019-10-30 | 3 | -6/+9 |
| | | | |||||
| * | | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2019-10-31 | 2 | -4/+4 |
| |/ | | | | | Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated. | ||||
| * | Quick fix to ensure cache descriptors always return deferreds | Erik Johnston | 2019-10-28 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2019-09-24 | 1 | -1/+30 |
|\| | |||||
| * | Generalize email sending logging (#6075) | Andrew Morgan | 2019-09-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | In ancient times Synapse would only send emails when it was notifying a user about a message they received... Now it can do all sorts of neat things! Change the logging so it's not just about notifications. | ||||
| * | Allow HS to send emails when adding an email to the HS (#6042) | Andrew Morgan | 2019-09-20 | 1 | -0/+29 |
| | | |||||
* | | Merge branch 'rav/fix_retry_reset' into matrix-org-hotfixes | Richard van der Hoff | 2019-09-20 | 1 | -4/+6 |
|\| | |||||
| * | Ensure email validation link parameters are URL-encoded (#6063) | Andrew Morgan | 2019-09-20 | 1 | -4/+6 |
| | | | | | | The validation links sent via email had their query parameters inserted without any URL-encoding. Surprisingly this didn't seem to cause any issues, but if a user were to put a `/` in their client_secret it could lead to problems. | ||||
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2019-09-18 | 1 | -1/+12 |
|\| | |||||
| * | Add opentracing span for HTTP push | Erik Johnston | 2019-09-09 | 1 | -1/+12 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-09-06 | 2 | -23/+77 |
|\| | |||||
| * | Allow Synapse to send registration emails + choose Synapse or an external ↵ | Andrew Morgan | 2019-09-06 | 2 | -23/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-09-04 | 1 | -1/+1 |
|\| | |||||
| * | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 1 | -1/+1 |
| | | | | | | | | | | 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 :) | ||||
* | | Merge branch 'release-v1.3.0' of github.com:matrix-org/synapse into ↵ | Brendan Abolivier | 2019-08-13 | 2 | -13/+32 |
|\| | | | | | | | matrix-org-hotfixes | ||||
| * | Remove redundant return | Erik Johnston | 2019-08-13 | 1 | -1/+0 |
| | | |||||
| * | Handle pusher being deleted during processing. | Erik Johnston | 2019-08-01 | 2 | -13/+33 |
| | | | | | | | | | | Instead of throwing a StoreError lets break out of processing loop and mark the pusher as stopped. | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-08-01 | 1 | -1/+7 |
|\| | |||||
| * | Explicitly check that tombstone is a state event before notifying. | Erik Johnston | 2019-07-31 | 1 | -1/+7 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-07-30 | 6 | -82/+65 |
|\| | |||||
| * | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 6 | -82/+65 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-07-17 | 2 | -1/+14 |
|\| | |||||
| * | Add default push rule to ignore reactions (#5623) | J. Ryan Stinnett | 2019-07-05 | 1 | -0/+13 |
| | | | | | | | | | | | | | | This adds a default push rule following the proposal in [MSC2153](https://github.com/matrix-org/matrix-doc/pull/2153). See also https://github.com/vector-im/riot-web/issues/10208 See also https://github.com/matrix-org/matrix-js-sdk/pull/976 | ||||
| * | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-06-21 | 13 | -699/+677 |
|\| | |||||
| * | Improve email notification logging (#5502) | Neil Johnson | 2019-06-20 | 1 | -1/+1 |
| | | |||||
| * | Run Black. (#5482) | Amber Brown | 2019-06-20 | 13 | -697/+675 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-06-17 | 3 | -7/+53 |
|\| | |||||
| * | Merge pull request #5388 from matrix-org/erikj/fix_email_push | Erik Johnston | 2019-06-17 | 3 | -7/+53 |
| |\ | | | | | | | Fix email notifications for unnamed rooms with multiple people | ||||
| | * | Add test | Erik Johnston | 2019-06-07 | 2 | -7/+42 |
| | | | |||||
| | * | Fix email notifications for large unnamed rooms. | Erik Johnston | 2019-06-07 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | When we try and calculate a description for a room for with no name but multiple other users we threw an exception (due to trying to subscript result of `dict.values()`). | ||||
* | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-06-11 | 1 | -1/+1 |
|\| | | | | | | | | | | | matrix-org-hotfixes | ||||
| * | | Change password reset links to /_matrix. | Erik Johnston | 2019-06-11 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-06-10 | 2 | -20/+69 |
|\| | | | | | | | matrix-org-hotfixes | ||||
| * | Add ability to perform password reset via email without trusting the ↵ | Andrew Morgan | 2019-06-06 | 2 | -20/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2019-05-02 | 3 | -10/+27 |
|\| | |||||
| * | Add a default .m.rule.tombstone push rule (#4867) | Travis Ralston | 2019-04-29 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | * Add a default .m.rule.tombstone push rule In support of MSC1930: https://github.com/matrix-org/matrix-doc/pull/1930 * changelog * Appease the changelog linter | ||||
| * | Merge pull request #5047 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-17 | 2 | -10/+10 |
| |\ | | | | | | | Send out emails with links to extend an account's validity period | ||||
| | * | Send out emails with links to extend an account's validity period | Brendan Abolivier | 2019-04-17 | 2 | -10/+10 |
| | | | |||||
* | | | Point pusher to new box | Erik Johnston | 2019-04-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-04-02 | 3 | -8/+43 |
|\| | | |||||
| * | | Make starting pushers faster during start up | Erik Johnston | 2019-04-02 | 3 | -8/+43 |
| |/ | | | | | | | | | | | | | | | | | | | | | We start all pushers on start up and immediately start a background process to fetch push to send. This makes start up incredibly painful when dealing with many pushers. Instead, let's do a quick fast DB check to see if there *may* be push to send and only start the background processes for those pushers. We also stagger starting up and doing those checks so that we don't try and handle all pushers at once. | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-02-22 | 3 | -9/+45 |
|\| | |||||
| * | Add missing return | Erik Johnston | 2019-02-22 | 1 | -0/+1 |
| | | |||||
| * | Correctly handle PusherConfigException | Erik Johnston | 2019-02-22 | 1 | -0/+9 |
| | | |||||
| * | Drop logging level of creating a pusher | Erik Johnston | 2019-02-22 | 1 | -1/+1 |
| | | |||||
| * | Correctly handle null data in HttpPusher | Erik Johnston | 2019-02-22 | 1 | -0/+5 |
| | | |||||
| * | Add prometheus metrics for number of badge update pushes. (#4709) | Richard van der Hoff | 2019-02-22 | 1 | -8/+25 |
| | | | | | | | | | | | | We're counting the number of push notifications, but not the number of badges; I'd like to see if they are significant. | ||||
| * | bail out early in on_new_receipts if no pushers (#4706) | Richard van der Hoff | 2019-02-21 | 1 | -0/+8 |
| | | |||||
* | | bail out early in on_new_receipts if no pushers | Richard van der Hoff | 2019-02-21 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2019-02-20 | 2 | -13/+14 |
|\| | |||||
| * | Logging improvements for the pusher (#4691) | Richard van der Hoff | 2019-02-20 | 2 | -13/+14 |
| | | |||||
* | | Apply the pusher http hack in the right place (#4692) | Richard van der Hoff | 2019-02-20 | 1 | -6/+5 |
| | | | | | | Do it in the constructor, so that it works for badge updates as well as pushes | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-01-30 | 1 | -1/+1 |
|\| | |||||
| * | Fix flake8 (#4519) | Amber Brown | 2019-01-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2018-11-20 | 1 | -2/+3 |
|\| | |||||
| * | Fix logcontext leak in EmailPusher | Richard van der Hoff | 2018-11-19 | 1 | -2/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2018-11-06 | 2 | -4/+4 |
|\| |