summary refs log tree commit diff
path: root/changelog.d (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Only count real users when checking for auto-creation of auto-join roomJason Robinson2019-09-091-0/+1
| | | | | | | | | | | | 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>
* Servers-known-about statistic (#5981)Amber Brown2019-09-071-0/+1
|
* Ensure a sid parameter is passed to bind_threepid (#5995)Andrew Morgan2019-09-061-0/+1
| | | `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-061-0/+1
|\ | | | | Correctly handle non-bool m.federate flag
| * NewsfileErik Johnston2019-09-061-0/+1
| |
* | Merge pull request #5993 from matrix-org/anoa/worker_store_regErik Johnston2019-09-061-0/+1
|\ \ | | | | | | Move get_threepid_validation_session and delete_threepid_session into RegistrationWorkerStore
| * | Change changelogAndrew Morgan2019-09-062-1/+1
| | |
| * | Add changelogAndrew Morgan2019-09-061-0/+1
| |/
* / Add changelogAndrew Morgan2019-09-061-0/+1
|/
* Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcsErik Johnston2019-09-061-0/+1
|\ | | | | Don't assume there is a 'self' arg in @trace decorator
| * Update changelogErik Johnston2019-09-061-1/+1
| |
| * NewsfileErik Johnston2019-09-061-0/+1
| |
* | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2019-09-066-0/+6
|/ | | | | | | | | | | | | | | | 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-051-0/+1
| | | | retrys (#5986)
* Gracefully handle log context slips and missing opentracing import errors. ↵Jorik Schellekens2019-09-051-0/+1
| | | | (#5988)
* Merge pull request #5984 from ↵Erik Johnston2019-09-051-0/+1
|\ | | | | | | | | matrix-org/joriks/opentracing_link_send_to_edu_contexts Link the send loop with the edus contexts
| * Bugfix phrasingJorik Schellekens2019-09-051-1/+1
| | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org>
| * newsfileJorik Schellekens2019-09-051-0/+1
| |
* | Add opentracing to all client servlets (#5983)Jorik Schellekens2019-09-051-0/+1
| |
* | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-051-0/+1
| |
* | Fix opentracing contexts missing from outbound replication requests (#5982)Jorik Schellekens2019-09-051-0/+1
| |
* | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-051-0/+1
|/ | | 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-041-0/+1
| | | 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-041-0/+1
| | | Very small code cleanup.
* Fix and refactor room and user stats (#5971)Erik Johnston2019-09-041-0/+1
| | | Previously the stats were not being correctly populated.
* Ensure the list media admin API is always available (#5966)Travis Ralston2019-09-031-0/+1
| | | | | | | | * 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
* Docker packaging should not su-exec or chmod if already running as UID/GID ↵Michael Kaye2019-09-031-0/+1
| | | | | | | | (#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-031-0/+1
| | | | | | | | * Ensure an auth instance is available to ListMediaInRoom Fixes https://github.com/matrix-org/synapse/issues/5737 * Changelog
* Remove double return statements (#5962)Andrew Morgan2019-09-031-0/+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-031-0/+1
| | | Trace device list changes.
* Remove unused methods from c/s api v1 in register.py (#5963)Andrew Morgan2019-09-021-0/+1
| | | 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-021-0/+1
| | | | | | | | | | | | | | * 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-021-0/+1
| | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-301-1/+0
| | | This reverts commit 4765f0cfd95f6160f32c75481651d125f343cd58.
* Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-301-0/+1
| | | | | Python will return a tuple whether there are parentheses around the returned values or not. I'm just sick of my editor complaining about this all over the place :)
* Move buildkite config to the pipelines repo (#5943)Amber Brown2019-08-311-0/+1
|
* Add m.id_access_token flag (#5930)Andrew Morgan2019-08-301-0/+1
| | | | | 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-301-0/+1
|
* Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)Andrew Morgan2019-08-301-1/+0
| | | | | This reverts commit 71fc04069a5770a204c3514e0237d7374df257a8. This broke 3PID invites as #5892 was required for it to work correctly.
* Fix coverage in sytest and use plugins for buildkite (#5922)Amber Brown2019-08-291-0/+1
|
* Add a link to python's logging config schema (#5926)Jorik Schellekens2019-08-281-0/+1
|
* Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-281-0/+1
|\ | | | | Exempt support users from consent
| * Removing entry for 5903Will Hunt2019-08-281-1/+0
| |
| * Update changelogHalf-Shot2019-08-231-1/+1
| |
| * Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consentHalf-Shot2019-08-231-0/+1
| |\
| | * Add changelogHalf-Shot2019-08-231-0/+1
| | |
| * | newsfile 5902Half-Shot2019-08-231-0/+1
| |/
* | Let synctl use a config directory. (#5904)Jorik Schellekens2019-08-281-0/+1
| | | | | | * Let synctl use a config directory.
* | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2019-08-281-0/+1
| | | | | | | | | | | | | | 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-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-281-0/+1
| |
* | Fix a cache-invalidation bug for worker-based deployments (#5920)Richard van der Hoff2019-08-281-0/+1
| | | | | | | | | | | | | | | | 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-281-0/+1
|\ \ | | | | | | Add GET method to admin API /users/@user:dom/admin
| * | Add GET method to admin API /users/@user:dom/adminOlivier Wilkinson (reivilibre)2019-08-271-0/+1
| | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | | Merge pull request #5859 from matrix-org/rei/msc2197reivilibre2019-08-281-0/+1
|\ \ \ | | | | | | | | 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>
| * | | NewsfileOlivier Wilkinson (reivilibre)2019-08-151-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookupsErik Johnston2019-08-271-0/+1
|\ \ \ \ | | | | | | | | | | Refactor MatrixFederationAgent to retry SRV.
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-08-2213-0/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | erikj/reliable_lookups
| * | | | | Make changelog entry be a featureErik Johnston2019-08-201-0/+0
| | | | | |
| * | | | | NewsfileErik Johnston2019-08-151-0/+1
| | | | | |
* | | | | | Allow schema deltas to be engine-specific (#5911)reivilibre2019-08-271-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | | | | | NewsfileOlivier Wilkinson (reivilibre)2019-08-271-0/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 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-271-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Increase profile display name limit
| * | | | | | Increase max display name limitNeil Johnson2019-08-241-0/+1
| |/ / / / /
* | | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-271-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add config option to sign remote key query responses with a separate key.
| * | | | | | NewsfileErik Johnston2019-08-211-0/+1
| | | | | | |
* | | | | | | Update 5909.miscRichard van der Hoff2019-08-271-1/+1
| | | | | | |
* | | | | | | Merge pull request #5909 from aaronraimist/public_base_urlRichard van der Hoff2019-08-271-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | public_base_url is actually public_baseurl
| * | | | | | Add changelogAaron Raimist2019-08-261-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* / | | | | Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-271-0/+1
|/ / / / / | | | | | | | | | | Admin API: Set adminship of a user
* | | | | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | 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-221-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration Remove shared secret registration
| * | | | | Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-0/+1
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_failErik Johnston2019-08-221-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Retry well known on fail
| * | | | | Fixup changelog and remove debug loggingErik Johnston2019-08-162-1/+1
| | | | | |
| * | | | | NewsfileErik Johnston2019-08-151-0/+1
| | | | | |
* | | | | | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-221-0/+1
| | | | | | | | | | | | | | | | | | Add opentracing tags and logs for e2e keys
* | | | | | Add missing index on users_in_public_rooms. (#5894)Richard van der Hoff2019-08-221-0/+1
| | | | | |
* | | | | | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-221-0/+1
| | | | | |
* | | | | | Improve error msg when key-fetch fails (#5896)Richard van der Hoff2019-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-0/+1
| |_|/ / / |/| | | | | | | | | These tables are never used, so we may as well drop them.
* | | | | Refactor the Appservice scheduler code (#5886)Richard van der Hoff2019-08-201-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-0/+1
|/ / / / | | | | | | | | Update opentracing docs to use the unified 'trace' method
* | | | Merge pull request #5860 from matrix-org/erikj/update_5704_commentsErik Johnston2019-08-191-0/+1
|\ \ \ \ | | | | | | | | | | Remove logging for #5407 and update comments
| * | | | NewsfileErik Johnston2019-08-161-0/+1
| |/ / /
* | | | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_indexHubert Chathi2019-08-161-0/+1
|\ \ \ \ | | | | | | | | | | add the version field to the index for e2e_room_keys
| * | | | fix changelogHubert Chathi2019-08-151-1/+1
| | | | |
| * | | | add changelogHubert Chathi2019-08-141-0/+1
| | | | |
* | | | | Opentracing misc (#5856)Jorik Schellekens2019-08-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-0/+1
| |_|/ / |/| | | | | | | | | | | | | | | 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.
* | | | Don't create broken room when power_level_content_override.users does not ↵Michael Telatynski2019-08-151-0/+1
| |/ / |/| | | | | | | | contain creator_id. (#5633)
* | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupErik Johnston2019-08-141-0/+1
|\ \ \ | |_|/ |/| | Retry well-known lookup before expiry.
| * | NewsfileErik Johnston2019-08-131-0/+1
| | |
* | | 1.3.0rc1 v1.3.0rc1Brendan Abolivier2019-08-1361-61/+0
| | |
* | | changelogAmber H. Brown2019-08-141-0/+1
| | |
* | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stopErik Johnston2019-08-131-0/+1
|\ \ \ | |/ / |/| | Handle pusher being deleted during processing.
| * | NewsfileErik Johnston2019-08-011-0/+1
| | |
* | | Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-131-0/+1
| | |
* | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-131-0/+1
|\ \ \ | | | | | | | | Add a lower bound to well-known TTL.
| * | | NewsfileErik Johnston2019-08-121-0/+1
| | |/ | |/|
* | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pausesErik Johnston2019-08-131-0/+1
|\ \ \ | | | | | | | | Don't unnecessarily block notifying of new events.
| * | | NewsfileErik Johnston2019-08-061-0/+1
| | | |
* | | | Merge pull request #5843 from matrix-org/erikj/workers_hist_visErik Johnston2019-08-121-0/+1
|\ \ \ \ | | | | | | | | | | Whitelist history visbility sytests for worker mode
| * | | | NewsfileErik Johnston2019-08-121-0/+1
| | | | |
* | | | | Merge pull request #5839 from tcitworld/fix-purge-remote-media-scriptErik Johnston2019-08-121-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | 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-091-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | 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-121-0/+1
|\ \ \ \ | |/ / / |/| | | Fix handling of redactions of redactions
| * | | changelogRichard van der Hoff2019-07-301-0/+1
| | | |
* | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncErik Johnston2019-08-061-0/+1
|\ \ \ \ | | | | | | | | | | Handle TimelineBatch being limited and empty.
| * | | | NewsfileErik Johnston2019-08-061-0/+1
| | |/ / | |/| |
* / | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-061-0/+1
|/ / / | | | | | | | | | | | | 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-011-0/+1
|\ \ \ | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt
| * | | ChangelogBrendan Abolivier2019-08-011-0/+1
| | | |
* | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachableErik Johnston2019-08-011-0/+1
|\ \ \ \ | | | | | | | | | | Return 502 not 500 when failing to reach any remote server.
| * | | | NewsfileErik Johnston2019-08-011-0/+1
| | | | |
* | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806)Andrew Morgan2019-08-011-0/+1
| | | | | | | | | | | | | | | Fixes #5803
* | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_errorErik Johnston2019-08-011-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Handle incorrectly encoded query params correctly
| * | | | NewsfileErik Johnston2019-08-011-0/+1
| | |_|/ | |/| |
* | | | Merge pull request #5805 from matrix-org/erikj/validate_stateErik Johnston2019-08-011-0/+1
|\ \ \ \ | | | | | | | | | | Validate well known state events are state events.
| * | | | NewsfileErik Johnston2019-07-311-0/+1
| | | | |
* | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstoneErik Johnston2019-08-011-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Don't allow clients to send tombstones that reference the same room
| * | | | Fix spelling.Erik Johnston2019-08-011-1/+1
| |/ / / | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * | | NewsfileErik Johnston2019-07-311-0/+1
| | | |
* | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomErik Johnston2019-08-011-0/+1
|\ \ \ \ | | | | | | | | | | Deny redaction of events in a different room.
| * | | | NewsfileErik Johnston2019-07-311-0/+1
| |/ / /
* | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsErik Johnston2019-08-011-0/+1
|\ \ \ \ | | | | | | | | | | Handle RequestSendFailed exception correctly in more places.
| * | | | NewsfileErik Johnston2019-07-301-0/+1
| | | | |
* | | | | NewsfileErik Johnston2019-07-311-0/+1
| |/ / / |/| | |
* | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2019-07-311-0/+1
| | | | | | | | | | | | | | | | | | | | This is intended as an amendment to #5674 as using M_UNKNOWN as the errcode makes it hard for clients to differentiate between an invalid password and a deactivated user (the problem we were trying to solve in the first place). M_UNKNOWN was originally chosen as it was presumed than an MSC would have to be carried out to add a new code, but as Synapse often is the testing bed for new MSC implementations, it makes sense to try it out first in the wild and then add it into the spec if it is successful. Thus this PR return a new M_USER_DEACTIVATED code when a deactivated user attempts to login.
* | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_knownErik Johnston2019-07-311-0/+1
|\ \ \ \ | | | | | | | | | | Share SSL options for well-known requests
| * | | | NewsfileErik Johnston2019-07-311-0/+1
| | | | |
* | | | | Remove DelayedCall debugging from test runs (#5787)Amber Brown2019-07-311-0/+1
| | | | |
* | | | | NewsfileErik Johnston2019-07-311-0/+1
|/ / / /
* | / / NewsfileErik Johnston2019-07-301-0/+1
| |/ / |/| |
* | | NewsfileErik Johnston2019-07-301-0/+1
| | |
* | | NewsfileErik Johnston2019-07-301-0/+1
| | |
* | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_stateErik Johnston2019-07-301-0/+1
|\ \ \ | | | | | | | | Add unit test for current state membership bg update
| * | | NewsfileErik Johnston2019-07-231-0/+1
| | | |
* | | | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-301-0/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | The `expire_access_token` didn't do what it sounded like it should do. What it actually did was make Synapse enforce the 'time' caveat on macaroons used as access tokens, but since our access token macaroons never contained such a caveat, it was always a no-op. (The code to add 'time' caveats was removed back in v0.18.5, in #1656)
* | | Room Complexity Client Implementation (#5783)Amber Brown2019-07-301-0/+1
| |/ |/|
* | Merge pull request #5774 from matrix-org/erikj/fix_rejected_membershipErik Johnston2019-07-291-0/+1
|\ \ | | | | | | Fix room summary when rejected events are in state
| * | NewsfileErik Johnston2019-07-261-0/+1
| | |
* | | Merge pull request #5752 from matrix-org/erikj/forgotten_userErik Johnston2019-07-291-0/+1
|\| | | | | | | | Remove some more joins on room_memberships
| * | NewsfileErik Johnston2019-07-241-0/+1
| |/
* | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqliteErik Johnston2019-07-291-0/+1
|\ \ | | | | | | Fix current_state bg update to work on old SQLite
| * | NewsfileErik Johnston2019-07-291-0/+1
| | |
* | | Move some timeout checking logs to DEBUG #5785 Amber Brown2019-07-301-0/+1
| | |
* | | Update the device list cache when keys/query is called (#5693)Jorik Schellekens2019-07-291-0/+1
| | |
* | | Fix debian packages for sid being called buster. (#5775)Erik Johnston2019-07-301-0/+1
|/ / | | | | | | | | | | | | | | | | | | * Fix debian packages for sid being called buster. I don't know why the sid images return buster as its codename in `lsb_release` but it does, so lets just grab the codename from the distro we pass into dockerfile * Newsfile
* | ChangelogBrendan Abolivier2019-07-291-0/+1
| |
* | Merge branch 'master' into developRichard van der Hoff2019-07-262-2/+0
|\ \
| * | 1.2.1Richard van der Hoff2019-07-262-2/+0
| | |
| * | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Richard van der Hoff2019-07-261-0/+1
| |\ \
* | \ \ Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatchRichard van der Hoff2019-07-261-0/+1
|\ \ \ \ | | |/ / | |/| | Log when we receive a /make_* request from a different origin
| * | | Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-261-0/+1
| | | |
* | | | Convert RedactionTestCase to modern test style (#5768)Richard van der Hoff2019-07-261-0/+1
| | | |
* | | | Merge pull request #5767 from matrix-org/rav/redactions/cross_room_idRichard van der Hoff2019-07-251-0/+1
|\ \ \ \ | | |/ / | |/| | log when a redaction attempts to redact an event in a different room
| * | | log when a redaction attempts to redact an event in a different roomRichard van der Hoff2019-07-251-0/+1
| |/ /
| * | 1.2.0rc2 v1.2.0rc2Andrew Morgan2019-07-241-1/+0
| | |
| * | Fix servlet metric names (#5734)Jorik Schellekens2019-07-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix servlet metric names Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Remove redundant check * Cover all return paths
* | | Fix some error cases in the caching layer. (#5749)Richard van der Hoff2019-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | | There was some inconsistent behaviour in the caching layer around how exceptions were handled - particularly synchronously-thrown ones. This seems to be most easily handled by pushing the creation of ObservableDeferreds down from CacheDescriptor to the Cache.
* | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatchErik Johnston2019-07-241-0/+1
|\ \ \ | | | | | | | | Log when we receive receipt from a different origin
| * | | Update changelog.d/5743.bugfixErik Johnston2019-07-231-1/+1
| | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| * | | NewsfileErik Johnston2019-07-231-0/+1
| | | |
* | | | Stop trying to fetch events with event_id=None. (#5753)Richard van der Hoff2019-07-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `None` is not a valid event id, so queuing up a database fetch for it seems like a silly thing to do. I considered making `get_event` return `None` if `event_id is None`, but then its interaction with `allow_none` seemed uninituitive, and strong typing ftw.
* | | | Add a prometheus metric for active cache lookups. (#5750)Richard van der Hoff2019-07-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | * Add a prometheus metric for active cache lookups. * changelog
* | | | Make Jaeger fully configurable (#5694)Jorik Schellekens2019-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | * Allow Jaeger to be configured * Update sample config
* | | | Replace returnValue with return (#5736)Amber Brown2019-07-231-0/+1
| |_|/ |/| |
* | | Opentracing Utils (#5722)Jorik Schellekens2019-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add decerators for tracing functions * Use the new clean contexts * Context and edu utils * Move opentracing setters * Move whitelisting * Sectioning comments * Better args wrapper * Docstrings Co-Authored-By: Erik Johnston <erik@matrix.org> * Remove unused methods. * Don't use global * One tracing decorator to rule them all.
* | | Merge pull request #5732 from matrix-org/erikj/sdnotifyErik Johnston2019-07-231-0/+1
|\ \ \ | |/ / |/| | Add process hooks to tell systemd our state.
| * | NewsfileErik Johnston2019-07-221-0/+1
| | |
* | | NewsfileErik Johnston2019-07-231-0/+1
| | |
* | | Merge pull request #5738 from matrix-org/erikj/faster_updateErik Johnston2019-07-231-0/+1
|\ \ \ | | | | | | | | Speed up current state background update.
| * | | NewsfileErik Johnston2019-07-231-0/+1
| | | |
* | | | NewsfileErik Johnston2019-07-221-0/+1
|/ / /
* | | Fix logging in workers (#5729)Amber Brown2019-07-221-0/+1
| | | | | | | | | This also adds a worker blacklist.
* | | Merge pull request #5730 from matrix-org/erikj/cache_versionsErik Johnston2019-07-221-0/+1
|\ \ \ | | | | | | | | Cache get_version_string.
| * | | Update changelog.d/5730.miscErik Johnston2019-07-221-1/+1
| | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| * | | NewsfileErik Johnston2019-07-221-0/+1
| |/ /
* | | Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-typeJason Robinson2019-07-221-0/+1
|\ \ \ | | | | | | | | Add `user_type` to returned fields in admin API user list endpoints
| * | | Add `user_type` to returned fields in admin API user list endpointsJason Robinson2019-07-221-0/+1
| |/ / | | | | | | | | | | | | | | | | | | Mostly user type will be empty (normal user) but there is also the "support" user type. Signed-off-by: Jason Robinson <jasonr@matrix.org>
* | | Fix stack overflow in Keyring (#5724)Richard van der Hoff2019-07-221-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Refactor Keyring._start_key_lookups There's an awful lot of deferreds and dictionaries flying around here. The whole thing can be made much simpler and achieve the same effect. * Add a delay to key lookup lock release to fix stack overflow A tactical call_later here should fix #5723 * changelog
| * | | changelogRichard van der Hoff2019-07-191-0/+1
| | | |
* | | | Merge tag 'v1.2.0rc1' into developAndrew Morgan2019-07-2252-55/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v1.2.0rc1 Features -------- - Add support for opentracing. ([\#5544](https://github.com/matrix-org/synapse/issues/5544), [\#5712](https://github.com/matrix-org/synapse/issues/5712)) - Add ability to pull all locally stored events out of synapse that a particular user can see. ([\#5589](https://github.com/matrix-org/synapse/issues/5589)) - Add a basic admin command app to allow server operators to run Synapse admin commands separately from the main production instance. ([\#5597](https://github.com/matrix-org/synapse/issues/5597)) - Add `sender` and `origin_server_ts` fields to `m.replace`. ([\#5613](https://github.com/matrix-org/synapse/issues/5613)) - Add default push rule to ignore reactions. ([\#5623](https://github.com/matrix-org/synapse/issues/5623)) - Include the original event when asking for its relations. ([\#5626](https://github.com/matrix-org/synapse/issues/5626)) - Implement `session_lifetime` configuration option, after which access tokens will expire. ([\#5660](https://github.com/matrix-org/synapse/issues/5660)) - Return "This account has been deactivated" when a deactivated user tries to login. ([\#5674](https://github.com/matrix-org/synapse/issues/5674)) - Enable aggregations support by default ([\#5714](https://github.com/matrix-org/synapse/issues/5714)) Bugfixes -------- - Fix 'utime went backwards' errors on daemonization. ([\#5609](https://github.com/matrix-org/synapse/issues/5609)) - Various minor fixes to the federation request rate limiter. ([\#5621](https://github.com/matrix-org/synapse/issues/5621)) - Forbid viewing relations on an event once it has been redacted. ([\#5629](https://github.com/matrix-org/synapse/issues/5629)) - Fix requests to the `/store_invite` endpoint of identity servers being sent in the wrong format. ([\#5638](https://github.com/matrix-org/synapse/issues/5638)) - Fix newly-registered users not being able to lookup their own profile without joining a room. ([\#5644](https://github.com/matrix-org/synapse/issues/5644)) - Fix bug in #5626 that prevented the original_event field from actually having the contents of the original event in a call to `/relations`. ([\#5654](https://github.com/matrix-org/synapse/issues/5654)) - Fix 3PID bind requests being sent to identity servers as `application/x-form-www-urlencoded` data, which is deprecated. ([\#5658](https://github.com/matrix-org/synapse/issues/5658)) - Fix some problems with authenticating redactions in recent room versions. ([\#5699](https://github.com/matrix-org/synapse/issues/5699), [\#5700](https://github.com/matrix-org/synapse/issues/5700), [\#5707](https://github.com/matrix-org/synapse/issues/5707)) - Ignore redactions of m.room.create events. ([\#5701](https://github.com/matrix-org/synapse/issues/5701)) Updates to the Docker image --------------------------- - Base Docker image on a newer Alpine Linux version (3.8 -> 3.10). ([\#5619](https://github.com/matrix-org/synapse/issues/5619)) - Add missing space in default logging file format generated by the Docker image. ([\#5620](https://github.com/matrix-org/synapse/issues/5620)) Improved Documentation ---------------------- - Add information about nginx normalisation to reverse_proxy.rst. Contributed by @skalarproduktraum - thanks! ([\#5397](https://github.com/matrix-org/synapse/issues/5397)) - --no-pep517 should be --no-use-pep517 in the documentation to setup the development environment. ([\#5651](https://github.com/matrix-org/synapse/issues/5651)) - Improvements to Postgres setup instructions. Contributed by @Lrizika - thanks! ([\#5661](https://github.com/matrix-org/synapse/issues/5661)) - Minor tweaks to postgres documentation. ([\#5675](https://github.com/matrix-org/synapse/issues/5675)) Deprecations and Removals ------------------------- - Remove support for the `invite_3pid_guest` configuration setting. ([\#5625](https://github.com/matrix-org/synapse/issues/5625)) Internal Changes ---------------- - Move logging code out of `synapse.util` and into `synapse.logging`. ([\#5606](https://github.com/matrix-org/synapse/issues/5606), [\#5617](https://github.com/matrix-org/synapse/issues/5617)) - Add a blacklist file to the repo to blacklist certain sytests from failing CI. ([\#5611](https://github.com/matrix-org/synapse/issues/5611)) - Make runtime errors surrounding password reset emails much clearer. ([\#5616](https://github.com/matrix-org/synapse/issues/5616)) - Remove dead code for persiting outgoing federation transactions. ([\#5622](https://github.com/matrix-org/synapse/issues/5622)) - Add `lint.sh` to the scripts-dev folder which will run all linting steps required by CI. ([\#5627](https://github.com/matrix-org/synapse/issues/5627)) - Move RegistrationHandler.get_or_create_user to test code. ([\#5628](https://github.com/matrix-org/synapse/issues/5628)) - Add some more common python virtual-environment paths to the black exclusion list. ([\#5630](https://github.com/matrix-org/synapse/issues/5630)) - Some counter metrics exposed over Prometheus have been renamed, with the old names preserved for backwards compatibility and deprecated. See `docs/metrics-howto.rst` for details. ([\#5636](https://github.com/matrix-org/synapse/issues/5636)) - Unblacklist some user_directory sytests. ([\#5637](https://github.com/matrix-org/synapse/issues/5637)) - Factor out some redundant code in the login implementation. ([\#5639](https://github.com/matrix-org/synapse/issues/5639)) - Update ModuleApi to avoid register(generate_token=True). ([\#5640](https://github.com/matrix-org/synapse/issues/5640)) - Remove access-token support from `RegistrationHandler.register`, and rename it. ([\#5641](https://github.com/matrix-org/synapse/issues/5641)) - Remove access-token support from `RegistrationStore.register`, and rename it. ([\#5642](https://github.com/matrix-org/synapse/issues/5642)) - Improve logging for auto-join when a new user is created. ([\#5643](https://github.com/matrix-org/synapse/issues/5643)) - Remove unused and unnecessary check for FederationDeniedError in _exception_to_failure. ([\#5645](https://github.com/matrix-org/synapse/issues/5645)) - Fix a small typo in a code comment. ([\#5655](https://github.com/matrix-org/synapse/issues/5655)) - Clean up exception handling around client access tokens. ([\#5656](https://github.com/matrix-org/synapse/issues/5656)) - Add a mechanism for per-test homeserver configuration in the unit tests. ([\#5657](https://github.com/matrix-org/synapse/issues/5657)) - Inline issue_access_token. ([\#5659](https://github.com/matrix-org/synapse/issues/5659)) - Update the sytest BuildKite configuration to checkout Synapse in `/src`. ([\#5664](https://github.com/matrix-org/synapse/issues/5664)) - Add a `docker` type to the towncrier configuration. ([\#5673](https://github.com/matrix-org/synapse/issues/5673)) - Convert `synapse.federation.transport.server` to `async`. Might improve some stack traces. ([\#5689](https://github.com/matrix-org/synapse/issues/5689)) - Documentation for opentracing. ([\#5703](https://github.com/matrix-org/synapse/issues/5703))
| * | 1.2.0rc1Andrew Morgan2019-07-2252-55/+0
| | |
* | | Demo uses deprecated cli option (#5725)Jorik Schellekens2019-07-221-0/+1
| | | | | | | | | | | | | | | | | | * Remove deprecated 'verbose' cli arg * Create 5725.bugfix
* | | Merge branch 'release-v1.2.0' into developJorik Schellekens2019-07-221-0/+1
|\| |
| * | Opentracing Documentation (#5703)Jorik Schellekens2019-07-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Opentracing survival guide * Update decorator names in doc * Doc cleanup These are all alterations as a result of comments in #5703, it includes mostly typos and clarifications. The most interesting changes are: - Split developer and user docs into two sections - Add a high level description of OpenTracing * newsfile * Move contributer specific info to docstring. * Sample config. * Trailing whitespace. * Update 5703.misc * Apply suggestions from code review Mostly just rewording parts of the docs for clarity. Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* | | Merge pull request #5720 from matrix-org/erikj/transactions_upsertErik Johnston2019-07-191-0/+1
|\ \ \ | | | | | | | | Use upsert when updating destination retry interval
| * | | NewsfileErik Johnston2019-07-191-0/+1
| | |/ | |/|
* | | Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_stateErik Johnston2019-07-191-0/+1
|\ \ \ | | | | | | | | Delegate to cached version when using get_filtered_current_state_ids
| * | | NewsfileErik Johnston2019-07-181-0/+1
| | | |
* | | | Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_stateErik Johnston2019-07-191-0/+1
|\ \ \ \ | | | | | | | | | | Add membership column to current_state_events table
| * | | | NewsfileErik Johnston2019-07-181-0/+1
| | | | |
* | | | | Don't accept opentracing data from clients. (#5715)Jorik Schellekens2019-07-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't accept opentracing data from clients. * newsfile
* | | | | Add 'rel' attribute to default welcome page. (#5695)Neil Johnson2019-07-191-0/+1
| | | | | | | | | | | | | | | | | | | | add rel attribute as a precaution against reverse tabnabbing in future
* | | | | Update the coding style doc (#5719)Richard van der Hoff2019-07-191-0/+1
| |_|/ / |/| | | | | | | | | | | | | | | A few fixes and removal of duplicated stuff, but mostly a bunch of the words on the config file.
* | | | Speed up the PostgreSQL unit tests (#5717)Amber Brown2019-07-191-0/+1
| | | |
* | | | Remove non-dedicated logging options and command line arguments (#5678)Amber Brown2019-07-191-0/+1
| |_|/ |/| |
* | | towncrierNeil Johnson2019-07-181-0/+1
| |/ |/|
* | Clean up opentracing configuration options (#5712)Richard van der Hoff2019-07-183-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up config settings and dead code. This is mostly about cleaning up the config format, to bring it into line with our conventions. In particular: * There should be a blank line after `## Section ##' headings * There should be a blank line between each config setting * There should be a `#`-only line between a comment and the setting it describes * We don't really do the `# #` style commenting-out of whole sections if we can help it * rename `tracer_enabled` to `enabled` While we're here, do more config parsing upfront, which makes it easier to use later on. Also removes redundant code from LogContextScopeManager. Also changes the changelog fragment to a `feature` - it's exciting!
* | Support Prometheus_client 0.4.0+ (#5636)Amber Brown2019-07-181-0/+1
| |
* | Remove the ability to query relations when the original event was redacted. ↵Andrew Morgan2019-07-181-0/+1
| | | | | | | | | | | | | | (#5629) Fixes #5594 Forbid viewing relations on an event once it has been redacted.
* | Convert synapse.federation.transport.server to async (#5689)Richard van der Hoff2019-07-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Convert BaseFederationServlet._wrap to async Empirically, this fixes some lost stacktraces. It should be safe because the wrapped function is called from JsonResource._async_render, which is already async. * Convert the rest of synapse.federation.transport.server to async We may as well do the whole file while we're here. * changelog * flake8
* | Ignore redactions of m.room.create events (#5701)Richard van der Hoff2019-07-171-0/+1
| |
* | Improve `Depends` specs in debian package. (#5675)Richard van der Hoff2019-07-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is basically a contrived way of adding a `Recommends` on `libpq5`, to fix #5653. The way this is supposed to happen in debhelper is to run `dh_shlibdeps`, which in turn runs `dpkg-shlibdeps`, which spits things out into `debian/<package>.substvars` whence they can later be included by `control`. Previously, we had disabled `dh_shlibdeps`, mostly because `dpkg-shlibdeps` gets confused about PIL's interdependent objects, but that's not really the right thing to do and there is another way to work around that. Since we don't always use postgres, we don't necessarily want a hard Depends on libpq5, so I've actually ended up adding an explicit invocation of `dpkg-shlibdeps` for `psycopg2`. I've also updated the build-depends list for the package, which was missing a couple of entries.
* | More refactoring in `get_events_as_list` (#5707)Richard van der Hoff2019-07-171-0/+1
| | | | | | | | | | | | | | | | We can now use `_get_events_from_cache_or_db` rather than going right back to the database, which means that (a) we can benefit from caching, and (b) it opens the way forward to more extensive checks on the original event. We now always require the original event to exist before we will serve up a redaction.
* | Fix redaction authentication (#5700)Richard van der Hoff2019-07-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensures that redactions are correctly authenticated for recent room versions. There are a few things going on here: * `_fetch_event_rows` is updated to return a dict rather than a list of rows. * Rather than returning multiple copies of an event which was redacted multiple times, it returns the redactions as a list within the dict. * It also returns the actual rejection reason, rather than merely the fact that it was rejected, so that we don't have to query the table again in `_get_event_from_row`. * The redaction handling is factored out of `_get_event_from_row`, and now checks if any of the redactions are valid.
* | Refactor `get_events_as_list` (#5699)Richard van der Hoff2019-07-171-0/+1
|/ | | | | | | | | | | A couple of changes here: * get rid of a redundant `allow_rejected` condition - we should already have filtered out any rejected events before we get to that point in the code, and the redundancy is confusing. Instead, let's stick in an assertion just to make double-sure we aren't leaking rejected events by mistake. * factor out a `_get_events_from_cache_or_db` method, which is going to be important for a forthcoming fix to redactions.
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmdErik Johnston2019-07-15123-85/+39
|\
| * Return a different error from Invalid Password when a user is deactivated ↵Andrew Morgan2019-07-151-0/+1
| | | | | | | | | | (#5674) Return `This account has been deactivated` instead of `Invalid password` when a user is deactivated.
| * Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataErik Johnston2019-07-151-0/+1
| |\ | | | | | | Add basic function to get all data for a user out of synapse
| | * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-07-0591-85/+7
| | |\ | | | | | | | | | | | | erikj/admin_exfiltrate_data
| * | | Add a `docker` type to the towncrier configuration (#5673)Richard van der Hoff2019-07-125-2/+3
| | | | | | | | | | | | ... and certain other changelog-related fixes
| * | | Implement access token expiry (#5660)Richard van der Hoff2019-07-121-0/+1
| | | | | | | | | | | | | | | | Record how long an access token is valid for, and raise a soft-logout once it expires.
| * | | fix changelog nameRichard van der Hoff2019-07-121-0/+0
| | | |
| * | | Update reverse_proxy.rst (#5397)Ulrik Günther2019-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | Updates reverse_proxy.rst with information about nginx' URI normalisation.
| * | | Add missing space in default logging file format generated by the Docker ↵Slavi Pantaleev2019-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | image (#5620) This adds a missing space, without which log lines appear uglier. Signed-off-by: Slavi Pantaleev <slavi@devture.com>
| * | | Upgrade Alpine Linux used in the Docker image (3.8 -> 3.10) (#5619)Slavi Pantaleev2019-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alpine Linux 3.8 is still supported, but it seems like it's quite outdated now. While Python should be the same on both, all other libraries, etc., are much newer in Alpine 3.9 and 3.10. Signed-off-by: Slavi Pantaleev <slavi@devture.com>
| * | | Add a mechanism for per-test configs (#5657)Richard van der Hoff2019-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | It's useful to be able to tweak the homeserver config to be used for each test. This PR adds a mechanism to do so.
| * | | Use /src for checking out synapse during sytests (#5664)Amber Brown2019-07-111-0/+1
| | | |
| * | | Improved docs on setting up Postgresql (#5661)Lrizika2019-07-111-0/+1
| | | | | | | | | | | | | | | | | | | | Added that synapse_user needs a database to access before it can auth Noted you'll need to enable password auth, linked to pg_hba.conf docs
| * | | small typo fix (#5655)Andrew Morgan2019-07-111-0/+1
| | | |
| * | | Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, let's get rid of `TOKEN_NOT_FOUND_HTTP_STATUS`. It was a hack we did at one point when it was possible to return either a 403 or a 401 if the creds were missing. We always return a 401 in these cases now (thankfully), so it's not needed. Let's also stop abusing `AuthError` for these cases. Honestly they have nothing that relates them to the other places that `AuthError` is used, other than the fact that they are loosely under the 'Auth' banner. It makes no sense for them to share exception classes. Instead, let's add a couple of new exception classes: `InvalidClientTokenError` and `MissingClientTokenError`, for the `M_UNKNOWN_TOKEN` and `M_MISSING_TOKEN` cases respectively - and an `InvalidClientCredentialsError` base class for the two of them.
| * | | Add basic opentracing support (#5544)Jorik Schellekens2019-07-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Configure and initialise tracer Includes config options for the tracer and sets up JaegerClient. * Scope manager using LogContexts We piggy-back our tracer scopes by using log context. The current log context gives us the current scope. If new scope is created we create a stack of scopes in the context. * jaeger is a dependency now * Carrier inject and extraction for Twisted Headers * Trace federation requests on the way in and out. The span is created in _started_processing and closed in _finished_processing because we need a meaningful log context. * Create logcontext for new scope. Instead of having a stack of scopes in a logcontext we create a new context for a new scope if the current logcontext already has a scope. * Remove scope from logcontext if logcontext is top level * Disable tracer if not configured * typo * Remove dependence on jaeger internals * bools * Set service name * :Explicitely state that the tracer is disabled * Black is the new black * Newsfile * Code style * Use the new config setup. * Generate config. * Copyright * Rename config to opentracing * Remove user whitelisting * Empty whitelist by default * User ConfigError instead of RuntimeError * Use isinstance * Use tag constants for opentracing. * Remove debug comment and no need to explicitely record error * Two errors a "s(c)entry" * Docstrings! * Remove debugging brainslip * Homeserver Whitlisting * Better opentracing config comment * linting * Inclue worker name in service_name * Make opentracing an optional dependency * Neater config retreival * Clean up dummy tags * Instantiate tracing as object instead of global class * Inlcude opentracing as a homeserver member. * Thread opentracing to the request level * Reference opetnracing through hs * Instantiate dummy opentracin g for tests. * About to revert, just keeping the unfinished changes just in case * Revert back to global state, commit number: 9ce4a3d9067bf9889b86c360c05ac88618b85c4f * Use class level methods in tracerutils * Start and stop requests spans in a place where we have access to the authenticated entity * Seen it, isort it * Make sure to close the active span. * I'm getting black and blue from this. * Logger formatting Co-Authored-By: Erik Johnston <erik@matrix.org> * Outdated comment * Import opentracing at the top * Return a contextmanager * Start tracing client requests from the servlet * Return noop context manager if not tracing * Explicitely say that these are federation requests * Include servlet name in client requests * Use context manager * Move opentracing to logging/ * Seen it, isort it again! * Ignore twisted return exceptions on context exit * Escape the scope * Scopes should be entered to make them useful. * Nicer decorator names * Just one init, init? * Don't need to close something that isn't open * Docs make you smarter
| * | | Inline issue_access_token (#5659)Richard van der Hoff2019-07-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is only used in one place, so it's clearer if we inline it and reduce the API surface. Also, fixes a buglet where we would create an access token even if we were about to block the user (we would never return the AT, so the user could never use it, but it was still created and added to the db.)
| * | | Merge pull request #5658 from matrix-org/babolivier/is-jsonBrendan Abolivier2019-07-101-0/+1
| |\ \ \ | | | | | | | | | | Send 3PID bind requests as JSON data
| | * | | Rename changelog fileBrendan Abolivier2019-07-101-0/+0
| | | | |
| | * | | Send 3PID bind requests as JSON dataBrendan Abolivier2019-07-101-0/+1
| | | | |
| * | | | Remove access-token support from RegistrationStore.register (#5642)Richard van der Hoff2019-07-101-0/+1
| |/ / / | | | | | | | | | | | | | | | | The 'token' param is no longer used anywhere except the tests, so let's kill that off too.
| * | | Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A fix for PR #5626, which returned the original event content as part of a call to /relations. Only problem was that we were attempting to aggregate the relations on top of it when we did so. We now set bundle_aggregations to False in the get_event call. We also do this when pulling the relation events as well, because edits of edits are not something we'd like to support here.
| * | | Add a linting script (#5627)Andrew Morgan2019-07-101-0/+1
| | | | | | | | | | | | Add a dev script to cover all the different linting steps.
| * | | Correct pep517 flag in readme (#5651)Bruno Windels2019-07-101-0/+1
| | | |
| * | | Merge pull request #5638 from matrix-org/babolivier/invite-jsonBrendan Abolivier2019-07-091-0/+1
| |\ \ \ | | | | | | | | | | Use JSON when querying the IS's /store-invite endpoint
| | * \ \ Merge branch 'develop' into babolivier/invite-jsonBrendan Abolivier2019-07-0888-75/+14
| | |\ \ \
| | * | | | ChangelogBrendan Abolivier2019-07-081-0/+1
| | | | | |
| * | | | | remove unused and unnecessary check for FederationDeniedError (#5645)Hubert Chathi2019-07-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FederationDeniedError is a subclass of SynapseError, which is a subclass of CodeMessageException, so if e is a FederationDeniedError, then this check for FederationDeniedError will never be reached since it will be caught by the check for CodeMessageException above. The check for CodeMessageException does almost the same thing as this check (since FederationDeniedError initialises with code=403 and msg="Federation denied with %s."), so may as well just keep allowing it to handle this case.
| * | | | | Include the original event in /relations (#5626)Andrew Morgan2019-07-091-0/+1
| | | | | | | | | | | | | | | | | | When asking for the relations of an event, include the original event in the response. This will mostly be used for efficiently showing edit history, but could be useful in other circumstances.
| * | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfBrendan Abolivier2019-07-091-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Allow newly-registered users to lookup their own profiles
| | * | | | | ChangelogBrendan Abolivier2019-07-081-0/+1
| | | |/ / / | | |/| | |
| * | | | | Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nothing uses this now, so we can remove the dead code, and clean up the API. Since we're changing the shape of the return value anyway, we take the opportunity to give the method a better name.
| * | | | | Unblacklist some user_directory sytests (#5637)Richard van der Hoff2019-07-091-0/+1
| | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/2306
| * | | | | Better logging for auto-join. (#5643)Richard van der Hoff2019-07-081-0/+1
| |/ / / / | | | | | | | | | | It was pretty unclear what was going on, so I've added a couple of log lines.
| * | | | Update ModuleApi to avoid register(generate_token=True) (#5640)Richard van der Hoff2019-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update ModuleApi to avoid register(generate_token=True) This is the only place this is still used, so I'm trying to kill it off. * changelog
| * | | | Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Factor out some redundant code in the login impl Also fixes a redundant access_token which was generated during jwt login. * changelog