rubydns 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca335a666974f8ec5e2a9c3cfe075e2d156593f0
-  data.tar.gz: ff3d9313d716dcf7c25cf40272fc97e7a36c508e
+  metadata.gz: dbd9b4d8a8eec2e1ae92fb9d8e5b57cf0eb120d4
+  data.tar.gz: dc2b13bae0244a6bade2b299f13b7ce1524aafc1
 SHA512:
-  metadata.gz: 4603602b5a55406025fb7064a6e4ed002bbeec6216397f458ca1f0105eeecda08d90d66cc360440cbdd8e3d172e38cad114130a988ec9830919ade26e0339506
-  data.tar.gz: 9f9efda65a0c352060278fb229f4d61b9a35514b13e4fab35ad996bb3a37dfc973589ea1614e928230828b47b648f2418c1aeabef67b4f7b50612f06ef3dfd05
+  metadata.gz: 661f8462c7fd1f6769b1674a556d34c3859b8ef8832435d294c9879a49d230a27ec1cb961bfc4814d43e1d81d5ea5b2b701c7f423465ab0b24c9f72df4822f7e
+  data.tar.gz: 99aab4506a8903ad037f6bcbfb1d0fb8c64a25c48b9599f14336e4bb4522649de45b24ff8d983cbf1ef598730ee70ea53b923e9f425d630921eb89da6f670113

data/bin/rubydns-check

