From df441c0d6d07434ae3d2f02acd38d624b19f16b3 Mon Sep 17 00:00:00 2001 From: checktheroads Date: Fri, 16 Aug 2019 23:08:22 -0700 Subject: [PATCH] remove requirement of Python 3.7 --- hyperglass/command/validate.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hyperglass/command/validate.py b/hyperglass/command/validate.py index 394e009..755c89c 100644 --- a/hyperglass/command/validate.py +++ b/hyperglass/command/validate.py @@ -100,9 +100,10 @@ def ip_blacklist(target): membership. """ logger.debug(f"Blacklist Enabled: {params.features.blacklist.enable}") + target = ipaddress.ip_network(target) membership = False if params.features.blacklist.enable: - target_ver = ipaddress.ip_network(target).version + target_ver = target.version user_blacklist = params.features.blacklist.networks networks = [ net @@ -114,7 +115,11 @@ def ip_blacklist(target): ) while not membership: for net in networks: - if ipaddress.ip_network(target).subnet_of(net): + blacklist_net = ipaddress.ip_network(net) + if ( + blacklist_net.network_address <= target.network_address + and blacklist_net.network_address >= target.broadcast_address + ): membership = True logger.debug(f"Blacklist Match Found for {target} in {net}") break