mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 09:02:15 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow multiple CIDR ranges when using lan shorthands

Browse source 
Signed-off-by: akp <abi@tdpain.net>
This commit is contained in:
akp 2024-11-22 11:41:12 +00:00 committed by ed
parent 8f7ffcf350
commit 0e31cfa784
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
copyparty/util.py
View file

@ -2709,12 +2709,21 @@ def build_netmap(csv: str, defer_mutex: bool = False):
if csv in ("any", "all", "no", ",", ""): if csv in ("any", "all", "no", ",", ""):
return None return None
if csv in ("lan", "local", "private", "prvt"):
csv = "10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, fd00::/8" # lan
csv += ", 169.254.0.0/16, fe80::/10" # link-local
csv += ", 127.0.0.0/8, ::1/128" # loopback
srcs = [x.strip() for x in csv.split(",") if x.strip()] srcs = [x.strip() for x in csv.split(",") if x.strip()]
expanded_shorthands = False
for shorthand in ("lan", "local", "private", "prvt"):
if shorthand in srcs:
if not expanded_shorthands:
srcs += [
"10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "fd00::/8", # lan
"169.254.0.0/16", "fe80::/10", # link-local
"127.0.0.0/8, ::1/128", # loopback
]
expanded_shorthands = True
srcs.remove(shorthand)
if not HAVE_IPV6: if not HAVE_IPV6:
srcs = [x for x in srcs if ":" not in x] srcs = [x for x in srcs if ":" not in x]