@@ -0,0 +1,374 @@
+#!/usr/bin/env ruby
+# Copyright, 2009, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# Pulls down DNS data from old-dns
+# rd-dns-check -s old-dns.mydomain.com -d mydomain.com. -f old-dns.yml
+
+# Check data against old-dns
+# rd-dns-check -s old-dns.mydomain.com -d mydomain.com. -c old-dns.yml
+
+# Check data against new DNS server
+# rd-dns-check -s 10.0.0.36 -d mydomain.com. -c old-dns.yml
+
+require 'yaml'
+require 'optparse'
+require 'set'
+
+class DNSRecord
+	def initialize(arr)
+		@record = arr
+		normalize
+	end
+  
+	def normalize
+		@record[0] = @record[0].downcase
+		@record[1] = @record[1].upcase
+		@record[2] = @record[2].upcase
+		@record[3] = @record[3].downcase
+	end
+  
+	def hostname
+		@record[0]
+	end
+  
+	def klass
+		@record[1]
+	end
+  
+	def type
+		@record[2]
+	end
+  
+	def value
+		@record[3]
+	end
+  
+	def is_address?
+		["A", "AAAA"].include?(type)
+	end
+  
+	def is_cname?
+		return type == "CNAME"
+	end
+  
+	def to_s
+		"#{hostname.ljust(50)} #{klass.rjust(4)} #{type.rjust(5)} #{value}"
+	end
+  
+	def key
+		"#{hostname}:#{klass}:#{type}".downcase
+	end
+  
+	def to_a
+		@record
+	end
+  
+	def == other
+		return @record == other.to_a
+	end
+end
+
+def dig(dns_server, cmd, exclude = ["TXT", "HINFO", "SOA", "NS"])
+	records = []
+	
+	IO.popen("dig @#{dns_server} +nottlid +nocmd +noall +answer " + cmd) do |p|
+		p.each do |line|
+			r = line.chomp.split(/\s/, 4)
+			
+			next if exclude.include?(r[2])
+      
+			records << DNSRecord.new(r)
+		end
+	end
+	
+	return records
+end
+
+def retrieve_records(dns_server, dns_root)
+	return dig(dns_server, "#{dns_root} AXFR")
+end
+
+def resolve_hostname(dns_server, hostname)
+	return dig(dns_server, "#{hostname} A").first
+end
+
+def resolve_address(dns_server, address)
+	return dig(dns_server, "-x #{address}").first
+end
+
+def print_summary(records, errors, okay, &block)
+	puts "[ Summary ]".center(72, "=")
+	puts "Checked #{records.size} record(s). #{errors} errors."
+	if errors == 0
+		puts "Everything seemed okay."
+	else
+		puts "The following records are okay:"
+		okay.each do |r|
+			if block_given?
+				yield r
+			else
+				puts "".rjust(12) + r.to_s
+			end
+		end
+	end
+end
+
+# Resolve hostnames to IP address "A" or "AAAA" records.
+# Works through CNAME records in order to find out the final
+# address if possible. Checks for loops in CNAME records.
+def resolve_addresses(records)
+	addresses = {}
+	cnames = {}
+  
+	# Extract all hostname -> ip address mappings
+	records.each do |r|
+		if r.is_address?
+			addresses[r.hostname] = r
+		elsif r.is_cname?
+			cnames[r.hostname] = r
+		end
+	end
+  
+	cnames.each do |hostname, r|
+		q = r
+		trail = []
+		failed = false
+    
+		# Keep track of CNAME records to avoid loops
+		while q.is_cname?
+			trail << q
+			q = cnames[q.value] || addresses[q.value]
+      
+			# Q could be nil at this point, which means there was no address record
+			# Q could be already part of the trail, which means there was a loop
+			if q == nil || trail.include?(q)
+				failed = true
+				break
+			end
+		end
+    
+		if failed
+			q = trail.last
+			puts "*** Warning: CNAME record #{hostname} does not point to actual address!"
+			trail.each_with_index do |r, idx|
+				puts idx.to_s.rjust(10) + ": " + r.to_s
+			end
+		end
+    
+		addresses[r.hostname] = q
+	end
+  
+	return addresses, cnames
+end
+
+def check_reverse(records, dns_server)
+	errors = 0
+	okay = []
+  
+	puts "[ Checking Reverse Lookups ]".center(72, "=")
+  
+	records.each do |r|
+		next unless r.is_address?
+    
+		sr = resolve_address(dns_server, r.value)
+    
+		if sr == nil
+			puts "*** Could not resolve host"
+			puts "".rjust(12) + r.to_s
+			errors += 1
+		elsif r.hostname != sr.value
+			puts "*** Hostname does not match"
+			puts "Primary: ".rjust(12) + r.to_s
+			puts "Secondary: ".rjust(12) + sr.to_s
+			errors += 1
+		else
+			okay << [r, sr]
+		end
+	end
+  
+	print_summary(records, errors, okay) do |r|
+		puts "Primary:".rjust(12) + r[0].to_s
+		puts "Secondary:".rjust(12) + r[1].to_s
+	end
+end
+
+def ping_records(records)
+	addresses, cnames = resolve_addresses(records)
+
+	errors = 0
+	okay = []
+
+	puts "[ Pinging Records ]".center(72, "=")
+  
+	addresses.each do |hostname, r|
+		ping = "ping -c 5 -t 5 -i 1 -o #{r.value} > /dev/null"
+    
+		system(ping)
+    
+		if $?.exitstatus == 0
+			okay << r
+		else
+			puts "*** Could not ping host #{hostname.dump}: #{ping.dump}"
+			puts "".rjust(12) + r.to_s
+			errors += 1
+		end
+	end
+  
+	print_summary(records, errors, okay)
+end
+
+def query_records(primary, secondary_server)
+	addresses, cnames = resolve_addresses(primary)
+  
+	okay = []
+	errors = 0
+  
+	primary.each do |r|
+		sr = resolve_hostname(secondary_server, r.hostname)
+    
+		if sr == nil
+			puts "*** Could not resolve hostname #{r.hostname.dump}"
+			puts "Primary: ".rjust(12) + r.to_s
+      
+			rsr = resolve_address(secondary_server, (addresses[r.value] || r).value)
+			puts "Address: ".rjust(12) + rsr.to_s if rsr
+      
+			errors += 1
+		elsif sr.value != r.value
+			ra = addresses[r.value] if r.is_cname?
+			sra = addresses[sr.value] if sr.is_cname?
+      
+			if (sra || sr).value != (ra || r).value
+				puts "*** IP Address does not match"
+				puts "Primary: ".rjust(12) + r.to_s
+				puts "Resolved: ".rjust(12) + ra.to_s if ra
+				puts "Secondary: ".rjust(12) + sr.to_s
+				puts "Resolved: ".rjust(12) + sra.to_s if sra
+				errors += 1
+			end
+		else
+			okay << r
+		end
+	end
+  
+	print_summary(primary, errors, okay)
+end
+
+def check_records(primary, secondary)
+	s = {}
+	okay = []
+	errors = 0
+  
+	secondary.each do |r|
+		s[r.key] = r
+	end
+
+	puts "[ Checking Records ]".center(72, "=")
+
+	primary.each do |r|
+		sr = s[r.key]
+    
+		if sr == nil
+			puts "*** Could not find record"
+			puts "Primary: ".rjust(12) + r.to_s
+			errors += 1
+		elsif sr != r
+			puts "*** Records are different"
+			puts "Primary: ".rjust(12) + r.to_s
+			puts "Secondary: ".rjust(12) + sr.to_s
+			errors += 1
+		else
+			okay << r
+		end
+	end
+  
+	print_summary(primary, errors, okay)
+end
+
+OPTIONS = {
+	:DNSServer => nil,
+	:DNSRoot => ".",
+}
+
+ARGV.options do |o|
+	script_name = File.basename($0)
+  
+	o.set_summary_indent('  ')
+	o.banner = "Usage: #{script_name} [options]"
+	o.define_head "This script is designed to test and check DNS servers."
+  
+	o.on("-s ns.my.domain.", "--server ns.my.domain.", String, "The DNS server to query.") { |host| OPTIONS[:DNSServer] = host }
+	o.on("-d my.domain.", "--domain my.domain.", String, "The DNS zone to transfer/test.") { |host| OPTIONS[:DNSRoot] = host }
+  
+	o.on("-f output.yml", "--fetch output.yml", String, "Pull down a list of hosts. Filters TXT and HINFO records. DNS transfers must be enabled.") { |f|
+		records = retrieve_records(OPTIONS[:DNSServer], OPTIONS[:DNSRoot])
+    
+		output = (f ? File.open(f, "w") : STDOUT)
+    
+		output.write(YAML::dump(records))
+    
+		puts "#{records.size} record(s) retrieved."
+	}
+  
+	o.on("-c input.yml", "--check input.yml", String, "Check that the DNS server returns results as specified by the file.") { |f|
+		input = (f ? File.open(f) : STDIN)
+    
+		master_records = YAML::load(input.read)
+		secondary_records = retrieve_records(OPTIONS[:DNSServer], OPTIONS[:DNSRoot])
+    
+		check_records(master_records, secondary_records)
+	}
+  
+	o.on("-q input.yml", "--query input.yml", String, "Query the remote DNS server with all hostnames in the given file, and checks the IP addresses are consistent.") { |f|
+		input = (f ? File.open(f) : STDIN)
+    
+		master_records = YAML::load(input.read)
+    
+		query_records(master_records, OPTIONS[:DNSServer])
+	}
+  
+	o.on("-p input.yml", "--ping input.yml", String, "Ping all hosts to check if they are available or not.") { |f|
+		input = (f ? File.open(f) : STDIN)
+    
+		master_records = YAML::load(input.read)
+    
+		ping_records(master_records)
+	}
+  
+	o.on("-r input.yml", "--reverse input.yml", String, "Check that all address records have appropriate reverse entries.") { |f|
+		input = (f ? File.open(f) : STDIN)
+    
+		master_records = YAML::load(input.read)
+    
+		check_reverse(master_records, OPTIONS[:DNSServer])
+	}
+  
+	o.separator ""
+	o.separator "Help and Copyright information"
+  
+	o.on_tail("--copy", "Display copyright information") {
+		puts "#{script_name}. Copyright (c) 2009, 2011 Samuel Williams. Released under the MIT license."
+		puts "See http://www.oriontransfer.co.nz/ for more information."
+		exit
+	}
+  
+	o.on_tail("-h", "--help", "Show this help message.") { puts o; exit }
+end.parse!

