summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Deny peeking into rooms that have been blockedErik Johnston2019-03-213-3/+76
|
* Rejig testcase to make it more extensibleErik Johnston2019-03-211-17/+22
|
* Remove debugErik Johnston2019-03-211-1/+0
|
* Add testsErik Johnston2019-03-211-1/+66
|
* Fix upsertErik Johnston2019-03-211-0/+1
|
* Revert spurious deleteErik Johnston2019-03-201-0/+4
|
* comment block_roomErik Johnston2019-03-201-0/+9
|
* Use flagsErik Johnston2019-03-205-15/+17
|
* Move requester check into assert_accepted_privacy_policyErik Johnston2019-03-201-5/+8
|
* NewsfileErik Johnston2019-03-201-0/+1
|
* Gracefully handle failing to kick userErik Johnston2019-03-201-19/+27
|
* Log new room IDErik Johnston2019-03-201-1/+6
|
* Only require consent for events with an associated requestErik Johnston2019-03-201-1/+5
| | | | | | | | | There are a number of instances where a server or admin may puppet a user to join/leave rooms, which we don't want to fail if the user has not consented to the privacy policy. We fix this by adding a check to test if the requester has an associated access_token, which is used as a proxy to answer the question of whether the action is being done on behalf of a real request from the user.
* Allow blocking a room multiple timesErik Johnston2019-03-201-2/+4
|
* Batching in the user directory import (#4900)Amber Brown2019-03-212-0/+14
|
* Add a config option for torture-testing worker replication. (#4902)Richard van der Hoff2019-03-203-1/+23
| | | Setting this to 50 or so makes a bunch of sytests fail in worker mode.
* Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-207-22/+308
| | | | Rate-limit outgoing read-receipts as per #4730.
* Merge pull request #4894 from matrix-org/erikj/postgres_tuningErik Johnston2019-03-192-2/+21
|\ | | | | Add note on tuning postgres
| * NewsfileErik Johnston2019-03-191-0/+1
| |
| * Add note on tuning postgresErik Johnston2019-03-191-2/+20
|/
* Merge pull request #4879 from matrix-org/erikj/test_old_depsErik Johnston2019-03-193-1/+21
|\ | | | | Add py27-old test case to buildkite
| * Add comment back inErik Johnston2019-03-191-0/+1
| |
| * Update newsfileErik Johnston2019-03-191-1/+1
| |
| * Revert changesErik Johnston2019-03-191-12/+2
| |
| * Bring py27-old into line with other test envsErik Johnston2019-03-181-0/+14
| |
| * Add coverage to py27-oldErik Johnston2019-03-181-3/+6
| |
| * NewsfileErik Johnston2019-03-181-0/+1
| |
| * Add py27-old test case to buildkiteErik Johnston2019-03-181-0/+11
| |
* | Merge pull request #4889 from matrix-org/rav/test_real_configRichard van der Hoff2019-03-198-18/+44
|\ \ | | | | | | Use a regular HomeServerConfig object for unit tests
| * | Fix RegistrationTestCaseRichard van der Hoff2019-03-191-2/+9
| | | | | | | | | | | | turns out this relies on there being a `user_consent_version` set.
| * | changelogRichard van der Hoff2019-03-191-0/+1
| | |
| * | Use a regular HomeServerConfig object for unit testsRichard van der Hoff2019-03-193-13/+25
| | | | | | | | | | | | | | | | | | | | | Rather than using a Mock for the homeserver config, use a genuine HomeServerConfig object. This makes for a more realistic test, and means that we don't have to keep remembering to add things to the mock config every time we add a new config setting.
| * | Fix resource limits testsRichard van der Hoff2019-03-191-2/+5
| | | | | | | | | | | | | | | Make sure that we have a `server_notices_mxid` set, given that we are relying on it.
| * | Fix registration testRichard van der Hoff2019-03-191-1/+2
| | | | | | | | | | | | | | | * Set allow_guest_access = True, since we rely on it * config doesn't have a `hostname` attribute; it is `server_name`
| * | Fix email testRichard van der Hoff2019-03-191-0/+2
| | | | | | | | | | | | | | | | | | | | | The Mailer expects the config object to have `email_smtp_pass` and `email_riot_base_url` attributes (and it won't by default, because the default config impl doesn't set any of the attributes unless email_enable_notifs is set).
| * | Merge remote-tracking branch 'origin/develop' into HEADRichard van der Hoff2019-03-1910-11/+45
| |\ \
* | | | Merge pull request #4888 from matrix-org/rav/fix_disabled_hsRichard van der Hoff2019-03-193-3/+24
|\| | | | |/ / |/| | Enforce hs_disabled_message correctly
| * | Enforce hs_disabled_message correctlyRichard van der Hoff2019-03-193-3/+24
| | | | | | | | | | | | | | | Fixes a bug where hs_disabled_message was not enforced for 3pid-based requests if there was no server_notices_mxid configured.
* | | fix test_auto_create_auto_join_where_no_consent (#4886)Neil Johnson2019-03-195-5/+39
| | |
* | | Fix user directory background update (#4887)Erik Johnston2019-03-192-1/+2
| | |
* | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-03-193-5/+4
|\ \ \ | |/ / |/| |
| * | Repoint docs for federation (#4881)Michael Kaye2019-03-192-1/+2
| | |
| * | fix some typos in federate.mdRichard van der Hoff2019-03-151-4/+2
| | |
* | | Comment out most options in the generated config. (#4863)Richard van der Hoff2019-03-1916-171/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it so that most options in the config are optional, and commented out in the generated config. The reasons this is a good thing are as follows: * If we decide that we should change the default for an option, we can do so, and only those admins that have deliberately chosen to override that option will be stuck on the old setting. * It moves us towards a point where we can get rid of the super-surprising feature of synapse where the default settings for the config come from the generated yaml. * It makes setting up a test config for unit testing an order of magnitude easier (see forthcoming PR). * It makes the generated config more consistent, and hopefully easier for users to understand.
* | | Migrate the user directory initial population to a background task (#4864)Amber Brown2019-03-198-301/+405
| | |
* | | Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-186-5/+86
| |/ |/|
* | Add ratelimiting on login (#4821)Brendan Abolivier2019-03-1511-37/+259
| | | | | | Add two ratelimiters on login (per-IP address and per-userID).
* | Merge pull request #4855 from matrix-org/rav/refactor_transaction_queueRichard van der Hoff2019-03-158-761/+865
|\ \ | | | | | | Split TransactionQueue up
| * | changelogRichard van der Hoff2019-03-131-0/+1
| | |
| * | Rename and move the classesRichard van der Hoff2019-03-137-811/+864
| | |
| * | Factor per-destination stuff out of TransactionQueueRichard van der Hoff2019-03-131-132/+182
| | | | | | | | | | | | This is easier than having to have a million fields keyed on destination.
* | | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_workerRichard van der Hoff2019-03-156-55/+111
|\| | | | | | | | Move client receipt processing to federation sender worker.
| * | changelogRichard van der Hoff2019-03-131-0/+1
| | |
| * | Move client receipt processing to federation sender worker.Richard van der Hoff2019-03-134-33/+78
| | | | | | | | | | | | | | | This is mostly a prerequisite for #4730, but also fits with the general theme of "move everything off the master that we possibly can".
| * | declare a ReadReceipt classRichard van der Hoff2019-03-132-24/+34
| | | | | | | | | | | | | | | I'm going to use this in queues and things, so it'll be useful to give it more of a structure.
* | | Merge pull request #4853 from matrix-org/erikj/worker_docker_ciErik Johnston2019-03-155-17/+54
|\ \ \ | | | | | | | | Allow passing --daemonize to workers
| * | | Correctly handle all command line optionsErik Johnston2019-03-143-16/+42
| | | |
| * | | NewsfileErik Johnston2019-03-131-0/+1
| | | |
| * | | Allow passing --daemonize to workersErik Johnston2019-03-132-1/+11
| | | |
* | | | Add systemd setup that supports workers (#4662)Luca Corbatto2019-03-156-0/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This setup is a way to manage workers with systemd. It does however not require workers. You can use this setup without workers. You just have to make sure that the homeserver is forking and writes its PID file to the location the service is looking in. The currently distributed setup in the debian package does not work in conjunction with workers. * Adds changelog * Lets systemd handle the forking Sets all services to `type=simple` and disables daemonizing on the synapse side. * Formats readme to 80 columns per line * Allows for full restart of all workers * Changes README to reflect the new setup * Adds dot to end of changelog file * Removes surplus word Co-Authored-By: targodan <targodan@users.noreply.github.com> * Adds missing word Co-Authored-By: targodan <targodan@users.noreply.github.com> * Fixes linebreak Co-Authored-By: targodan <targodan@users.noreply.github.com> * Fixes unit type
* | | | Add some stuff back to the .gitignore (#4843)Aaron Raimist2019-03-152-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add some stuff back to the .gitignore Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist> * Reorder and remove old items from .gitignore Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | Merge pull request #4859 from matrix-org/revert-4793-anoa/trailing_slashesErik Johnston2019-03-144-12/+11
|\ \ \ \ | | | | | | | | | | Revert "Make federation endpoints more tolerant of trailing slashes for some endpoints"
| * | | | Revert "Make federation endpoints more tolerant of trailing slashes for some ↵Erik Johnston2019-03-144-12/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | endpoints (#4793)" This reverts commit 290552fd836f4ae2dc1d893a7f72f7fff85365d3.
* | | | Merge pull request #4846 from matrix-org/hawkowl/userdir-searchErik Johnston2019-03-1411-138/+206
|\ \ \ \ | |/ / / |/| | | Improve searching in the userdir
| * | | fixupAmber Brown2019-03-132-2/+2
| | | |
| * | | fixupAmber Brown2019-03-134-75/+17
| | | |
| * | | fixupAmber Brown2019-03-121-2/+2
| | | |
| * | | fixupAmber Brown2019-03-121-1/+1
| | | |
| * | | fixupAmber Brown2019-03-121-1/+2
| | | |
| * | | fixupAmber Brown2019-03-124-176/+159
| | | |
| * | | fixupAmber Brown2019-03-121-1/+1
| | | |
| * | | use the old methodAmber Brown2019-03-121-3/+2
| | | |
| * | | fixAmber Brown2019-03-121-1/+1
| | | |
| * | | pep8Amber Brown2019-03-121-2/+1
| | | |
| * | | changelogAmber Brown2019-03-121-0/+1
| | | |
| * | | fixesAmber Brown2019-03-124-52/+74
| | | |
| * | | setup masterAmber Brown2019-03-111-0/+2
| | | |
| * | | master startupAmber Brown2019-03-112-0/+9
| | | |
| * | | Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-searchAmber Brown2019-03-118-19/+57
| |\ \ \
| * | | | initialAmber Brown2019-03-115-4/+114
| | | | |
* | | | | Document using a certificate with a full chain (#4849)Andrew Morgan2019-03-134-2/+17
| | | | |
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into developNeil Johnson2019-03-125-154/+207
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | fix orphaned sentenceNeil Johnson2019-03-121-1/+0
| | | |
| * | | Neilj/improved delegation doc 2 (#4832)Neil Johnson2019-03-124-148/+202
| | | | | | | | | | | | | | | | | | | | Improved federation configuration docs. Specifically detailing .well-known and SRV based delegation methods. Inspiration Valentin Lab <valentin.lab@kalysto.org> for https://github.com/matrix-org/synapse/pull/4781
| * | | Add zwsp in bug report template (#4811)Richard van der Hoff2019-03-061-6/+6
| | | | | | | | | | | | | | | | | | | | Inserts a zero-width space in the `-->` which isn't supposed to close a comment. This used to be here but it got lost in d86826277d764217311d0d34a8e6143d09237a94.
* | | | Transfer local user's push rules on room upgrade (#4838)Andrew Morgan2019-03-123-0/+62
| | | | | | | | | | | | Transfer push rules (notifications) on room upgrade
* | | | Clarify what registration_shared_secret allows for (#2885) (#4844)Aaron Raimist2019-03-114-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clarify what registration_shared_secret allows for (#2885) Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | Make federation endpoints more tolerant of trailing slashes for some ↵Andrew Morgan2019-03-114-11/+12
| | | | | | | | | | | | | | | | | | | | endpoints (#4793) Server side of a solution towards #3622.
* | | | Merge pull request #4847 from matrix-org/erikj/fix_stacktrace_keyringErik Johnston2019-03-112-2/+3
|\ \ \ \ | |_|_|/ |/| | | Correctly log expected errors when fetching server keys
| * | | NewsfileErik Johnston2019-03-111-0/+1
| | | |
| * | | Correctly log expected errors when fetching server keysErik Johnston2019-03-111-2/+2
|/ / /
* | | Merge pull request #4839 from matrix-org/anoa/no_captcha_testsAndrew Morgan2019-03-112-0/+2
|\ \ \ | | | | | | | | Disable captcha registration by default in tests
| * | | Add changelogAndrew Morgan2019-03-081-0/+1
| | | |
| * | | Disable captcha registration by default in testsAndrew Morgan2019-03-081-0/+1
| | |/ | |/|
* | | fix incorrect encoding of filenames with spaces in (#2090)Matthew Hodgson2019-03-112-3/+52
| | | | | | | | | | | | fixes https://github.com/vector-im/riot-web/issues/3155
* | | Merge pull request #4837 from matrix-org/erikj/optional_prev_stateErik Johnston2019-03-114-16/+3
|\ \ \ | |/ / |/| | Make `prev_state` field optional
| * | Add comment to schemaErik Johnston2019-03-081-0/+2
| | |
| * | NewsfileErik Johnston2019-03-081-0/+1
| | |
| * | Make `prev_state` field optionalErik Johnston2019-03-082-16/+0
|/ / | | | | | | | | | | | | The `prev_state` field on events is not specced and so synapse shouldn't explode if an event is missing the field. Fixes #4787
* | Merge pull request #4814 from matrix-org/erikj/soft_fail_implErik Johnston2019-03-085-1/+113
|\ \ | | | | | | Implement soft fail
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-03-0840-503/+711
| |\ \ | |/ / |/| | | | | erikj/soft_fail_impl
* | | Merge pull request #4829 from matrix-org/erikj/device_list_seen_updatesErik Johnston2019-03-082-3/+8
|\ \ \ | | | | | | | | When re-syncing device lists reset the state
| * | | NewsfileErik Johnston2019-03-071-0/+1
| | | |
| * | | When re-syncing device lists reset the stateErik Johnston2019-03-071-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We keep track of what stream IDs we've seen so that we know what updates we've handled or missed. If we re-sync we don't know if the updates we've seen are included in the re-sync (there may be a race), so we should reset the seen updates.
* | | | Merge pull request #4828 from matrix-org/erikj/debug_device_listsErik Johnston2019-03-072-2/+39
|\ \ \ \ | |/ / / |/| | | Add some debug logging for device list handling
| * | | NewsfileErik Johnston2019-03-071-0/+1
| | | |
| * | | Add some debug logging for device list handlingErik Johnston2019-03-071-2/+38
|/ / /
* | | Merge pull request #4824 from matrix-org/rav/docker_docsRichard van der Hoff2019-03-072-4/+38
|\ \ \ | | | | | | | | Document the `generate` option for the docker image.
| * | | Document the `generate` option for the docker image.Richard van der Hoff2019-03-072-4/+38
| | | |
* | | | Debian package: fix warning during preconfiguration. (#4823)Richard van der Hoff2019-03-072-1/+11
|\ \ \ \
| * | | | Debian package: fix warning during preconfiguration.Richard van der Hoff2019-03-072-1/+11
| |/ / /
* | | | Update example_log_config.yaml (#4820)Richard van der Hoff2019-03-072-1/+3
| | | |
* | | | Fix check-newsfragment for debian-only changes. (#4825)Richard van der Hoff2019-03-072-7/+6
| | | |
* | | | Rewrite userdir to be faster (#4537)Amber Brown2019-03-076-409/+400
| | | |
* | | | Reword the sample config header to be less scary (#4801)Matthew Hodgson2019-03-073-10/+21
|/ / /
* | | Merge pull request #4779 from matrix-org/travis/iconsTravis Ralston2019-03-064-7/+8
|\ \ \ | | | | | | | | Use static locations for Riot icons
| * | | Update changelog.d/4779.miscRichard van der Hoff2019-03-061-1/+1
| | | | | | | | | | | | Co-Authored-By: turt2live <travpc@gmail.com>
| * | | ChangelogTravis Ralston2019-03-011-0/+1
| | | |
| * | | Use static locations for Riot iconsTravis Ralston2019-03-013-7/+7
| | | | | | | | | | | | See https://github.com/vector-im/riot-web/issues/9009
* | | | Merge pull request #4818 from matrix-org/erikj/prefill_client_ipsErik Johnston2019-03-062-0/+3
|\ \ \ \ | | | | | | | | | | Prefill client IPs cache on workers
| * | | | Update changelogErik Johnston2019-03-062-1/+1
| | | | |
| * | | | NewsfileErik Johnston2019-03-061-0/+1
| | | | |
| * | | | Prefill client IPs cache on workersErik Johnston2019-03-061-0/+2
| | | | |
* | | | | Merge pull request #4815 from matrix-org/erikj/docstringsErik Johnston2019-03-063-7/+46
|\ \ \ \ \ | | | | | | | | | | | | Add docstrings from matrix-org-hotfixes
| * | | | | NewsfileErik Johnston2019-03-061-0/+1
| | | | | |
| * | | | | Add docstrings from matrix-org-hotfixesErik Johnston2019-03-062-7/+45
| |/ / / /
* | | | | Merge pull request #4816 from matrix-org/erikj/4422_debugErik Johnston2019-03-062-7/+47
|\ \ \ \ \ | | | | | | | | | | | | Port #4422 debug logging from hotfixes
| * | | | | NewsfileErik Johnston2019-03-061-0/+1
| | | | | |
| * | | | | Port #4422 debug logging from hotfixesErik Johnston2019-03-061-7/+46
| |/ / / /
* | | | | Merge pull request #4817 from matrix-org/erikj/shutdown_room_messageErik Johnston2019-03-062-11/+12
|\ \ \ \ \ | |/ / / / |/| | | | Send message after room has been shutdown
| * | | | NewsfileErik Johnston2019-03-061-0/+1
| | | | |
| * | | | Send message after room has been shutdownErik Johnston2019-03-061-11/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the explanation message is sent to the abuse room before any users are forced joined, which means it tends to get lost in the backlog of joins. So instead we send the message *after* we've forced joined everyone.
* | | | Merge pull request #4792 from matrix-org/anoa/replication_tokensAndrew Morgan2019-03-062-3/+29
|\ \ \ \ | | | | | | | | | | Support batch updates in the worker sender
| * | | | Simplify token replication logicAndrew Morgan2019-03-051-23/+14
| | | | |
| * | | | Clean up logic and add commentsAndrew Morgan2019-03-041-11/+18
| | | | |
| * | | | Clearer branching, fix missing list clearAndrew Morgan2019-03-041-4/+11
| | | | |
| * | | | Add changelogAndrew Morgan2019-03-041-0/+1
| | | | |
| * | | | Prevent replication wedgingAndrew Morgan2019-03-041-4/+24
| | | | |
* | | | | Merge pull request #4804 from ↵Brendan Abolivier2019-03-067-31/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/ratelimit_registration_improvements Improve ratelimit on registration
| * | | | | Make registration ratelimiter separate from the main events oneBrendan Abolivier2019-03-063-2/+6
| | | | | |
| * | | | | Revert "Split ratelimiters in two (one for events, one for registration)"Brendan Abolivier2019-03-069-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d7dbad3526136cfc9fdbd568635be5016fb637db.
| * | | | | Add changelogBrendan Abolivier2019-03-051-0/+1
| | | | | |
| * | | | | Split ratelimiters in two (one for events, one for registration)Brendan Abolivier2019-03-059-11/+15
| | | | | |
| * | | | | Update sample configBrendan Abolivier2019-03-051-11/+13
| | | | | |
| * | | | | Move settings from registration to ratelimiting in config fileBrendan Abolivier2019-03-052-18/+20
|/ / / / /
| | | * | Factor out soft fail checksErik Johnston2019-03-081-5/+22
| | | | |
| | | * | NewsfileErik Johnston2019-03-061-0/+1
| | | | |
| | | * | Implement soft failErik Johnston2019-03-064-1/+95
| |_|/ / |/| | |
* | | | Merge pull request #4772 from jbweston/jbweston/server-version-apiErik Johnston2019-03-055-2/+85
|\ \ \ \ | | | | | | | | | | Add 'server_version' endpoint to admin API
| * | | | add API documentationJoseph Weston2019-03-021-0/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joseph Weston <joseph@weston.cloud>
| * | | | Add changelog and AUTHORS file entryJoseph Weston2019-03-012-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joseph Weston <joseph@weston.cloud>
| * | | | Add 'server_version' endpoint to admin APIJoseph Weston2019-03-012-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | This is required because the 'Server' HTTP header is not always passed through proxies.
| * | | | Import 'admin' module rather than 'register_servlets' directlyJoseph Weston2019-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will later need also to import 'register_servlets' from the 'login' module, so we un-pollute the namespace now to keep the logical changes separate.
* | | | | Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-0517-54/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rate-limiting for registration * Add unit test for registration rate limiting * Add config parameters for rate limiting on auth endpoints * Doc * Fix doc of rate limiting function Co-Authored-By: babolivier <contact@brendanabolivier.com> * Incorporate review * Fix config parsing * Fix linting errors * Set default config for auth rate limiting * Fix tests * Add changelog * Advance reactor instead of mocked clock * Move parameters to registration specific config and give them more sensible default values * Remove unused config options * Don't mock the rate limiter un MAU tests * Rename _register_with_store into register_with_store * Make CI happy * Remove unused import * Update sample config * Fix ratelimiting test for py2 * Add non-guest test
* | | | | Merge pull request #4795 from matrix-org/anoa/configinatoractoringAndrew Morgan2019-03-052-3/+4
|\ \ \ \ \ | | | | | | | | | | | | Remove reference to that no longer exists in README
| * | | | | Add changelogAndrew Morgan2019-03-041-0/+1
| | | | | |
| * | | | | Remove reference to that no longer exists in READMEAndrew Morgan2019-03-041-3/+3
| | | | | |
* | | | | | Merge pull request #4794 from matrix-org/anoa/erroneous_dollahsAndrew Morgan2019-03-052-22/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unnecessary dollar signs
| * | | | | | Add changelogAndrew Morgan2019-03-041-0/+1
| | | | | | |
| * | | | | | Remove unnecessary dollar signsAndrew Morgan2019-03-041-22/+22
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | A dollar sign is already appended to the end of each PATH, so there's no need to add one in the PATH declaration as well.
* | | | | | Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_roomErik Johnston2019-03-054-29/+127
|\ \ \ \ \ \ | | | | | | | | | | | | | | Stop backpaginating when events not visible
| * | | | | | clarify commentsErik Johnston2019-03-053-10/+13
| | | | | | |
| * | | | | | Fix missing null guardErik Johnston2019-03-041-1/+1
| | | | | | |
| * | | | | | Only check history visibility when filteringErik Johnston2019-03-042-35/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When filtering events to send to server we check more than just history visibility. However when deciding whether to backfill or not we only care about the history visibility.
| * | | | | | s/get_forward_events/get_successor_events/Erik Johnston2019-03-042-3/+3
| | | | | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-03-04101-535/+1462
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | erikj/stop_fed_not_in_room
| * | | | | | | Update newsfile to have a full stopErik Johnston2019-02-271-1/+1
| | | | | | | |
| * | | | | | | Update commentsErik Johnston2019-02-271-3/+13
| | | | | | | |
| * | | | | | | NewsfileErik Johnston2019-02-201-0/+1
| | | | | | | |
| * | | | | | | Stop backpaginating when events not visibleErik Johnston2019-02-203-5/+78
| | | | | | | |
* | | | | | | | Merge pull request #4799 from matrix-org/rav/clean_up_replication_codeErik Johnston2019-03-052-60/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Clean ups in replication notifier
| * | | | | | | | changelogRichard van der Hoff2019-03-041-0/+1
| | | | | | | | |
| * | | | | | | | Remove redundant PreserveLoggingContextRichard van der Hoff2019-03-041-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both (!) things that register as replication listeners do the right thing wrt logcontexts, so this is redundant.
| * | | | | | | | Remove unused `wait_for_replication` methodRichard van der Hoff2019-03-041-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I guess this was used once? It's not now, anyway.
* | | | | | | | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keysErik Johnston2019-03-0511-747/+765
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow /keys/{changes,query} API to run on worker
| * | | | | | | | | NewsfileErik Johnston2019-03-041-0/+1
| | | | | | | | | |
| * | | | | | | | | Allow /keys/{changes,query} API to run on workerErik Johnston2019-03-043-2/+15
| | | | | | | | | |
| * | | | | | | | | Split DeviceHandler into master and workerErik Johnston2019-03-042-170/+179
| | | | | | | | | |
| * | | | | | | | | Fixup slave storesErik Johnston2019-03-046-577/+572
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4798 from matrix-org/rav/rr_debugRichard van der Hoff2019-03-042-6/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add some debug about processing read receipts.
| * | | | | | | | | Add some debug about processing read receipts.Richard van der Hoff2019-03-042-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm hoping to establish which rooms are having lots of RRs sent for them, and how old the events are when they are sent.
* | | | | | | | | | Merge pull request #4797 from matrix-org/rav/inline_rr_sendRichard van der Hoff2019-03-042-59/+45
|\| | | | | | | | | | |_|/ / / / / / / |/| | | | | | | | Clean up read-receipt handling.
| * | | | | | | | Clean up read-receipt handling.Richard van der Hoff2019-03-042-59/+45
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a call to run_as_background_process: there is no need to run this as a background process, because build_and_send_edu does not block. We may as well inline the whole of _push_remotes.
* / / / / / / / Include a default configuration file in the 'docs' directory. (#4791)Richard van der Hoff2019-03-0411-13/+1114
|/ / / / / / /
* | | | | | | Fix v4v6 option in HAProxy example config (#4790)Seebi2019-03-042-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The v4v6 option only has a usage one ipv6 socket: https://serverfault.com/q/747895 Signed-off-by: Flakebi <flakebi@t-online.de>
* | | | | | | Avoid rebuilding Edu objects in worker mode (#4770)Richard van der Hoff2019-03-046-19/+37
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | In worker mode, on the federation sender, when we receive an edu for sending over the replication socket, it is parsed into an Edu object. There is no point extracting the contents of it so that we can then immediately build another Edu.
* | | | | | Update test_typing to use HomeserverTestCase. (#4771)Richard van der Hoff2019-03-045-179/+176
| |_|_|/ / |/| | | |
* | | | | Fix incorrect log about not persisting duplicate state event. (#4776)Richard van der Hoff2019-03-012-3/+5
| |_|/ / |/| | | | | | | We were logging this when it was not true.
* | | | Merge branch 'master' into developRichard van der Hoff2019-03-013-6/+6
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | 0.99.2 v0.99.2 github/release-v0.99.2 release-v0.99.2Richard van der Hoff2019-03-011-6/+0
| | |
| * | 0.99.2Richard van der Hoff2019-03-013-4/+10
| | |
* | | Minor docstring fixes for MatrixFederationAgent (#4765)Andrew Morgan2019-02-282-1/+6
| | |
* | | Make 'event_id' a required parameter in federated state requests (#4741)Amber Brown2019-02-272-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * make 'event_id' a required parameter in federated state requests As per the spec: https://matrix.org/docs/spec/server_server/r0.1.1.html#id40 Signed-off-by: Joseph Weston <joseph@weston.cloud> * add changelog entry for bugfix Signed-off-by: Joseph Weston <joseph@weston.cloud> * Update server.py
* | | Fix parsing of Content-Disposition headers (#4763)Richard van der Hoff2019-02-273-20/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix parsing of Content-Disposition headers TIL: filenames in content-dispostion headers can contain semicolons, and aren't %-encoded. * fix python2 incompatibility * Fix docstrings
* | | Move from TravisCI to BuildKite (#4752)Amber Brown2019-02-2713-108/+325
| | |
* | | Merge pull request #4759 from matrix-org/erikj/3pid_client_readerErik Johnston2019-02-274-33/+37
|\ \ \ | | | | | | | | Move /account/3pid to client_reader
| * | | Update changelog.d/4759.featureRichard van der Hoff2019-02-271-1/+1
| | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re>
| * | | NewsfileErik Johnston2019-02-271-0/+1
| | | |
| * | | Move /account/3pid to client_readerErik Johnston2019-02-273-33/+36
| | | |
* | | | Merge pull request #4758 from matrix-org/erikj/use_presence_replicationErik Johnston2019-02-273-2/+9
|\ \ \ \ | | | | | | | | | | When presence is disabled don't send over replication
| * | | | NewsfileErik Johnston2019-02-271-0/+1
| | | | |
| * | | | When presence is enabled don't send over replicationErik Johnston2019-02-272-2/+8
| |/ / /
* | | | Merge pull request #4757 from matrix-org/erikj/key_api_fed_readaeErik Johnston2019-02-274-1/+13
|\ \ \ \ | |/ / / |/| | | Move server key queries to federation reader
| * | | Fix unit testsErik Johnston2019-02-271-0/+6
| | | |
| * | | NewsfileErik Johnston2019-02-271-0/+1
| | | |
| * | | Move server key queries to federation readerErik Johnston2019-02-272-1/+6
|/ / /
* | | Merge pull request #4749 from matrix-org/erikj/replication_connection_backoffErik Johnston2019-02-275-6/+43
|\ \ \ | |/ / |/| | Fix tightloop over connecting to replication server
| * | Move connecting logic into ClientReplicationStreamProtocolErik Johnston2019-02-272-18/+17
| | |
| * | NewsfileErik Johnston2019-02-261-0/+1
| | |
| * | Increase the max delay between retry attemptsErik Johnston2019-02-261-1/+1
| | | | | | | | | | | | | | | Otherwise if you have many workers they can easily take out master with their connection attempts
| * | Fix tightloop over connecting to replication serverErik Johnston2019-02-263-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the client failed to process incoming commands during the initial set up of the replication connection it would immediately disconnect and reconnect, resulting in a tightloop. This can happen, for example, when subscribing to a stream that has a row that is too long in the backlog. The fix here is to not consider the connection successfully set up until the client has succesfully subscribed and caught up with the streams. This ensures that the retry logic timers aren't reset until then, meaning that if an error does happen during start up the client will continue backing off before retrying again.
* | | 0.99.2rc1 v0.99.2rc1Richard van der Hoff2019-02-2750-53/+63
| | |
* | | Limit cache invalidation replication line length (#4748)Erik Johnston2019-02-273-5/+28
| | |
* | | Add database version to phonehome stats. (#4753)Richard van der Hoff2019-02-275-0/+46
| | |
* | | Fix check-newsfragment script (#4750)Richard van der Hoff2019-02-263-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix check-newsfragment script I previously broke this so that it always succeeded... * more fixes * fix newsfiles
* | | Fix apache reverse proxy example (#4742)Paul Tötterman2019-02-261-1/+1
|/ / | | | | | | | | So that it actually works. See https://httpd.apache.org/docs/2.4/mod/mod_proxy.html#proxypass Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
* | Merge pull request #4746 from matrix-org/anoa/public_rooms_federate_developAndrew Morgan2019-02-264-13/+65
|\ \ | | | | | | Prevent showing non-fed rooms in fed /publicRooms v2
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-02-26391-6363/+18845
| |\ \ | |/ / |/| | | | | anoa/public_rooms_federate_develop
* | | Merge pull request #4745 from matrix-org/revert-4736-anoa/public_rooms_federateAndrew Morgan2019-02-264-70/+17
|\ \ \ | | | | | | | | Revert "Prevent showing non-fed rooms in fed /publicRooms"
| * | | Revert "Prevent showing non-fed rooms in fed /publicRooms"Andrew Morgan2019-02-264-70/+17
|/ / /
* | | Merge pull request #4736 from matrix-org/anoa/public_rooms_federateAndrew Morgan2019-02-264-17/+70
|\ \ \ | | | | | | | | Config option to prevent showing non-fed rooms in fed /publicRooms
| * | | Cleaner chunk logicAndrew Morgan2019-02-261-5/+4
| | | |
| * | | Correct indentAndrew Morgan2019-02-261-3/+3
| | | |
| * | | Correct docstring types and chunk logicAndrew Morgan2019-02-261-10/+11
| | | |
| * | | Clean up room chunk logicAndrew Morgan2019-02-261-6/+8
| | | |
| * | | Make not showing non-federated rooms the defaultAndrew Morgan2019-02-262-13/+1
| | | |
| * | | Result may be NoneAndrew Morgan2019-02-261-1/+1
| | | |
| * | | Address rich commentsAndrew Morgan2019-02-262-7/+31
| | | |
| * | | Fix group's call to generate_room_entryAndrew Morgan2019-02-251-4/+2
| | | |
| * | | elif not else ifAndrew Morgan2019-02-251-1/+1
| | | |
| * | | syntax derpAndrew Morgan2019-02-251-1/+1
| | | |
| * | | Simplify call to generate_room_entryAndrew Morgan2019-02-251-17/+13
| | | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-02-25384-6331/+18693
| |\ \ \ | | | | | | | | | | | | | | | anoa/public_rooms_federate
| * | | | Docs and arg name clarificationAndrew Morgan2019-02-251-2/+15
| | | | |
| * | | | Don't restrict non-fed rooms over client APIsAndrew Morgan2019-02-253-14/+22
| | | | |
| * | | | Config option to prevent showing non-fed rooms in fed /publicRoomsAndrew Morgan2019-02-252-2/+26
| | | | |
* | | | | Don't log stack trace when client has gone away during media download (#4738)Erik Johnston2019-02-252-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't log stack trace when client has gone away during media download * Newsfile * Fixup newsfile
* | | | | Fix ACME config for python 2. (#4717)Richard van der Hoff2019-02-252-3/+8
| | | | | | | | | | | | | | | Fixes #4675.
* | | | | switch from google.com to recaptcha.net for reCAPTCHA (#4731)Matthew Hodgson2019-02-255-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add trivial clarification about jemalloc * switch from google.com to recaptcha.net because https://developers.google.com/recaptcha/docs/faq#can-i-use-recaptcha-globally
* | | | | Merge pull request #4737 from matrix-org/erikj/failure_log_tbErik Johnston2019-02-255-8/+14
|\ \ \ \ \ | | | | | | | | | | | | Log tracebacks correctly
| * | | | | NewsfileErik Johnston2019-02-252-1/+2
| | | | | |
| * | | | | Log tracebacks correctlyErik Johnston2019-02-253-7/+12
| | |/ / / | |/| | |
* | | | | Merge pull request #4718 from matrix-org/erikj/fix_backfill_state_shredErik Johnston2019-02-252-3/+32
|\ \ \ \ \ | | | | | | | | | | | | Fix backfill storing incorrect state for events
| * | | | | Fixup changelogErik Johnston2019-02-251-1/+1
| | | | | |
| * | | | | Fix typoErik Johnston2019-02-251-1/+1
| | | | | |
| * | | | | More commentsErik Johnston2019-02-251-0/+4
| | | | | |
| * | | | | Assert rather than clobber the valuesErik Johnston2019-02-251-2/+2
| | | | | |
| * | | | | NewsfileErik Johnston2019-02-251-0/+1
| | | | | |
| * | | | | Add comments and paranoiaErik Johnston2019-02-251-2/+23
| | | | | |
| * | | | | Fix backfill storing incorrect state for eventsErik Johnston2019-02-221-1/+4
| | | | | |