IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make IPv4 address parsing more strict

Browse Source 
Let netaddr.IPAddress() use inet_pton() rather than inet_aton() for
IP address parsing. We will use the same function in IPv4/IPv6
conversions + be stricter and don't allow IP addresses such as
'1.1.1' at the same time.

https://fedorahosted.org/freeipa/ticket/1965
This commit is contained in:
Martin Kosek 2011-10-13 14:35:06 +02:00
parent e5389ffd51
commit f7a9da8b3f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ipapython/ipautil.py
View File

@ -69,9 +69,15 @@ def get_domain_name():
return domain_name return domain_name
class CheckedIPAddress(netaddr.IPAddress): class CheckedIPAddress(netaddr.IPAddress):
# Use inet_pton() rather than inet_aton() for IP address parsing. We
# will use the same function in IPv4/IPv6 conversions + be stricter
# and don't allow IP addresses such as '1.1.1' in the same time
netaddr_ip_flags = netaddr.INET_PTON
def __init__(self, addr, match_local=False, parse_netmask=True): def __init__(self, addr, match_local=False, parse_netmask=True):
if isinstance(addr, CheckedIPAddress): if isinstance(addr, CheckedIPAddress):
super(CheckedIPAddress, self).__init__(addr) super(CheckedIPAddress, self).__init__(addr, flags=self.netaddr_ip_flags)
self.prefixlen = addr.prefixlen self.prefixlen = addr.prefixlen
self.defaultnet = addr.defaultnet self.defaultnet = addr.defaultnet
self.interface = addr.interface self.interface = addr.interface
@ -88,7 +94,7 @@ class CheckedIPAddress(netaddr.IPAddress):
pass pass
else: else:
try: try:
addr = netaddr.IPAddress(addr) addr = netaddr.IPAddress(addr, flags=self.netaddr_ip_flags)
except ValueError: except ValueError:
net = netaddr.IPNetwork(addr) net = netaddr.IPNetwork(addr)
if not parse_netmask: if not parse_netmask:
@ -140,7 +146,7 @@ class CheckedIPAddress(netaddr.IPAddress):
if addr.version == 4 and addr == net.broadcast: if addr.version == 4 and addr == net.broadcast:
raise ValueError("cannot use broadcast IP address") raise ValueError("cannot use broadcast IP address")
super(CheckedIPAddress, self).__init__(addr) super(CheckedIPAddress, self).__init__(addr, flags=self.netaddr_ip_flags)
self.prefixlen = net.prefixlen self.prefixlen = net.prefixlen
self.defaultnet = defnet self.defaultnet = defnet
self.interface = iface self.interface = iface