data/lib/rubydns/resolver.rb

@@ -21,6 +21,8 @@
 require_relative 'message'
 require_relative 'binary_string'
 
+require 'securerandom'
+
 module RubyDNS
 	class InvalidProtocolError < StandardError
 	end
@@ -34,15 +36,14 @@ module RubyDNS
 		# In the case of multiple servers, they will be checked in sequence.
 		def initialize(servers, options = {})
 			@servers = servers
-			@sequence = 0
 			
 			@options = options
 		end
 
 		# Provides the next sequence identification number which is used to keep track of DNS messages.
 		def next_id!
-			# Sequence IDs are 16-bit integers.
-			return (@sequence += 1) % (2**16)
+			# Using sequential numbers for the query ID is generally a bad thing because over UDP they can be spoofed. 16-bits isn't hard to guess either, but over UDP we also use a random port, so this makes effectively 32-bits of entropy to guess per request.
+			SecureRandom.random_number(2**16)
 		end
 
 		# Look up a named resource of the given resource_class.
@@ -105,7 +106,7 @@ module RubyDNS
 				end
 				
 				# Measured in seconds:
-				@timeout = options[:timeout] || 5
+				@timeout = options[:timeout] || 1
 				
 				@logger = options[:logger]
 			end
@@ -192,7 +193,7 @@ module RubyDNS
 			
 			module UDPRequestHandler
 				def self.open(host, port, request)
