a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dig lookup plugin: Fix using only last nameserver specified (#8970) 

* dig plugin: Fix using only last nameserver given

Currently, when specifying multiple nameservers
either using multiple `@ns.example.com` arguments
or by specifying multiple nameservers in a single
argument (@ns1.example.com,ns2.example.com), due
to a bug only the very last nameserver that is
specified is actually used.
This is because for every iteration of the
    for ns in nsset
loop, the local list of nameservers is cleared
and after adding the currently processed nameserver
entry, the whole `nameservers` list of the Resolver
instance is overridden with that new list with just
one element. And as far as I can see, when setting
that `nameserver` property, the dnspython library
actually overrides the existing list and doesn't
do some trickery to append the new nameservers or
something like that.

Therefore, the assignment of the `nameservers`
property of the Resolver is moved after the argument
processing so all nameservers are added and then
collectively written to the `nameservers` property
of the Resolver.

* Add CHANGELOG fragment
pull/8987/head
JaegerMaKn 2024-10-05 15:03:04 +02:00 committed by GitHub
parent fea0ffa5aa
commit 8610223d03
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/8970-fix-dig-multi-nameservers.yml Normal file
View File

@ -0,0 +1,2 @@
bugfixes:
- dig lookup plugin - fix using only the last nameserver specified (https://github.com/ansible-collections/community.general/pull/8970).

6
plugins/lookup/dig.py
View File

@ -330,6 +330,7 @@ class LookupModule(LookupBase):
myres.use_edns(0, ednsflags=dns.flags.DO, payload=edns_size) myres.use_edns(0, ednsflags=dns.flags.DO, payload=edns_size)
domains = [] domains = []
nameservers = []
qtype = self.get_option('qtype') qtype = self.get_option('qtype')
flat = self.get_option('flat') flat = self.get_option('flat')
fail_on_error = self.get_option('fail_on_error') fail_on_error = self.get_option('fail_on_error')
@ -345,7 +346,6 @@ class LookupModule(LookupBase):
if t.startswith('@'): # e.g. "@10.0.1.2,192.0.2.1" is ok. if t.startswith('@'): # e.g. "@10.0.1.2,192.0.2.1" is ok.
nsset = t[1:].split(',') nsset = t[1:].split(',')
for ns in nsset: for ns in nsset:
nameservers = []
# Check if we have a valid IP address. If so, use that, otherwise # Check if we have a valid IP address. If so, use that, otherwise
# try to resolve name to address using system's resolver. If that # try to resolve name to address using system's resolver. If that
# fails we bail out. # fails we bail out.
@ -358,7 +358,6 @@ class LookupModule(LookupBase):
nameservers.append(nsaddr) nameservers.append(nsaddr)
except Exception as e: except Exception as e:
raise AnsibleError("dns lookup NS: %s" % to_native(e)) raise AnsibleError("dns lookup NS: %s" % to_native(e))
myres.nameservers = nameservers
continue continue
if '=' in t: if '=' in t:
try: try:
@ -397,6 +396,9 @@ class LookupModule(LookupBase):
# print "--- domain = {0} qtype={1} rdclass={2}".format(domain, qtype, rdclass) # print "--- domain = {0} qtype={1} rdclass={2}".format(domain, qtype, rdclass)
if len(nameservers) > 0:
myres.nameservers = nameservers
if qtype.upper() == 'PTR': if qtype.upper() == 'PTR':
reversed_domains = [] reversed_domains = []
for domain in domains: for domain in domains: