summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Fix commentsErik Johnston2019-09-114-5/+5
| | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
* Add test for admin redaction ratelimiting.Erik Johnston2019-09-111-0/+25
|
* Fix how we check for self redactionErik Johnston2019-09-111-4/+18
|
* Update sample configErik Johnston2019-09-111-0/+7
|
* NewsfileErik Johnston2019-09-111-0/+1
|
* Allow use of different ratelimits for admin redactions.Erik Johnston2019-09-114-12/+56
| | | | | This is useful to allow room admins to quickly deal with a large number of abusive messages.
* Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationErik Johnston2019-09-104-42/+46
|\ | | | | Use account_threepid_delegate for 3pid validation
| * Add changelogAndrew Morgan2019-09-103-4/+5
| |
| * Use account_threepid_delegate for 3pid validationAndrew Morgan2019-09-103-42/+45
| |
* | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-usersJason Robinson2019-09-094-10/+69
|\ \ | | | | | | Only count real users when checking for auto-creation of auto-join room
| * | Fix code style, againJason Robinson2019-09-091-3/+1
| | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * | Simplify count_real_users SQL to only count user_type is null rowsJason Robinson2019-09-091-1/+1
| | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * | Simplify is_real_user_txn check to trust user_type is null if real userJason Robinson2019-09-091-1/+1
| | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * | Auto-fix a few code style issuesJason Robinson2019-09-091-4/+4
| | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * | Only count real users when checking for auto-creation of auto-join roomJason Robinson2019-09-094-10/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if the first registered user was a "support" or "bot" user, when the first real user registers, the auto-join rooms were not created. Fix to exclude non-real (ie users with a special user type) users when counting how many users there are to determine whether we should auto-create a room. Signed-off-by: Jason Robinson <jasonr@matrix.org>
* | | Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-096-2/+220
|\ \ \ | | | | | | | | Censor redactions in DB after a month
| * | | Fix commentsErik Johnston2019-09-091-2/+3
| | | |
| * | | Default to censoring redactions after seven daysErik Johnston2019-09-092-7/+11
| | | |
| * | | Use better names in SQLErik Johnston2019-09-091-5/+8
| | | |
| * | | Fixup commentErik Johnston2019-09-091-4/+12
| | | |
| * | | Don't start looping call unless enabledErik Johnston2019-09-091-1/+2
| | | |
| * | | Handle setting retention period to 0Erik Johnston2019-09-092-2/+2
| | | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-09-05144-1781/+2395
| |\ \ \ | | | | | | | | | | | | | | | erikj/censor_redactions
| * | | | Fix testErik Johnston2019-09-051-1/+3
| | | | |
| * | | | Make redaction retention period configurableErik Johnston2019-09-054-3/+27
| | | | |
| * | | | NewsfileErik Johnston2019-08-301-0/+1
| | | | |
| * | | | Censor redactions in DB after a monthErik Johnston2019-08-303-1/+175
| | | | |
* | | | | Add a build info metric to Prometheus (#6005)Amber Brown2019-09-103-2/+33
| | | | |
* | | | | Merge pull request #6003 from matrix-org/erikj/push_opentracingErik Johnston2019-09-092-1/+13
|\ \ \ \ \ | |_|_|/ / |/| | | | Add opentracing span for HTTP push
| * | | | NewsfileErik Johnston2019-09-091-0/+1
| | | | |
| * | | | Add opentracing span for HTTP pushErik Johnston2019-09-091-1/+12
|/ / / /
* | | | Servers-known-about statistic (#5981)Amber Brown2019-09-077-60/+226
| | | |
* | | | Ensure a sid parameter is passed to bind_threepid (#5995)Andrew Morgan2019-09-062-1/+8
| | | | | | | | | | | | `sid` is required to be part of `three_pid_creds`. We were 500'ing if it wasn't provided instead of returning `M_MISSING_PARAM`.
* | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flagErik Johnston2019-09-063-2/+7
|\ \ \ \ | |_|_|/ |/| | | Correctly handle non-bool m.federate flag
| * | | NewsfileErik Johnston2019-09-061-0/+1
| | | |
| * | | Correctly handle non-bool m.federate flagErik Johnston2019-09-062-2/+6
| | | |
* | | | Merge pull request #5993 from matrix-org/anoa/worker_store_regErik Johnston2019-09-062-79/+80
|\ \ \ \ | | | | | | | | | | Move get_threepid_validation_session and delete_threepid_session into RegistrationWorkerStore
| * | | | Move delete_threepid_session into RegistrationWorkerStoreAndrew Morgan2019-09-061-25/+25
| | | | |
| * | | | Change changelogAndrew Morgan2019-09-062-1/+1
| | | | |
| * | | | Move get_threepid_validation_session into RegistrationWorkerStoreAndrew Morgan2019-09-061-54/+54
| | | | |
| * | | | Add changelogAndrew Morgan2019-09-061-0/+1
| |/ / /
* | | | Merge pull request #5994 from matrix-org/anoa/html_template_fixErik Johnston2019-09-063-2/+3
|\ \ \ \ | |/ / / |/| | | Fix destructuring assumption bug with using load_jinja2_templates
| * | | Apply suggestions from code reviewAndrew Morgan2019-09-062-2/+2
| | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org>
| * | | Add changelogAndrew Morgan2019-09-061-0/+1
| | | |
| * | | Fix destructuring assumption bugAndrew Morgan2019-09-062-2/+2
|/ / /
* | | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcsErik Johnston2019-09-062-5/+6
|\ \ \ | | | | | | | | Don't assume there is a 'self' arg in @trace decorator
| * | | Update changelogErik Johnston2019-09-061-1/+1
| | | |
| * | | NewsfileErik Johnston2019-09-061-0/+1
| | | |
| * | | Don't assume there is a 'self' arg in @trace decoratorErik Johnston2019-09-061-5/+5
| | | |
* | | | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2019-09-0629-302/+820
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987) This is a combination of a few different PRs, finally all being merged into `develop`: * #5875 * #5876 * #5868 (This one added the `/versions` flag but the flag itself was actually [backed out](https://github.com/matrix-org/synapse/commit/891afb57cbdf9867f2848341b29c75d6f35eef5a#diff-e591d42d30690ffb79f63bb726200891) in #5969. What's left is just giving /versions access to the config file, which could be useful in the future) * #5835 * #5969 * #5940 Clients should not actually use the new registration functionality until https://github.com/matrix-org/synapse/pull/5972 is merged. UPGRADE.rst, changelog entries and config file changes should all be reviewed closely before this PR is merged.
* | | Trace how long it takes for the send trasaction to complete, including ↵Jorik Schellekens2019-09-054-38/+58
| | | | | | | | | | | | retrys (#5986)
* | | Gracefully handle log context slips and missing opentracing import errors. ↵Jorik Schellekens2019-09-052-24/+59
| |/ |/| | | | | (#5988)
* | Merge pull request #5984 from ↵Erik Johnston2019-09-055-8/+16
|\ \ | | | | | | | | | | | | matrix-org/joriks/opentracing_link_send_to_edu_contexts Link the send loop with the edus contexts
| * | use access methods (duh..)Jorik Schellekens2019-09-051-1/+3
| | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org>
| * | Bugfix phrasingJorik Schellekens2019-09-051-1/+1
| | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org>
| * | Opentracing context cannot be noneJorik Schellekens2019-09-051-1/+1
| | |
| * | newsfileJorik Schellekens2019-09-051-0/+1
| | |
| * | Link the send loop with the edus contextsJorik Schellekens2019-09-053-7/+12
| | | | | | | | | | | | | | | | | | The contexts were being filtered too early so the send loop wasn't being linked to them unless the destination was whitelisted.
* | | Add opentracing to all client servlets (#5983)Jorik Schellekens2019-09-056-18/+26
| | |
* | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-054-47/+132
| | |
* | | Fix opentracing contexts missing from outbound replication requests (#5982)Jorik Schellekens2019-09-052-4/+17
| | |
* | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-053-1/+36
|/ / | | | | Implements `POST /_matrix/client/r0/account/3pid/unbind` from [MSC2140](https://github.com/matrix-org/matrix-doc/blob/dbkr/tos_2/proposals/2140-terms-of-service-2.md#post-_matrixclientr0account3pidunbind).
* | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-044-64/+10
| | | | | | Removes the `bind_email` and `bind_msisdn` parameters from the `/register` C/S API endpoint as per [MSC2140: Terms of Service for ISes and IMs](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R107).
* | Cleanup event auth type initialisation (#5975)Andrew Morgan2019-09-042-5/+6
| | | | | | Very small code cleanup.
* | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-0411-641/+1642
| | | | | | Previously the stats were not being correctly populated.
* | code cleanupsAndrew Morgan2019-09-031-7/+2
| |
* | Ensure the list media admin API is always available (#5966)Travis Ralston2019-09-032-2/+6
| | | | | | | | | | | | | | | | * Ensure the list media admin API is always available This API is required for some external media repo implementations to operate (mostly for doing quarantine operations on a room). * changelog
* | Fix docstringAndrew Morgan2019-09-031-2/+1
| |
* | Remove unnecessary variable declarationAndrew Morgan2019-09-031-1/+0
| |
* | Docker packaging should not su-exec or chmod if already running as UID/GID ↵Michael Kaye2019-09-032-35/+50
| | | | | | | | | | | | | | | | (#5970) Adjust su-exec to only be used if needed. If UID == getuid() and GID == getgid() then we do not need to su-exec, and chmod will not work.
* | Ensure an auth instance is available to ListMediaInRoom (#5967)Travis Ralston2019-09-032-0/+2
| | | | | | | | | | | | | | | | * Ensure an auth instance is available to ListMediaInRoom Fixes https://github.com/matrix-org/synapse/issues/5737 * Changelog
* | fix typoMatthew Hodgson2019-09-031-1/+1
| |
* | Remove double return statements (#5962)Andrew Morgan2019-09-0315-20/+1
| | | | | | | | | | | | | | | | | | | | Remove all the "double return" statements which were a result of us removing all the instances of ``` defer.returnValue(...) return ``` statements when we switched to python3 fully.
* | Opentrace device lists (#5853)Jorik Schellekens2019-09-038-58/+118
| | | | | | Trace device list changes.
* | Remove unused methods from c/s api v1 in register.py (#5963)Andrew Morgan2019-09-023-137/+2
| | | | | | These methods were part of the v1 C/S API. Remove them as they are no longer used by any code paths.
* | fix thumbnail storage location (#5915)L0ric02019-09-022-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix thumbnail storage location Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> * Add changelog file. Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> * Update Changelog Signed-off-by: Lorenz Steinert <lorenz@steinerts.de>
* | Update INSTALL.md to say that Python 2 is no longer supported (#5953)Aaron Raimist2019-09-022-2/+3
| | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-302-7/+1
| | | | | | This reverts commit 4765f0cfd95f6160f32c75481651d125f343cd58.
* | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3081-286/+287
| | | | | | | | | | Python will return a tuple whether there are parentheses around the returned values or not. I'm just sick of my editor complaining about this all over the place :)
* | Move buildkite config to the pipelines repo (#5943)Amber Brown2019-08-313-310/+16
| |
* | Add m.id_access_token flag (#5930)Andrew Morgan2019-08-302-1/+7
| | | | | | | | | | Adds a flag to `/versions`' `unstable_features` section indicating that this Synapse understands what an `id_access_token` is, as per https://github.com/matrix-org/synapse/issues/5927#issuecomment-523566043 Fixes #5927
* | Removed unused jenkins/ folder and script (#5938)Amber Brown2019-08-302-16/+1
| |
* | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)Andrew Morgan2019-08-304-166/+9
| | | | | | | | | | This reverts commit 71fc04069a5770a204c3514e0237d7374df257a8. This broke 3PID invites as #5892 was required for it to work correctly.
* | Fix buildkite pipeline plugin matrix-org/annotate using the wrong variable ↵Amber Brown2019-08-301-3/+3
| | | | | | | | config
* | Fix coverage in sytest and use plugins for buildkite (#5922)Amber Brown2019-08-298-32/+92
|/
* Add a link to python's logging config schema (#5926)Jorik Schellekens2019-08-283-2/+5
|
* Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-285-2/+9
|\ | | | | Exempt support users from consent
| * Removing entry for 5903Will Hunt2019-08-281-1/+0
| |
| * Apply suggestions from code reviewWill Hunt2019-08-231-2/+2
| | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org>
| * Update changelogHalf-Shot2019-08-231-1/+1
| |
| * Exempt bot usersHalf-Shot2019-08-231-1/+1
| |
| * Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consentHalf-Shot2019-08-232-1/+3
| |\
| | * Add changelogHalf-Shot2019-08-231-0/+1
| | |
| | * Add bot typeHalf-Shot2019-08-231-1/+2
| | |
| * | Fix registration testHalf-Shot2019-08-231-0/+1
| | |
| * | newsfile 5902Half-Shot2019-08-231-0/+1
| | |
| * | Ignore consent for support usersHalf-Shot2019-08-231-0/+1
| | |
| * | Return user_type in get_user_by_idHalf-Shot2019-08-231-1/+4
| |/
* | Let synctl use a config directory. (#5904)Jorik Schellekens2019-08-283-6/+15
| | | | | | * Let synctl use a config directory.
* | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2019-08-284-9/+166
| | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/5861 Adds support for the v2 lookup API as defined in [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134). Currently this is only used for 3PID invites. Sytest PR: https://github.com/matrix-org/sytest/pull/679
* | Config templating (#5900)Jorik Schellekens2019-08-289-46/+366
| | | | | | | | | | | | | | | | | | | | | | | | Template config files * Imagine a system composed entirely of x, y, z etc and the basic operations.. Wait George, why XOR? Why not just neq? George: Eh, I didn't think of that.. Co-Authored-By: Erik Johnston <erik@matrix.org>
* | Implement a structured logging output system. (#5680)Amber Brown2019-08-2831-82/+1328
| |
* | Fix a cache-invalidation bug for worker-based deployments (#5920)Richard van der Hoff2019-08-282-8/+17
| | | | | | | | | | | | | | | | Some of the caches on worker processes were not being correctly invalidated when a room's state was changed in a way that did not affect the membership list of the room. We need to make sure we send out cache invalidations even when no memberships are changing.
* | Merge pull request #5914 from matrix-org/rei/admin_getadminreivilibre2019-08-285-9/+62
|\ \ | | | | | | Add GET method to admin API /users/@user:dom/admin
| * | Document GET method for retrieving admin bit of user in admin APIOlivier Wilkinson (reivilibre)2019-08-271-0/+19
| | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| * | Add GET method to admin API /users/@user:dom/adminOlivier Wilkinson (reivilibre)2019-08-274-9/+43
| | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | | Typographical corrections in docker/README (#5921)Victor Goff2019-08-281-5/+5
| | |
* | | Merge pull request #5859 from matrix-org/rei/msc2197reivilibre2019-08-284-16/+96
|\ \ \ | | | | | | | | MSC2197 Search Filters over Federation
| * | | Newsfile on one lineOlivier Wilkinson (reivilibre)2019-08-201-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| * | | Use MSC2197 on stable prefix as it has almost finished FCPOlivier Wilkinson (reivilibre)2019-08-202-26/+4
| | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| * | | NewsfileOlivier Wilkinson (reivilibre)2019-08-151-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| * | | Add support for inbound MSC2197 requests on unstable Federation APIOlivier Wilkinson (reivilibre)2019-08-151-1/+59
| | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| * | | Support MSC2197 outbound with unstable prefixOlivier Wilkinson (reivilibre)2019-08-152-16/+59
| | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookupsErik Johnston2019-08-277-215/+283
|\ \ \ \ | | | | | | | | | | Refactor MatrixFederationAgent to retry SRV.
| * | | | Fix off by one error in SRV result shufflingErik Johnston2019-08-271-8/+13
| | | | |
| * | | | Fixup commentsErik Johnston2019-08-231-1/+9
| | | | |
| * | | | Fix logcontextsErik Johnston2019-08-231-4/+8
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-08-2247-284/+850
| |\ \ \ \ | | | | | | | | | | | | | | | | | | erikj/reliable_lookups
| * | | | | Make changelog entry be a featureErik Johnston2019-08-201-0/+0
| | | | | |
| * | | | | Remove now unused pick_server_from_listErik Johnston2019-08-201-30/+0
| | | | | |
| * | | | | Fixup _sort_server_list to be slightly more efficientErik Johnston2019-08-201-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also document that we are using the algorithm described in RFC2782 and ensure we handle zero weight correctly.
| * | | | | Remove test debugsErik Johnston2019-08-203-3/+0
| | | | | |
| * | | | | NewsfileErik Johnston2019-08-151-0/+1
| | | | | |
| * | | | | Refactor MatrixFederationAgent to retry SRV.Erik Johnston2019-08-154-194/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors MatrixFederationAgent to move the SRV lookup into the endpoint code, this has two benefits: 1. Its easier to retry different host/ports in the same way as HostnameEndpoint. 2. We avoid SRV lookups if we have a free connection in the pool
* | | | | | Allow schema deltas to be engine-specific (#5911)reivilibre2019-08-272-5/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow schema deltas to be engine-specific Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Newsfile Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Code style (Black) Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| * | | | | | Code style (Black)Olivier Wilkinson (reivilibre)2019-08-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| * | | | | | NewsfileOlivier Wilkinson (reivilibre)2019-08-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| * | | | | | Allow schema deltas to be engine-specificOlivier Wilkinson (reivilibre)2019-08-271-5/+21
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limitRichard van der Hoff2019-08-272-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Increase profile display name limit
| * | | | | | Increase max display name limitNeil Johnson2019-08-242-1/+2
| |/ / / / /
* | | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-275-26/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add config option to sign remote key query responses with a separate key.
| * | | | | | Don't implicitly include server signing keyErik Johnston2019-08-231-7/+6
| | | | | | |
| * | | | | | Fixup review commentsErik Johnston2019-08-233-6/+6
| | | | | | |
| * | | | | | NewsfileErik Johnston2019-08-211-0/+1
| | | | | | |
| * | | | | | Only sign when we respond to remote key requestsErik Johnston2019-08-212-23/+16
| | | | | | |
| * | | | | | Add config option for keys to use to sign keysErik Johnston2019-08-213-9/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows servers to separate keys that are used to sign remote keys when acting as a notary server.
* | | | | | | Update 5909.miscRichard van der Hoff2019-08-271-1/+1
| | | | | | |
* | | | | | | Merge pull request #5909 from aaronraimist/public_base_urlRichard van der Hoff2019-08-273-2/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | public_base_url is actually public_baseurl
| * | | | | | Add changelogAaron Raimist2019-08-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | | | | | public_base_url is actually public_baseurlAaron Raimist2019-08-262-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* / | | | | Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-276-0/+132
|/ / / / / | | | | | | | | | | Admin API: Set adminship of a user
* | | | | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-229-94/+234
| | | | | | | | | | | | | | | | | | | | | | | | | Propagate opentracing contexts through EDUs Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* | | | | Merge pull request #5877 from ↵Richard van der Hoff2019-08-222-53/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration Remove shared secret registration
| * | | | | Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-222-53/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This type of registration was probably never used. It only includes the user name in the HMAC but not the password. Shared secret registration is still available via client/r0/admin/register. Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
* | | | | | Opentracing across workers (#5771)Jorik Schellekens2019-08-225-83/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate opentracing contexts across workers Also includes some Convenience modifications to opentracing for servlets, notably: - Add boolean to skip the whitelisting check on inject extract methods. - useful when injecting into carriers locally. Otherwise we'd always have to include our own servername and whitelist our servername - start_active_span_from_request instead of header - Add boolean to decide whether to extract context from a request to a servlet
* | | | | | Revert "Do not send consent notices if "no-consent-required" is set"Brendan Abolivier2019-08-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 27a686e53b8ba3f2e2f102fae73e598c00ec0086.
* | | | | | Revert "Add "require_consent" parameter for registration"Brendan Abolivier2019-08-223-18/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3320aaab3a9bba3f5872371aba7053b41af9d0a0.
* | | | | | Do not send consent notices if "no-consent-required" is setHalf-Shot2019-08-221-0/+4
| | | | | |
* | | | | | Add "require_consent" parameter for registrationHalf-Shot2019-08-223-3/+18
| |_|_|/ / |/| | | |
* | | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_failErik Johnston2019-08-224-72/+164
|\ \ \ \ \ | | | | | | | | | | | | Retry well known on fail
| * | | | | Change jitter to be a factor rather than absolute valueErik Johnston2019-08-202-13/+14
| | | | | |
| * | | | | Fixup changelog and remove debug loggingErik Johnston2019-08-163-5/+2
| | | | | |
| * | | | | NewsfileErik Johnston2019-08-151-0/+1
| | | | | |
| * | | | | Retry well known on fail.Erik Johnston2019-08-153-67/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have recently seen a valid well-known for a domain we want to retry on (non-final) errors a few times, to handle temporary blips in networking/etc.
* | | | | | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-227-7/+142
| | | | | | | | | | | | | | | | | | Add opentracing tags and logs for e2e keys
* | | | | | Add missing index on users_in_public_rooms. (#5894)Richard van der Hoff2019-08-222-0/+18
| | | | | |
* | | | | | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-226-0/+232
| | | | | |
* | | | | | Improve error msg when key-fetch fails (#5896)Richard van der Hoff2019-08-222-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no point doing a raise_from here, because the exception is always logged at warn with no stacktrace in the caller. Instead, let's try to give better messages to reduce confusion. In particular, this means that we won't log 'Failed to connect to remote server' when we don't even attempt to connect to the remote server due to blacklisting.
* | | | | | Drop some unused tables. (#5893)Richard van der Hoff2019-08-214-47/+23
| |_|/ / / |/| | | | | | | | | These tables are never used, so we may as well drop them.
* | | | | Refactor the Appservice scheduler code (#5886)Richard van der Hoff2019-08-203-49/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the labyrinthine `recoverer_fn` code, and clean up the startup code (it seemed to be previously inexplicably split between `ApplicationServiceScheduler.start` and `_Recoverer.start`). Add some docstrings too.
| * | | | | Refactor the Appservice scheduler codeRichard van der Hoff2019-08-203-49/+68
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the labyrinthine `recoverer_fn` code, and clean up the startup code (it seemed to be previously inexplicably split between `ApplicationServiceScheduler.start` and `_Recoverer.start`). Add some docstrings too.
* | | | | Avoid deep recursion in appservice recovery (#5885)Richard van der Hoff2019-08-202-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully, this will fix a stack overflow when recovering an appservice. The recursion here leads to a huge chain of deferred callbacks, which then overflows the stack when the chain completes. `inlineCallbacks` makes a better job of this if we use iteration instead. Clean up the code a bit too, while we're there.
* | | | | Opentracing doc update (#5776)Jorik Schellekens2019-08-202-27/+41
|/ / / / | | | | | | | | Update opentracing docs to use the unified 'trace' method
* | | | Merge pull request #5860 from matrix-org/erikj/update_5704_commentsErik Johnston2019-08-192-17/+6
|\ \ \ \ | | | | | | | | | | Remove logging for #5407 and update comments
| * | | | NewsfileErik Johnston2019-08-161-0/+1
| | | | |
| * | | | Remove logging for #5407 and update commentsErik Johnston2019-08-151-17/+5
| |/ / /
* | | | Merge branch 'master' into developBrendan Abolivier2019-08-176-15/+66
|\ \ \ \
| * | | | 1.3.1 v1.3.1 github/release-v1.3.1 release-v1.3.1Richard van der Hoff2019-08-175-5/+28
| | | | |
| * | | | Drop dependency on sdnotify (#5871)Richard van der Hoff2019-08-173-11/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to save OSes which don't use it from having to maintain a port. Fixes #5865.
| * | | | add attributionRichard van der Hoff2019-08-161-1/+1
| | | | |
| * | | | Add changelog entry.Chris Moos2019-08-161-0/+1
| | | | |
| * | | | Fix issue with Synapse not starting up. Fixes #5866.Chris Moos2019-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Moos <chris@chrismoos.com>
* | | | | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_indexHubert Chathi2019-08-163-1/+20
|\ \ \ \ \ | | | | | | | | | | | | add the version field to the index for e2e_room_keys
| * | | | | fix changelogHubert Chathi2019-08-151-1/+1
| | | | | |
| * | | | | update set_e2e_room_key to agree with fixed indexHubert Chathi2019-08-141-1/+1
| | | | | |
| * | | | | add changelogHubert Chathi2019-08-141-0/+1
| | | | | |
| * | | | | add the version field to the index for e2e_room_keysHubert Chathi2019-08-141-0/+18
| | | | | |
* | | | | | Opentracing misc (#5856)Jorik Schellekens2019-08-164-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add authenticated_entity and servlet_names tags. Functionally: - Add a tag for authenticated_entity - Add a tag for servlet_names Stylistically: Moved to importing methods directly from opentracing.
* | | | | | Fix up password reset template config names (#5863)Andrew Morgan2019-08-153-10/+11
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | Fixes #5833 The emailconfig code was attempting to pull incorrect config file names. This corrects that, while also marking a difference between a config file variable that's a filepath versus a str containing HTML.
* | | | | Merge branch 'master' into developBrendan Abolivier2019-08-156-14/+28
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge tag 'v1.3.0'Brendan Abolivier2019-08-15237-2739/+4310
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.3.0 (2019-08-15) ========================== Bugfixes -------- - Fix 500 Internal Server Error on `publicRooms` when the public room list was cached. ([\#5851](https://github.com/matrix-org/synapse/issues/5851)) Synapse 1.3.0rc1 (2019-08-13) ========================== Features -------- - Use `M_USER_DEACTIVATED` instead of `M_UNKNOWN` for errcode when a deactivated user attempts to login. ([\#5686](https://github.com/matrix-org/synapse/issues/5686)) - Add sd_notify hooks to ease systemd integration and allows usage of Type=Notify. ([\#5732](https://github.com/matrix-org/synapse/issues/5732)) - Synapse will no longer serve any media repo admin endpoints when `enable_media_repo` is set to False in the configuration. If a media repo worker is used, the admin APIs relating to the media repo will be served from it instead. ([\#5754](https://github.com/matrix-org/synapse/issues/5754), [\#5848](https://github.com/matrix-org/synapse/issues/5848)) - Synapse can now be configured to not join remote rooms of a given "complexity" (currently, state events) over federation. This option can be used to prevent adverse performance on resource-constrained homeservers. ([\#5783](https://github.com/matrix-org/synapse/issues/5783)) - Allow defining HTML templates to serve the user on account renewal attempt when using the account validity feature. ([\#5807](https://github.com/matrix-org/synapse/issues/5807)) Bugfixes -------- - Fix UISIs during homeserver outage. ([\#5693](https://github.com/matrix-org/synapse/issues/5693), [\#5789](https://github.com/matrix-org/synapse/issues/5789)) - Fix stack overflow in server key lookup code. ([\#5724](https://github.com/matrix-org/synapse/issues/5724)) - start.sh no longer uses deprecated cli option. ([\#5725](https://github.com/matrix-org/synapse/issues/5725)) - Log when we receive an event receipt from an unexpected origin. ([\#5743](https://github.com/matrix-org/synapse/issues/5743)) - Fix debian packaging scripts to correctly build sid packages. ([\#5775](https://github.com/matrix-org/synapse/issues/5775)) - Correctly handle redactions of redactions. ([\#5788](https://github.com/matrix-org/synapse/issues/5788)) - Return 404 instead of 403 when accessing /rooms/{roomId}/event/{eventId} for an event without the appropriate permissions. ([\#5798](https://github.com/matrix-org/synapse/issues/5798)) - Fix check that tombstone is a state event in push rules. ([\#5804](https://github.com/matrix-org/synapse/issues/5804)) - Fix error when trying to login as a deactivated user when using a worker to handle login. ([\#5806](https://github.com/matrix-org/synapse/issues/5806)) - Fix bug where user `/sync` stream could get wedged in rare circumstances. ([\#5825](https://github.com/matrix-org/synapse/issues/5825)) - The purge_remote_media.sh script was fixed. ([\#5839](https://github.com/matrix-org/synapse/issues/5839)) Deprecations and Removals ------------------------- - Synapse now no longer accepts the `-v`/`--verbose`, `-f`/`--log-file`, or `--log-config` command line flags, and removes the deprecated `verbose` and `log_file` configuration file options. Users of these options should migrate their options into the dedicated log configuration. ([\#5678](https://github.com/matrix-org/synapse/issues/5678), [\#5729](https://github.com/matrix-org/synapse/issues/5729)) - Remove non-functional 'expire_access_token' setting. ([\#5782](https://github.com/matrix-org/synapse/issues/5782)) Internal Changes ---------------- - Make Jaeger fully configurable. ([\#5694](https://github.com/matrix-org/synapse/issues/5694)) - Add precautionary measures to prevent future abuse of `window.opener` in default welcome page. ([\#5695](https://github.com/matrix-org/synapse/issues/5695)) - Reduce database IO usage by optimising queries for current membership. ([\#5706](https://github.com/matrix-org/synapse/issues/5706), [\#5738](https://github.com/matrix-org/synapse/issues/5738), [\#5746](https://github.com/matrix-org/synapse/issues/5746), [\#5752](https://github.com/matrix-org/synapse/issues/5752), [\#5770](https://github.com/matrix-org/synapse/issues/5770), [\#5774](https://github.com/matrix-org/synapse/issues/5774), [\#5792](https://github.com/matrix-org/synapse/issues/5792), [\#5793](https://github.com/matrix-org/synapse/issues/5793)) - Improve caching when fetching `get_filtered_current_state_ids`. ([\#5713](https://github.com/matrix-org/synapse/issues/5713)) - Don't accept opentracing data from clients. ([\#5715](https://github.com/matrix-org/synapse/issues/5715)) - Speed up PostgreSQL unit tests in CI. ([\#5717](https://github.com/matrix-org/synapse/issues/5717)) - Update the coding style document. ([\#5719](https://github.com/matrix-org/synapse/issues/5719)) - Improve database query performance when recording retry intervals for remote hosts. ([\#5720](https://github.com/matrix-org/synapse/issues/5720)) - Add a set of opentracing utils. ([\#5722](https://github.com/matrix-org/synapse/issues/5722)) - Cache result of get_version_string to reduce overhead of `/version` federation requests. ([\#5730](https://github.com/matrix-org/synapse/issues/5730)) - Return 'user_type' in admin API user endpoints results. ([\#5731](https://github.com/matrix-org/synapse/issues/5731)) - Don't package the sytest test blacklist file. ([\#5733](https://github.com/matrix-org/synapse/issues/5733)) - Replace uses of returnValue with plain return, as returnValue is not needed on Python 3. ([\#5736](https://github.com/matrix-org/synapse/issues/5736)) - Blacklist some flakey tests in worker mode. ([\#5740](https://github.com/matrix-org/synapse/issues/5740)) - Fix some error cases in the caching layer. ([\#5749](https://github.com/matrix-org/synapse/issues/5749)) - Add a prometheus metric for pending cache lookups. ([\#5750](https://github.com/matrix-org/synapse/issues/5750)) - Stop trying to fetch events with event_id=None. ([\#5753](https://github.com/matrix-org/synapse/issues/5753)) - Convert RedactionTestCase to modern test style. ([\#5768](https://github.com/matrix-org/synapse/issues/5768)) - Allow looping calls to be given arguments. ([\#5780](https://github.com/matrix-org/synapse/issues/5780)) - Set the logs emitted when checking typing and presence timeouts to DEBUG level, not INFO. ([\#5785](https://github.com/matrix-org/synapse/issues/5785)) - Remove DelayedCall debugging from the test suite, as it is no longer required in the vast majority of Synapse's tests. ([\#5787](https://github.com/matrix-org/synapse/issues/5787)) - Remove some spurious exceptions from the logs where we failed to talk to a remote server. ([\#5790](https://github.com/matrix-org/synapse/issues/5790)) - Improve performance when making `.well-known` requests by sharing the SSL options between requests. ([\#5794](https://github.com/matrix-org/synapse/issues/5794)) - Disable codecov GitHub comments on PRs. ([\#5796](https://github.com/matrix-org/synapse/issues/5796)) - Don't allow clients to send tombstone events that reference the room it's sent in. ([\#5801](https://github.com/matrix-org/synapse/issues/5801)) - Deny redactions of events sent in a different room. ([\#5802](https://github.com/matrix-org/synapse/issues/5802)) - Deny sending well known state types as non-state events. ([\#5805](https://github.com/matrix-org/synapse/issues/5805)) - Handle incorrectly encoded query params correctly by returning a 400. ([\#5808](https://github.com/matrix-org/synapse/issues/5808)) - Handle pusher being deleted during processing rather than logging an exception. ([\#5809](https://github.com/matrix-org/synapse/issues/5809)) - Return 502 not 500 when failing to reach any remote server. ([\#5810](https://github.com/matrix-org/synapse/issues/5810)) - Reduce global pauses in the events stream caused by expensive state resolution during persistence. ([\#5826](https://github.com/matrix-org/synapse/issues/5826)) - Add a lower bound to well-known lookup cache time to avoid repeated lookups. ([\#5836](https://github.com/matrix-org/synapse/issues/5836)) - Whitelist history visbility sytests in worker mode tests. ([\#5843](https://github.com/matrix-org/synapse/issues/5843))
| | * | | | 1.3.0 v1.3.0 github/release-v1.3.0 release-v1.3.0Brendan Abolivier2019-08-155-6/+14
| | | | | |
| | * | | | Remove libsqlite3-dev from required build dependencies. (#5766)Andrew Morgan2019-08-153-5/+4
| | | | | |
| | * | | | Merge pull request #5851 from matrix-org/rei/roomdir_maybedeferredreivilibre2019-08-152-2/+10
| | |\ \ \ \ | | | |_|_|/ | | |/| | | Room Directory: Wrap `get_local_public_room_list` call in `maybeDeferred`
| | | * | | Update changelog.d/5851.bugfix reivilibre2019-08-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use imperative Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| | | * | | NewsfileOlivier Wilkinson (reivilibre)2019-08-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| | | * | | Wrap `get_local_public_room_list` call in `maybeDeferred` because itOlivier Wilkinson (reivilibre)2019-08-141-2/+8
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is cached and so does not always return a `Deferred`. `await` does not silently pass-through non-Deferreds like `yield` used to. Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| * | | | make user creation steps clearerNeil Johnson2019-08-081-5/+4
| | | | |
* | | | | Don't create broken room when power_level_content_override.users does not ↵Michael Telatynski2019-08-152-1/+14
| |_|_|/ |/| | | | | | | | | | | contain creator_id. (#5633)
* | | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupErik Johnston2019-08-145-27/+137
|\ \ \ \ | |_|/ / |/| | | Retry well-known lookup before expiry.
| * | | NewsfileErik Johnston2019-08-131-0/+1
| | | |
| * | | Retry well-known lookup before expiry.Erik Johnston2019-08-134-27/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives a bit of a grace period where we can attempt to refetch a remote `well-known`, while still using the cached result if that fails. Hopefully this will make the well-known resolution a bit more torelant of failures, rather than it immediately treating failures as "no result" and caching that for an hour.
* | | | 1.3.0rc1 v1.3.0rc1Brendan Abolivier2019-08-1363-62/+75
| | | |
* | | | Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startupBrendan Abolivier2019-08-132-1/+2
|\ \ \ \ | | | | | | | | | | Fix mediarepo worker startup
| * | | | changelogAmber H. Brown2019-08-141-0/+1
| | | | |
| * | | | fix config being a dict, actuallyAmber H. Brown2019-08-141-1/+1
|/ / / /
* | | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stopErik Johnston2019-08-134-21/+55
|\ \ \ \ | |/ / / |/| | | Handle pusher being deleted during processing.
| * | | Remove redundant returnErik Johnston2019-08-131-1/+0
| | | |
| * | | Clarify docstringErik Johnston2019-08-131-1/+1
| | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| * | | NewsfileErik Johnston2019-08-011-0/+1
| | | |
| * | | Handle pusher being deleted during processing.Erik Johnston2019-08-013-21/+55
| | | | | | | | | | | | | | | | | | | | Instead of throwing a StoreError lets break out of processing loop and mark the pusher as stopped.
* | | | Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-1310-91/+188
| | | |
* | | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-134-171/+222
|\ \ \ \ | | | | | | | | | | Add a lower bound to well-known TTL.
| * | | | Make default well known cache global again.Erik Johnston2019-08-131-1/+4
| | | | |
| * | | | NewsfileErik Johnston2019-08-121-0/+1
| | | | |
| * | | | Move well known lookup into a separate clasErik Johnston2019-08-073-173/+216
| | | | |
| * | | | Add a lower bound for TTL on well known results.Erik Johnston2019-08-062-2/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | It costs both us and the remote server for us to fetch the well known for every single request we send, so we add a minimum cache period. This is set to 5m so that we still honour the basic premise of "refetch frequently".
* | | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pausesErik Johnston2019-08-132-128/+143
|\ \ \ \ | | | | | | | | | | Don't unnecessarily block notifying of new events.
| * | | | NewsfileErik Johnston2019-08-061-0/+1
| | | | |
| * | | | Don't unnecessarily block notifying of new events.Erik Johnston2019-08-061-128/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When persisting events we calculate new stream orderings up front. Before we notify about an event all events with lower stream orderings must have finished being persisted. This PR moves the assignment of stream ordering till *after* calculated the new current state and split the batch of events into separate chunks for persistence. This means that if it takes a long time to calculate new current state then it will not block events in other rooms being notified about. This should help reduce some global pauses in the events stream which can last for tens of seconds (if not longer), caused by some particularly expensive state resolutions.
* | | | | Merge pull request #5843 from matrix-org/erikj/workers_hist_visErik Johnston2019-08-122-4/+1
|\ \ \ \ \ | | | | | | | | | | | | Whitelist history visbility sytests for worker mode
| * | | | | NewsfileErik Johnston2019-08-121-0/+1
| | | | | |
| * | | | | Whitelist history visbility sytests for worker modeErik Johnston2019-08-121-4/+0
| | | | | |
* | | | | | Merge pull request #5839 from tcitworld/fix-purge-remote-media-scriptErik Johnston2019-08-122-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix curl command typo in purge_remote_media.sh
| * | | | | Changelogs should end in '.' or '!'Erik Johnston2019-08-121-1/+1
| | | | | |
| * | | | | Fix curl command typo in purge_remote_media.shThomas Citharel2019-08-092-1/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Was verbose option instead of -X, command didn't work Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | | Merge pull request #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-123-101/+183
|\ \ \ \ \ | |/ / / / |/| | | | Fix handling of redactions of redactions
| * | | | changelogRichard van der Hoff2019-07-301-0/+1
| | | | |
| * | | | Handle loops in redaction eventsRichard van der Hoff2019-07-302-60/+106
| | | | |
| * | | | recursively fetch redactionsRichard van der Hoff2019-07-301-32/+36
| | | | |
| * | | | split _get_events_from_db out of _enqueue_eventsRichard van der Hoff2019-07-291-32/+51
| | | | |
| * | | | Return dicts from _fetch_event_listRichard van der Hoff2019-07-291-15/+27
| | | | |
* | | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncErik Johnston2019-08-062-6/+38
|\ \ \ \ \ | | | | | | | | | | | | Handle TimelineBatch being limited and empty.
| * | | | | NewsfileErik Johnston2019-08-061-0/+1
| | | | | |
| * | | | | Handle TimelineBatch being limited and empty.Erik Johnston2019-08-061-6/+37
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | This hopefully addresses #5407 by gracefully handling an empty but limited TimelineBatch. We also add some logging to figure out how this is happening.
* / | | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-062-3/+12
|/ / / / | | | | | | | | | | | | | | | | Part of fixing matrix-org/sytest#652 Sytest PR: matrix-org/sytest#667
* | | | Account validity: allow defining HTML templates to serve the us… (#5807)Brendan Abolivier2019-08-018-11/+119
|\ \ \ \ | | | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt
| * | | | LintBrendan Abolivier2019-08-013-17/+10
| | | | |
| * | | | Sample configBrendan Abolivier2019-08-011-0/+10
| | | | |
| * | | | ChangelogBrendan Abolivier2019-08-011-0/+1
| | | | |
| * | | | Add testsBrendan Abolivier2019-08-011-0/+37
| | | | |
| * | | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-015-9/+76
| | | | |
* | | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachableErik Johnston2019-08-012-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Return 502 not 500 when failing to reach any remote server.
| * | | | | NewsfileErik Johnston2019-08-011-0/+1
| | | | | |
| * | | | | Return 502 not 500 when failing to reach any remote server.Erik Johnston2019-08-011-4/+3
| | | | | |
* | | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806)Andrew Morgan2019-08-012-21/+22
| | | | | | | | | | | | | | | | | | Fixes #5803
* | | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_errorErik Johnston2019-08-012-1/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Handle incorrectly encoded query params correctly
| * | | | | NewsfileErik Johnston2019-08-011-0/+1
| | | | | |
| * | | | | Handle incorrectly encoded query params correctlyErik Johnston2019-08-011-1/+6
| | |_|/ / | |/| | |
* | | | | Merge pull request #5805 from matrix-org/erikj/validate_stateErik Johnston2019-08-012-2/+10
|\ \ \ \ \ | | | | | | | | | | | | Validate well known state events are state events.
| * | | | | NewsfileErik Johnston2019-07-311-0/+1
| | | | | |
| * | | | | Validate well-known state events are state events.Erik Johnston2019-07-311-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lets disallow sending things like memberships, topics etc as non-state events.
* | | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstoneErik Johnston2019-08-012-0/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Don't allow clients to send tombstones that reference the same room
| * | | | | Fix spelling.Erik Johnston2019-08-012-2/+4
| |/ / / / | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * | | | NewsfileErik Johnston2019-07-311-0/+1
| | | | |
| * | | | Don't allow clients to send tombstones that reference the same roomErik Johnston2019-07-311-0/+7
| | | | |
* | | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomErik Johnston2019-08-012-1/+4
|\ \ \ \ \ | | | | | | | | | | | | Deny redaction of events in a different room.
| * | | | | NewsfileErik Johnston2019-07-311-0/+1
| | | | | |
| * | | | | Deny redaction of events in a different room.Erik Johnston2019-07-311-1/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | We already correctly filter out such redactions, but we should also deny them over the CS API.
* | | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsErik Johnston2019-08-013-32/+61
|\ \ \ \ \ | | | | | | | | | | | | Handle RequestSendFailed exception correctly in more places.