-					# Open a datagram socket... EventMachine doesn't support connected datagram sockets, so we have to cheat a bit:
+					# Open a datagram socket... a random socket chosen by the OS by specifying 0 for the port:
 					EventMachine::open_datagram_socket('', 0, self, request, host, port)
 				end
 				
@@ -208,6 +209,9 @@ module RubyDNS
 				end
 				
 				def receive_data(data)
+					# local_port, local_ip = Socket.unpack_sockaddr_in(get_sockname)
+					# puts "Socket name: #{local_ip}:#{local_port}"
+					
 					# Receiving response from remote DNS server...
 					message = RubyDNS::decode_message(data)
 					

data/lib/rubydns/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module RubyDNS
-	VERSION = "0.8.0"
+	VERSION = "0.8.1"
 end

data/test/test_resolver_performance.rb

@@ -0,0 +1,122 @@
+#!/usr/bin/env ruby
+
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'minitest/autorun'
+
+require 'rubydns'
+require 'rubydns/system'
+
+require 'benchmark'
+
+class ResolverPerformanceTest < MiniTest::Test
+	# The larger this number, the better RubyDNS::Resolver will look as it is highly asynchronous.
+	DOMAINS = %W{
+		Facebook.com
+		Twitter.com
+		Google.com
+		Youtube.com
+		Wordpress.org
+		Adobe.com
+		Blogspot.com
+		Wikipedia.org
+		Linkedin.com
+		Wordpress.com
+		Yahoo.com
+		Amazon.com
+		Flickr.com
+		Pinterest.com
+		Tumblr.com
+		W3.org
+		Apple.com
+		Myspace.com
+		Vimeo.com
+		Microsoft.com
+		Youtu.be
+		Qq.com
+		Digg.com
+		Baidu.com
+		Stumbleupon.com
+		Addthis.com
+		Statcounter.com
+		Feedburner.com
+		TradeMe.co.nz
+		Delicious.com
+		Nytimes.com
+		Reddit.com
+		Weebly.com
+		Bbc.co.uk
+		Blogger.com
+		Msn.com
+		Macromedia.com
+		Goo.gl
+		Instagram.com
+		Gov.uk
+		Icio.us
+		Yandex.ru
+		Cnn.com
+		Webs.com
+		Google.de
+		T.co
+		Livejournal.com
+		Imdb.com
+		Mail.ru
+		Jimdo.com
+	}
+	
+	def test_resolvers
+		rubydns_resolved = {}
+		resolv_resolved = {}
+		
+		Benchmark.bm(20) do |x|
+			x.report("RubyDNS::Resolver") do
+				resolver = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
+				
+				# Number of requests remaining since this is an asynchronous event loop:
+				pending = DOMAINS.size
+				
+				EventMachine::run do
+					DOMAINS.each do |domain|
+						resolver.addresses_for(domain) do |addresses|
+							rubydns_resolved[domain] = addresses
+							
+							EventMachine::stop if (pending -= 1) == 0
+						end
+					end
+				end
+			end
+			
+			x.report("Resolv::DNS") do
+				resolver = Resolv::DNS.new(:nameserver => "8.8.8.8")
+				
+				DOMAINS.each do |domain|
+					resolv_resolved[domain] = resolver.getaddresses(domain)
+				end
+			end
+		end
+		
+		DOMAINS.each do |domain|
+			# We don't really care if the responses aren't identical - they should be most of the time but due to the way DNS works this isn't always the case:
+			refute_empty resolv_resolved[domain]
+			refute_empty rubydns_resolved[domain]
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -76,8 +76,7 @@ description: "\t\tRubyDNS is a high-performance DNS server which can be easily i
 email:
 - samuel.williams@oriontransfer.co.nz
 executables:
