mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-22 12:44:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

Give MFA config access

Browse source
This commit is contained in:
Andrew Morgan 2019-04-02 11:49:10 +01:00
parent 40702b638e
commit cc149b11ea
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
synapse/http/federation/matrix_federation_agent.py
View file

@ -79,10 +79,11 @@ class MatrixFederationAgent(object):
def __init__( def __init__(
self, reactor, tls_client_options_factory, self, reactor, tls_client_options_factory,
_well_known_tls_policy=None, config, _well_known_tls_policy=None,
_srv_resolver=None, _srv_resolver=None,
_well_known_cache=well_known_cache, _well_known_cache=well_known_cache,
): ):
self.config = config
self._reactor = reactor self._reactor = reactor
self._clock = Clock(reactor) self._clock = Clock(reactor)
@ -149,7 +150,7 @@ class MatrixFederationAgent(object):
tls_options = None tls_options = None
else: else:
tls_options = self._tls_client_options_factory.get_options( tls_options = self._tls_client_options_factory.get_options(
res.tls_server_name.decode("ascii"), self.hs.config, res.tls_server_name.decode("ascii"), self.config,
) )
# make sure that the Host header is set correctly # make sure that the Host header is set correctly

1
synapse/http/matrixfederationclient.py
View file

@ -177,6 +177,7 @@ class MatrixFederationHttpClient(object):
self.agent = MatrixFederationAgent( self.agent = MatrixFederationAgent(
hs.get_reactor(), hs.get_reactor(),
tls_client_options_factory, tls_client_options_factory,
hs.config,
) )
self.clock = hs.get_clock() self.clock = hs.get_clock()
self._store = hs.get_datastore() self._store = hs.get_datastore()