OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Lint

pull/8821/head
Patrick Cloke 2020-11-30 15:25:28 -05:00
parent d5ba7a927f
commit 7233d25cbf
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/config/federation.py
View File

@ -36,17 +36,13 @@ class FederationConfig(Config):
for domain in federation_domain_whitelist: for domain in federation_domain_whitelist:
self.federation_domain_whitelist[domain] = True self.federation_domain_whitelist[domain] = True
ip_range_blacklist = config.get( ip_range_blacklist = config.get("ip_range_blacklist", [])
"ip_range_blacklist", []
)
# Attempt to create an IPSet from the given ranges # Attempt to create an IPSet from the given ranges
try: try:
self.ip_range_blacklist = IPSet(ip_range_blacklist) self.ip_range_blacklist = IPSet(ip_range_blacklist)
except Exception as e: except Exception as e:
raise ConfigError( raise ConfigError("Invalid range(s) provided in ip_range_blacklist: %s" % e)
"Invalid range(s) provided in ip_range_blacklist: %s" % e
)
# Always blacklist 0.0.0.0, :: # Always blacklist 0.0.0.0, ::
self.ip_range_blacklist.update(["0.0.0.0", "::"]) self.ip_range_blacklist.update(["0.0.0.0", "::"])