-- rd-dns-check
-- rd-resolve-test
+- rubydns-check
 extensions: []
 extra_rdoc_files: []
 files:
@@ -87,8 +86,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- bin/rd-dns-check
-- bin/rd-resolve-test
+- bin/rubydns-check
 - lib/rubydns.rb
 - lib/rubydns/binary_string.rb
 - lib/rubydns/chunked.rb
@@ -116,6 +114,7 @@ files:
 - test/test_message.rb
 - test/test_passthrough.rb
 - test/test_resolver.rb
+- test/test_resolver_performance.rb
 - test/test_rules.rb
 - test/test_slow_server.rb
 - test/test_system.rb
@@ -158,6 +157,7 @@ test_files:
 - test/test_message.rb
 - test/test_passthrough.rb
 - test/test_resolver.rb
+- test/test_resolver_performance.rb
 - test/test_rules.rb
 - test/test_slow_server.rb
 - test/test_system.rb

data/bin/rd-dns-check

@@ -1,374 +0,0 @@
-#!/usr/bin/env ruby
-# Copyright, 2009, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# Pulls down DNS data from old-dns
-# rd-dns-check -s old-dns.mydomain.com -d mydomain.com. -f old-dns.yml
-
-# Check data against old-dns
-# rd-dns-check -s old-dns.mydomain.com -d mydomain.com. -c old-dns.yml
-
-# Check data against new DNS server
-# rd-dns-check -s 10.0.0.36 -d mydomain.com. -c old-dns.yml
-
-require 'yaml'
-require 'optparse'
-require 'set'
-
-class DNSRecord
-  def initialize(arr)
-    @record = arr
-    normalize
-  end
-  
-  def normalize
-    @record[0] = @record[0].downcase
-    @record[1] = @record[1].upcase
-    @record[2] = @record[2].upcase
-    @record[3] = @record[3].downcase
-  end
-  
-  def hostname
-    @record[0]
-  end
-  
-  def klass
-    @record[1]
-  end
-  
-  def type
-    @record[2]
-  end
-  
-  def value
-    @record[3]
-  end
-  
-  def is_address?
-    ["A", "AAAA"].include?(type)
-  end
-  
-  def is_cname?
-    return type == "CNAME"
-  end
-  
-  def to_s
-    "#{hostname.ljust(50)} #{klass.rjust(4)} #{type.rjust(5)} #{value}"
-  end
-  
-  def key
-    "#{hostname}:#{klass}:#{type}".downcase
-  end
-  
-  def to_a
-    @record
-  end
-  
-  def == other
-    return @record == other.to_a
-  end
-end
-
-def dig(dns_server, cmd, exclude = ["TXT", "HINFO", "SOA", "NS"])
-	records = []
-	
-	IO.popen("dig @#{dns_server} +nottlid +nocmd +noall +answer " + cmd) do |p|
-		p.each do |line|
-			r = line.chomp.split(/\s/, 4)
-			
-			next if exclude.include?(r[2])
-      
-			records << DNSRecord.new(r)
-		end
-	end
-	
-	return records
-end
-
-def retrieve_records(dns_server, dns_root)
-	return dig(dns_server, "#{dns_root} AXFR")
-end
-
-def resolve_hostname(dns_server, hostname)
-  return dig(dns_server, "#{hostname} A").first
-end
-
-def resolve_address(dns_server, address)
-  return dig(dns_server, "-x #{address}").first
-end
-
-def print_summary(records, errors, okay, &block)
-  puts "[ Summary ]".center(72, "=")
-  puts "Checked #{records.size} record(s). #{errors} errors."
-  if errors == 0
-    puts "Everything seemed okay."
-  else
-    puts "The following records are okay:"
-    okay.each do |r|
-      if block_given?
-        yield r
-      else
-        puts "".rjust(12) + r.to_s
-      end
-    end
-  end
-end
-
-# Resolve hostnames to IP address "A" or "AAAA" records.
-# Works through CNAME records in order to find out the final
-# address if possible. Checks for loops in CNAME records.
-def resolve_addresses(records)
-  addresses = {}
-  cnames = {}
-  
-  # Extract all hostname -> ip address mappings
-  records.each do |r|
-    if r.is_address?
-      addresses[r.hostname] = r
-    elsif r.is_cname?
-      cnames[r.hostname] = r
-    end
-  end
-  
-  cnames.each do |hostname, r|
-    q = r
-    trail = []
-    failed = false
-    
-    # Keep track of CNAME records to avoid loops
-    while q.is_cname?
-      trail << q
-      q = cnames[q.value] || addresses[q.value]
-      
-      # Q could be nil at this point, which means there was no address record
-      # Q could be already part of the trail, which means there was a loop
-      if q == nil || trail.include?(q)
-        failed = true
-        break
-      end
-    end
-    
-    if failed
-      q = trail.last
-      puts "*** Warning: CNAME record #{hostname} does not point to actual address!"
-      trail.each_with_index do |r, idx|
-        puts idx.to_s.rjust(10) + ": " + r.to_s
-      end
-    end
-    
-    addresses[r.hostname] = q
-  end
-  
-  return addresses, cnames
-end
-
-def check_reverse(records, dns_server)
-  errors = 0
-  okay = []
-  
-  puts "[ Checking Reverse Lookups ]".center(72, "=")
-  
-  records.each do |r|
-    next unless r.is_address?
-    
-    sr = resolve_address(dns_server, r.value)
-    
-    if sr == nil
-      puts "*** Could not resolve host"
-      puts "".rjust(12) + r.to_s
-      errors += 1
-    elsif r.hostname != sr.value
-      puts "*** Hostname does not match"
-      puts "Primary: ".rjust(12) + r.to_s
-      puts "Secondary: ".rjust(12) + sr.to_s
-      errors += 1
-    else
-      okay << [r, sr]
-    end
-  end
-  
-  print_summary(records, errors, okay) do |r|
-    puts "Primary:".rjust(12) + r[0].to_s
-    puts "Secondary:".rjust(12) + r[1].to_s
-  end
-end
-
-def ping_records(records)
-  addresses, cnames = resolve_addresses(records)
-
-  errors = 0
-  okay = []
-
-  puts "[ Pinging Records ]".center(72, "=")
-  
-  addresses.each do |hostname, r|
-    ping = "ping -c 5 -t 5 -i 1 -o #{r.value} > /dev/null"
-    
-    system(ping)
-    
-    if $?.exitstatus == 0
-      okay << r
-    else
-      puts "*** Could not ping host #{hostname.dump}: #{ping.dump}"
-      puts "".rjust(12) + r.to_s
-      errors += 1
-    end
-  end
-  
-  print_summary(records, errors, okay)
-end
-
-def query_records(primary, secondary_server)
-  addresses, cnames = resolve_addresses(primary)
-  
-  okay = []
-  errors = 0
-  
-  primary.each do |r|
-    sr = resolve_hostname(secondary_server, r.hostname)
-    
-    if sr == nil
-      puts "*** Could not resolve hostname #{r.hostname.dump}"
-      puts "Primary: ".rjust(12) + r.to_s
-      
-      rsr = resolve_address(secondary_server, (addresses[r.value] || r).value)
-      puts "Address: ".rjust(12) + rsr.to_s if rsr
-      
-      errors += 1
-    elsif sr.value != r.value
-      ra = addresses[r.value] if r.is_cname?
-      sra = addresses[sr.value] if sr.is_cname?
-      
-      if (sra || sr).value != (ra || r).value
-        puts "*** IP Address does not match"
-        puts "Primary: ".rjust(12) + r.to_s
-        puts "Resolved: ".rjust(12) + ra.to_s if ra
-        puts "Secondary: ".rjust(12) + sr.to_s
-        puts "Resolved: ".rjust(12) + sra.to_s if sra
-        errors += 1
-      end
-    else
-      okay << r
-    end
-  end
-  
-  print_summary(primary, errors, okay)
-end
-
-def check_records(primary, secondary)
-  s = {}
-  okay = []
-  errors = 0
-  
-  secondary.each do |r|
-    s[r.key] = r
-  end
-
-  puts "[ Checking Records ]".center(72, "=")
-
-  primary.each do |r|
-    sr = s[r.key]
-    
-    if sr == nil
-      puts "*** Could not find record"
-      puts "Primary: ".rjust(12) + r.to_s
-      errors += 1
-    elsif sr != r
-      puts "*** Records are different"
-      puts "Primary: ".rjust(12) + r.to_s
-      puts "Secondary: ".rjust(12) + sr.to_s
-      errors += 1
-    else
-      okay << r
-    end
-  end
-  
-  print_summary(primary, errors, okay)
-end
-
-OPTIONS = {
-	:DNSServer => nil,
-	:DNSRoot => ".",
-}
-
-ARGV.options do |o|
-  script_name = File.basename($0)
-  
-  o.set_summary_indent('  ')
-  o.banner = "Usage: #{script_name} [options]"
-  o.define_head "This script is designed to test and check DNS servers."
-  
-  o.on("-s ns.my.domain.", "--server ns.my.domain.", String, "The DNS server to query.") { |host| OPTIONS[:DNSServer] = host }
-  o.on("-d my.domain.", "--domain my.domain.", String, "The DNS zone to transfer/test.") { |host| OPTIONS[:DNSRoot] = host }
-  
-  o.on("-f output.yml", "--fetch output.yml", String, "Pull down a list of hosts. Filters TXT and HINFO records. DNS transfers must be enabled.") { |f|
-    records = retrieve_records(OPTIONS[:DNSServer], OPTIONS[:DNSRoot])
-    
-    output = (f ? File.open(f, "w") : STDOUT)
-    
-    output.write(YAML::dump(records))
-    
-    puts "#{records.size} record(s) retrieved."
-  }
-  
-  o.on("-c input.yml", "--check input.yml", String, "Check that the DNS server returns results as specified by the file.") { |f|
-    input = (f ? File.open(f) : STDIN)
-    
-    master_records = YAML::load(input.read)
-    secondary_records = retrieve_records(OPTIONS[:DNSServer], OPTIONS[:DNSRoot])
-    
-    check_records(master_records, secondary_records)
-  }
-  
-  o.on("-q input.yml", "--query input.yml", String, "Query the remote DNS server with all hostnames in the given file, and checks the IP addresses are consistent.") { |f|
-    input = (f ? File.open(f) : STDIN)
-    
-    master_records = YAML::load(input.read)
-    
-    query_records(master_records, OPTIONS[:DNSServer])
-  }
-  
-  o.on("-p input.yml", "--ping input.yml", String, "Ping all hosts to check if they are available or not.") { |f|
-    input = (f ? File.open(f) : STDIN)
-    
-    master_records = YAML::load(input.read)
-    
-    ping_records(master_records)
-  }
-  
-  o.on("-r input.yml", "--reverse input.yml", String, "Check that all address records have appropriate reverse entries.") { |f|
-    input = (f ? File.open(f) : STDIN)
-    
-    master_records = YAML::load(input.read)
-    
-    check_reverse(master_records, OPTIONS[:DNSServer])
-  }
-  
-  o.separator ""
-  o.separator "Help and Copyright information"
-  
-  o.on_tail("--copy", "Display copyright information") {
-    puts "#{script_name}. Copyright (c) 2009, 2011 Samuel Williams. Released under the MIT license."
-    puts "See http://www.oriontransfer.co.nz/ for more information."
-    exit
-  }
-  
-  o.on_tail("-h", "--help", "Show this help message.") { puts o; exit }
-end.parse!

