diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-09-15 15:50:13 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-09-15 15:50:13 +0100 |
| commit | d4af08a167cb5351110036c35bdfc267242d8131 (patch) | |
| tree | 3b281a6e3c8a3c2ea8b0c3f0bffa0286b86418c9 | |
| parent | Rename context factory (diff) | |
| download | synapse-d4af08a167cb5351110036c35bdfc267242d8131.tar.xz | |
Use shorter config key name
| -rw-r--r-- | synapse/config/tls.py | 6 | ||||
| -rw-r--r-- | synapse/server.py | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py index 35ff13f4ba..e6023a718d 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -46,9 +46,9 @@ class TlsConfig(Config): # (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 = config.get( - "i_really_want_to_ignore_ssl_certs_when_i_am_an_https_client_even_" - "though_it_is_woefully_insecure_because_i_am_testing_i_promise", False) + 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) diff --git a/synapse/server.py b/synapse/server.py index d96c5a573a..8424798b1b 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -181,7 +181,8 @@ class HomeServer(BaseHomeServer): def build_http_client_context_factory(self): config = self.get_config() return ( - InsecureInterceptableContextFactory() if config.use_insecure_ssl_client + InsecureInterceptableContextFactory() + if config.use_insecure_ssl_client_just_for_testing_do_not_use else BrowserLikePolicyForHTTPS() ) |