diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-09-15 16:52:38 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-09-15 16:52:38 +0100 |
| commit | 2c8f16257a3c8d4ad330f584f59f5e678207af14 (patch) | |
| tree | 2745c1dff2e67b7bec31ca96d79bce999f9bf788 /synapse/config | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Use shorter config key name (diff) | |
| download | synapse-2c8f16257a3c8d4ad330f584f59f5e678207af14.tar.xz | |
Merge pull request #272 from matrix-org/daniel/insecureclient
Allow configuration to ignore invalid SSL certs
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/tls.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py index 4751d39bc9..e6023a718d 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -42,6 +42,14 @@ class TlsConfig(Config): config.get("tls_dh_params_path"), "tls_dh_params" ) + # This config option applies to non-federation HTTP clients + # (e.g. for talking to recaptcha, identity servers, and such) + # It should never be used in production, and is intended for + # use only when running tests. + self.use_insecure_ssl_client_just_for_testing_do_not_use = config.get( + "use_insecure_ssl_client_just_for_testing_do_not_use" + ) + def default_config(self, config_dir_path, server_name): base_key_name = os.path.join(config_dir_path, server_name) |