data/bin/rd-resolve-test

@@ -1,160 +0,0 @@
-#!/usr/bin/env ruby
-# Copyright, 2009, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'rubydns/version'
-
-require 'resolv'
-require 'optparse'
-
-OPTIONS = {
-	:Domains => [],
-	:Nameservers => [],
-	:Timeout => 0.5,
-
-	:Threads => 10,
-	:Requests => 20
-}
-
-ARGV.options do |o|
-	script_name = File.basename($0)
-
-	o.banner = "Usage: #{script_name} [options] nameserver [nameserver]"
-
-	o.on("-d [path]", String, "Specify a file that contains a list of domains") do |path|
-		OPTIONS[:Domains] += File.readlines(path).collect { |name| name.strip.downcase }
-	end
-
-	o.on("-t [timeout]", Float, "Queries that take longer than this will be printed") do |timeout|
-		OPTIONS[:Timeout] = timeout.to_f
-	end
-
-	o.on("--threads [count]", Integer, "Number of threads to resolve names concurrently") do |count|
-		OPTIONS[:Threads] = count.to_i
-	end
-
-	o.on("--requests [count]", Integer, "Number of requests to perform per thread") do |count|
-		OPTIONS[:Requests] = count.to_i
-	end
-
-	o.on_tail("--copy", "Display copyright information") do
-		puts "#{script_name} v#{RubyDNS::VERSION::STRING}. Copyright (c) 2009, 2011 Samuel Williams. Released under the MIT license."
-		puts "See http://www.oriontransfer.co.nz/ for more information."
-
-		exit
-	end
-
-	o.on_tail("-h", "--help", "Show this help message.") { puts o; exit }
-end.parse!
-
-OPTIONS[:Nameservers] = ARGV
-
-if OPTIONS[:Nameservers].size > 0
-	$R = Resolv::DNS.new(:nameserver => ARGV)
-else
-	$R = Resolv::DNS.new
-end
-
-$TG = ThreadGroup.new
-$M = Mutex.new
-$STATUS = {}
-$TOTAL = [0.0, 0]
-
-if OPTIONS[:Domains].size == 0
-	OPTIONS[:Domains] += ["www.google.com", "www.amazon.com", "www.apple.com", "www.microsoft.com"]
-	OPTIONS[:Domains] += ["www.rubygems.org", "www.ruby-lang.org", "www.slashdot.org", "www.lucidsystems.org"]
-	OPTIONS[:Domains] += ["www.facebook.com", "www.twitter.com", "www.myspace.com", "www.youtube.com"]
-	OPTIONS[:Domains] += ["www.oriontransfer.co.nz", "www.digg.com"]
-end
-
-def random_domain
-	d = OPTIONS[:Domains]
-
-	d[rand(d.size - 1)]
-end
-
-puts "Starting test with #{OPTIONS[:Domains].size} domains..."
-puts "Using nameservers: " + OPTIONS[:Nameservers].join(", ")
-puts "Only long running queries will be printed..."
-
-def resolve_domain
-	s = Time.now
-	result = nil
-	name = random_domain
-
-	begin
-		result = [$R.getaddress(name)]
-	rescue Resolv::ResolvError
-		$M.synchronize do
-			puts "Name #{name} failed to resolve!"
-			$STATUS[name] ||= []
-			$STATUS[name] << :failure
-
-			if $STATUS[name].include?(:success)
-				puts "Name #{name} has had previous successes!"
-			end
-		end
-
-		return
-	end
-
-	result.unshift(name)
-	result.unshift(Time.now - s)
-
-	$M.synchronize do	
-		$TOTAL[0] += result[0]
-		$TOTAL[1] += 1
-
-		if result[0] > OPTIONS[:Timeout]
-			puts "\t\t%0.2fs: %s => %s" % result
-		end
-
-		$STATUS[name] ||= []
-		$STATUS[name] << :success
-
-		if $STATUS[name].include?(:failure)
-			puts "Name #{name} has had previous failures!"
-		end
-	end
-end
-
-puts "Starting threads..."
-Thread.abort_on_exception = true
-
-OPTIONS[:Threads].times do
-	th = Thread.new do
-		OPTIONS[:Requests].times do
-			resolve_domain
-		end
-	end
-
-	$TG.add th
-end
-
-$TG.list.each { |thr| thr.join }
-
-$STATUS.each do |name, results|
-	if results.include?(:failure)
-		puts "Name #{name} failed at least once!"
-	end
-end
-
-puts
-puts "Requests: #{$TOTAL[1]} Average time: #{$TOTAL[0] / $TOTAL[1]}"