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

[Web] fix ipv4,6 not being able to be set if only one range is in allowed

Browse source 
+ add hints for form for the ip addresses
This commit is contained in:
lare 2023-02-05 21:10:32 +01:00
parent b44f89b664
commit e6e38675b9
3 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
web/backend/main.py
View file

@ -163,9 +163,14 @@ def check_peering_data(form):
raise ValueError()
is_in_allowed = False
if session["user-data"]["allowed4"]:
for allowed4 in session["user-data"]["allowed4"]:
if not isinstance(session["user-data"]["allowed4"],tuple):
allowed4 = session["user-data"]["allowed4"]
if ipv4 in ip_network(allowed4):
is_in_allowed = True
else:
for allowed4 in session["user-data"]["allowed4"]:
if ipv4 in ip_network(allowed4):
is_in_allowed = True
if not is_in_allowed:
return False, "supplied ipv4 addr not in allowed ip range"
else:
@ -180,12 +185,18 @@ def check_peering_data(form):
raise ValueError()
is_in_allowed = False
if session["user-data"]["allowed6"]:
for allowed6 in session["user-data"]["allowed6"]:
if not isinstance(session["user-data"]["allowed6"],tuple):
allowed6 = session["user-data"]["allowed6"]
if ipv6 in ip_network(allowed6):
is_in_allowed = True
else:
for allowed6 in session["user-data"]["allowed6"]:
if ipv6 in ip_network(allowed6):
is_in_allowed = True
if not is_in_allowed:
return False, "supplied ipv6 addr not in allowed ip range"
except ValueError:
except ValueError as e:
print(e)
return False, "invalid ip address(es) supplied"
# check bgp options