summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Clean up exception handling for access_tokens (#5656)Andrew Morgan2020-02-174-86/+86
|\| | | |
| * | | | Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-114-93/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)Andrew Morgan2020-02-1710-12/+615
|\| | | |
| * | | | Add basic opentracing support (#5544)Jorik Schellekens2019-07-1110-12/+615
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)Andrew Morgan2020-02-171-7/+3
|\| | | |
| * | | | Inline issue_access_token (#5659)Richard van der Hoff2019-07-111-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-jsonAndrew Morgan2020-02-171-1/+1
|\| | | |
| * | | | Merge pull request #5658 from matrix-org/babolivier/is-jsonBrendan Abolivier2019-07-101-1/+1
| |\ \ \ \ | | | | | | | | | | | | Send 3PID bind requests as JSON data
| | * | | | TypoBrendan Abolivier2019-07-101-1/+1
| | | | | |
| | * | | | Send 3PID bind requests as JSON dataBrendan Abolivier2019-07-101-1/+1
| | | | | |
* | | | | | Remove access-token support from RegistrationStore.register (#5642)Andrew Morgan2020-02-172-21/+5
|\| | | | |
| * | | | | Remove access-token support from RegistrationStore.register (#5642)Richard van der Hoff2019-07-102-21/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | 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 Morgan2020-02-171-2/+12
|\| | | |
| * | | | Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #5638 from matrix-org/babolivier/invite-jsonAndrew Morgan2020-02-171-4/+24
|\| | | |
| * | | | Merge pull request #5638 from matrix-org/babolivier/invite-jsonBrendan Abolivier2019-07-091-4/+18
| |\ \ \ \ | | | | | | | | | | | | Use JSON when querying the IS's /store-invite endpoint
| | * \ \ \ Merge branch 'develop' into babolivier/invite-jsonBrendan Abolivier2019-07-08105-1513/+1630
| | |\ \ \ \
| | * | | | | LintBrendan Abolivier2019-07-081-1/+2
| | | | | | |
| | * | | | | Use application/json when querying the IS's /store-invite endpointBrendan Abolivier2019-07-081-4/+17
| | | | | | |
* | | | | | | remove unused and unnecessary check for FederationDeniedError (#5645)Andrew Morgan2020-02-171-4/+1
|\| | | | | |
| * | | | | | remove unused and unnecessary check for FederationDeniedError (#5645)Hubert Chathi2019-07-091-4/+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 Morgan2020-02-172-4/+6
|\| | | | | |
| * | | | | | Include the original event in /relations (#5626)Andrew Morgan2019-07-092-4/+6
| | | | | | | | | | | | | | | | | | | | | 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-selfAndrew Morgan2020-02-171-0/+4
|\| | | | | |
| * | | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfBrendan Abolivier2019-07-091-0/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow newly-registered users to lookup their own profiles
| | * | | | | | Allow newly-registered users to lookup their own profilesBrendan Abolivier2019-07-081-0/+4
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | When a user creates an account and the 'require_auth_for_profile_requests' config flag is set, and a client that performed the registration wants to lookup the newly-created profile, the request will be denied because the user doesn't share a room with themselves yet.
* | | | | | | Remove access-token support from RegistrationHandler.register (#5641)Andrew Morgan2020-02-176-56/+15
|\| | | | | |
| * | | | | | Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-086-56/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Better logging for auto-join. (#5643)Andrew Morgan2020-02-171-0/+7
|\| | | | | |
| * | | | | | Better logging for auto-join. (#5643)Richard van der Hoff2019-07-081-0/+7
| |/ / / / / | | | | | | | | | | | | 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)Andrew Morgan2020-02-171-8/+56
|\| | | | |
| * | | | | Update ModuleApi to avoid register(generate_token=True) (#5640)Richard van der Hoff2019-07-081-8/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)Andrew Morgan2020-02-171-39/+10
|\| | | | |
| * | | | | Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-081-39/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Factor out some redundant code in the login impl Also fixes a redundant access_token which was generated during jwt login. * changelog
| * | | | | Move get_or_create_user to test code (#5628)Richard van der Hoff2019-07-081-51/+0
| | | | | | | | | | | | | | | | | | This is only used in tests, so...
* | | | | | Add default push rule to ignore reactions (#5623)Andrew Morgan2020-02-171-0/+13
|\| | | | |
| * | | | | Add default push rule to ignore reactions (#5623)J. Ryan Stinnett2019-07-051-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a default push rule following the proposal in [MSC2153](https://github.com/matrix-org/matrix-doc/pull/2153). See also https://github.com/vector-im/riot-web/issues/10208 See also https://github.com/matrix-org/matrix-js-sdk/pull/976
* | | | | | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2020-02-171-1/+5
|\| | | | |
| * | | | | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2019-07-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Riot team would like some extra fields as part of m.replace, so here you go. Fixes: #5598
* | | | | | Remove support for invite_3pid_guest. (#5625)Andrew Morgan2020-02-176-196/+2
|\| | | | |
| * | | | | Remove support for invite_3pid_guest. (#5625)Richard van der Hoff2019-07-056-196/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has never been documented, and I'm not sure it's ever been used outside sytest. It's quite a lot of poorly-maintained code, so I'd like to get rid of it. For now I haven't removed the database table; I suggest we leave that for a future clearout.
* | | | | remove dead transaction persist code (#5622)Andrew Morgan2020-02-173-69/+0
|\| | | |
| * | | | remove dead transaction persist code (#5622)Richard van der Hoff2019-07-053-69/+0
| | | | | | | | | | | | | | | | | | | | this hasn't done anything for years
* | | | | Fixes to the federation rate limiter (#5621)Andrew Morgan2020-02-172-10/+10
|\| | | |
| * | | | Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-052-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Put the default window_size back to 1000ms (broken by #5181) - Make the `rc_federation` config actually do something - fix an off-by-one error in the 'concurrent' limit - Avoid creating an unused `_PerHostRatelimiter` object for every single incoming request
* | | | | Make errors about email password resets much clearer (#5616)Andrew Morgan2020-02-171-11/+8
|\| | | |
| * | | | Make errors about email password resets much clearer (#5616)Andrew Morgan2019-07-051-11/+8
| | | | | | | | | | | | | | | The runtime errors that dealt with local email password resets talked about config options that users may not even have in their config file yet (if upgrading). Instead, the cryptic errors are now replaced with hopefully much more helpful ones.
* | | | | Improve the backwards compatibility re-exports of synapse.logging.context ↵Andrew Morgan2020-02-173-5/+61
|\| | | | | | | | | | | | | | | | | | | (#5617)
| * | | | Improve the backwards compatibility re-exports of synapse.logging.context ↵Amber Brown2019-07-053-5/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#5617) * Improve the backwards compatibility re-exports of synapse.logging.context. * reexport logformatter too
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-07-041-1/+1
| |\ \ \ \
* | | | | | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-148-15/+11
| | | | | |
* | | | | | Delete duplicate user deactivationAndrew Morgan2020-02-141-7/+0
| | | | | |
* | | | | | Fix account_validity incorrect email response contentAndrew Morgan2020-02-141-2/+5
| | | | | |
* | | | | | Fix incorrect run_in_background import statementAndrew Morgan2020-02-141-1/+1
| | | | | |
* | | | | | 1.1.0Andrew Morgan2020-02-141-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 1.1.0Erik Johnston2019-07-041-1/+1
| | | | | |
* | | | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-1471-141/+153
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-0471-141/+153
| | | | | |
* | | | | | Fix 'utime went backwards' errors on daemonization. (#5609)Andrew Morgan2020-02-142-31/+43
|\| | | | |
| * | | | | Fix 'utime went backwards' errors on daemonization. (#5609)Richard van der Hoff2019-07-032-31/+43
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix 'utime went backwards' errors on daemonization. Fixes #5608 * remove spurious debug
* | | | | 1.1.0rc2Andrew Morgan2020-02-141-1/+1
|\| | | |
| * | | | 1.1.0rc2 v1.1.0rc2Richard van der Hoff2019-07-031-1/+1
| | | | |
* | | | | Fix a number of "Starting txn from sentinel context" warnings (#5605)Andrew Morgan2020-02-144-6/+34
|\| | | |
| * | | | Fix a number of "Starting txn from sentinel context" warnings (#5605)Richard van der Hoff2019-07-034-6/+34
| | | | | | | | | | | | | | | | | | | | Fixes #5602, #5603
* | | | | Fix media repo breaking (#5593)Andrew Morgan2020-02-143-12/+24
|\| | | |
| * | | | Fix media repo breaking (#5593)Amber Brown2019-07-023-12/+24
| | | | |
* | | | | prepare v1.1.0rc1Andrew Morgan2020-02-141-1/+1
|\| | | |
| * | | | prepare v1.1.0rc1Richard van der Hoff2019-07-021-1/+1
| | | | |
* | | | | Complete the SAML2 implementation (#5422)Andrew Morgan2020-02-145-44/+209
|\| | | |
| * | | | Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-025-44/+209
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * SAML2 Improvements and redirect stuff Signed-off-by: Alexander Trost <galexrt@googlemail.com> * Code cleanups and simplifications. Also: share the saml client between redirect and response handlers. * changelog * Revert redundant changes to static js * Move all the saml stuff out to a centralised handler * Add support for tracking SAML2 sessions. This allows us to correctly handle `allow_unsolicited: False`. * update sample config * cleanups * update sample config * rename BaseSSORedirectServlet for consistency * Address review comments
| | * \ \ \ Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-0122-205/+303
| | |\ \ \ \
| | * | | | | Address review commentsRichard van der Hoff2019-07-011-5/+7
| | | | | | |
| | * | | | | rename BaseSSORedirectServlet for consistencyRichard van der Hoff2019-06-271-3/+3
| | | | | | |
| | * | | | | cleanupsRichard van der Hoff2019-06-273-11/+18
| | | | | | |
| | * | | | | Add support for tracking SAML2 sessions.Richard van der Hoff2019-06-262-3/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to correctly handle `allow_unsolicited: False`.
| | * | | | | Move all the saml stuff out to a centralised handlerRichard van der Hoff2019-06-264-50/+96
| | | | | | |
| | * | | | | Revert redundant changes to static jsRichard van der Hoff2019-06-261-4/+2
| | | | | | |
| | * | | | | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-26304-9516/+9216
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge tag 'v1.0.0rc3' into rav/saml2_clientRichard van der Hoff2019-06-114-2/+7
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.0.0rc3 (2019-06-10) ============================= Security: Fix authentication bug introduced in 1.0.0rc1. Please upgrade to rc3 immediately
| | * | | | | | | Code cleanups and simplifications.Richard van der Hoff2019-06-116-50/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: share the saml client between redirect and response handlers.
| | * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-1085-861/+4648
| | |\ \ \ \ \ \ \
| | * | | | | | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-025-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Trost <galexrt@googlemail.com>
* | | | | | | | | | Fix JWT login with new users (#5586)Andrew Morgan2020-02-141-6/+3
|\| | | | | | | | |
| * | | | | | | | | Fix JWT login with new users (#5586)PauRE2019-07-021-6/+3
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
* | | | | | | | | fix async/await consentresource (#5585)Andrew Morgan2020-02-141-1/+3
|\| | | | | | | |
| * | | | | | | | fix async/await consentresource (#5585)Amber Brown2019-07-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5582
* | | | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloopAndrew Morgan2020-02-141-2/+19
|\| | | | | | | |
| * | | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloopErik Johnston2019-07-011-2/+19
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | Fix sync tightloop bug.
| | * | | | | | | Fixup commentErik Johnston2019-07-011-6/+13
| | | | | | | | |
| | * | | | | | | Fix sync tightloop bug.Erik Johnston2019-06-211-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If, for some reason, presence updates take a while to persist then it can trigger clients to tightloop calling `/sync` due to the presence handler returning updates but not advancing the stream token. Fixes #5503.
* | | | | | | | | Make the http server handle coroutine-making REST servlets (#5475)Andrew Morgan2020-02-149-156/+114
|\| | | | | | | |
| * | | | | | | | Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-299-156/+114
| | | | | | | | |
| * | | | | | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimitBrendan Abolivier2019-06-281-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't update the ratelimiter before sending a 3PID invite
| | * | | | | | | | Only ratelimit when sending the emailBrendan Abolivier2019-06-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we do the opposite, an event can arrive after or while sending the email and the 3PID invite event will get ratelimited.
| | * | | | | | | | Don't update the ratelimiter before sending a 3PID inviteBrendan Abolivier2019-06-281-1/+1
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | This would cause emails being sent, but Synapse responding with a 429 when creating the event. The client would then retry, and with bad timing the same scenario would happen again. Some testing I did ended up sending me 10 emails for one single invite because of this.
* | | | | | | | | Don't log GC 0s at INFO (#5557)Andrew Morgan2020-02-141-1/+4
|\| | | | | | | |
| * | | | | | | | Don't log GC 0s at INFO (#5557)Amber Brown2019-06-281-1/+4
| | | | | | | | |
* | | | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ↵Andrew Morgan2020-02-142-7/+64
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | federation (#5550)
| * | | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ↵Amber Brown2019-06-282-7/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | federation (#5550)
* | | | | | | | | Added possibilty to disable local password authentication (#5092)Andrew Morgan2020-02-143-1/+11
|\| | | | | | | |
| * | | | | | | | Added possibilty to disable local password authentication (#5092)Daniel Hoffend2019-06-273-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Hoffend <dh@dotlan.net>
* | | | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543)Andrew Morgan2020-02-141-1/+9
|\| | | | | | | |
| * | | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543)Andrew Morgan2019-06-271-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Helps address #5444
* | | | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devicesAndrew Morgan2020-02-143-37/+97
|\| | | | | | | |
| * | | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devicesErik Johnston2019-06-273-37/+97
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Refactor devices changed query to pull less from DB
| | * | | | | | | Review commentsErik Johnston2019-06-272-7/+5
| | | | | | | | |
| | * | | | | | | Refactor and comment sync device list codeErik Johnston2019-06-261-17/+53
| | | | | | | | |
| | * | | | | | | Use batch_iter and correct docstringErik Johnston2019-06-261-15/+12
| | | | | | | | |
| | * | | | | | | Rename get_users_whose_devices_changedErik Johnston2019-06-263-5/+5
| | | | | | | | |
| | * | | | | | | Refactor get_user_ids_changed to pull less from DBErik Johnston2019-06-263-28/+57
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a client asks for users whose devices have changed since a token we used to pull *all* users from the database since the token, which could easily be thousands of rows for old tokens. This PR changes this to only check for changes for users the client is actually interested in. Fixes #5553
* | | | | | | | Fix JWT login (#5555)Andrew Morgan2020-02-142-1/+2
|\| | | | | | |
| * | | | | | | Fix JWT login (#5555)PauRE2019-06-272-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix JWT login with register Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Add pyjwt conditional dependency Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Added changelog file Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Improved changelog description Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
* | | | | | | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2020-02-142-52/+90
|\| | | | | |
| * | | | | | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2019-06-252-52/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #4583 Does slightly less than #5045, which prevented a room from being upgraded multiple times, one after another. This PR still allows that, but just prevents two from happening at the same time. Mostly just to mitigate the fact that servers are slow and it can take a moment for the room upgrade to actually complete. We don't want people sending another request to upgrade the room when really they just thought the first didn't go through.
* | | | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsAndrew Morgan2020-02-142-5/+41
|\| | | | | |
| * | | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsRichard van der Hoff2019-06-242-5/+41
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add --data-dir and --open-private-ports options.
| | * | | | | | Add "--open-private-ports" cmdline optionRichard van der Hoff2019-06-242-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is helpful when generating a config file for running synapse under docker.
| | * | | | | | Add --data-directory commandline argumentRichard van der Hoff2019-06-241-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't necessarily want to put the data in the cwd.
* | | | | | | | Merge pull request #5523 from matrix-org/rav/arg_defaultsAndrew Morgan2020-02-1429-107/+87
|\| | | | | | |
| * | | | | | | Merge pull request #5523 from matrix-org/rav/arg_defaultsRichard van der Hoff2019-06-2429-107/+87
| |\| | | | | | | | | | | | | | | | | | | | | | Stop conflating generated config and default config
| | * | | | | | Don't load the generated config as the default.Richard van der Hoff2019-06-2429-94/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's too confusing.
| | * | | | | | Ensure that all config options have sensible defaultsRichard van der Hoff2019-06-244-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will enable us to skip the unintuitive behaviour where the generated config and default config are the same thing.
* | | | | | | | Merge pull request #5499 from matrix-org/rav/cleanup_metricsAndrew Morgan2020-02-142-29/+52
|\| | | | | | |
| * | | | | | | Merge pull request #5499 from matrix-org/rav/cleanup_metricsRichard van der Hoff2019-06-242-29/+52
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Cleanups and sanity-checking in cpu and db metrics
| | * | | | | | | blackRichard van der Hoff2019-06-241-6/+2
| | | | | | | | |
| | * | | | | | | Avoid raising exceptions in metricsRichard van der Hoff2019-06-241-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sentry will catch the errors if they happen, so that should be good enough, and woun't make things explode if we hit the error condition.
| | * | | | | | | Merge branch 'develop' into rav/cleanup_metricsRichard van der Hoff2019-06-24291-9106/+8018
| | |\ \ \ \ \ \ \
| | * | | | | | | | Sanity-checking for metrics updatesRichard van der Hoff2019-06-191-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that our clocks go forward.
| | * | | | | | | | Simplify PerformanceCounters.update interfaceRichard van der Hoff2019-06-191-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we already have the duration for the update, so may as well use it rather than passing extra params around and recalculating it.
| | * | | | | | | | Remove unused _get_event_countersRichard van der Hoff2019-06-191-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been redundant since cdb3757942fefdcdc3d33b9c6d7c9e44decefd6f.
| * | | | | | | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicroomsBrendan Abolivier2019-06-243-15/+39
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Split public rooms directory auth config in two
| | * | | | | | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-243-15/+39
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenAndrew Morgan2020-02-132-17/+19
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenErik Johnston2019-06-242-17/+19
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | Fix /messages on workers when no from param specified.
| | * | | | | | | | | Fix /messages on workers when no from param specified.Erik Johnston2019-06-242-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no `from` param is specified we calculate and use the "current token" that inlcuded typing, presence, etc. These are unused during pagination and are not available on workers, so we simply don't calculate them.
* | | | | | | | | | | Merge pull request #5516 from matrix-org/rav/acme_key_pathAndrew Morgan2020-02-134-10/+52
|\| | | | | | | | | |
| * | | | | | | | | | Remove unused Config.config_dir_path attributeRichard van der Hoff2019-06-241-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is no longer used and only serves to confuse.
| * | | | | | | | | | Allow configuration of the path used for ACME account keys.Richard van der Hoff2019-06-243-7/+52
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because sticking it in the same place as the config isn't necessarily the right thing to do.
* | | | | | | | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Andrew Morgan2020-02-1330-63/+99
|\| | | | | | | | |
| * | | | | | | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Richard van der Hoff2019-06-2430-63/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Pull config_dir_path and data_dir_path calculation out of read_config_files * Pass config_dir_path and data_dir_path into read_config
* | | | | | | | | | Factor acme bits out to a separate file (#5521)Andrew Morgan2020-02-132-53/+93
|\| | | | | | | | |
| * | | | | | | | | Factor acme bits out to a separate file (#5521)Richard van der Hoff2019-06-242-53/+93
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | This makes some of the conditional-import hoop-jumping easier.
* | | | | | | | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversalAndrew Morgan2020-02-131-6/+14
|\| | | | | | | |
| * | | | | | | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversalRichard van der Hoff2019-06-241-6/+14
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use monotonic clock where possible for metrics
| | * | | | | | | | Use monotonic clock where possible for metricsRichard van der Hoff2019-06-191-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes intermittent errors observed on Apple hardware which were caused by time.clock() appearing to go backwards when called from different threads. Also fixes a bug where database activity times were logged as 1/1000 of their correct ratio due to confusion between milliseconds and seconds.
* | | | | | | | | | Drop support for cpu_affinity (#5525)Andrew Morgan2020-02-134-51/+1
|\| | | | | | | | |
| * | | | | | | | | Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-224-51/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | This has no useful purpose on python3, and is generally a source of confusion.
* | | | | | | | | Improve help and cmdline option names for --generate-config options (#5512)Andrew Morgan2020-02-131-22/+28
|\| | | | | | | |
| * | | | | | | | Improve help and cmdline option names for --generate-config options (#5512)Richard van der Hoff2019-06-211-22/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * group the arguments together into a group * add new names "--generate-missing-config" and "--config-directory" for existing cmdline options "--generate-keys" and "--keys-dir", which better reflect their purposes.
* | | | | | | | | Refactor Config parser and add some comments. (#5511)Andrew Morgan2020-02-131-14/+35
|\| | | | | | | |
| * | | | | | | | Refactor Config parser and add some comments. (#5511)Richard van der Hoff2019-06-211-14/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some comments, and simplify `read_config_files`.
* | | | | | | | | Improve logging when generating config files (#5510)Andrew Morgan2020-02-133-1/+7
|\| | | | | | | |
| * | | | | | | | Improve logging when generating config files (#5510)Richard van der Hoff2019-06-213-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make it a bit clearer what's going on.
* | | | | | | | | Only import jinja2 when needed (#5514)Andrew Morgan2020-02-131-1/+2
|\| | | | | | | |
| * | | | | | | | Only import jinja2 when needed (#5514)Andrew Morgan2019-06-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/5431 `jinja2` was being imported even when it wasn't strictly necessary. This made it required to run Synapse, even if the functionality that required it wasn't enabled. This was causing new Synapse installations to crash on startup. Email modules are now required.
* | | | | | | | | Fix "Unexpected entry in 'full_schemas'" log warning (#5509)Andrew Morgan2020-02-131-1/+1
|\| | | | | | | |
| * | | | | | | | Fix "Unexpected entry in 'full_schemas'" log warning (#5509)Richard van der Hoff2019-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a README.txt which always sets off this warning, which is a bit alarming when you first start synapse. I don't think we need to warn about this.
* | | | | | | | | Fix logging error when a tampered event is detected. (#5500)Andrew Morgan2020-02-131-1/+0
|\| | | | | | | |
| * | | | | | | | Fix logging error when a tampered event is detected. (#5500)Richard van der Hoff2019-06-211-1/+0
| | | | | | | | |
* | | | | | | | | Merge pull request #5513 from matrix-org/erikj/fix_messages_tokenAndrew Morgan2020-02-131-0/+2
|\| | | | | | | |
| * | | | | | | | Fix /messages on worker when no token suppliedErik Johnston2019-06-211-0/+2
| | | | | | | | |
* | | | | | | | | Support pagination API in client_reader workerAndrew Morgan2020-02-131-0/+2
|\| | | | | | | |
| * | | | | | | | Support pagination API in client_reader workerErik Johnston2019-06-211-0/+2
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #5476 from matrix-org/erikj/histogram_extremitiesErik Johnston2019-06-212-1/+36
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add metrics for length of new extremities persisted.
* | | | | | | | | Improve email notification logging (#5502)Andrew Morgan2020-02-131-1/+1
|\| | | | | | | |
| * | | | | | | | Improve email notification logging (#5502)Neil Johnson2019-06-201-1/+1
| | | | | | | | |
* | | | | | | | | BlackAndrew Morgan2020-02-132-5/+5
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | BlackErik Johnston2019-06-201-2/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-06-20292-9079/+7986
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/histogram_extremities
| * | | | | | | | Add descriptions and remove redundant set(..)Erik Johnston2019-06-192-4/+7
| | | | | | | | |
* | | | | | | | | Run Black. (#5482)Andrew Morgan2020-02-1317-62/+64
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Run Black. (#5482)Amber Brown2019-06-20291-9076/+7753
| | | | | | | | |
| * | | | | | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_errorErik Johnston2019-06-191-9/+19
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Handle the case of `get_missing_events` failing
* | | | | | | | | | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-11295-9336/+8020
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsAndrew Morgan2020-02-102-3/+6
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsErik Johnston2019-06-195-1/+124
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add experimental option to reduce extremities.
| | * | | | | | | | | Run as background process and fix commentsErik Johnston2019-06-192-3/+6
| | | | | | | | | | |
| * | | | | | | | | | Fix typo in deactivation background jobBrendan Abolivier2019-06-191-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Add some logging to 3pid invite sig verification (#5015)Andrew Morgan2020-02-101-8/+38
|\| | | | | | | | | |
| * | | | | | | | | | Add some logging to 3pid invite sig verification (#5015)David Baker2019-06-181-8/+38
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had to add quite a lot of logging to diagnose a problem with 3pid invites - we only logged the one failure which isn't all that informative. NB. I'm not convinced the logic of this loop is right: I think it should just accept a single valid signature from a trusted source rather than fail if *any* signature is invalid. Also it should probably not skip the rest of middle loop if a check fails? However, I'm deliberately not changing the logic here.
* | | | | | | | | | Fix loglineAndrew Morgan2020-02-101-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix loglineErik Johnston2019-06-181-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2020-02-101-9/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/fix_get_missing_events_error
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-06-18171-2326/+11195
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/fix_get_missing_events_error
| * | | | | | | | | Handle the case of `get_missing_events` failingErik Johnston2019-04-101-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a call to `/get_missing_events` fails we log an exception and stop processing the top level event we received over federation. Instead let's try and handle it sensibly given it is a somewhat expected failure mode.
* | | | | | | | | | Add experimental option to reduce extremities.Andrew Morgan2020-02-105-1/+121
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Add experimental option to reduce extremities.Erik Johnston2019-06-185-1/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new config option `cleanup_extremities_with_dummy_events` which periodically sends dummy events to rooms with more than 10 extremities. THIS IS REALLY EXPERIMENTAL.
* | | | | | | | | | Only count non-cache state resolutionAndrew Morgan2020-02-101-3/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Only count non-cache state resolutionErik Johnston2019-06-181-3/+3
| | | | | | | | | |
* | | | | | | | | | Use consistent bucketsAndrew Morgan2020-02-102-1/+33
|\| | | | | | | | |
| * | | | | | | | | Use consistent bucketsErik Johnston2019-06-181-1/+1
| | | | | | | | | |
| * | | | | | | | | Add metric fo number of state groups in resolutionErik Johnston2019-06-171-0/+10
| | | | | | | | | |
| * | | | | | | | | Add metrics for len of new extremities persisted.Erik Johnston2019-06-171-1/+23
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Of new events being persisted add metrics for total size of forward extremities and number of unchanged, "stale" extremities.
* | | | | | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pidAndrew Morgan2020-02-101-0/+9
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pidBrendan Abolivier2019-06-172-1/+42
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add third party rules hook for 3PID invites
| | * | | | | | | | Make check_threepid_can_be_invited asyncBrendan Abolivier2019-06-171-0/+1
| | | | | | | | | |
| | * | | | | | | | Add third party rules hook for 3PID invitesBrendan Abolivier2019-06-172-1/+41
| | | | | | | | | |
| * | | | | | | | | Merge pull request #5479 from matrix-org/erikj/add_create_room_hook_developErik Johnston2019-06-172-4/+48
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add third party rules hook into create room
| | * | | | | | | | Add third party rules hook into create roomErik Johnston2019-06-172-4/+48
| | |/ / / / / / /
* | | | | | | | | Remove Postgres 9.4 support (#5448)Andrew Morgan2020-02-102-24/+6
|\| | | | | | | |
| * | | | | | | | Remove Postgres 9.4 support (#5448)Amber Brown2019-06-182-24/+6
| |/ / / / / / /
* | | | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsAndrew Morgan2020-02-104-19/+28
|\| | | | | | |
| * | | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsErik Johnston2019-06-174-19/+28
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Handle HttpResponseException when using federation client.
| | * | | | | | | Handle failing to talk to master over replicationErik Johnston2019-06-071-1/+9
| | | | | | | | |
| | * | | | | | | Handle HttpResponseException when using federation client.Erik Johnston2019-06-073-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we just log exceptions everywhere.
* | | | | | | | | Merge commit 'dd927b29e' into dinsic-release-v1.1.0Andrew Morgan2020-02-103-7/+53
|\| | | | | | | |
| * | | | | | | | Merge pull request #5388 from matrix-org/erikj/fix_email_pushErik Johnston2019-06-173-7/+53
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix email notifications for unnamed rooms with multiple people
| | * | | | | | | | Add testErik Johnston2019-06-072-7/+42
| | | | | | | | | |
| | * | | | | | | | Fix email notifications for large unnamed rooms.Erik Johnston2019-06-071-0/+11
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we try and calculate a description for a room for with no name but multiple other users we threw an exception (due to trying to subscript result of `dict.values()`).
* | | | | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_masterAndrew Morgan2020-02-101-3/+4
|\| | | | | | | |
| * | | | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_masterErik Johnston2019-06-171-3/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Only start background group attestation renewals on master
| | * | | | | | | | Only start background group attestation renewals on masterErik Johnston2019-06-071-3/+4
| | | | | | | | | |
| * | | | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_stateErik Johnston2019-06-171-6/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix 3PID invite room state over federation.
| * \ \ \ \ \ \ \ \ \ Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-146-4/+191
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow server admins to define implementations of extra rules for allowing or denying incoming events
* | | | | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveAndrew Morgan2020-02-102-2/+2
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveErik Johnston2019-06-142-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Prometheus histograms are cumalative
| | * | | | | | | | | | | Prometheus histograms are cumalativeErik Johnston2019-06-142-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_jobBrendan Abolivier2019-06-141-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix background job for deactivated flag
| | * | | | | | | | | | | | Fix background job for deactivated flagBrendan Abolivier2019-06-141-2/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #5462 from ↵Brendan Abolivier2019-06-144-2/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_deactivated_accounts_2 Don't send renewal emails to deactivated users (second attempt)
* | | | | | | | | | | | | | Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0Andrew Morgan2020-02-1033-130/+989
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fix resetting password via a phone number (#21) dinsic_2020-02-10Andrew Morgan2020-01-241-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Validate client_secret parameter according to spec (#20)Andrew Morgan2020-01-223-1/+33
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add the ability to restrict max avatar filesize and content-type (#19)Andrew Morgan2019-12-123-2/+79
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add limit_profile_requests_to_known_users option (#18)Andrew Morgan2019-12-052-2/+15
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Capatilise letters after a - in new user displaynames (#14)Andrew Morgan2019-12-021-16/+58
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Discard retention policies when retrieving stateBrendan Abolivier2019-11-292-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Purge jobs don't delete the latest event in a room in order to keep the forward extremity and not break the room. On the other hand, get_state_events, when given an at_token argument calls filter_events_for_client to know if the user can see the event that matches that (sync) token. That function uses the retention policies of the events it's given to filter out those that are too old from a client's view. Some clients, such as Riot, when loading a room, request the list of members for the latest sync token it knows about, and get confused to the point of refusing to send any message if the server tells it that it can't get that information. This can happen very easily with the message retention feature turned on and a room with low activity so that the last event sent becomes too old according to the room's retention policy. An easy and clean fix for that issue is to discard the room's retention policies when retrieving state.
| * | | | | | | | | | | | | Hide expired users from user directory, optionally show on renewal (#13)Andrew Morgan2019-11-142-0/+55
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add a /user/:user_id/info servlet to give user deactivated/expired ↵Andrew Morgan2019-11-142-6/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | information (#12)
| * | | | | | | | | | | | | Create configurable ratelimiter for 3pid invites (#11)Andrew Morgan2019-11-122-8/+17
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't apply retention policy based filtering on state eventsBrendan Abolivier2019-11-061-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy.
| * | | | | | | | | | | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-0110-9/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy. The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`. The proxy will then be used for * push * url previews * phone-home stats * recaptcha validation * CAS auth validation It will *not* be used for: * Application Services * Identity servers * Outbound federation * In worker configurations, connections from workers to masters Fixes #4198.
| * | | | | | | | | | | | | TypoBrendan Abolivier2019-10-041-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | LintBrendan Abolivier2019-10-041-3/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-10-041-14/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add test caseBrendan Abolivier2019-10-041-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | LintBrendan Abolivier2019-10-041-1/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't 500 code when trying to exchange a revoked 3PID inviteBrendan Abolivier2019-10-041-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this is not documented in the spec (but should be), Riot (and other clients) revoke 3PID invites by sending a m.room.third_party_invite event with an empty ({}) content to the room's state. When the invited 3PID gets associated with a MXID, the identity server (which doesn't know about revocations) sends down to the MXID's homeserver all of the undelivered invites it has for this 3PID. The homeserver then tries to talk to the inviting homeserver in order to exchange these invite for m.room.member events. When one of the invite is revoked, the inviting homeserver responds with a 500 error because it tries to extract a 'display_name' property from the content, which is empty. This might cause the invited server to consider that the server is down and not try to exchange other, valid invites (or at least delay it). This fix handles the case of revoked invites by avoiding trying to fetch a 'display_name' from the original invite's content, and letting the m.room.member event fail the auth rules (because, since the original invite's content is empty, it doesn't have public keys), which results in sending a 403 with the correct error message to the invited server.
| * | | | | | | | | | | | | Merge pull request #7 from matrix-org/babolivier/deactivation-inviteBrendan Abolivier2019-09-271-0/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject pending invites on deactivation
| | * | | | | | | | | | | | | s/return/defer.returnValue/Brendan Abolivier2019-09-271-1/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-09-271-4/+2
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| | * | | | | | | | | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| | * | | | | | | | | | | | | LintBrendan Abolivier2019-09-271-1/+34
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Allow membership events which membership isn't join or invite in restricted ↵Brendan Abolivier2019-09-261-1/+9
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rooms
| * | | | | | | | | | | | | Consider every room as having no retention policy if the feature is disabledBrendan Abolivier2019-09-241-0/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Move get_retention_policy_for_room to RoomWorkerStoreBrendan Abolivier2019-09-241-55/+55
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove unnecessary cast to listBrendan Abolivier2019-09-201-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | LintBrendan Abolivier2019-09-191-1/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use six.moves.filter when filtering out from MXIDBrendan Abolivier2019-09-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python 2's filter() function and Python 3's don't return the same type when processing a string (respectively str and filter), therefore use six's compatibility mapping (which resolves to itertools.ifilter() if using Python2), then generate a string from the filtered list, in order to ensure consistent behaviour between Python 2 and Python 3.
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-09-01 23:56:04 +0000