Allow response records from other sections

DNS queries for delegation records to poorly constructed zones won't have
answers, but they will have authority. Also, +nosearch
This commit is contained in:
Nate Riffe 2015-05-05 11:52:51 -05:00
parent a2fcc87a13
commit 019aefac22
3 changed files with 18 additions and 2 deletions

View File

@ -51,6 +51,12 @@ Puppet::Type.newtype(:dns_rr) do
defaultto 'localhost'
end
newparam(:query_section) do
desc 'The DNS response section to check for existing record values'
defaultto 'answer'
newvalues 'answer', 'authority', 'additional'
end
newparam(:keyname) do
desc 'Keyname for the TSIG key used to update the record'
defaultto 'update'

View File

@ -37,6 +37,12 @@ Puppet::Type.newtype(:resource_record) do
defaultto 'localhost'
end
newparam(:query_section) do
desc 'The DNS response section to check for existing record values'
defaultto 'answer'
newvalues 'answer', 'authority', 'additional'
end
newparam(:keyname) do
desc 'Keyname for the TSIG key used to update the record'
defaultto 'update'

View File

@ -86,6 +86,10 @@ module PuppetBind
resource[:zone]
end
def query_section
resource[:query_section]
end
def keyname
resource[:keyname]
end
@ -109,9 +113,9 @@ module PuppetBind
def query
unless @query
if keyed?
dig_text = dig("@#{server}", '+noall', '+answer', name, type, '-c', rrclass, '-y', tsig_param)
dig_text = dig("@#{server}", '+noall', '+nosearch', "+#{query_section}", name, type, '-c', rrclass, '-y', tsig_param)
else
dig_text = dig("@#{server}", '+noall', '+answer', name, type, '-c', rrclass)
dig_text = dig("@#{server}", '+noall', '+nosearch', "+#{query_section}", name, type, '-c', rrclass)
end
@query = dig_text.lines.map do |line|
linearray = line.chomp.split(/\s+/, 5)