IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Better handle IPv6 validation

Browse Source
This commit is contained in:
Robert Chacón 2022-09-09 14:49:19 -06:00 committed by GitHub
parent 0ad0d84635
commit 2549316708
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
v1.2/LibreQoS.py
View File

@ -111,7 +111,7 @@ def validateNetworkAndDevices():
circuitID, circuitName, deviceID, deviceName, ParentNode, mac, ipv4_input, ipv6_input, downloadMin, uploadMin, downloadMax, uploadMax, comment = row circuitID, circuitName, deviceID, deviceName, ParentNode, mac, ipv4_input, ipv6_input, downloadMin, uploadMin, downloadMax, uploadMax, comment = row
# Each entry in ShapedDevices.csv can have multiple IPv4s or IPv6s seperated by commas. Split them up and parse each to ensure valid # Each entry in ShapedDevices.csv can have multiple IPv4s or IPv6s seperated by commas. Split them up and parse each to ensure valid
ipv4_hosts = [] ipv4_hosts = []
ipv6_hosts = [] ipv6_subnets_and_hosts = []
if ipv4_input != "": if ipv4_input != "":
try: try:
ipv4_input = ipv4_input.replace(' ','') ipv4_input = ipv4_input.replace(' ','')
@ -138,13 +138,11 @@ def validateNetworkAndDevices():
else: else:
ipv6_list = [ipv6_input] ipv6_list = [ipv6_input]
for ipEntry in ipv6_list: for ipEntry in ipv6_list:
if '/128' in ipEntry: if (type(ipaddress.ip_network(ipEntry)) is ipaddress.IPv6Network) or (type(ipaddress.ip_address(ipEntry)) is ipaddress.IPv6Address):
ipEntry = ipEntry.replace('/128','') ipv6_subnets_and_hosts.extend(ipEntry)
ipv6_hosts.append(ipaddress.ip_address(ipEntry))
elif '/' in ipEntry:
ipv6_hosts.extend(list(ipaddress.ip_network(ipEntry).hosts()))
else: else:
ipv6_hosts.append(ipaddress.ip_address(ipEntry)) warnings.warn("Provided IPv6 '" + ipv6_input + "' in ShapedDevices.csv at row " + str(rowNum) + " is not valid.")
devicesValidatedOrNot = False
except: except:
warnings.warn("Provided IPv6 '" + ipv6_input + "' in ShapedDevices.csv at row " + str(rowNum) + " is not valid.") warnings.warn("Provided IPv6 '" + ipv6_input + "' in ShapedDevices.csv at row " + str(rowNum) + " is not valid.")
devicesValidatedOrNot = False devicesValidatedOrNot = False
@ -271,7 +269,7 @@ def refreshShapers():
ipv4_hosts.append(host) ipv4_hosts.append(host)
else: else:
ipv4_hosts.append(ipEntry) ipv4_hosts.append(ipEntry)
ipv6_hosts = [] ipv6_subnets_and_hosts = []
if ipv6_input != "": if ipv6_input != "":
ipv6_input = ipv6_input.replace(' ','') ipv6_input = ipv6_input.replace(' ','')
if "," in ipv6_input: if "," in ipv6_input:
@ -279,14 +277,7 @@ def refreshShapers():
else: else:
ipv6_list = [ipv6_input] ipv6_list = [ipv6_input]
for ipEntry in ipv6_list: for ipEntry in ipv6_list:
if '/128' in ipEntry: ipv6_subnets_and_hosts.append(ipEntry)
ipv6_hosts.append(ipEntry)
elif '/' in ipEntry:
theseHosts = ipaddress.ip_network(ipEntry).hosts()
for host in theseHosts:
ipv6_hosts.append(str(host))
else:
ipv6_hosts.append(ipEntry)
# If there is something in the circuit ID field # If there is something in the circuit ID field
if circuitID != "": if circuitID != "":
# Seen circuit before # Seen circuit before
@ -308,7 +299,7 @@ def refreshShapers():
"deviceName": deviceName, "deviceName": deviceName,
"mac": mac, "mac": mac,
"ipv4s": ipv4_hosts, "ipv4s": ipv4_hosts,
"ipv6s": ipv6_hosts, "ipv6s": ipv6_subnets_and_hosts,
} }
devicesListForCircuit.append(thisDevice) devicesListForCircuit.append(thisDevice)
circuit['devices'] = devicesListForCircuit circuit['devices'] = devicesListForCircuit
@ -324,7 +315,7 @@ def refreshShapers():
"deviceName": deviceName, "deviceName": deviceName,
"mac": mac, "mac": mac,
"ipv4s": ipv4_hosts, "ipv4s": ipv4_hosts,
"ipv6s": ipv6_hosts, "ipv6s": ipv6_subnets_and_hosts,
} }
deviceListForCircuit.append(thisDevice) deviceListForCircuit.append(thisDevice)
thisCircuit = { thisCircuit = {
@ -353,7 +344,7 @@ def refreshShapers():
"deviceName": deviceName, "deviceName": deviceName,
"mac": mac, "mac": mac,
"ipv4s": ipv4_hosts, "ipv4s": ipv4_hosts,
"ipv6s": ipv6_hosts, "ipv6s": ipv6_subnets_and_hosts,
} }
deviceListForCircuit.append(thisDevice) deviceListForCircuit.append(thisDevice)
thisCircuit = { thisCircuit = {