cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ipaddr: Handle ipaddress index in network correctly (#57896)

Browse source 
This commit prevents integer indices from being parsed as ip nets

Fixes #57895

Signed-off-by: Tobias Schramm <tobleminer@gmail.com>
This commit is contained in:
Tobias 2019-06-21 15:26:08 +02:00 committed by René Moser
parent 0f12e1c7d8
commit e7c39460ed
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/57896-fix-ipaddr-cidr-index-handling.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- 'ipaddr: prevent integer indices from being parsed as ip nets'

2
lib/ansible/plugins/filter/ipaddr.py
View file

@ -630,7 +630,7 @@ def ipaddr(value, query='', version=False, alias='ipaddr'):
# address/network is inside that specific subnet
try:
# ?? 6to4 and link-local were True here before. Should they still?
if query and (query not in query_func_map or query == 'cidr_lookup') and ipaddr(query, 'network'):
if query and (query not in query_func_map or query == 'cidr_lookup') and not str(query).isdigit() and ipaddr(query, 'network'):
iplist = netaddr.IPSet([netaddr.IPNetwork(query)])
query = 'cidr_lookup'
except Exception: