Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 03:44:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Clean up the blacklist/whitelist handling.

Browse source 
Always set the config key with an empty list, even if a list isn't specified.
This means that the codepaths are the same for both the empty list and
for a missing key. Since the behaviour is the same for both cases this
makes the code somewhat easier to reason about.
This commit is contained in:
Mark Haines 2016-05-16 13:03:59 +01:00
parent dd95eb4cb5
commit eb79110beb
3 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/http/client.py
View file

@ -380,8 +380,7 @@ class CaptchaServerHttpClient(SimpleHttpClient):
class SpiderEndpointFactory(object):
def __init__(self, hs):
self.blacklist = hs.config.url_preview_ip_range_blacklist
if hasattr(hs.config, "url_preview_ip_range_whitelist"):
self.whitelist = hs.config.url_preview_ip_range_whitelist
self.whitelist = hs.config.url_preview_ip_range_whitelist
self.policyForHTTPS = hs.get_http_client_context_factory()
def endpointForURI(self, uri):