GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-02-17 14:01:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix wrong logging for CIDR ranges in match_host

Browse Source 
(cherry picked from commit 761d3ef500db4991c2546df89eda35ba67c243ea)
This commit is contained in:
James Lu 2017-08-15 21:26:18 -07:00
parent 90884924a8
commit d1f8358159
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes.py
View File

@ -1220,18 +1220,16 @@ class Irc(utils.DeprecatedAttributesObject):
# HACK: support CIDR hosts in the hosts portion # HACK: support CIDR hosts in the hosts portion
try: try:
header, cidrtarget = glob.split('@', 1) header, cidrtarget = glob.split('@', 1)
log.debug('(%s) Processing CIDRs for %s (full host: %s)', self.name,
cidrtarget, glob)
# Try to parse the host portion as a CIDR range # Try to parse the host portion as a CIDR range
network = ipaddress.ip_network(cidrtarget) network = ipaddress.ip_network(cidrtarget)
log.debug('(%s) Found CIDR for %s, replacing target host with IP %s', self.name,
realhost, target)
real_ip = self.users[target].ip real_ip = self.users[target].ip
if ipaddress.ip_address(real_ip) in network: if ipaddress.ip_address(real_ip) in network:
# If the CIDR matches, hack around the host matcher by pretending that # If the CIDR matches, hack around the host matcher by pretending that
# the lookup target was the IP and not the CIDR range! # the lookup target was the IP and not the CIDR range!
glob = '@'.join((header, real_ip)) glob = '@'.join((header, real_ip))
log.debug('(%s) Found matching CIDR %s for %s, replacing target host with IP %s', self.name,
cidrtarget, target, real_ip)
except ValueError: except ValueError:
pass pass