summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Add missing yieldErik Johnston2018-08-231-1/+2
|
* Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-2255-603/+1130
|\ | | | | | | neilj/server_notices_on_blocking
| * Merge branch 'master' into developRichard van der Hoff2018-08-221-1/+1
| |\
| | * Use recaptcha_ajax.js directly from GoogleRichard van der Hoff2018-08-222-196/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was originally done in commit c75b71a397d91c013a65a7f57d2c13199cf4c204, but got reverted on this branch due to the PR (#3677) being based on the wrong branch. We're ready to merge this to master now, so let's make it match release-v0.33.3.
| | * Merge tag 'v0.33.3'Richard van der Hoff2018-08-22103-916/+2769
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features -------- - Add support for the SNI extension to federation TLS connections. Thanks to @vojeroen! ([\#3439](https://github.com/matrix-org/synapse/issues/3439)) - Add /_media/r0/config ([\#3184](https://github.com/matrix-org/synapse/issues/3184)) - speed up /members API and add `at` and `membership` params as per MSC1227 ([\#3568](https://github.com/matrix-org/synapse/issues/3568)) - implement `summary` block in /sync response as per MSC688 ([\#3574](https://github.com/matrix-org/synapse/issues/3574)) - Add lazy-loading support to /messages as per MSC1227 ([\#3589](https://github.com/matrix-org/synapse/issues/3589)) - Add ability to limit number of monthly active users on the server ([\#3633](https://github.com/matrix-org/synapse/issues/3633)) - Support more federation endpoints on workers ([\#3653](https://github.com/matrix-org/synapse/issues/3653)) - Basic support for room versioning ([\#3654](https://github.com/matrix-org/synapse/issues/3654)) - Ability to disable client/server Synapse via conf toggle ([\#3655](https://github.com/matrix-org/synapse/issues/3655)) - Ability to whitelist specific threepids against monthly active user limiting ([\#3662](https://github.com/matrix-org/synapse/issues/3662)) - Add some metrics for the appservice and federation event sending loops ([\#3664](https://github.com/matrix-org/synapse/issues/3664)) - Where server is disabled, block ability for locked out users to read new messages ([\#3670](https://github.com/matrix-org/synapse/issues/3670)) - set admin uri via config, to be used in error messages where the user should contact the administrator ([\#3687](https://github.com/matrix-org/synapse/issues/3687)) - Synapse's presence functionality can now be disabled with the "use_presence" configuration option. ([\#3694](https://github.com/matrix-org/synapse/issues/3694)) - For resource limit blocked users, prevent writing into rooms ([\#3708](https://github.com/matrix-org/synapse/issues/3708)) Bugfixes -------- - Fix occasional glitches in the synapse_event_persisted_position metric ([\#3658](https://github.com/matrix-org/synapse/issues/3658)) - Fix bug on deleting 3pid when using identity servers that don't support unbind API ([\#3661](https://github.com/matrix-org/synapse/issues/3661)) - Make the tests pass on Twisted < 18.7.0 ([\#3676](https://github.com/matrix-org/synapse/issues/3676)) - Don’t ship recaptcha_ajax.js, use it directly from Google ([\#3677](https://github.com/matrix-org/synapse/issues/3677)) - Fixes test_reap_monthly_active_users so it passes under postgres ([\#3681](https://github.com/matrix-org/synapse/issues/3681)) - Fix mau blocking calulation bug on login ([\#3689](https://github.com/matrix-org/synapse/issues/3689)) - Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved_users ([\#3692](https://github.com/matrix-org/synapse/issues/3692)) - Improve HTTP request logging to include all requests ([\#3700](https://github.com/matrix-org/synapse/issues/3700)) - Avoid timing out requests while we are streaming back the response ([\#3701](https://github.com/matrix-org/synapse/issues/3701)) - Support more federation endpoints on workers ([\#3705](https://github.com/matrix-org/synapse/issues/3705), [\#3713](https://github.com/matrix-org/synapse/issues/3713)) - Fix "Starting db txn 'get_all_updated_receipts' from sentinel context" warning ([\#3710](https://github.com/matrix-org/synapse/issues/3710)) - Fix bug where `state_cache` cache factor ignored environment variables ([\#3719](https://github.com/matrix-org/synapse/issues/3719)) - Fix bug in v0.33.3rc1 which caused infinite loops and OOMs ([\#3723](https://github.com/matrix-org/synapse/issues/3723)) - Fix bug introduced in v0.33.3rc1 which made the ToS give a 500 error ([\#3732](https://github.com/matrix-org/synapse/issues/3732)) Deprecations and Removals ------------------------- - The Shared-Secret registration method of the legacy v1/register REST endpoint has been removed. For a replacement, please see [the admin/register API documentation](https://github.com/matrix-org/synapse/blob/master/docs/admin_api/register_api.rst). ([\#3703](https://github.com/matrix-org/synapse/issues/3703)) Internal Changes ---------------- - The test suite now can run under PostgreSQL. ([\#3423](https://github.com/matrix-org/synapse/issues/3423)) - Refactor HTTP replication endpoints to reduce code duplication ([\#3632](https://github.com/matrix-org/synapse/issues/3632)) - Tests now correctly execute on Python 3. ([\#3647](https://github.com/matrix-org/synapse/issues/3647)) - Sytests can now be run inside a Docker container. ([\#3660](https://github.com/matrix-org/synapse/issues/3660)) - Port over enough to Python 3 to allow the sytests to start. ([\#3668](https://github.com/matrix-org/synapse/issues/3668)) - Update docker base image from alpine 3.7 to 3.8. ([\#3669](https://github.com/matrix-org/synapse/issues/3669)) - Rename synapse.util.async to synapse.util.async_helpers to mitigate async becoming a keyword on Python 3.7. ([\#3678](https://github.com/matrix-org/synapse/issues/3678)) - Synapse's tests are now formatted with the black autoformatter. ([\#3679](https://github.com/matrix-org/synapse/issues/3679)) - Implemented a new testing base class to reduce test boilerplate. ([\#3684](https://github.com/matrix-org/synapse/issues/3684)) - Rename MAU prometheus metrics ([\#3690](https://github.com/matrix-org/synapse/issues/3690)) - add new error type ResourceLimit ([\#3707](https://github.com/matrix-org/synapse/issues/3707)) - Logcontexts for replication command handlers ([\#3709](https://github.com/matrix-org/synapse/issues/3709)) - Update admin register API documentation to reference a real user ID. ([\#3712](https://github.com/matrix-org/synapse/issues/3712))
| | | * bump version to 0.33.3Richard van der Hoff2018-08-221-1/+1
| | | |
| | * | Revert "Use recaptcha_ajax.js directly from Google"Richard van der Hoff2018-08-132-1/+196
| | | |
| * | | Merge pull request #3724 from Half-Shot/hs/guest-fetch-eventErik Johnston2018-08-221-1/+1
| |\ \ \ | | | | | | | | | | Allow guests to use /rooms/:roomId/event/:eventId
| | * | | Allow guests to access /rooms/:roomId/event/:eventIdWill Hunt2018-08-201-1/+1
| | | | |
| * | | | Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-226-42/+74
| |\ \ \ \ | | | | | | | | | | | | Allow profile updates to happen on workers
| | * | | | Rename WorkerProfileHandler to BaseProfileHandlerErik Johnston2018-08-222-5/+12
| | | | | |
| | * | | | Add assert to ensure handler is only run on masterErik Johnston2018-08-221-0/+2
| | | | | |
| | * | | | Remove redundant varsErik Johnston2018-08-221-3/+0
| | | | | |
| | * | | | Add some fixmesErik Johnston2018-08-172-0/+6
| | | | | |
| | * | | | Call UserDirectoryHandler methods directlyErik Johnston2018-08-174-104/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that the user directory handling is fairly racey as a bunch of stuff assumes that the processing happens on master, which it doesn't when there is a synapse.app.user_dir worker. So lets just call the function directly until we actually get round to fixing it, since it doesn't make the situation any worse.
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-1768-538/+1330
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | erikj/split_profiles
| | * | | | | Split ProfileHandler into master and workerErik Johnston2018-08-172-9/+19
| | | | | | |
| | * | | | | Remote profile cache should remain in master workerErik Johnston2018-08-171-4/+2
| | | | | | |
| | * | | | | DocstringsErik Johnston2018-08-091-1/+11
| | | | | | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-0930-126/+667
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_profiles
| | * | | | | | Allow ratelimiting on workersErik Johnston2018-08-071-29/+29
| | | | | | | |
| | * | | | | | Allow profile changes to happen on workersErik Johnston2018-08-075-8/+106
| | | | | | | |
| * | | | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handlerErik Johnston2018-08-226-271/+388
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Refactor state module to support multiple room versions
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-2081-748/+1735
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/refactor_state_handler
| | * | | | | | | | Remove redundant room_version checksErik Johnston2018-08-202-15/+4
| | | | | | | | | |
| | * | | | | | | | Revert spurious changeErik Johnston2018-08-201-2/+2
| | | | | | | | | |
| | * | | | | | | | Add fast path in state res for zero prev eventsErik Johnston2018-08-091-1/+6
| | | | | | | | | |
| | * | | | | | | | Choose state algorithm based on room versionErik Johnston2018-08-094-16/+105
| | | | | | | | | |
| | * | | | | | | | Add constants for room versionsErik Johnston2018-08-091-2/+7
| | | | | | | | | |
| | * | | | | | | | Refactor state moduleErik Johnston2018-08-092-296/+325
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We split out the actual state resolution algorithm to prepare for having multiple versions.
| * | | | | | | | | Merge pull request #3735 from matrix-org/travis/federation-spellingRichard van der Hoff2018-08-221-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | limt -> limit
| | * | | | | | | | | limt -> limitTravis Ralston2018-07-311-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/release-v0.33.3' into developRichard van der Hoff2018-08-221-3/+12
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | fix another consent encoding failRichard van der Hoff2018-08-211-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Fix 500 error from /consent formRichard van der Hoff2018-08-211-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3731
| * | | | | | | | | | Split the state_group_cache in two (#3726)Matthew Hodgson2018-08-221-17/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splits the state_group_cache in two. One half contains normal state events; the other contains member events. The idea is that the lazyloading common case of: "I want a subset of member events plus all of the other state" can be accomplished efficiently by splitting the cache into two, and asking for "all events" from the non-members cache, and "just these keys" from the members cache. This means we can avoid having to make DictionaryCache aware of these sort of complicated queries, whilst letting LL requests benefit from the caching. Previously we were unable to sensibly use the caching and had to pull all state from the DB irrespective of the filtering, which made things slow. Hopefully fixes https://github.com/matrix-org/synapse/issues/3720.
| * | | | | | | | | | Merge tag 'v0.33.3rc2' into developRichard van der Hoff2018-08-213-4/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfixes -------- - Fix bug in v0.33.3rc1 which caused infinite loops and OOMs ([\#3723](https://github.com/matrix-org/synapse/issues/3723))
| | * | | | | | | | | changelog v0.33.3rc2Amber Brown2018-08-211-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Fix exceptions when a connection is closed before we read the headersRichard van der Hoff2018-08-202-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bugs introduced in #3700, by making sure that we behave sanely when an incoming connection is closed before the headers are read.
| | * | | | | | | | | Robustness fix for logcontext filterRichard van der Hoff2018-08-201-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the logcontext filter not explode if it somehow ends up with a logcontext of None, since that infinite-loops the whole logging system.
| | * | | | | | | | | versionAmber Brown2018-08-211-1/+1
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3727 from matrix-org/erikj/dont_error_on_missing_keysErik Johnston2018-08-212-5/+9
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Don't log exceptions when failing to fetch server keys
| | * | | | | | | | | Log more detail when we fail to authenticate requestErik Johnston2018-08-211-3/+3
| | | | | | | | | | |
| | * | | | | | | | | Don't log exceptions when failing to fetch server keysErik Johnston2018-08-212-4/+8
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not being able to resolve or connect to remote servers is an expected error, so we shouldn't log at ERROR with stacktraces.
| * | | | | | | | | Fix typoErik Johnston2018-08-211-4/+4
| | | | | | | | | |
| * | | | | | | | | isortErik Johnston2018-08-211-1/+2
| | | | | | | | | |
| * | | | | | | | | Make the in flight requests metrics thread safeErik Johnston2018-08-201-3/+10
| | | | | | | | | |
| * | | | | | | | | Make the in flight background process metrics thread safeErik Johnston2018-08-201-5/+20
| |/ / / / / / / /
| * | | / / / / / Port over enough to get some sytests running on Python 3 (#3668)Amber Brown2018-08-2011-40/+90
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Use get_cache_factor_for function for `state_cache`Erik Johnston2018-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the cache factor for `state_cache` to be individually specified in the enviroment
| * | | | | | | Merge pull request #3713 from matrix-org/erikj/fixup_fed_loggingErik Johnston2018-08-201-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix logging bug in EDU handling over replication
| | * | | | | | | Fix logging bug in EDU handling over replicationErik Johnston2018-08-171-1/+1
| | | | | | | | |
| * | | | | | | | Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commandsRichard van der Hoff2018-08-178-20/+53
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Logcontexts for replication command handlers
| | * | | | | | | | Logcontexts for replication command handlersRichard van der Hoff2018-08-178-20/+53
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the handlers for replication commands as background processes. This should improve the visibility in our metrics, and reduce the number of "running db transaction from sentinel context" warnings. Ideally it means converting the things that fire off deferreds into the night into things that actually return a Deferred when they are done. I've made a bit of a stab at this, but it will probably be leaky.
| * | | | | | | | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updatesRichard van der Hoff2018-08-175-21/+28
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix logcontexts for running pushers
| | * | | | | | | | Fix logcontexts for running pushersRichard van der Hoff2018-08-175-21/+28
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, avoid resetting the logcontext before running the pushers, to fix the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning. Instead, give them their own "background process" logcontexts.
| * | | | | | | | Integrate presence from hotfixes (#3694)Amber Brown2018-08-189-17/+90
| | | | | | | | |
| * | | | | | | | Remove v1/register's broken shared secret functionality (#3703)Amber Brown2018-08-181-54/+0
| | | | | | | | |
| * | | | | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responsesRichard van der Hoff2018-08-171-4/+13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use a producer to stream back responses
| | * | | | | | | | Use a producer to stream back responsesRichard van der Hoff2018-08-151-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem with dumping all of the json response into the Request object at once is that doing so starts the timeout for the next request to be received: so if it takes longer than 60s to stream back the response to the client, the client never gets it. The correct solution is to use a Producer; then the timeout is only started once all of the content is sent over the TCP connection.
| * | | | | | | | | Merge pull request #3700 from matrix-org/rav/wait_for_producersRichard van der Hoff2018-08-172-92/+179
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Refactor request logging code
| | * | | | | | | | | Refactor request logging codeRichard van der Hoff2018-08-152-92/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves a bunch of the logic for deciding when to log the receipt and completion of HTTP requests into SynapseRequest, rather than in the request handling wrappers. Advantages of this are: * we get logs for *all* requests (including OPTIONS and HEADs), rather than just those that end up hitting handlers we've remembered to decorate correctly. * when a request handler wires up a Producer (as the media stuff does currently, and as other things will do soon), we log at the point that all of the traffic has been sent to the client.
* | | | | | | | | | | Update notice formatErik Johnston2018-08-222-5/+15
| | | | | | | | | | |
* | | | | | | | | | | rename error codeNeil Johnson2018-08-182-4/+4
| | | | | | | | | | |
* | | | | | | | | | | special case server_notices_mxidNeil Johnson2018-08-181-0/+6
| | | | | | | | | | |
* | | | | | | | | | | special case server_notices_mxidNeil Johnson2018-08-181-1/+1
| | | | | | | | | | |
* | | | | | | | | | | clean up, no functional changesNeil Johnson2018-08-172-41/+47
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-173-6/+55
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
| * | | | | | | | | | Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse ↵Neil Johnson2018-08-176-3/+18
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neilj/limit_exceeded_error
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into neilj/limit_exceeded_errorNeil Johnson2018-08-176-3/+18
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| * | / | | | | | | | | server limits config docsNeil Johnson2018-08-171-0/+26
| |/ / / / / / / / / /
| * | | | | | | | | | add new error type ResourceLimitNeil Johnson2018-08-163-6/+28
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-176-3/+17
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
| * | | | | | | | | | remove errant yieldNeil Johnson2018-08-171-1/+1
| | | | | | | | | | |
| * | | | | | | | | | call reap on start up and fix under reaping bugNeil Johnson2018-08-163-2/+6
| | | | | | | | | | |
| * | | | | | | | | | block event creation and room creation on hitting resource limitsNeil Johnson2018-08-162-1/+9
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix inbound federation on reader workerErik Johnston2018-08-161-0/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inbound federation requires calculating push, which in turn relies on having access to account data.
* | | | | | | | | flake8Neil Johnson2018-08-161-3/+2
| | | | | | | | |
* | | | | | | | | refactor for readability, and reuse caching for setting tagsNeil Johnson2018-08-162-68/+114
| | | | | | | | |
* | | | | | | | | add room taggingNeil Johnson2018-08-161-9/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-164-3/+96
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
| * | | | | | | | Add GET media/v1/config (#3184)Will Hunt2018-08-162-1/+50
| | | | | | | | |
| * | | | | | | | lazyload aware /messages (#3589)Matthew Hodgson2018-08-162-2/+46
| | | | | | | | |
* | | | | | | | | check for room state before deciding on actionNeil Johnson2018-08-162-67/+26
| | | | | | | | |
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-165-18/+158
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
| * | | | | | | | initial cut at a room summary API (#3574)Matthew Hodgson2018-08-165-18/+158
| | | | | | | | |
* | | | | | | | | WIP impl commiting to get feedbackNeil Johnson2018-08-161-6/+74
| | | | | | | | |
* | | | | | | | | fix case where empty string state check is evaulated as FalseNeil Johnson2018-08-161-1/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-155-20/+172
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
| * | | | | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+mausNeil Johnson2018-08-151-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Mau off by one errors
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-1523-178/+591
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-142-2/+3
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus
| | * | | | | | | | | | support admin_email config and pass through into blocking errors, return ↵Neil Johnson2018-08-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases
| | * | | | | | | | | | fix off by 1s on mauNeil Johnson2018-08-141-2/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-141-10/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-144-17/+35
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-143-8/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus
| * | | | | | | | | | | | | speed up /members and add at= and membership params (#3568)Matthew Hodgson2018-08-154-18/+170
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-1559-489/+855
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
| * | | | | | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federationErik Johnston2018-08-1514-138/+498
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | Move more federation APIs to workers
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-1554-337/+368
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation
| | * | | | | | | | | | | | Use federation handler function rather than duplicateErik Johnston2018-08-152-48/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves renaming _persist_events to be a public function.
| | * | | | | | | | | | | | Rename slave TransactionStore to SlaveTransactionStoreErik Johnston2018-08-156-11/+11
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Move clean_room_for_join to masterErik Johnston2018-08-092-2/+49
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fixup doc commentsErik Johnston2018-08-092-0/+28
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-0930-126/+667
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation
| | * | | | | | | | | | | | Pull in necessary stores in federation_readerErik Johnston2018-08-062-1/+2
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Move necessary storage functions to worker classesErik Johnston2018-08-063-98/+100
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Import all functions from TransactionStoreErik Johnston2018-08-061-11/+2
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Add EDU/query handling over replicationErik Johnston2018-08-064-13/+62
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Add replication APIs for persisting federation eventsErik Johnston2018-08-064-10/+290
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_emailNeil Johnson2018-08-154-22/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | support admin_email config and pass through into blocking errors,
| | * | | | | | | | | | | clean up AuthErrorNeil Johnson2018-08-151-7/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'neilj/update_limits_error_codes' of ↵Neil Johnson2018-08-151-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into neilj/admin_email
| | | * | | | | | | | | | | update error codes for resource limitingNeil Johnson2018-08-151-2/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | update admin email to uriNeil Johnson2018-08-151-1/+1
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | replace admin_email with admin_uri for greater flexibilityNeil Johnson2018-08-153-8/+8
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_emailNeil Johnson2018-08-143-25/+56
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | remove blank lineNeil Johnson2018-08-141-1/+0
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Update register.pyNeil Johnson2018-08-141-10/+0
| | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | remove comments
| | * | | | | | | | | support admin_email config and pass through into blocking errors, return ↵Neil Johnson2018-08-134-17/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases
| * | | | | | | | | | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_nameNeil Johnson2018-08-151-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | combine mau metrics into one group
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-143-9/+28
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | neilj/change_prometheus_mau_metric_name
| | * | | | | | | | | | pep8Neil Johnson2018-08-141-0/+1
| | | | | | | | | | | |
| | * | | | | | | | | | combine mau metrics into one groupNeil Johnson2018-08-141-4/+3
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbindErik Johnston2018-08-155-20/+78
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers
| | * | | | | | | | | Log when we 3pid/unbind request failsErik Johnston2018-08-091-0/+2
| | | | | | | | | | |
| | * | | | | | | | | Don't fail requests to unbind 3pids for non supporting ID serversErik Johnston2018-08-085-20/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older identity servers may not support the unbind 3pid request, so we shouldn't fail the requests if we received one of 400/404/501. The request still fails if we receive e.g. 500 responses, allowing clients to retry requests on transient identity server errors that otherwise do support the API. Fixes #3661
| * | | | | | | | | | adding missing yieldNeil Johnson2018-08-141-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-143-8/+27
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | Block ability to read via sync if mau limit exceeded
| | * | | | | | | | | make comments clearerNeil Johnson2018-08-141-1/+2
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/develop' into ↵Amber Brown2018-08-144-196/+11
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | neilj/fix_reap_users_in_postgres
| | * | | | | | | | Merge pull request #3677 from andrewshadura/masterRichard van der Hoff2018-08-132-196/+1
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | Use recaptcha_ajax.js directly from Google
| | | * | | | | | | Use recaptcha_ajax.js directly from GoogleAndrej Shadura2018-08-102-196/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script recaptcha_ajax.js contains minified non-free code which we probably cannot redistribute. Since it talks to Google servers anyway, it is better to just download it from Google directly instead of shipping it. This fixes #1932.
| | * | | | | | | | Revert "support admin_email config and pass through into blocking errors, ↵Neil Johnson2018-08-134-35/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return AuthError in all cases" This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6.
| | * | | | | | | | support admin_email config and pass through into blocking errors, return ↵Neil Johnson2018-08-134-17/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases
| | * | | | | | | | Run tests under PostgreSQL (#3423)Amber Brown2018-08-132-0/+10
| | | | | | | | | |
| * | | | | | | | | fix sqlite/postgres incompatibility in reap_monthly_active_usersNeil Johnson2018-08-111-16/+28
| |/ / / / / / / /
| * | | | | | | | Merge branch 'rav/fix_linearizer_cancellation' into developRichard van der Hoff2018-08-101-43/+68
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix linearizer cancellation on twisted < 18.7Richard van der Hoff2018-08-101-43/+68
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that cancellation of inlineDeferreds didn't really work properly until Twisted 18.7. This commit refactors Linearizer.queue to avoid inlineCallbacks.
| * | | | | | | | log *after* reloading log configRichard van der Hoff2018-08-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because logging *before* reloading means the log message gets lost in the old MemoryLogger
| * | | | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-1029-31/+31
| | | | | | | | |
| * | | | | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requestsRichard van der Hoff2018-08-1013-16/+110
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | send SNI for federation requests
| | * | | | | | | more generic conversion of str/bytes to unicodeJeroen2018-08-091-1/+1
| | | | | | | | |
| | * | | | | | | include private functions from twistedJeroen2018-08-091-2/+35
| | | | | | | | |
| | * | | | | | | updated docstring for ServerContextFactoryJeroen2018-08-081-1/+1
| | | | | | | | |
| | * | | | | | | fix isortJeroen2018-07-291-2/+3
| | | | | | | | |
| | * | | | | | | fix accidental removal of hsJeroen2018-07-271-1/+1
| | | | | | | | |
| | * | | | | | | Merge branch 'develop' into send_sni_for_federation_requestsRichard van der Hoff2018-07-2772-1162/+2278
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into ↵Jeroen2018-07-14259-1767/+1825
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send_sni_for_federation_requests # Conflicts: # synapse/crypto/context_factory.py
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' into send_sni_for_federation_requestsJeroen2018-07-0968-191/+791
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # synapse/http/endpoint.py
| | * | | | | | | | | | take idna implementation from twistedJeroen2018-06-261-2/+2
| | | | | | | | | | | |
| | * | | | | | | | | | allow self-signed certificatesJeroen2018-06-263-35/+36
| | | | | | | | | | | |
| | * | | | | | | | | | formatting changes for pep8Jeroen2018-06-254-5/+8
| | | | | | | | | | | |
| | * | | | | | | | | | send SNI for federation requestsJeroen2018-06-2414-13/+69
| | | | | | | | | | | |
* | | | | | | | | | | | wip cut at sending resource server noticesNeil Johnson2018-08-152-44/+55
| | | | | | | | | | | |
* | | | | | | | | | | | add new event typesNeil Johnson2018-08-151-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | backout ability to pass in event type to server noticesNeil Johnson2018-08-143-4/+5
| | | | | | | | | | | |
* | | | | | | | | | | | support server notice state events for resource limitsNeil Johnson2018-08-144-8/+22
| | | | | | | | | | | |
* | | | | | | | | | | | fix typoNeil Johnson2018-08-131-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | implementation of server notices to alert on hitting resource limitsNeil Johnson2018-08-102-45/+65
| | | | | | | | | | | |
* | | | | | | | | | | | wip at implementing MSC 7075Neil Johnson2018-08-091-0/+84
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | rename _user_last_seen_monthly_activeNeil Johnson2018-08-092-6/+6
| | | | | | | | | | |
* | | | | | | | | | | fix errant parenthesisNeil Johnson2018-08-091-1/+1
| | | | | | | | | | |
* | | | | | | | | | | only block on sync where user is not part of the mau cohortNeil Johnson2018-08-092-3/+17
| | | | | | | | | | |
* | | | | | | | | | | block sync if auth checks failNeil Johnson2018-08-091-7/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-093-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sync_block
| * | | | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hsNeil Johnson2018-08-093-0/+9
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Flag to disable HS without disabling federation
| | * | | | | | | | | | fix pep8 too many linesNeil Johnson2018-08-081-1/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-0812-22/+240
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-083-6/+54
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hsNeil Johnson2018-08-084-37/+69
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-061-4/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-061-4/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-062-8/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs
| | * | | | | | | | | | | | | | | | disable HS from configNeil Johnson2018-08-043-0/+9
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-0921-298/+667
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sync_block
| * | | | | | | | | | | | | | | | | Merge branch 'master' into developAmber Brown2018-08-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | 0.33.2Amber Brown2018-08-091-1/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | fix for rc1 v0.33.2rc1Amber Brown2018-08-071-1/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | versionAmber Brown2018-08-071-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servletErik Johnston2018-08-095-274/+395
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints
| | * | | | | | | | | | | | | | | | Fixup wording and remove dead codeErik Johnston2018-08-091-2/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Rename POST param to METHODErik Johnston2018-08-082-13/+22
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fixup logging and docstringsErik Johnston2018-08-082-2/+40
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix isortErik Johnston2018-08-061-4/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-0340-601/+707
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/refactor_repl_servlet
| | * | | | | | | | | | | | | | | | Use new helper base class for membership requestsErik Johnston2018-07-312-195/+108
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Use new helper base class for ReplicationSendEventRestServletErik Johnston2018-07-312-86/+40
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add helper base class for generating new replication endpointsErik Johnston2018-07-311-0/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will hopefully reduce the boiler plate required to implement new internal HTTP requests.
| * | | | | | | | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metricsRichard van der Hoff2018-08-083-1/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | more metrics for the federation and appservice senders
| | * | | | | | | | | | | | | | | | fix metric nameRichard van der Hoff2018-08-071-1/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | more metrics for the federation and appservice sendersRichard van der Hoff2018-08-073-1/+32
| | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versionsRichard van der Hoff2018-08-0812-22/+239
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | Support for room versioning
| | * | | | | | | | | | | | | | | Don't expose default_room_version as config optRichard van der Hoff2018-08-073-15/+5
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Check m.room.create for sane room_versionsRichard van der Hoff2018-08-062-4/+32
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | include known room versions in outgoing make_joinsRichard van der Hoff2018-08-064-8/+25
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | sanity check response from make_joinRichard van der Hoff2018-08-031-1/+3
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Enforce compatibility when processing make_join requestsRichard van der Hoff2018-08-033-4/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject make_join requests from servers which do not support the room version. Also include the room version in the response.
| | * | | | | | | | | | | | | | | Basic support for room versioningRichard van der Hoff2018-08-036-5/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first tranche of support for room versioning. It includes: * setting the default room version in the config file * new room_version param on the createRoom API * storing the version of newly-created rooms in the m.room.create event * fishing the version of existing rooms out of the m.room.create event
| | * | | | | | | | | | | | | | | Docstrings for BaseFederationServletRichard van der Hoff2018-08-031-0/+47
| | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to save me reverse-engineering this stuff again.
* | / | | | | | | | | | | | | | sync auth blockingNeil Johnson2018-08-081-5/+11
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-084-36/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/reserved_users
| * | | | | | | | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_trackerNeil Johnson2018-08-0810-53/+220
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | API for monthly_active_users table
| | * | | | | | | | | | | | | typosNeil Johnson2018-08-082-3/+3
| | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Fix occasional glitches in the synapse_event_persisted_position metricRichard van der Hoff2018-08-071-3/+8
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every so often this metric glitched to a negative number. I'm assuming it was due to backfilled events.
| * | | | | | | | | | | | Return M_NOT_FOUND when a profile could not be found. (#3596)Will Hunt2018-08-031-31/+58
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | prevent total number of reserved users being too largeNeil Johnson2018-08-071-1/+3
| | | | | | | | | | | |
* | | | | | | | | | | | implement reserved users for mau limitsNeil Johnson2018-08-073-12/+41
| | | | | | | | | | | |
* | | | | | | | | | | | WIP building out mau reserved usersNeil Johnson2018-08-061-1/+15
| | | | | | | | | | | |
* | | | | | | | | | | | load mau limit threepidsNeil Johnson2018-08-061-0/+3
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Fix postgres compatibility bugNeil Johnson2018-08-061-4/+15
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | update comments to reflect new sigNeil Johnson2018-08-061-4/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | make use of _simple_select_one_onecol, improved commentsNeil Johnson2018-08-062-8/+15
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | py3 fixNeil Johnson2018-08-031-1/+1
| | | | | | | |
* | | | | | | | bug fixesNeil Johnson2018-08-033-19/+7
| | | | | | | |
* | | | | | | | wip commit - tests failingNeil Johnson2018-08-033-40/+53
| | | | | | | |
* | | | | | | | fix (lots of) py3 test failuresNeil Johnson2018-08-031-2/+2
| | | | | | | |
* | | | | | | | fix caching and testsNeil Johnson2018-08-032-49/+43
| | | | | | | |
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-0318-376/+433
|\| | | | | | |
| * | | | | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handlingRichard van der Hoff2018-08-028-142/+123
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Clean up handling of errors from outbound requests
| | * | | | | | | Kill off MatrixCodeMessageExceptionRichard van der Hoff2018-08-015-78/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code brings the SimpleHttpClient into line with the MatrixFederationHttpClient by having it raise HttpResponseExceptions when a request fails (rather than trying to parse for matrix errors and maybe raising MatrixCodeMessageException). Then, whenever we were checking for MatrixCodeMessageException and turning them into SynapseErrors, we now need to check for HttpResponseExceptions and call to_synapse_error.
| | * | | | | | | Refactor code for turning HttpResponseException into SynapseErrorRichard van der Hoff2018-08-013-34/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit replaces SynapseError.from_http_response_exception with HttpResponseException.to_synapse_error. The new method actually returns a ProxiedRequestError, which allows us to pass through additional metadata from the API call.
| | * | | | | | | Be more careful which errors we send back over the C-S APIRichard van der Hoff2018-08-013-32/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We really shouldn't be sending all CodeMessageExceptions back over the C-S API; it will include things like 401s which we shouldn't proxy. That means that we need to explicitly turn a few HttpResponseExceptions into SynapseErrors in the federation layer. The effect of the latter is that the matrix errcode will get passed through correctly to calling clients, which might help with some of the random M_UNKNOWN errors when trying to join rooms.
| * | | | | | | | Merge pull request #3638 from ↵Richard van der Hoff2018-08-021-129/+148
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/rav/refactor_federation_client_exception_handling Factor out exception handling in federation_client
| | * | | | | | | Factor out exception handling in federation_clientRichard van der Hoff2018-08-011-129/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out the error handling from make_membership_event, send_join, and send_leave, so that it can be shared.
| * | | | | | | | Merge branch 'master' into developRichard van der Hoff2018-08-029-19/+65
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge tag 'v0.33.1'Richard van der Hoff2018-08-028-19/+63
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 0.33.1 (2018-08-02) =========================== SECURITY FIXES -------------- - Fix a potential issue where servers could request events for rooms they have not joined. (`#3641 <https://github.com/matrix-org/synapse/issues/3641>`_) - Fix a potential issue where users could see events in private rooms before they joined. (`#3642 <https://github.com/matrix-org/synapse/issues/3642>`_)
| | | * | | | | | | | Prepare 0.33.1Richard van der Hoff2018-08-021-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Check room visibility for /event/ requestsRichard van der Hoff2018-08-023-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the user has permission to view the requeseted event for /event/{eventId} and /room/{roomId}/event/{eventId} requests. Also check that the event is in the given room for /room/{roomId}/event/{eventId}, for sanity.
| | | * | | | | | | | Avoid extra db lookupsRichard van der Hoff2018-08-023-62/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're about to look up the events themselves anyway, we can skip the extra db queries here.
| | | * | | | | | | | Validation for events/rooms in fed requestsRichard van der Hoff2018-08-023-1/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we get a federation request which refers to an event id, make sure that said event is in the room the caller claims it is in. (patch supplied by @turt2live)
| | * | | | | | | | | Merge pull request #3377 from Valodim/note-affinityRichard van der Hoff2018-07-191-0/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | document that the affinity package is required for the cpu_affinity setting
| | | * | | | | | | | add note that the affinity package is required for the cpu_affinity settingVincent Breitmoser2018-06-091-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_storeErik Johnston2018-08-022-89/+100
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Split out DB writes in federation handler
| | * | | | | | | | | | update docsErik Johnston2018-08-012-4/+6
| | | | | | | | | | | |
| | * | | | | | | | | | _persist_auth_tree no longer returns anythingErik Johnston2018-08-011-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-07-3026-108/+446
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_fed_store
| | * | | | | | | | | | | Split out DB writes in federation handlerErik Johnston2018-07-252-85/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to easily add an internal replication API to proxy these reqeusts to master, so that we can move federation APIs to workers.
* | | | | | | | | | | | | update generate_monthly_active_users, and reap_monthly_active_usersNeil Johnson2018-08-021-2/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | typoNeil Johnson2018-08-021-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | wip attempt at cachingNeil Johnson2018-08-021-9/+47
| | | | | | | | | | | | |
* | | | | | | | | | | | | do mau checks based on monthly_active_users tableNeil Johnson2018-08-024-19/+29
| | | | | | | | | | | | |
* | | | | | | | | | | | | remove unused count_monthly_usersNeil Johnson2018-08-021-25/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | insertion into monthly_active_usersNeil Johnson2018-08-024-8/+36
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-022-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_tracker
| * | | | | | | | | | | | | self.db_conn unusedNeil Johnson2018-08-011-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | normalise reaping queryNeil Johnson2018-08-011-3/+38
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Revert "change monthly_active_users table to be a single column"Neil Johnson2018-08-022-4/+10
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec716a35b219d147dee51733b55573952799a549.
* | | | | | | | | | | | | change monthly_active_users table to be a single columnNeil Johnson2018-08-012-10/+4
| | | | | | | | | | | | |