summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:matrix-org/synapse into anoa/v2_lookupAndrew Morgan2019-09-111-2/+26
|\
| * Fix existing v2 identity server calls (MSC2140) (#6013)Andrew Morgan2019-09-111-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | Two things I missed while implementing [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R80). 1. Access tokens should be provided to the identity server as `access_token`, not `id_access_token`, even though the homeserver may accept the tokens as `id_access_token`. 2. Access tokens must be sent to the identity server in a query parameter, the JSON body is not allowed. We now send the access token as part of an `Authorization: ...` header, which fixes both things. The breaking code was added in https://github.com/matrix-org/synapse/pull/5892 Sytest PR: https://github.com/matrix-org/sytest/pull/697
* | Address review comments.Andrew Morgan2019-09-111-16/+7
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/v2_lookupAndrew Morgan2019-09-1148-1123/+2489
|\|
| * Remove origin parameter from add_display_name_to_third_party_invite and add ↵Andrew Morgan2019-09-113-4/+9
| | | | | | | | | | | | | | params to docstring (#6010) Another small fixup noticed during work on a larger PR. The `origin` field of `add_display_name_to_third_party_invite` is not used and likely was just carried over from the `on_PUT` method of `FederationThirdPartyInviteExchangeServlet` which, like all other servlets, provides an `origin` argument. Since it's not used anywhere in the handler function though, we should remove it from the function arguments.
| * Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationErik Johnston2019-09-103-42/+45
| |\ | | | | | | Use account_threepid_delegate for 3pid validation
| | * Add changelogAndrew Morgan2019-09-102-4/+4
| | |
| | * 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-092-8/+41
| |\ \ | | | | | | | | 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-092-8/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-093-1/+136
| |\ \ \ | | | | | | | | | | Censor redactions in DB after a month
| | * | | Fix commentsErik Johnston2019-09-091-2/+3
| | | | |
| | * | | Default to censoring redactions after seven daysErik Johnston2019-09-091-4/+6
| | | | |
| | * | | 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-05102-1339/+1680
| | |\ \ \ | | | | | | | | | | | | | | | | | | erikj/censor_redactions
| | * | | | Make redaction retention period configurableErik Johnston2019-09-052-2/+19
| | | | | |
| | * | | | Censor redactions in DB after a monthErik Johnston2019-08-302-1/+104
| | | | | |
| * | | | | Add a build info metric to Prometheus (#6005)Amber Brown2019-09-101-0/+12
| | | | | |
| * | | | | Add opentracing span for HTTP pushErik Johnston2019-09-091-1/+12
| | |_|/ / | |/| | |
| * | | | Servers-known-about statistic (#5981)Amber Brown2019-09-072-0/+90
| | | | |
| * | | | Ensure a sid parameter is passed to bind_threepid (#5995)Andrew Morgan2019-09-061-1/+7
| | | | | | | | | | | | | | | `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-062-2/+6
| |\ \ \ \ | | |_|_|/ | |/| | | Correctly handle non-bool m.federate flag
| | * | | 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-061-79/+79
| |\ \ \ \ | | | | | | | | | | | | Move get_threepid_validation_session and delete_threepid_session into RegistrationWorkerStore
| | * | | | Move delete_threepid_session into RegistrationWorkerStoreAndrew Morgan2019-09-061-25/+25
| | | | | |
| | * | | | Move get_threepid_validation_session into RegistrationWorkerStoreAndrew Morgan2019-09-061-54/+54
| | |/ / /
| * | | | Apply suggestions from code reviewAndrew Morgan2019-09-062-2/+2
| | | | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org>
| * | | | Fix destructuring assumption bugAndrew Morgan2019-09-062-2/+2
| |/ / /
| * | | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcsErik Johnston2019-09-061-5/+5
| |\ \ \ | | | | | | | | | | Don't assume there is a 'self' arg in @trace decorator
| | * | | 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-0620-289/+706
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-053-38/+57
| | | | | | | | | | | | | | | | retrys (#5986)
| * | | Gracefully handle log context slips and missing opentracing import errors. ↵Jorik Schellekens2019-09-051-24/+58
| | |/ | |/| | | | | | | (#5988)
| * | Merge pull request #5984 from ↵Erik Johnston2019-09-054-8/+15
| |\ \ | | | | | | | | | | | | | | | | 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>
| | * | Opentracing context cannot be noneJorik Schellekens2019-09-051-1/+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-055-18/+25
| | | |
| * | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-052-47/+126
| | | |
| * | | Fix opentracing contexts missing from outbound replication requests (#5982)Jorik Schellekens2019-09-051-4/+16
| | | |
| * | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-052-1/+35
| |/ / | | | | | | 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-043-64/+9
| | | | | | | | | 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-5/+5
| | | | | | | | | Very small code cleanup.
| * | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-047-528/+1041
| | | | | | | | | Previously the stats were not being correctly populated.
| * | code cleanupsAndrew Morgan2019-09-031-7/+2
| | |
* | | id_access_token -> access_token in query paramsAndrew Morgan2019-09-101-2/+2
| | |
* | | lintAndrew Morgan2019-09-091-15/+10
| | |
* | | address review commentsAndrew Morgan2019-09-091-24/+37
| | |
* | | liiiiiiiiiiiintAndrew Morgan2019-09-051-3/+7
| | |
* | | Address review commentsAndrew Morgan2019-09-051-37/+39
| | |
* | | Apply suggestions from code reviewAndrew Morgan2019-09-051-3/+3
| | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* | | Change lookup_3pid back to a private methodAndrew Morgan2019-09-041-2/+2
| | |
* | | whoopsAndrew Morgan2019-09-041-1/+1
| | |
* | | lintAndrew Morgan2019-09-041-5/+2
| | |
* | | Factor our v2 invite thingsAndrew Morgan2019-09-041-79/+19
| | |
* | | Fix issues with moving stuff back to RoomMemberHandlerAndrew Morgan2019-09-041-5/+5
| | |
* | | Revert moving lookup stuff to IdentityHandlerAndrew Morgan2019-09-042-194/+194
| | |
* | | Merge branch 'anoa/v2_lookup' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-09-041-2/+2
|\ \ \ | | | | | | | | | | | | anoa/v2_lookup
| * | | Apply suggestions from code reviewAndrew Morgan2019-09-041-3/+3
| | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* | | | Address review commentsAndrew Morgan2019-09-041-14/+25
|/ / /
* | | id_access_token supportAndrew Morgan2019-09-034-17/+102
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/v2_lookupAndrew Morgan2019-09-031-2/+5
|\| |
| * | Ensure the list media admin API is always available (#5966)Travis Ralston2019-09-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | use v2 identity service api endpoints for 3pid invites and lookupAndrew Morgan2019-09-032-175/+176
| | |
* | | Merge branch 'develop' into anoa/v2_lookupAndrew Morgan2019-09-03137-1156/+2700
|\| |
| * | Fix docstringAndrew Morgan2019-09-031-2/+1
| | |
| * | Remove unnecessary variable declarationAndrew Morgan2019-09-031-1/+0
| | |
| * | 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
| * | fix typoMatthew Hodgson2019-09-031-1/+1
| | |
| * | Remove double return statements (#5962)Andrew Morgan2019-09-0314-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-037-58/+117
| | | | | | | | | Trace device list changes.
| * | Remove unused methods from c/s api v1 in register.py (#5963)Andrew Morgan2019-09-022-137/+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-1/+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>
| * | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-301-6/+1
| | | | | | | | | This reverts commit 4765f0cfd95f6160f32c75481651d125f343cd58.
| * | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3074-280/+280
| | | | | | | | | | | | | | | 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 :)
| * | Add m.id_access_token flag (#5930)Andrew Morgan2019-08-301-1/+6
| | | | | | | | | | | | | | | 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
| * | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)Andrew Morgan2019-08-303-165/+9
| |/ | | | | | | | | This reverts commit 71fc04069a5770a204c3514e0237d7374df257a8. This broke 3PID invites as #5892 was required for it to work correctly.
| * Add a link to python's logging config schema (#5926)Jorik Schellekens2019-08-281-1/+2
| |
| * Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-283-2/+7
| |\ | | | | | | Exempt support users from consent
| | * Apply suggestions from code reviewWill Hunt2019-08-231-2/+2
| | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org>
| | * Exempt bot usersHalf-Shot2019-08-231-1/+1
| | |
| | * Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consentHalf-Shot2019-08-231-1/+2
| | |\
| | | * Add bot typeHalf-Shot2019-08-231-1/+2
| | | |
| | * | 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-281-3/+4
| | | | | | | | | * Let synctl use a config directory.
| * | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2019-08-283-9/+165
| | | | | | | | | | | | | | | | | | | | | 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-284-37/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2819-77/+763
| | |
| * | Fix a cache-invalidation bug for worker-based deployments (#5920)Richard van der Hoff2019-08-281-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | 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-283-9/+42
| |\ \ | | | | | | | | Add GET method to admin API /users/@user:dom/admin
| | * | Add GET method to admin API /users/@user:dom/adminOlivier Wilkinson (reivilibre)2019-08-273-9/+42
| | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| * | | Merge pull request #5859 from matrix-org/rei/msc2197reivilibre2019-08-283-16/+95
| |\ \ \ | | | | | | | | | | MSC2197 Search Filters over Federation
| | * | | 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>
| | * | | 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-272-208/+217
| |\ \ \ \ | | | | | | | | | | | | 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-2229-243/+742
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | erikj/reliable_lookups
| | * | | | | 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.
| | * | | | | Refactor MatrixFederationAgent to retry SRV.Erik Johnston2019-08-152-189/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-271-5/+19
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| | * | | | | | 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-271-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Increase profile display name limit
| | * | | | | | Increase max display name limitNeil Johnson2019-08-241-1/+1
| | |/ / / / /
| * | | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-273-26/+47
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | 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-232-4/+4
| | | | | | | |
| | * | | | | | 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-212-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows servers to separate keys that are used to sign remote keys when acting as a notary server.
| * | | | | | | Merge pull request #5909 from aaronraimist/public_base_urlRichard van der Hoff2019-08-272-2/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | public_base_url is actually public_baseurl
| | * | | | | | 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-274-0/+111
| |/ / / / / | | | | | | | | | | | | Admin API: Set adminship of a user
| * | | | | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-227-92/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-53/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration Remove shared secret registration
| | * | | | | Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-221-53/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-224-83/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-222-37/+115
| |\ \ \ \ \ | | | | | | | | | | | | | | Retry well known on fail
| | * | | | | Change jitter to be a factor rather than absolute valueErik Johnston2019-08-201-11/+12
| | | | | | |
| | * | | | | Fixup changelog and remove debug loggingErik Johnston2019-08-161-4/+1
| | | | | | |
| | * | | | | Retry well known on fail.Erik Johnston2019-08-152-34/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-226-7/+141
| | | | | | | | | | | | | | | | | | | | | Add opentracing tags and logs for e2e keys
| * | | | | | Add missing index on users_in_public_rooms. (#5894)Richard van der Hoff2019-08-221-0/+17
| | | | | | |
| * | | | | | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-224-0/+213
| | | | | | |
| * | | | | | Improve error msg when key-fetch fails (#5896)Richard van der Hoff2019-08-221-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'anoa/v2_lookup' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-08-281-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | anoa/v2_lookup
| * | | | | | | Apply suggestions from code reviewAndrew Morgan2019-08-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org>
* | | | | | | | lintAndrew Morgan2019-08-281-2/+5
|/ / / / / / /
* | | | | | | Warn user when the id_server they chose does not support any of the hs' ↵Andrew Morgan2019-08-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | desired lookup algos
* | | | | | | small fixes and remove unnecessary EnumAndrew Morgan2019-08-282-23/+18
| | | | | | |
* | | | | | | lintAndrew Morgan2019-08-271-2/+6
| | | | | | |
* | | | | | | Address review commentsAndrew Morgan2019-08-271-14/+17
| | | | | | |
* | | | | | | lintAndrew Morgan2019-08-211-1/+1
| | | | | | |
* | | | | | | Continue to support v1 lookupAndrew Morgan2019-08-211-2/+57
| | | | | | |
* | | | | | | Merge branch 'develop' into anoa/v2_lookupAndrew Morgan2019-08-215-137/+152
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: Drop some unused tables. (#5893) Avoid deep recursion in appservice recovery (#5885) Opentracing doc update (#5776) Refactor the Appservice scheduler code
| * | | | | | Drop some unused tables. (#5893)Richard van der Hoff2019-08-213-47/+22
| | |_|/ / / | |/| | | | | | | | | | These tables are never used, so we may as well drop them.
| * | | | | Refactor the Appservice scheduler code (#5886)Richard van der Hoff2019-08-201-45/+65
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-45/+65
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-27/+40
| |/ / / / | | | | | | | | | | Update opentracing docs to use the unified 'trace' method
* | | | | linter fightAndrew Morgan2019-08-211-1/+0
| | | | |
* | | | | lintAndrew Morgan2019-08-214-12/+17
| | | | |
* | | | | Use the v2 lookup APIAndrew Morgan2019-08-213-11/+102
|/ / / /
* | | | Merge pull request #5860 from matrix-org/erikj/update_5704_commentsErik Johnston2019-08-191-17/+5
|\ \ \ \ | | | | | | | | | | Remove logging for #5407 and update comments
| * | | | Remove logging for #5407 and update commentsErik Johnston2019-08-151-17/+5
| |/ / /
* | | | Merge branch 'master' into developBrendan Abolivier2019-08-174-13/+39
|\ \ \ \
| * | | | 1.3.1 v1.3.1 github/release-v1.3.1 release-v1.3.1Richard van der Hoff2019-08-171-1/+1
| | | | |
| * | | | Drop dependency on sdnotify (#5871)Richard van der Hoff2019-08-172-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to save OSes which don't use it from having to maintain a port. Fixes #5865.
| * | | | 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-162-1/+19
|\ \ \ \ \ | | | | | | | | | | | | add the version field to the index for e2e_room_keys
| * | | | | update set_e2e_room_key to agree with fixed indexHubert Chathi2019-08-141-1/+1
| | | | | |
| * | | | | add the version field to the index for e2e_room_keysHubert Chathi2019-08-141-0/+18
| | | | | |
* | | | | | Opentracing misc (#5856)Jorik Schellekens2019-08-163-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-152-10/+10
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | 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-152-3/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 1.3.0 v1.3.0 github/release-v1.3.0 release-v1.3.0Brendan Abolivier2019-08-151-1/+1
| | | | |
| * | | | 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>
* | | | Don't create broken room when power_level_content_override.users does not ↵Michael Telatynski2019-08-151-1/+13
| |_|/ |/| | | | | | | | contain creator_id. (#5633)
* | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupErik Johnston2019-08-142-25/+65
|\ \ \ | |/ / |/| | Retry well-known lookup before expiry.
| * | Retry well-known lookup before expiry.Erik Johnston2019-08-132-25/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-1/+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-133-21/+54
|\ \ \ | |/ / |/| | 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>
| * | 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-136-91/+172
| | |
* | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-132-149/+200
|\ \ \ | | | | | | | | Add a lower bound to well-known TTL.
| * | | Make default well known cache global again.Erik Johnston2019-08-131-1/+4
| | | |
| * | | Move well known lookup into a separate clasErik Johnston2019-08-072-153/+197
| | | |
| * | | Add a lower bound for TTL on well known results.Erik Johnston2019-08-061-0/+4
| | |/ | |/| | | | | | | | | | | | | | | | 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-131-128/+142
|\ \ \ | | | | | | | | Don't unnecessarily block notifying of new events.
| * | | 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 #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-121-101/+112
|\ \ \ \ | |_|/ / |/| | | Fix handling of redactions of redactions
| * | | Handle loops in redaction eventsRichard van der Hoff2019-07-301-60/+36
| | | |
| * | | 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-061-6/+37
|\ \ \ \ | | | | | | | | | | Handle TimelineBatch being limited and empty.
| * | | | 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-061-3/+11
|/ / / | | | | | | | | | | | | 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-015-11/+71
|\ \ \ | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt
| * | | LintBrendan Abolivier2019-08-012-16/+9
| | | |
| * | | 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-011-4/+3
|\ \ \ \ | | | | | | | | | | Return 502 not 500 when failing to reach any remote server.
| * | | | 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-011-21/+21
| | | | | | | | | | | | | | | Fixes #5803
* | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_errorErik Johnston2019-08-011-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | Handle incorrectly encoded query params correctly
| * | | | Handle incorrectly encoded query params correctlyErik Johnston2019-08-011-1/+6
| | |_|/ | |/| |
* | | | Merge pull request #5805 from matrix-org/erikj/validate_stateErik Johnston2019-08-011-2/+9
|\ \ \ \ | | | | | | | | | | Validate well known state events are state events.
| * | | | 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-011-0/+9
|\ \ \ \ \ | |_|/ / / |/| | | | Don't allow clients to send tombstones that reference the same room
| * | | | Fix spelling.Erik Johnston2019-08-011-1/+3
| |/ / / | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * | | 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-011-1/+3
|\ \ \ \ | | | | | | | | | | Deny redaction of events in a different room.
| * | | | 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-012-32/+60
|\ \ \ \ | | | | | | | | | | Handle RequestSendFailed exception correctly in more places.
| * | | | Don't log as exception when failing durig backfillErik Johnston2019-07-301-0/+3
| | | | |
| * | | | Correctly handle errors doing requests to group serversErik Johnston2019-07-291-32/+57
| | | | |
* | | | | Explicitly check that tombstone is a state event before notifying.Erik Johnston2019-07-311-1/+7
| |/ / / |/| | |
* | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2019-07-311-1/+2
| | | | | | | | | | | | | | | | | | | | 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.
* | | | Remove duplicate return statementAndrew Morgan2019-07-311-1/+0
| | | |
* | | | Share SSL options for well-known requestsErik Johnston2019-07-312-11/+13
| | | |
* | | | Don't recreate columnErik Johnston2019-07-302-1/+22
| |/ / |/| |
* | | Fix current_state_events membership background update.Erik Johnston2019-07-302-1/+1
| | | | | | | | | | | | | | | | | | Turns out not all rooms are in `rooms`, so lets fetch the room list from `current_state_events`. We move the delta file to force it to be run again.
* | | Unwrap errorErik Johnston2019-07-301-1/+2
| | |
* | | Fix error handling when fetching remote device keysErik Johnston2019-07-301-3/+1
| | |
* | | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-303-30/+6
| |/ |/| | | | | | | | | | | | | 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-305-11/+206
|/
* Merge pull request #5774 from matrix-org/erikj/fix_rejected_membershipErik Johnston2019-07-291-0/+6
|\ | | | | Fix room summary when rejected events are in state
| * Fix room summary when rejected events are in stateErik Johnston2019-07-261-0/+6
| | | | | | | | | | | | Annoyingly, `current_state_events` table can include rejected events, in which case the membership column will be null. To work around this lets just always filter out null membership for now.
* | Merge pull request #5752 from matrix-org/erikj/forgotten_userErik Johnston2019-07-292-35/+123
|\ \ | | | | | | Remove some more joins on room_memberships
| * | Expand commentErik Johnston2019-07-291-0/+5
| | |
| * | Remove lost commentErik Johnston2019-07-291-7/+0
| |/
| * Remove join when calculating room summaries.Erik Johnston2019-07-241-13/+21
| |
| * Remove join on room_memberships when fetching rooms for user.Erik Johnston2019-07-241-22/+36
| |
| * Add function to get all forgotten rooms for userErik Johnston2019-07-242-0/+68
| | | | | | | | | | | | This will allow us to efficiently filter out rooms that have been forgotten in other queries without having to join against the `room_memberships` table.
* | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqliteErik Johnston2019-07-291-2/+2
|\ \ | | | | | | Fix current_state bg update to work on old SQLite
| * | Fix current_state bg update to work on old SQLiteErik Johnston2019-07-291-2/+2
| | |
* | | Move some timeout checking logs to DEBUG #5785 Amber Brown2019-07-302-2/+2
| | |
* | | Update the device list cache when keys/query is called (#5693)Jorik Schellekens2019-07-292-74/+136
|/ /
* | Add kwargs and docBrendan Abolivier2019-07-291-2/+4
| |
* | Add ability to pass arguments to looping callsBrendan Abolivier2019-07-291-2/+2
| |
* | Merge branch 'master' into developRichard van der Hoff2019-07-262-1/+5
|\ \
| * | 1.2.1Richard van der Hoff2019-07-261-1/+1
| | |
| * | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Richard van der Hoff2019-07-262-4/+37
| |\ \
| * | | Log when we receive receipt from a different originErik Johnston2019-07-261-13/+22
| | | |
| * | | Fix DoS when there is a cycle in redaction eventsRichard van der Hoff2019-07-261-0/+4
| | | | | | | | | | | | | | | | | | | | Make sure that synapse doesn't explode when a redaction redacts itself, or there is a larger cycle.
* | | | Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatchRichard van der Hoff2019-07-262-4/+37
|\ \ \ \ | | |/ / | |/| | 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-262-4/+37
| | | |
* | | | Merge pull request #5767 from matrix-org/rav/redactions/cross_room_idRichard van der Hoff2019-07-251-0/+27
|\ \ \ \ | | |/ / | |/| | 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/+27
| | | |
* | | | Fix some error cases in the caching layer. (#5749)Richard van der Hoff2019-07-251-32/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'master' into developAndrew Morgan2019-07-251-1/+1
|\| | |
| * | | 1.2.0 v1.2.0 github/release-v1.2.0 release-v1.2.0Andrew Morgan2019-07-251-1/+1
| |/ /
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-18 19:21:26 +0000