diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-06 10:50:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 10:50:42 +0100 |
| commit | cb3b381fcbb7e9bcb3a3e46b08d21ae5b2f3de24 (patch) | |
| tree | b82425dd1854b01dfeea7156e1736aa40f8bdb8e /tests | |
| parent | Merge pull request #5361 from matrix-org/rav/generate_signing_key (diff) | |
| parent | Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verification (diff) | |
| download | synapse-cb3b381fcbb7e9bcb3a3e46b08d21ae5b2f3de24.tar.xz | |
Merge pull request #5359 from matrix-org/rav/enable_tls_verification
Validate federation server TLS certificates by default.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/http/federation/test_matrix_federation_agent.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/http/federation/test_matrix_federation_agent.py b/tests/http/federation/test_matrix_federation_agent.py index ed0ca079d9..4153da4da7 100644 --- a/tests/http/federation/test_matrix_federation_agent.py +++ b/tests/http/federation/test_matrix_federation_agent.py @@ -27,6 +27,7 @@ from twisted.web.http import HTTPChannel from twisted.web.http_headers import Headers from twisted.web.iweb import IPolicyForHTTPS +from synapse.config.homeserver import HomeServerConfig from synapse.crypto.context_factory import ClientTLSOptionsFactory from synapse.http.federation.matrix_federation_agent import ( MatrixFederationAgent, @@ -52,11 +53,16 @@ class MatrixFederationAgentTests(TestCase): self.well_known_cache = TTLCache("test_cache", timer=self.reactor.seconds) + # for now, we disable cert verification for the test, since the cert we + # present will not be trusted. We should do better here, though. + config_dict = default_config("test", parse=False) + config_dict["federation_verify_certificates"] = False + config = HomeServerConfig() + config.parse_config_dict(config_dict) + self.agent = MatrixFederationAgent( reactor=self.reactor, - tls_client_options_factory=ClientTLSOptionsFactory( - default_config("test", parse=True) - ), + tls_client_options_factory=ClientTLSOptionsFactory(config), _well_known_tls_policy=TrustingTLSPolicyForHTTPS(), _srv_resolver=self.mock_resolver, _well_known_cache=self.well_known_cache, |