summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Remove some superfluous logging (#3855)Amber Brown2018-09-132-1/+26
|
* Merge pull request #3846 from matrix-org/neilj/expose-registered-users hhs-7Neil Johnson2018-09-122-3/+28
|\ | | | | expose number of real reserved users
| * improve namingNeil Johnson2018-09-122-6/+10
| |
| * expose number of real reserved usersNeil Johnson2018-09-122-3/+24
| |
* | show heroes if a room has a 'deleted' name/canonical_alias (#3851)Matthew Hodgson2018-09-121-2/+15
| |
* | Merge pull request #3853 from matrix-org/erikj/log_outbound_each_timeErik Johnston2018-09-121-75/+74
|\ \ | | | | | | Log outbound requests when we retry
| * | Log outbound requests when we retryErik Johnston2018-09-121-75/+74
| | |
* | | argh pep8Matthew Hodgson2018-09-121-1/+1
| | |
* | | correctly log gappy sync metricsMatthew Hodgson2018-09-121-1/+1
| | |
* | | fix loglineMatthew Hodgson2018-09-121-1/+1
| | |
* | | Merge pull request #3841 from matrix-org/erikj/manhole_key_lengthErik Johnston2018-09-121-13/+31
|\ \ \ | | | | | | | | Change the manhole SSH key to have more bits
| * | | Change the manhole SSH key to have more bitsErik Johnston2018-09-111-13/+31
| | | | | | | | | | | | | | | | | | | | Newer versions of openssh client refuse to connect to the old key due to its length.
* | | | Port federation/ to py3 (#3847)Amber Brown2018-09-123-19/+18
| | | |
* | | | Merge pull request #3835 from krombel/fix_3821Amber Brown2018-09-121-1/+5
|\ \ \ \ | | | | | | | | | | fix VOIP crashes under Python 3
| * | | | fix VOIP crashes under Python 3 (#3821)Krombel2018-09-101-1/+5
| |/ / /
* | | | Merge pull request #3826 from matrix-org/rav/logging_for_keyringAmber Brown2018-09-123-13/+46
|\ \ \ \ | | | | | | | | | | add some logging for the keyring queue
| * | | | clearer logging when things fail, tooRichard van der Hoff2018-09-062-7/+28
| | | | |
| * | | | add some logging for the keyring queueRichard van der Hoff2018-09-061-6/+18
| | | | | | | | | | | | | | | | | | | | why is it so damn slow?
* | | | | Merge pull request #3824 from matrix-org/rav/fix_jwt_importAmber Brown2018-09-122-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix jwt import check
| * | | | | Fix jwt import checkRichard van der Hoff2018-09-072-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This handy code attempted to check that we could import jwt, but utterly failed to check it was the right jwt. Fixes https://github.com/matrix-org/synapse/issues/3793
* | | | | | Port rest/ to Python 3 (#3823)Amber Brown2018-09-1217-100/+112
| |_|_|/ / |/| | | |
* | | | | Port crypto/ to Python 3 (#3822)Amber Brown2018-09-123-6/+13
| | | | |
* | | | | Timeout reading body for outbound HTTP requestsErik Johnston2018-09-121-7/+45
| |_|_|/ |/| | |
* | | | Speed up lazy loading (#3827)Matthew Hodgson2018-09-123-30/+157
| |_|/ |/| | | | | | | | | | | * speed up room summaries by pulling their data from room_memberships rather than room state * disable LL for incr syncs, and log incr sync stats (#3840)
* | | Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_joinAmber Brown2018-09-071-0/+13
|\ \ \ | |/ / |/| | Send existing room tags down sync on join
| * | Don't send empty tags list down syncErik Johnston2018-09-061-0/+5
| | |
| * | Send existing room tags down sync on joinErik Johnston2018-09-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | When a user joined a room any existing tags were not sent down the sync stream. Ordinarily this isn't a problem because the user needs to be in the room to have set tags in it, however synapse will sometimes add tags for a user to a room, e.g. for server notices, which need to come down sync.
* | | Merge branch 'master' into developAmber Brown2018-09-071-1/+1
|\ \ \
| * | | versionAmber Brown2018-09-071-1/+1
| | | |
| * | | Bump version and changelogErik Johnston2018-09-061-1/+1
| | | |
| * | | Merge tag 'v0.33.3.1' into release-v0.33.4Erik Johnston2018-09-064-31/+125
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 0.33.3.1 (2018-09-06) ============================= SECURITY FIXES -------------- - Fix an issue where event signatures were not always correctly validated ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) - Fix an issue where server_acls could be circumvented for incoming events ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) Internal Changes ---------------- - Unignore synctl in .dockerignore to fix docker builds ([\#3802](https://github.com/matrix-org/synapse/issues/3802))
| * | | | version and towncrier v0.33.4rc1Amber Brown2018-09-041-1/+1
| | | | |
* | | | | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6Neil Johnson2018-09-061-1/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | guest users should not be part of mau total
| * | | | ensure guests never enter mau listNeil Johnson2018-09-061-4/+3
| | | | |
| * | | | guest users should not be part of mau totalNeil Johnson2018-09-051-1/+6
| | | | |
* | | | | Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edusAmber Brown2018-09-071-0/+12
|\ \ \ \ \ | | | | | | | | | | | | Limit the number of PDUs/EDUs per fedreation transaction
| * | | | | Limit the number of PDUs/EDUs per fedreation transactionErik Johnston2018-09-061-0/+12
| | | | | |
* | | | | | Merge pull request #3788 from matrix-org/erikj/remove_conn_idAmber Brown2018-09-071-12/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove conn_id from repl prometheus metrics
| * | | | | | Remove conn_idErik Johnston2018-09-041-2/+2
| | | | | | |
| * | | | | | Remove conn_id from repl prometheus metricsErik Johnston2018-09-031-10/+10
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | `conn_id` gets set to a random string, and so we end up filling up prometheus with tonnes of data series, which is bad.
* | | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_stateAmber Brown2018-09-071-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | User iter* during sync state calculations
| * | | | | | User iter* during sync state calculationsErik Johnston2018-09-051-8/+8
| | | | | | |
* | | | | | | Merge pull request #3804 from matrix-org/rav/fix_openssl_depAmber Brown2018-09-071-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | bump dep on pyopenssl to 16.x
| * | | | | | bump dep on pyopenssl to 16.xRichard van der Hoff2018-09-061-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Port handlers/ to Python 3 (#3803)Amber Brown2018-09-076-19/+22
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'master' into developRichard van der Hoff2018-09-065-32/+126
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | prepare v0.33.3.1 v0.33.3.1 github/release-v0.33.3.1 release-v0.33.3.1Richard van der Hoff2018-09-061-1/+1
| | | |
| * | | Fix origin handling for pushed transactionsRichard van der Hoff2018-09-053-15/+15
| | | | | | | | | | | | | | | | | | | | Use the actual origin for push transactions, rather than whatever the remote server claimed.
| * | | Check that signatures on events are validRichard van der Hoff2018-09-051-16/+110
| | | | | | | | | | | | | | | | | | | | | | | | We should check that both the sender's server, and the server which created the event_id (which may be different from whatever the remote server has told us the origin is), have signed the event.
* | | | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filterRichard van der Hoff2018-09-052-13/+39
|\ \ \ \ | | | | | | | | | | Implement 'event_format' filter param in /sync
| * | | | Implement 'event_format' filter param in /syncRichard van der Hoff2018-09-042-13/+39
| | |_|/ | |/| | | | | | | | | | | | | | This has been specced and part-implemented; let's implement it for /sync (but no other endpoints yet :/).
* | | | Port http/ to Python 3 (#3771)Amber Brown2018-09-066-184/+130
| |_|/ |/| |
* | | Merge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings hhs-5Neil Johnson2018-09-042-7/+21
|\ \ \ | |/ / |/| | improve human readable error messages
| * | improve human readable error messageNeil Johnson2018-09-041-1/+2
| | |
| * | improve human readable error messagesNeil Johnson2018-09-042-7/+20
| | |
* | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_funcErik Johnston2018-09-033-57/+7
|\ \ \ | |/ / |/| | Remove unnecessary resolve_events_with_state_map
| * | Remove unnecessary resolve_events_with_state_mapErik Johnston2018-08-223-57/+7
| | | | | | | | | | | | | | | We only ever used the synchronous resolve_events_with_state_map in one place, which is trivial to replace with the async version.
* | | assert rather than warn hhs-4Neil Johnson2018-08-311-3/+2
| | |
* | | move threepid checker to config, add missing yieldsNeil Johnson2018-08-315-21/+35
| | |
* | | fix reference to is_threepid_reservedNeil Johnson2018-08-311-1/+1
| | |
* | | ensure post registration auth checks do not fail erroneouslyNeil Johnson2018-08-314-6/+24
| | |
* | | fix bug where preserved threepid user comes to sign up and server is mau blockedNeil Johnson2018-08-314-3/+21
| | |
* | | Port storage/ to Python 3 (#3725)Amber Brown2018-08-3111-31/+77
| | |
* | | Merge pull request #3764 from matrix-org/rav/close_db_conn_after_initRichard van der Hoff2018-08-3012-48/+30
|\ \ \ | | | | | | | | Make sure that we close db connections opened during init
| * | | use abc.abstractpropertyRichard van der Hoff2018-08-281-5/+4
| | | | | | | | | | | | | | | | This gives clearer messages when someone gets it wrong
| * | | Make sure that we close db connections opened during initRichard van der Hoff2018-08-2812-48/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should explicitly close any db connections we open, because failing to do so can block other transactions as per https://github.com/matrix-org/synapse/issues/3682. Let's also try to factor out some of the boilerplate by having server classes define their datastore class rather than duplicating the whole of `setup`.
* | | | fix #3445Krombel2018-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | itervalues(d) calls d.itervalues() [PY2] and d.values() [PY3] but SortedDict only implements d.values()
* | | | don't return non-LL-member state in incremental sync state blocks (#3760)Matthew Hodgson2018-08-281-1/+8
|/ / / | | | | | | don't return non-LL-member state in incremental sync state blocks
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contactErik Johnston2018-08-241-4/+3
|\ \ \
| * | | Fix checking if service notice room is already taggedErik Johnston2018-08-241-4/+3
| | | | | | | | | | | | | | | | This manifested in synapse repeatedly setting the tag for the room
* | | | Change admin_uri to admin_contact in config and errorsErik Johnston2018-08-244-8/+8
|/ / /
* | | Ensure we wake up /sync when we add tag to notice roomErik Johnston2018-08-242-2/+13
| | |
* | | Make content of tag an empty object rather than nullErik Johnston2018-08-242-2/+2
| | |
* | | Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1Erik Johnston2018-08-241-1/+1
|\ \ \ | | | | | | | | Allow federation_domain_whitelist to be emtpy list
| * | | Fix bug when federation_domain_whitelist is an emtpy listErik Johnston2018-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | Outbound federation were incorrectly allowed when the config option was set to an empty list
* | | | Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticseErik Johnston2018-08-241-0/+4
|\ \ \ \ | | | | | | | | | | Fix bug where we broke sync when using limit_usage_by_mau
| * | | | Fix bug where we broke sync when using limit_usage_by_mauErik Johnston2018-08-241-0/+4
| |/ / / | | | | | | | | | | | | | | | | We assumed that we always had service notices configured, but that is not always true
* | | | Merge pull request #3751 from matrix-org/rav/twisted_17Richard van der Hoff2018-08-241-1/+1
|\ \ \ \ | |/ / / |/| | | Pin to twisted 17.1 or later
| * | | Pin to twisted 17.1 or laterRichard van der Hoff2018-08-241-1/+1
| | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/3741.
* | | | Implement trail usersErik Johnston2018-08-234-2/+43
|/ / /
* | | Fix bug where we resent "limit exceeded" server noticesErik Johnston2018-08-231-1/+5
| | | | | | | | | | | | This was due to a bug where we mutated a cached event's contents
* | | 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
| | | | | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-23 09:07:32 +0000