rubydns 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4fda39223a95e55c2076290f606afad961a2329
-  data.tar.gz: 68c313608b3dfff428024fded19fc4ca09031417
+  metadata.gz: 027557f4aae547ca2ae32cc66c59909b6a6bee56
+  data.tar.gz: f19af2749cdff025edbf9b7d8e8e6546c4911377
 SHA512:
-  metadata.gz: 446b2658fd2a6438881ca805f0a202ca34f3d3e7b56480751ee230d5dfa3ac93757dac0f51f69edbad6fbc9afc925b8fd11efd774696b63439b1d8b6bfa5c044
-  data.tar.gz: 40fa8b55fc9351c2c7afba9791ea58632290f3c21871005729498e1058b01219cc45c3d638076599a203c453ffd2190a4facaeff7d495afbbea397964fd9603b
+  metadata.gz: bd783eaa39bb28ae521da7b20aaea97636e8c3dfe492864f0c299f7264d786407ecebce88d2e759c42c7e08aff448a914e1913243fafda6d9bf2bdf6489177e2
+  data.tar.gz: 932b3c6332d87ca10684b42d34cc37b7738730ddb489afd7b08df0f54606ef24560c772e7f30c316b40652d7483d7e3f0f15312cc0f4e68df7a9ba84783d1f14

data/lib/rubydns/handler.rb

@@ -39,11 +39,11 @@ module RubyDNS
 				query = RubyDNS::decode_message(data)
 
 				return server.process_query(query, options, &block)
-			rescue
+			rescue => error
 				server.logger.error "Error processing request!"
-				server.logger.error "#{$!.class}: #{$!.message}"
+				server.logger.error "#{error.class}: #{error.message}"
 
-				$!.backtrace.each { |at| server.logger.error at }
+				error.backtrace.each { |at| server.logger.error at }
 
 				# Encoding may fail, so we need to handle this particular case:
 				server_failure = Resolv::DNS::Message::new(query ? query.id : 0)

data/lib/rubydns/message.rb

@@ -22,6 +22,8 @@ require 'eventmachine'
 require 'stringio'
 require 'resolv'
 
+require 'base64'
+
 require 'rubydns/extensions/resolv'
 
 module RubyDNS
@@ -30,12 +32,32 @@ module RubyDNS
 	# The DNS message container.
 	Message = Resolv::DNS::Message
 
+	DecodeError = Resolv::DNS::DecodeError
+
+	@@dump_bad_message = nil
+	
+	# Call this function with a path where bad messages will be saved. Any message that causes an exception to be thrown while decoding the binary will be saved in base64 for later inspection. The log file could grow quickly so be careful - not designed for long term use.
+	def self.log_bad_messages!(log_path)
+		bad_messages_log = Logger.new(log_path, 10, 1024*100)
+		bad_messages_log.level = Logger::DEBUG
+		
+		@dump_bad_message = lambda do |error, data|
+			bad_messages_log.debug("Bad message: #{Base64.encode64(data)}")
+			RubyDNS.log_exception(bad_messages_log, error)
+		end
+	end
+
 	def self.decode_message(data)
 		if data.respond_to? :force_encoding
 			data.force_encoding("BINARY")
 		end
 		
-		# This may throw Resolv::DNS::DecodeError.
 		Message.decode(data)
+	rescue => error
+		if @dump_bad_message
+			@dump_bad_message.call(StandardError.new("foo"), data)
+		end
+		
+		raise
 	end
 end

data/lib/rubydns/resolver.rb

@@ -84,6 +84,8 @@ module RubyDNS
 				end
 				
 				request.errback do |error|
+					# In the case of a timeout, error will be nil, so we make one up.
+					
 					yield error
 				end
 				
@@ -167,18 +169,24 @@ module RubyDNS
 					end
 					
 					# Setting up the timeout...
-					timeout(@timeout) do
-						@logger.debug "[#{@message.id}] Request timed out!" if @logger
-						
-						finish_request!
-						
-						try_next_server!
-					end
+					timeout(@timeout)
 				else
 					fail ResolutionFailure.new("No available servers responded to the request.")
 				end
 			end
 			
+			def timeout seconds
+				cancel_timeout
+				
+				@deferred_timeout = EventMachine::Timer.new(seconds) do
+					@logger.debug "[#{@message.id}] Request timed out!" if @logger
+					
+					finish_request!
+					
+					try_next_server!
+				end
+			end
+			
 			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:

data/lib/rubydns/version.rb

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

data/test/test_resolver.rb

@@ -36,7 +36,7 @@ class ResolverTest < Test::Unit::TestCase
 		
 		EventMachine::run do
 			resolver.query('foobar.oriontransfer.org') do |response|
-				assert_equal response.rcode, Resolv::DNS::RCode::NXDomain
+				assert_equal Resolv::DNS::RCode::NXDomain, response.rcode
 				EventMachine::stop
 			end
 		end

data/test/test_slow_server.rb

@@ -41,7 +41,7 @@ class SlowServer < RExec::Daemon::Base
 				transaction.defer!
 			
 				# No domain exists, after 5 seconds:
-				EventMachine::Timer.new(2) do
+				EventMachine::Timer.new(5) do
 					transaction.failure!(:NXDomain)
 				end
 			end
@@ -62,6 +62,28 @@ class SlowServerTest < Test::Unit::TestCase
 		SlowServer.stop
 	end
 	
+	def test_timeout
+		start_time = Time.now
+		end_time = nil
+		got_response = false
+		
+		# Because there are two servers, the total timeout is actually, 2 seconds
+		resolver = RubyDNS::Resolver.new(SlowServer::SERVER_PORTS, :timeout => 1)
+		
+		EventMachine::run do
+			resolver.query("apple.com", IN::A) do |response|
+				end_time = Time.now
+				
+				got_response = response
+				
+				EventMachine::stop
+			end
+		end
+		
+		assert (end_time - start_time) <= 2.5, "Response should fail within timeout period."
+		assert_equal RubyDNS::ResolutionFailure, got_response.class, "Response should be resolution failure."
+	end
+	
 	def test_slow_request
 		start_time = Time.now
 		end_time = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexec