Clarify note type

bug/bundler_fix
Jon Hart 2016-04-08 18:35:43 -07:00
parent 44a98cc36f
commit a37f9c9eda
No known key found for this signature in database
GPG Key ID: 2FA9F0A3AFA8E9D3
1 changed files with 12 additions and 12 deletions

View File

@ -125,7 +125,7 @@ class MetasploitModule < Msf::Auxiliary
1.upto(threads) do 1.upto(threads) do
t << framework.threads.spawn("Module(#{refname})", false, queue.shift) do |test_current| t << framework.threads.spawn("Module(#{refname})", false, queue.shift) do |test_current|
Thread.current.kill unless test_current Thread.current.kill unless test_current
a = get_a(test_current, 'dns_bruteforce') a = get_a(test_current, 'DNS bruteforce records')
records |= a if a records |= a if a
end end
end end
@ -172,7 +172,7 @@ class MetasploitModule < Msf::Auxiliary
end end
def dns_wildcard_enabled?(domain) def dns_wildcard_enabled?(domain)
records = get_a("#{Rex::Text.rand_text_alpha(16)}.#{domain}", 'dns_wildcard') records = get_a("#{Rex::Text.rand_text_alpha(16)}.#{domain}", 'DNS wildcard records')
if records.blank? if records.blank?
false false
else else
@ -192,11 +192,11 @@ class MetasploitModule < Msf::Auxiliary
print_good("#{ip}: PTR: #{r.ptr} ") print_good("#{ip}: PTR: #{r.ptr} ")
end end
return if records.blank? return if records.blank?
save_note(ip, 'get_ptr', records) save_note(ip, 'DNS PTR records', records)
records records
end end
def get_a(domain, type='get_a') def get_a(domain, type='DNS A records')
resp = dns_query(domain, 'A') resp = dns_query(domain, 'A')
return if resp.blank? || resp.answer.blank? return if resp.blank? || resp.answer.blank?
@ -223,7 +223,7 @@ class MetasploitModule < Msf::Auxiliary
print_good("#{domain} CNAME: #{r.cname}") print_good("#{domain} CNAME: #{r.cname}")
end end
return if records.blank? return if records.blank?
save_note(domain, 'get_cname', records) save_note(domain, 'DNS CNAME records', records)
records records
end end
@ -239,7 +239,7 @@ class MetasploitModule < Msf::Auxiliary
print_good("#{domain} NS: #{r.nsdname}") print_good("#{domain} NS: #{r.nsdname}")
end end
return if records.blank? return if records.blank?
save_note(domain, 'get_ns', records) save_note(domain, 'DNS NS records', records)
records records
end end
@ -259,7 +259,7 @@ class MetasploitModule < Msf::Auxiliary
print_error("Query #{domain} DNS MX - exception: #{e}") print_error("Query #{domain} DNS MX - exception: #{e}")
ensure ensure
return if records.blank? return if records.blank?
save_note(domain, 'get_mx', records) save_note(domain, 'DNS MX records', records)
records records
end end
end end
@ -276,7 +276,7 @@ class MetasploitModule < Msf::Auxiliary
print_good("#{domain} SOA: #{r.mname}") print_good("#{domain} SOA: #{r.mname}")
end end
return if records.blank? return if records.blank?
save_note(domain, 'get_soa', records) save_note(domain, 'DNS SOA records', records)
records records
end end
@ -292,7 +292,7 @@ class MetasploitModule < Msf::Auxiliary
print_good("#{domain} TXT: #{r.txt}") print_good("#{domain} TXT: #{r.txt}")
end end
return if records.blank? return if records.blank?
save_note(domain, 'get_txt', records) save_note(domain, 'DNS TXT records', records)
records records
end end
@ -331,7 +331,7 @@ class MetasploitModule < Msf::Auxiliary
records = [] records = []
tlds.each do |tld| tlds.each do |tld|
tldr = get_a("#{domain_}.#{tld}", 'get_tld') tldr = get_a("#{domain_}.#{tld}", 'DNS TLD records')
next if tldr.blank? next if tldr.blank?
records |= tldr records |= tldr
print_good("#{domain_}.#{tld}: TLD: #{tldr.join(',')}") print_good("#{domain_}.#{tld}: TLD: #{tldr.join(',')}")
@ -399,7 +399,7 @@ class MetasploitModule < Msf::Auxiliary
ns_a_records = [] ns_a_records = []
# try to get A record for nameserver from target NS, which may fail # try to get A record for nameserver from target NS, which may fail
target_ns_a = get_a(nameserver, 'axfr') target_ns_a = get_a(nameserver, 'DNS AXFR records')
ns_a_records |= target_ns_a if target_ns_a ns_a_records |= target_ns_a if target_ns_a
ns_a_records << ::Rex::Socket.resolv_to_dotted(nameserver) ns_a_records << ::Rex::Socket.resolv_to_dotted(nameserver)
begin begin
@ -414,7 +414,7 @@ class MetasploitModule < Msf::Auxiliary
print_good("#{domain} Zone Transfer: #{zone}") print_good("#{domain} Zone Transfer: #{zone}")
end end
return if records.blank? return if records.blank?
save_note(domain, 'axfr', records) save_note(domain, 'DNS AXFR recods', records)
records records
end end