lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 17:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

dhcpd6: fix iaid_duid parsing

Browse Source 
It seems it's possible for whitespace to exist between the double quotes
and iaid_duid identifier. We also make sure that we're correctly
able to identify the ending bracket of a single iaaddr or iaprefix
segment.
This commit is contained in:
Stephan de Wit 2023-08-25 08:53:46 +02:00
parent 1dbcf112e6
commit fb2d2f63d1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/opnsense/scripts/dhcp/get_leases6.py
View File

@ -33,6 +33,7 @@ import calendar
import datetime
import time
import argparse
import re
def parse_date(ymd, hms):
dt = '%s %s' % (ymd, hms)
@ -107,7 +108,9 @@ def parse_lease(lines):
cur_segment = []
addresses = []
prefixes = []
iaid_duid = parse_iaid_duid(lines[0].split()[1])
# make sure any whitespace between the iaid_duid and the double quotes is removed
first = re.sub(r'"\s*([^"]*?)\s*"', r'"\1"', lines[0]).split()[1]
iaid_duid = parse_iaid_duid(first)
lease['lease_type'] = lines[0].split()[0]
lease.update(iaid_duid)
@ -120,7 +123,7 @@ def parse_lease(lines):
if parts[0] == 'iaaddr' or parts[0] == 'iaprefix':
cur_segment.append(line)
elif len(line) > 3 and line[2] == '}' and len(cur_segment) > 0:
elif len(line) > 1 and line[0] == ' ' and '}' in line and len(cur_segment) > 0:
cur_segment.append(line)
(segment_type, segment) = parse_iaaddr_iaprefix(cur_segment)
if segment_type == 'iaaddr':