Update blacklist for 0.0.0.0.

clokep · clokep · commit fdd6e40f9b6a · 2021-02-01T17:16:08.000-05:00
diff --git a/synapse/config/repository.py b/synapse/config/repository.py
@@ -189,7 +189,7 @@ def read_config(self, config, **kwargs):
             # unroutable addresses.
             self.url_preview_ip_range_blacklist = generate_ip_set(
                 config["url_preview_ip_range_blacklist"],
-                ["0.0.0.0", "::"],
+                ["0.0.0.0/8", "::"],
                 config_path=("url_preview_ip_range_blacklist",),
             )
 
diff --git a/synapse/config/server.py b/synapse/config/server.py
@@ -358,7 +358,7 @@ def read_config(self, config, **kwargs):
 
         # Always blacklist 0.0.0.0, ::
         self.ip_range_blacklist = generate_ip_set(
-            ip_range_blacklist, ["0.0.0.0", "::"], config_path=("ip_range_blacklist",)
+            ip_range_blacklist, ["0.0.0.0/8", "::"], config_path=("ip_range_blacklist",)
         )
 
         self.ip_range_whitelist = generate_ip_set(
@@ -374,7 +374,7 @@ def read_config(self, config, **kwargs):
         # Always blacklist 0.0.0.0, ::
         self.federation_ip_range_blacklist = generate_ip_set(
             federation_ip_range_blacklist,
-            ["0.0.0.0", "::"],
+            ["0.0.0.0/8", "::"],
             config_path=("federation_ip_range_blacklist",),
         )
 

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ def read_config(self, config, **kwargs):`
`189`	`189`	`# unroutable addresses.`
`190`	`190`	`self.url_preview_ip_range_blacklist = generate_ip_set(`
`191`	`191`	`config["url_preview_ip_range_blacklist"],`
`192`		`- ["0.0.0.0", "::"],`
	`192`	`+ ["0.0.0.0/8", "::"],`
`193`	`193`	`config_path=("url_preview_ip_range_blacklist",),`
`194`	`194`	`)`
`195`	`195`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ def read_config(self, config, **kwargs):`
`358`	`358`
`359`	`359`	`# Always blacklist 0.0.0.0, ::`
`360`	`360`	`self.ip_range_blacklist = generate_ip_set(`
`361`		`- ip_range_blacklist, ["0.0.0.0", "::"], config_path=("ip_range_blacklist",)`
	`361`	`+ ip_range_blacklist, ["0.0.0.0/8", "::"], config_path=("ip_range_blacklist",)`
`362`	`362`	`)`
`363`	`363`
`364`	`364`	`self.ip_range_whitelist = generate_ip_set(`
`@@ -374,7 +374,7 @@ def read_config(self, config, **kwargs):`
`374`	`374`	`# Always blacklist 0.0.0.0, ::`
`375`	`375`	`self.federation_ip_range_blacklist = generate_ip_set(`
`376`	`376`	`federation_ip_range_blacklist,`
`377`		`- ["0.0.0.0", "::"],`
	`377`	`+ ["0.0.0.0/8", "::"],`
`378`	`378`	`config_path=("federation_ip_range_blacklist",),`
`379`	`379`	`)`
`380`	`380`