lare/autopeering
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update kverify to use new api scheme

Browse source
This commit is contained in:
lare 2022-12-10 11:42:31 +01:00
parent 2eeb36e453
commit d6509ef6fe
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
venv venv
config.json config.json
*.pyc *.pyc
__pycache__

10
web/backend/main.py
View file

@ -295,7 +295,7 @@ def check_peering_data(form):
raise ValueError() raise ValueError()
is_in_allowed = False is_in_allowed = False
if session["user-data"]["allowed4"]: if session["user-data"]["allowed4"]:
for allowed4 in session["user-data"]["allowed4"].split(","): for allowed4 in session["user-data"]["allowed4"]:
if ipv4 in ip_network(allowed4): if ipv4 in ip_network(allowed4):
is_in_allowed = True is_in_allowed = True
if not is_in_allowed: if not is_in_allowed:
@ -312,7 +312,7 @@ def check_peering_data(form):
raise ValueError() raise ValueError()
is_in_allowed = False is_in_allowed = False
if session["user-data"]["allowed6"]: if session["user-data"]["allowed6"]:
for allowed6 in session["user-data"]["allowed6"].split(","): for allowed6 in session["user-data"]["allowed6"]:
if ipv6 in ip_network(allowed6): if ipv6 in ip_network(allowed6):
is_in_allowed = True is_in_allowed = True
if not is_in_allowed: if not is_in_allowed:
@ -399,16 +399,14 @@ def login():
int(asn) int(asn)
if "allowed4" in request.form: if "allowed4" in request.form:
allowed4 = request.form["allowed4"] allowed4 = request.form["allowed4"]
v4_ranges = allowed4.split( v4_ranges = allowed4.split(",") if "," in allowed4 else [allowed4]
",") if "," in allowed4 else [allowed4]
for v4_range in v4_ranges: for v4_range in v4_ranges:
IPv4Network(v4_range) IPv4Network(v4_range)
else: else:
allowed4 = None allowed4 = None
if "allowed6" in request.form: if "allowed6" in request.form:
allowed6 = request.form["allowed6"] allowed6 = request.form["allowed6"]
v6_ranges = allowed6.split( v6_ranges = allowed6.split(",") if "," in allowed6 else [allowed6]
",") if "," in allowed6 else [allowed6]
for v6_range in v6_ranges: for v6_range in v6_ranges:
IPv6Network(v6_range) IPv6Network(v6_range)
else: else: