notwa/respodns
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

match IPs more robustly and multiple per line

Browse Source
This commit is contained in:
Connor Olding 2020-09-04 14:48:23 +02:00
parent 70308230e6
commit 921c51e118
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
respodns/ip_util.py
View File

@ -1,17 +1,24 @@
import re import re
ipv4_pattern = re.compile(r"(\d+)\.(\d+)\.(\d+)\.(\d+)", re.ASCII) ipv4_pattern = re.compile(r"(\d+)\.(\d+)\.(\d+)\.(\d+)", re.ASCII)
ipv4_pattern_strict = re.compile(r"""
(?:^|(?<=[^\d.]))
(0|1\d\d|2[0-4]\d|25[0-5]|[1-9]\d?)
\.
(0|1\d\d|2[0-4]\d|25[0-5]|[1-9]\d?)
\.
(0|1\d\d|2[0-4]\d|25[0-5]|[1-9]\d?)
\.
(0|1\d\d|2[0-4]\d|25[0-5]|[1-9]\d?)
(?:$|(?=[^\d.]))
""", re.ASCII | re.VERBOSE)
def read_ips(f): def read_ips(f):
# TODO: make more robust. (regex pls) for line in f.readlines():
for ip in f.readlines(): line, _, _ = line.partition("#") # ignore comments
if "#" in ip: for match in ipv4_pattern_strict.finditer(line):
ip, _, _ = ip.partition("#") yield match.group() # yield the entire string
ip = ip.strip()
if ip.count(".") != 3:
continue
yield ip
def addr_to_int(ip): def addr_to_int(ip):