mirror of
https://github.com/9001/copyparty.git
synced 2026-10-05 22:04:38 +01:00
better ipv6 ratelimiting logic (#1439)
aligns ipv6 normalizatoin logic with the typical residental allocation of /56 instead of /64.
This commit is contained in:
+3
-4
@@ -1501,8 +1501,7 @@ class Garda(object):
|
|||||||
return 0, ip
|
return 0, ip
|
||||||
|
|
||||||
if ":" in ip:
|
if ":" in ip:
|
||||||
# assume /64 clients; drop 4 groups
|
ip = ipnorm(ip)
|
||||||
ip = IPv6Address(ip).exploded[:-20]
|
|
||||||
|
|
||||||
if prev and self.uniq:
|
if prev and self.uniq:
|
||||||
if self.prev.get(ip) == prev:
|
if self.prev.get(ip) == prev:
|
||||||
@@ -2445,8 +2444,8 @@ def odfusion(
|
|||||||
|
|
||||||
def ipnorm(ip: str) -> str:
|
def ipnorm(ip: str) -> str:
|
||||||
if ":" in ip:
|
if ":" in ip:
|
||||||
# assume /64 clients; drop 4 groups
|
# assume /56 clients; drop final 72 bits
|
||||||
return IPv6Address(ip).exploded[:-20]
|
return str(IPv6Network(ip + "/56", strict=False).network_address)
|
||||||
|
|
||||||
return ip
|
return ip
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user