From 5d0a54ec53c18289f50ccb9cd69e0df62c63a2dc Mon Sep 17 00:00:00 2001 From: erkin Date: Mon, 22 Mar 2021 13:59:25 +0300 Subject: util: T3419: Handle IP addresses with netmasks and subnet prefixes in strip-private --- src/helpers/strip-private.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/helpers/strip-private.py') diff --git a/src/helpers/strip-private.py b/src/helpers/strip-private.py index 23761e578..023298eec 100755 --- a/src/helpers/strip-private.py +++ b/src/helpers/strip-private.py @@ -19,7 +19,7 @@ import argparse import re import sys -from netaddr import IPAddress, AddrFormatError +from netaddr import IPNetwork, AddrFormatError parser = argparse.ArgumentParser(description='strip off private information from VyOS config') @@ -58,7 +58,7 @@ def ip_match(match: re.Match, subst: str) -> str: result = match.group(0) # Is this a valid IP address? try: - addr = IPAddress(result) + addr = IPNetwork(result).ip # No? Then we've got nothing to do with it. except AddrFormatError: return result -- cgit v1.2.3