diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 18:30:00 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 18:30:00 +0100 |
| commit | a53946a8a185490c6569d9a7dc6ffc07c344e74a (patch) | |
| tree | 7feacceace84fbb6390e4e7b7c3ba89b56380246 /synapse/http/client.py | |
| parent | Add server TLS context factory (diff) | |
| download | synapse-a53946a8a185490c6569d9a7dc6ffc07c344e74a.tar.xz | |
Enable SSL for s2s http client
Diffstat (limited to 'synapse/http/client.py')
| -rw-r--r-- | synapse/http/client.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 36ba2c6591..acc39742de 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -113,8 +113,9 @@ class TwistedHttpClient(HttpClient): requests. """ - def __init__(self): + def __init__(self, hs): self.agent = MatrixHttpAgent(reactor) + self.hs = hs @defer.inlineCallbacks def put_json(self, destination, path, data): @@ -177,7 +178,10 @@ class TwistedHttpClient(HttpClient): retries_left = 5 # TODO: setup and pass in an ssl_context to enable TLS - endpoint = matrix_endpoint(reactor, destination, timeout=10) + endpoint = matrix_endpoint( + reactor, destination, timeout=10, + ssl_context_factory=self.hs.tls_tls_context_factory + ) while True: try: |