summary refs log tree commit diff
path: root/synapse/config (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2020-03-161-1/+1
|\ | | | | | | | | * commit '46c12918a': Fix typo in domain name in account_threepid_delegates config option (#6273)
| * Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2019-10-301-1/+1
| |
* | Option to suppress resource exceeded alerting (#6173)Andrew Morgan2020-03-161-2/+8
|\| | | | | | | | | * commit '2794b7905': Option to suppress resource exceeded alerting (#6173)
| * Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-241-2/+8
| | | | | | | | The expected use case is to suppress MAU limiting on small instances
* | Add config linting script that checks for bool casing (#6203)Andrew Morgan2020-03-169-15/+22
|\| | | | | | | | | * commit '409c62b27': Add config linting script that checks for bool casing (#6203)
| * Add config linting script that checks for bool casing (#6203)Andrew Morgan2019-10-239-15/+22
| | | | | | | | | | Add a linting script that enforces all boolean values in the default config be lowercase. This has annoyed me for a while so I decided to fix it.
* | Fix logging config for the docker image (#6197)Andrew Morgan2020-03-161-3/+2
|\| | | | | | | | | * commit '560c12226': Fix logging config for the docker image (#6197)
| * Fix logging config for the docker image (#6197)Richard van der Hoff2019-10-181-3/+2
| | | | | | | | | | | | | | | | Turns out that loggers that are instantiated before the config is loaded get turned off. Also bring the logging config that is generated by --generate-config into line. Fixes #6194.
* | cas: support setting display name (#6114)Andrew Morgan2020-02-261-0/+3
|\|
| * cas: support setting display name (#6114)Valérian Rousset2019-10-111-0/+3
| | | | | | Now, the CAS server can return an attribute stating what's the desired displayname, instead of using the username directly.
* | Refactor HomeserverConfig so it can be typechecked (#6137)Andrew Morgan2020-02-2633-79/+385
|\|
| * Refactor HomeserverConfig so it can be typechecked (#6137)Amber Brown2019-10-1033-79/+385
| |
* | Fix up some typechecking (#6150)Andrew Morgan2020-02-266-12/+20
|\|
| * Fix up some typechecking (#6150)Amber Brown2019-10-026-12/+20
| | | | | | | | | | | | * type checking fixes * changelog
* | Merge pull request #6117 from matrix-org/erikj/fix_sample_configAndrew Morgan2020-02-251-1/+1
|\|
| * Fix 'redaction_retention_period' sampel config to match guidelinesErik Johnston2019-09-261-1/+1
| |
* | Explicitly log when a homeserver does not have a trusted key server ↵Andrew Morgan2020-02-252-12/+52
|\| | | | | | | configured (#6090)
| * Explicitly log when a homeserver does not have a trusted key server ↵Neil Johnson2019-09-262-12/+52
| | | | | | | | configured (#6090)
* | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2Andrew Morgan2020-02-251-0/+13
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-09-253-61/+185
| |\ | | | | | | | | | erikj/cleanup_user_ips_2
| * | Review commentsErik Johnston2019-09-251-1/+1
| | |
| * | Prune rows in user_ips older than configured periodErik Johnston2019-09-241-0/+13
| | | | | | | | | | | | Defaults to pruning everything older than 28d.
* | | Enable cleaning up extremities with dummy events by default to prevent undue ↵Andrew Morgan2020-02-251-3/+1
|\ \ \ | | |/ | |/| | | | build up of forward extremities. (#5884)
| * | Enable cleaning up extremities with dummy events by default to prevent undue ↵Neil Johnson2019-09-251-3/+1
| | | | | | | | | | | | build up of forward extremities. (#5884)
* | | Merge pull request #6037 from matrix-org/rav/saml_mapping_workAndrew Morgan2020-02-251-2/+76
|\| |
| * | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-241-6/+42
| |\ \
| * \ \ Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-245-3/+44
| |\ \ \
| * \ \ \ Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-1914-168/+524
| |\ \ \ \
| * | | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-131-2/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to assign unique mxids to saml users based on an incrementing suffix. For that to work, we need to record the allocated mxid in a separate table.
* | | | | | Merge pull request #6069 from matrix-org/rav/fix_attribute_mappingAndrew Morgan2020-02-251-6/+42
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #6069 from matrix-org/rav/fix_attribute_mappingRichard van der Hoff2019-09-241-6/+42
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Fix a bug with saml attribute maps.
| | * | | | docstrings and commentsRichard van der Hoff2019-09-241-7/+21
| | | | | |
| | * | | | Merge branch 'develop' into rav/fix_attribute_mappingRichard van der Hoff2019-09-1914-168/+524
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Fix a bug with saml attribute maps.Richard van der Hoff2019-09-191-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug where the default attribute maps were prioritised over user-specified ones, resulting in incorrect mappings. The problem is that if you call SPConfig.load() multiple times, it adds new attribute mappers to a list. So by calling it with the default config first, and then the user-specified config, we would always get the default mappers before the user-specified mappers. To solve this, let's merge the config dicts first, and then pass them to SPConfig.
* | | | | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2020-02-251-0/+2
|\| | | | |
| * | | | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2019-09-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Second part of solving #6076 Fixes #6076 We return a submit_url parameter on calls to POST */msisdn/requestToken so that clients know where to submit token information to.
* | | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanupAndrew Morgan2020-02-251-51/+62
|\| | | | |
| * | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanupRichard van der Hoff2019-09-231-51/+62
| |\ \ \ \ \ | | | | | | | | | | | | | | Make the sample saml config closer to our standards
| | * \ \ \ \ Merge branch 'develop' into rav/saml_config_cleanupRichard van der Hoff2019-09-1914-168/+524
| | |\ \ \ \ \ | | | | |/ / / | | | |/| / / | | | |_|/ / | | |/| | |
| | * | | | Make the sample saml config closer to our standardsRichard van der Hoff2019-09-131-51/+62
| | | |/ / | | |/| | | | | | | | | | | | It' still not great, thanks to the nested dictionaries, but it's better.
* | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2020-02-251-0/+3
|\| | | |
| * | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2019-09-231-0/+3
| | |_|/ | |/| | | | | | | | | | | | | | Uses a SimpleHttpClient instance equipped with the federation_ip_range_blacklist list for requests to identity servers provided by user input. Does not use a blacklist when contacting identity servers specified by account_threepid_delegates. The homeserver trusts the latter and we don't want to prevent homeserver admins from specifying delegates that are on internal IP addresses. Fixes #5935
* | | | Merge pull request #6072 from matrix-org/rav/fix_retry_resetAndrew Morgan2020-02-252-2/+2
|\| | |
| * | | fix broken copyrightsMatthew Hodgson2019-09-232-2/+2
| | | |
* | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2020-02-251-0/+36
|\| | |
| * | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-201-0/+36
| | | |
* | | | Fix typo in account_threepid_delegates config (#6028)Andrew Morgan2020-02-251-1/+1
|\| | |
| * | | Fix typo in account_threepid_delegates config (#6028)Jorik Schellekens2019-09-181-1/+1
| | |/ | |/|
* | | (#5849) Convert rst to markdown (#6040)Andrew Morgan2020-02-251-6/+6
|\| |
| * | (#5849) Convert rst to markdown (#6040)dstipp2019-09-171-6/+6
| | | | | | | | | | | | | | | Converting some of the rst documentation to markdown. Attempted to preserve whitespace and line breaks to minimize cosmetic change.
* | | Fix well-known lookups with the federation certificate whitelist (#5997)Andrew Morgan2020-02-251-1/+8
|\| |
| * | Fix well-known lookups with the federation certificate whitelist (#5997)Amber Brown2019-09-141-1/+8
| | |
* | | Fix for structured logging tests stomping on logs (#6023)Andrew Morgan2020-02-251-8/+25
|\| |
| * | Fix for structured logging tests stomping on logs (#6023)Amber Brown2019-09-131-8/+25
| | |
* | | add report_stats_endpoint config option (#6012)Andrew Morgan2020-02-251-0/+9
|\| |
| * | add report_stats_endpoint config option (#6012)Sorunome2019-09-121-0/+9
| | | | | | | | | This PR adds the optional `report_stats_endpoint` to configure where stats are reported to, if enabled.
* | | Blow up config if opentracing is missing (#5985)Andrew Morgan2020-02-251-0/+7
|\| |
| * | Blow up config if opentracing is missing (#5985)Jorik Schellekens2019-09-121-0/+7
| | | | | | | | | | | | * Blow up config if opentracing is missing
* | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionAndrew Morgan2020-02-251-0/+13
|\| |
| * | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionErik Johnston2019-09-111-0/+13
| |\ \ | | | | | | | | Allow use of different ratelimits for admin redactions.
| | * | Fix commentsErik Johnston2019-09-111-1/+1
| | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| | * | Allow use of different ratelimits for admin redactions.Erik Johnston2019-09-111-0/+13
| | | | | | | | | | | | | | | | | | | | This is useful to allow room admins to quickly deal with a large number of abusive messages.
* | | | Check dependencies on setup in the nicer way. (#5989)Andrew Morgan2020-02-252-27/+12
|\| | |
| * | | Check dependencies on setup in the nicer way. (#5989)Jorik Schellekens2019-09-112-27/+12
| |/ /
* | | Merge pull request #5934 from matrix-org/erikj/censor_redactionsAndrew Morgan2020-02-251-0/+17
|\| |
| * | Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-091-0/+17
| |\ \ | | | | | | | | Censor redactions in DB after a month
| | * | Default to censoring redactions after seven daysErik Johnston2019-09-091-4/+6
| | | |
| | * | Handle setting retention period to 0Erik Johnston2019-09-091-1/+1
| | | |
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-09-051-8/+5
| | |\ \ | | | | | | | | | | | | | | | erikj/censor_redactions
| | * | | Make redaction retention period configurableErik Johnston2019-09-051-0/+15
| | | | |
* | | | | Servers-known-about statistic (#5981)Andrew Morgan2020-02-251-0/+31
|\| | | |
| * | | | Servers-known-about statistic (#5981)Amber Brown2019-09-071-0/+31
| | | | |
* | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2020-02-252-28/+130
|\| | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987)
| * | | | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2019-09-062-28/+130
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Fix and refactor room and user stats (#5971)Andrew Morgan2020-02-251-8/+5
|\| | |
| * | | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-041-8/+5
| |/ / | | | | | | Previously the stats were not being correctly populated.
* | | Add a link to python's logging config schema (#5926)Andrew Morgan2020-02-241-1/+2
|\| |
| * | Add a link to python's logging config schema (#5926)Jorik Schellekens2019-08-281-1/+2
| | |
* | | Let synctl use a config directory. (#5904)Andrew Morgan2020-02-241-3/+4
|\| |
| * | Let synctl use a config directory. (#5904)Jorik Schellekens2019-08-281-3/+4
| | | | | | | | | * Let synctl use a config directory.
* | | Config templating (#5900)Andrew Morgan2020-02-214-37/+161
|\| |
| * | 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)Andrew Morgan2020-02-211-42/+61
|\| |
| * | Implement a structured logging output system. (#5680)Amber Brown2019-08-281-42/+61
| | |
* | | Merge pull request #5895 from matrix-org/erikj/notary_keyAndrew Morgan2020-02-211-4/+30
|\| |
| * | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-271-4/+30
| |\ \ | | | | | | | | 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
| | | |
| | * | Add config option for keys to use to sign keysErik Johnston2019-08-211-4/+31
| | | | | | | | | | | | | | | | | | | | 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_urlAndrew Morgan2020-02-211-1/+1
|\| | |
| * | | public_base_url is actually public_baseurlAaron Raimist2019-08-261-1/+1
| |/ / | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | Fix up password reset template config names (#5863)Andrew Morgan2020-02-201-8/+8
|\| |
| * | Fix up password reset template config names (#5863)Andrew Morgan2019-08-151-8/+8
| |/ | | | | | | | | 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 pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startupAndrew Morgan2020-02-201-1/+1
|\|
| * fix config being a dict, actuallyAmber H. Brown2019-08-141-1/+1
| |
* | Don't load the media repo when configured to use an external media repo (#5754)Andrew Morgan2020-02-201-0/+20
|\|
| * Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-131-0/+20
| |
| * LintBrendan Abolivier2019-08-011-12/+7
| |
| * Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-2/+48
| |
* | Remove non-functional 'expire_access_token' setting (#5782)Andrew Morgan2020-02-201-6/+0
|\|
| * Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-301-6/+0
| | | | | | | | | | | | | | | | 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)Andrew Morgan2020-02-201-0/+41
|\|
| * Room Complexity Client Implementation (#5783)Amber Brown2019-07-301-0/+41
| |
* | Make Jaeger fully configurable (#5694)Andrew Morgan2020-02-191-0/+22
|\|
| * Make Jaeger fully configurable (#5694)Jorik Schellekens2019-07-231-0/+22
| | | | | | | | | | | | * Allow Jaeger to be configured * Update sample config
* | Fix logging in workers (#5729)Andrew Morgan2020-02-191-0/+1
|\|
| * Fix logging in workers (#5729)Amber Brown2019-07-221-0/+1
| | | | | | This also adds a worker blacklist.
| * Merge branch 'release-v1.2.0' into developJorik Schellekens2019-07-221-12/+2
| |\
* | \ Opentracing Documentation (#5703)Andrew Morgan2020-02-191-12/+2
|\ \ \ | | |/ | |/|
| * | Opentracing Documentation (#5703)Jorik Schellekens2019-07-221-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Opentracing survival guide * Update decorator names in doc * Doc cleanup These are all alterations as a result of comments in #5703, it includes mostly typos and clarifications. The most interesting changes are: - Split developer and user docs into two sections - Add a high level description of OpenTracing * newsfile * Move contributer specific info to docstring. * Sample config. * Trailing whitespace. * Update 5703.misc * Apply suggestions from code review Mostly just rewording parts of the docs for clarity. Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* | | Remove non-dedicated logging options and command line arguments (#5678)Andrew Morgan2020-02-193-76/+13
|\ \ \ | | |/ | |/|
| * | Remove non-dedicated logging options and command line arguments (#5678)Amber Brown2019-07-192-75/+12
| |/
| * enable aggregations support by defaultNeil Johnson2019-07-181-1/+1
| |
* | Clean up opentracing configuration options (#5712)Andrew Morgan2020-02-191-22/+41
|\|
| * Clean up opentracing configuration options (#5712)Richard van der Hoff2019-07-181-22/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up config settings and dead code. This is mostly about cleaning up the config format, to bring it into line with our conventions. In particular: * There should be a blank line after `## Section ##' headings * There should be a blank line between each config setting * There should be a `#`-only line between a comment and the setting it describes * We don't really do the `# #` style commenting-out of whole sections if we can help it * rename `tracer_enabled` to `enabled` While we're here, do more config parsing upfront, which makes it easier to use later on. Also removes redundant code from LogContextScopeManager. Also changes the changelog fragment to a `feature` - it's exciting!
* | Merge pull request #5597 from matrix-org/erikj/admin_api_cmdAndrew Morgan2020-02-175-10/+79
|\|
| * Clean up arg name and remove lying commentErik Johnston2019-07-161-7/+5
| |
| * Fix invoking add_argument from homeserver.pyErik Johnston2019-07-151-1/+1
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmdErik Johnston2019-07-157-19/+114
| |\
| * | Move creation of ArgumentParser to callerErik Johnston2019-07-151-10/+5
| | |
| * | Fix up commentsErik Johnston2019-07-151-1/+1
| | |
| * | Change add_arguments to be a static methodErik Johnston2019-07-155-5/+39
| | |
| * | Add basic admin cmd appErik Johnston2019-07-021-3/+45
| | |
* | | Implement access token expiry (#5660)Andrew Morgan2020-02-171-0/+16
|\ \ \ | | |/ | |/|
| * | Implement access token expiry (#5660)Richard van der Hoff2019-07-121-0/+16
| | | | | | | | | | | | Record how long an access token is valid for, and raise a soft-logout once it expires.
* | | Add basic opentracing support (#5544)Andrew Morgan2020-02-172-0/+52
|\| |
| * | Add basic opentracing support (#5544)Jorik Schellekens2019-07-112-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | Remove support for invite_3pid_guest. (#5625)Andrew Morgan2020-02-171-3/+2
|\| |
| * | Remove support for invite_3pid_guest. (#5625)Richard van der Hoff2019-07-051-3/+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.
* | | Fixes to the federation rate limiter (#5621)Andrew Morgan2020-02-171-2/+2
|\| |
| * | Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | - 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.
* | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-141-2/+2
|\| |
| * | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-041-2/+2
| | |
* | | Complete the SAML2 implementation (#5422)Andrew Morgan2020-02-141-1/+32
|\| |
| * | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-013-2/+47
| |\|
| * | cleanupsRichard van der Hoff2019-06-271-6/+13
| | |
| * | Add support for tracking SAML2 sessions.Richard van der Hoff2019-06-261-1/+19
| | | | | | | | | | | | This allows us to correctly handle `allow_unsolicited: False`.
| * | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-2631-620/+704
| |\ \
| * | | Code cleanups and simplifications.Richard van der Hoff2019-06-111-1/+6
| | | | | | | | | | | | | | | | Also: share the saml client between redirect and response handlers.
| * | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-104-99/+422
| |\ \ \
| * | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Trost <galexrt@googlemail.com>
* | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ↵Andrew Morgan2020-02-141-1/+31
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | federation (#5550)
| * | | | Update the TLS cipher string and provide configurability for TLS on outgoing ↵Amber Brown2019-06-281-1/+31
| | | | | | | | | | | | | | | | | | | | federation (#5550)
* | | | | Added possibilty to disable local password authentication (#5092)Andrew Morgan2020-02-141-0/+7
|\| | | |
| * | | | Added possibilty to disable local password authentication (#5092)Daniel Hoffend2019-06-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | 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 #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 #5534 from matrix-org/babolivier/federation-publicroomsBrendan Abolivier2019-06-241-10/+34
| |\ \ \ \ | | |/ / / | |/| | | Split public rooms directory auth config in two
| | * | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-10/+34
| | | | |
* | | | | Merge pull request #5516 from matrix-org/rav/acme_key_pathAndrew Morgan2020-02-132-5/+14
|\| | | |
| * | | | 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-241-2/+14
| |/ / / | | | | | | | | | | | | | | | | 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
* | | | Drop support for cpu_affinity (#5525)Andrew Morgan2020-02-132-25/+0
|\| | |
| * | | Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-222-25/+0
| | | | | | | | | | | | 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.
* | | | Run Black. (#5482)Andrew Morgan2020-02-132-3/+3
|\| | |
| * | | Run Black. (#5482)Amber Brown2019-06-2022-427/+369
| | | |
* | | | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-1122-444/+397
| | | |
* | | | Add experimental option to reduce extremities.Andrew Morgan2020-02-101-0/+6
|\| | |
| * | | Add experimental option to reduce extremities.Erik Johnston2019-06-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-142-0/+44
| |\ \ \ | | | | | | | | | | Allow server admins to define implementations of extra rules for allowing or denying incoming events
* | \ \ \ Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0Andrew Morgan2020-02-104-1/+54
|\ \ \ \ \
| * | | | | Add the ability to restrict max avatar filesize and content-type (#19)Andrew Morgan2019-12-121-0/+30
| | | | | |
| * | | | | Add limit_profile_requests_to_known_users option (#18)Andrew Morgan2019-12-051-0/+13
| | | | | |
| * | | | | Create configurable ratelimiter for 3pid invites (#11)Andrew Morgan2019-11-121-0/+9
| | | | | |
| * | | | | Rename io.open import to limite side-effectsBrendan Abolivier2019-09-091-2/+2
| | | | | |
| * | | | | LintBrendan Abolivier2019-09-091-1/+1
| | | | | |
| * | | | | Read all files as UTF-8Brendan Abolivier2019-09-091-1/+2
| | | | | |
* | | | | | Remove Python 2.7 support. (#5425)Andrew Morgan2020-02-101-6/+5
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | / Don't warn user about password reset disabling through config code (#5387)Andrew Morgan2019-06-111-6/+5
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Moves the warning about password resets being disabled to the point where a user actually tries to reset their password. Is this an appropriate place for it to happen? Also removed the disabling of msisdn password resets when you don't have an email config, as that just doesn't make sense. Also change the error a user receives upon disabled passwords to specify that only email-based password reset is disabled.
* | | | Merge branch 'dinsic' into babolivier/dinsic-message-retentionBrendan Abolivier2019-08-281-2/+43
|\ \ \ \
| * | | | LintBrendan Abolivier2019-08-011-12/+7
| | | | |
| * | | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-2/+48
| | | | |
* | | | | Implement per-room message retention policiesBrendan Abolivier2019-08-281-0/+172
|/ / / /
* | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-10/+34
| | | |
* | | | Merge branch 'babolivier/third_party_event_rules' into dinsicBrendan Abolivier2019-06-142-0/+44
|\ \ \ \ | | |/ / | |/| |
| * | | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-142-0/+44
| |/ /
* | | Merge branch 'dinsic' into babolivier/userdir_hide_usersBrendan Abolivier2019-06-127-73/+501
|\ \ \
| * | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-127-73/+496
| |\| |
| | * | Improve startup checks for insecure notary configs (#5392)Richard van der Hoff2019-06-101-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not really a problem to trust notary responses signed by the old key so long as we are also doing TLS validation. This commit adds a check to the config parsing code at startup to check that we do not have the insecure matrix.org key without tls validation, and refuses to start without it. This allows us to remove the rather alarming-looking warning which happens at runtime.
| | * | Set default room version to v4. (#5379)Neil Johnson2019-06-061-1/+1
| | | | | | | | | | | | | | | | Set default room version to v4.
| | * | Add ability to perform password reset via email without trusting the ↵Andrew Morgan2019-06-061-15/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identity server (#5377) Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option. This PR is a culmination of 3 smaller PRs which have each been separately reviewed: * #5308 * #5345 * #5368
| | * | Stop hardcoding trust of old matrix.org key (#5374)Richard van der Hoff2019-06-061-39/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a few changes going on here: * We make checking the signature on a key server response optional: if no verify_keys are specified, we trust to TLS to validate the connection. * We change the default config so that it does not require responses to be signed by the old key. * We replace the old 'perspectives' config with 'trusted_key_servers', which is also formatted slightly differently. * We emit a warning to the logs every time we trust a key server response signed by the old key.
| | * | Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verificationRichard van der Hoff2019-06-052-1/+17
| | |\ \
| | | * | Fix `federation_custom_ca_list` configuration option.Richard van der Hoff2019-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | Previously, setting this option would cause an exception at startup.
| | | * | Neilj/mau tracking config explainer (#5284)Neil Johnson2019-06-051-0/+16
| | | | | | | | | | | | | | | | | | | | Improve documentation of monthly active user blocking and mau_trial_days
| | * | | Validate federation server TLS certificates by default.Richard van der Hoff2019-06-051-5/+5
| | |/ /
| | * | Merge pull request #5341 from matrix-org/babolivier/email_configBrendan Abolivier2019-06-041-42/+57
| | |\ \ | | | |/ | | |/| Make account validity renewal emails work when email notifs are disabled
| | * | Merge pull request #5276 from matrix-org/babolivier/account_validity_job_deltaErik Johnston2019-05-311-1/+5
| | |\ \ | | | | | | | | | | Allow configuring a range for the account validity startup job
| | * | | Fix docs on resetting the user directory (#5036)Aaron Raimist2019-05-281-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| | * | | Add missing blank line in config (#5249)Richard van der Hoff2019-05-241-0/+1
| | | | |
| | * | | Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Replaces DEFAULT_ROOM_VERSION constant with a method that first checks the config, then returns a hardcoded value if the option is not present. That hardcoded value is now located in the server.py config file.
| | * | | Room Statistics (#4338)Amber Brown2019-05-212-10/+92
| | | | |
| * | | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-111-0/+5
| |\| | |
| | * | | Merge pull request #5204 from ↵Brendan Abolivier2019-05-211-0/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_expiration_date Add startup background job for account validity
| | * \ \ \ Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-201-0/+5
| | |\ \ \ \ | | | | | | | | | | | | | | Land basic reaction and edit support.
| | | * | | | Add aggregations APIErik Johnston2019-05-161-0/+5
| | | | | | |
* | | | | | | Hide new users from the user directory if enabled in the server config.Brendan Abolivier2019-06-101-0/+11
|/ / / / / /
* | | | | | Merge branch 'babolivier/email_config' into dinsic dinsic_2019-06-04Brendan Abolivier2019-06-041-42/+57
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Only parse from email if providedBrendan Abolivier2019-06-041-4/+5
| | | | | |
| * | | | | LintBrendan Abolivier2019-06-041-1/+0
| | | | | |
| * | | | | Make account validity renewal emails work when email notifs are disabledBrendan Abolivier2019-06-041-42/+57
| | |_|/ / | |/| | |
* | | | | Merge branch 'babolivier/account_validity_job_delta' of ↵ dinsic_2019-05-31Erik Johnston2019-05-311-1/+5
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | github.com:matrix-org/synapse into dinsic
| * | | | Move delta from +10% to -10%Brendan Abolivier2019-05-311-1/+1
| | | | |
| * | | | Gah pythonBrendan Abolivier2019-05-311-1/+1
| | | | |
| * | | | Make max_delta equal to period * 10%Brendan Abolivier2019-05-311-11/+4
| | | | |
| * | | | Allow configuring a range for the account validity startup jobBrendan Abolivier2019-05-281-0/+11
| |/ / / | | | | | | | | | | | | | | | | When enabling the account validity feature, Synapse will look at startup for registered account without an expiration date, and will set one equals to 'now + validity_period' for them. On large servers, it can mean that a large number of users will have the same expiration date, which means that they will all be sent a renewal email at the same time, which isn't ideal. In order to mitigate this, this PR allows server admins to define a 'max_delta' so that the expiration date is a random value in the [now + validity_period ; now + validity_period + max_delta] range. This allows renewal emails to be progressively sent over a configured period instead of being sent all in one big batch.
* | | | Merge pull request #5214 from matrix-org/babolivier/password-policyBrendan Abolivier2019-05-221-1/+37
|\ \ \ \ | | | | | | | | | | Allow server admins to define and enforce a password policy (MSC2000)
| * | | | Improve documentation on generated configurationBrendan Abolivier2019-05-211-7/+27
| | | | |
| * | | | First implementation of MSC2000Brendan Abolivier2019-05-201-1/+17
| | |/ / | |/| |
* | | | Merge branch 'babolivier/account_validity_expiration_date' into dinsicBrendan Abolivier2019-05-211-0/+8
|\ \ \ \ | | |/ / | |/| |
| * | | DocBrendan Abolivier2019-05-211-0/+8
| |/ /
* | | Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17Brendan Abolivier2019-05-172-42/+122
|\| |
| * | Add option to disable per-room profilesBrendan Abolivier2019-05-161-0/+11
| | |
| * | Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-42/+73
| |/
| * Add ability to blacklist ip ranges for federation traffic (#5043)Andrew Morgan2019-05-131-0/+38
| |
* | Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14Brendan Abolivier2019-05-145-29/+208
|\|
| * add options to require an access_token to GET /profile and /publicRooms on ↵Matthew Hodgson2019-05-081-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CS API (#5083) This commit adds two config options: * `restrict_public_rooms_to_local_users` Requires auth to fetch the public rooms directory through the CS API and disables fetching it through the federation API. * `require_auth_for_profile_requests` When set to `true`, requires that requests to `/profile` over the CS API are authenticated, and only returns the user's profile if the requester shares a room with the profile's owner, as per MSC1301. MSC1301 also specifies a behaviour for federation (only returning the profile if the server asking for it shares a room with the profile's owner), but that's currently really non-trivial to do in a not too expensive way. Next step is writing down a MSC that allows a HS to specify which user sent the profile query. In this implementation, Synapse won't send a profile query over federation if it doesn't believe it already shares a room with the profile's owner, though. Groups have been intentionally omitted from this commit.
| * Merge branch 'master' into developRichard van der Hoff2019-05-031-10/+21
| |\
| | * more config comment updatesRichard van der Hoff2019-05-031-2/+5
| | |
| | * Blacklist 0.0.0.0 and :: by default for URL previewsRichard van der Hoff2019-05-031-10/+18
| | |
| * | Merge pull request #5124 from matrix-org/babolivier/aliasesBrendan Abolivier2019-05-021-0/+11
| |\ \ | | | | | | | | Add some limitations to alias creation
| | * | Add some limitations to alias creationBrendan Abolivier2019-05-021-0/+11
| | | |
| * | | Move admin API to a new prefixRichard van der Hoff2019-05-011-2/+2
| |/ /
| * | Config option for verifying federation certificates (MSC 1711) (#4967)Andrew Morgan2019-04-252-8/+93
| | |
| * | Don't crash on lack of expiry templatesBrendan Abolivier2019-04-181-2/+6
| | |
| * | Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-172-9/+50
| |\ \ | | | | | | | | Send out emails with links to extend an account's validity period
| | * | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-172-9/+50
| | | |
* | | | Move lookup endpoint to CS API (and s/is_server/id_server/)Brendan Abolivier2019-04-301-1/+0
| | | |
* | | | [DINSIC] Add ability to proxy identity lookups (#5048)Andrew Morgan2019-04-161-0/+1
| | | |
* | | | Merge branch 'develop' into dinsicAndrew Morgan2019-04-154-2/+24
|\| | |
| * | | Remove periods from copyright headers (#5046)Andrew Morgan2019-04-111-1/+1
| | | |
| * | | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-091-0/+17
| |\| | | | | | | | | | Add time-based account expiration
| | * | Add account expiration featureBrendan Abolivier2019-04-091-0/+17
| | |/
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-09 15:32:40 +0000