Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use shorter config key name

This commit is contained in:
Daniel Wagner-Hall 2015-09-15 15:50:13 +01:00
parent 3bcbabc9fb
commit d4af08a167
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/config/tls.py
View File

@ -46,9 +46,9 @@ class TlsConfig(Config):
# (e.g. for talking to recaptcha, identity servers, and such) # (e.g. for talking to recaptcha, identity servers, and such)
# It should never be used in production, and is intended for # It should never be used in production, and is intended for
# use only when running tests. # use only when running tests.
self.use_insecure_ssl_client = config.get( self.use_insecure_ssl_client_just_for_testing_do_not_use = config.get(
"i_really_want_to_ignore_ssl_certs_when_i_am_an_https_client_even_" "use_insecure_ssl_client_just_for_testing_do_not_use"
"though_it_is_woefully_insecure_because_i_am_testing_i_promise", False) )
def default_config(self, config_dir_path, server_name): def default_config(self, config_dir_path, server_name):
base_key_name = os.path.join(config_dir_path, server_name) base_key_name = os.path.join(config_dir_path, server_name)

3
synapse/server.py
View File

@ -181,7 +181,8 @@ class HomeServer(BaseHomeServer):
def build_http_client_context_factory(self): def build_http_client_context_factory(self):
config = self.get_config() config = self.get_config()
return ( return (
InsecureInterceptableContextFactory() if config.use_insecure_ssl_client InsecureInterceptableContextFactory()
if config.use_insecure_ssl_client_just_for_testing_do_not_use
else BrowserLikePolicyForHTTPS() else BrowserLikePolicyForHTTPS()
) )