rubydns 0.5.2 → 0.5.3

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+  - rbx-18mode
+  - rbx-19mode

data/Gemfile

@@ -1,7 +1,4 @@
-# A sample Gemfile
-source "https://rubygems.org"
-
-gem "rexec", "~> 1.5.1"
-gem "rake"
-gem "eventmachine"
+source 'https://rubygems.org'
 
+# Specify your gem's dependencies in rubydns.gemspec
+gemspec

data/README.md

@@ -1,55 +1,52 @@
-RubyDNS
-=======
+# RubyDNS
 
-* Released under the MIT license.
-* Copyright (C) 2009, 2011 [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams/).
-* [![Build Status](https://secure.travis-ci.org/ioquatix/rubydns.png)](http://travis-ci.org/ioquatix/rubydns)
+RubyDNS is a high-performance DNS server which can be easily integrated into other projects or used as a stand-alone daemon (via RExec). By default it uses rule-based pattern matching. Results can be hard-coded, computed, fetched from a remote DNS server or fetched from a local cache, depending on requirements.
 
-RubyDNS is a simple programmatic DSL (domain specific language) for configuring and running a DNS server. RubyDNS provides a daemon that runs a DNS server which can process DNS requests depending on specific policy. Rule selection is based on pattern matching, and results can be hard-coded, computed, fetched from a remote DNS server, fetched from a local cache, etc.
+In addition, RubyDNS includes a high-performance asynchronous DNS resolver built on top of EventMachine. This module can be used by itself in client applications without using the full RubyDNS server stack.
 
-RubyDNS provides a full daemon server using RExec. You can either use the built in daemon, customize it to your needs, or specify a full daemon implementation.
+For examples and documentation please see the main [project page][1].
 
-RubyDNS is not designed to be high-performance and uses a thread-per-request model. This is designed to make it as easy as possible to achieve concurrent performance. This is also due to the fact that many other APIs work best this way (unfortunately).
+[1]: http://www.oriontransfer.co.nz/gems/rubydns
 
-For examples please see the main [project page][1].
+[![Build Status](https://secure.travis-ci.org/ioquatix/rubydns.png)](http://travis-ci.org/ioquatix/rubydns)
 
-[1]: http://www.oriontransfer.co.nz/gems/rubydns
+## Installation
 
-Basic Example
--------------
+Add this line to your application's Gemfile:
 
-This is copied from `test/example1.rb`. It has been simplified slightly.
+    gem 'rubydns'
 
-	require 'rubygems'
-	require 'rubydns'
+And then execute:
 
-	$R = Resolv::DNS.new
+    $ bundle
 
-	RubyDNS::run_server do
-		Name = Resolv::DNS::Name
-		IN = Resolv::DNS::Resource::IN
-		
-		# For this exact address record, return an IP address
-		match("dev.mydomain.org", IN::A) do |transaction|
-			transaction.respond!("10.0.0.80")
-		end
+Or install it yourself as:
 
-		match(/^test([0-9]+).mydomain.org$/, IN::A) do |match_data, transaction|
-			offset = match_data[1].to_i
+    $ gem install rubydns
 
-			if offset > 0 && offset < 10
-				logger.info "Responding with address #{"10.0.0." + (90 + offset).to_s}..."
-				transaction.respond!("10.0.0." + (90 + offset).to_s)
-			else
-				logger.info "Address out of range: #{offset}!"
-				false
+## Usage
+
+This is copied from `test/examples/test-dns-2.rb`. It has been simplified slightly.
+
+	require 'rubydns'
+
+	Name = Resolv::DNS::Name
+	IN = Resolv::DNS::Resource::IN
+
+	# Use upstream DNS for name resolution.
+	UPSTREAM = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
+
+	def self.run
+		# Start the RubyDNS server
+		RubyDNS::run_server(:listen => INTERFACES) do
+			match("test.mydomain.org", IN::A) do |transaction|
+				transaction.respond!("10.0.0.80")
 			end
-		end
 
-		# Default DNS handler
-		otherwise do |transaction|
-			logger.info "Passing DNS request upstream..."
-			transaction.passthrough!($R)
+			# Default DNS handler
+			otherwise do |transaction|
+				transaction.passthrough!(UPSTREAM)
+			end
 		end
 	end
 
@@ -59,8 +56,7 @@ After starting this server you can test it using dig:
 	dig @localhost dev.mydomain.org
 	dig @localhost google.com
 
-Compatibility
--------------
+## Compatibility
 
 ### Migrating from RubyDNS 0.3.x to 0.4.x ###
 
@@ -130,16 +126,24 @@ Once you call this, the transaction won't complete until you call either `transa
 
 You can see a complete example in `test/test_slow_server.rb`.
 
-Todo
-----
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+### Desired Features
 
 * Support for more features of DNS such as zone transfer.
 * Support reverse records more easily.
 
-License
--------
+## License
+
+Released under the MIT license.
 
-Copyright (c) 2010, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+Copyright, 2009, 2012, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/{rakefile.rb → Rakefile}

@@ -1,5 +1,5 @@
-
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
 Rake::TestTask.new do |t|
 	t.libs << 'test'
@@ -7,4 +7,3 @@ end
 
 desc "Run tests"
 task :default => :test
-

data/bin/rd-dns-check

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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

data/bin/rd-resolve-test

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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

data/lib/rubydns.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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
@@ -66,7 +66,7 @@ module RubyDNS
 	#
 	def self.run_server (options = {}, &block)
 		server = RubyDNS::Server.new(&block)
-		server.logger.info "Starting RubyDNS server (v#{RubyDNS::VERSION::STRING})..."
+		server.logger.info "Starting RubyDNS server (v#{RubyDNS::VERSION})..."
 		
 		options[:listen] ||= [[:udp, "0.0.0.0", 53], [:tcp, "0.0.0.0", 53]]
 		
@@ -89,4 +89,3 @@ module RubyDNS
 		server.fire(:stop)
 	end
 end
-

data/lib/rubydns/chunked.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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

data/lib/rubydns/extensions/hexdump.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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

data/lib/rubydns/extensions/logger.rb

@@ -0,0 +1,30 @@
+# 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.
+
+module RubyDNS
+	# Logs an exception nicely.
+	def self.log_exception(logger, exception)
+		logger.error "#{exception.class}: #{exception.message}"
+		if exception.backtrace
+			Array(exception.backtrace).each { |at| logger.error at }
+		end
+		
+	end
+end

data/lib/rubydns/extensions/resolv.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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

data/lib/rubydns/extensions/string-1.8.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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

data/lib/rubydns/extensions/string-1.9.2.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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

data/lib/rubydns/extensions/string-1.9.3.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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

data/lib/rubydns/extensions/string.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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

data/lib/rubydns/handler.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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

data/lib/rubydns/message.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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
@@ -35,6 +35,7 @@ module RubyDNS
 			data.force_encoding("BINARY")
 		end
 		
+		# This may throw Resolv::DNS::DecodeError.
 		Message.decode(data)
 	end
 end

data/lib/rubydns/resolver.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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
@@ -111,12 +111,22 @@ module RubyDNS
 			end
 			
 			def process_response!(response)
-				if response.tc != 0
+				if Exception === response
+					@logger.warn "[#{@message.id}] Failure while processing response #{exception}!" if @logger
+					RubyDNS.log_exception(@logger, response) if @logger
+					
+					try_next_server!
+				elsif response.tc != 0
 					@logger.warn "[#{@message.id}] Received truncated response!" if @logger
-					# We hardcode this behaviour for now.
+					
+					try_next_server!
+				elsif response.id != @message.id
+					@logger.warn "[#{@message.id}] Received response with incorrect message id: #{response.id}" if @request.logger
+					
 					try_next_server!
 				else
 					@logger.warn "[#{@message.id}] Received valid response #{response.inspect}" if @logger
+					
 					succeed response
 				end
 			end
@@ -175,13 +185,11 @@ module RubyDNS
 				def receive_data(data)
 					# Receiving response from remote DNS server...
 					message = RubyDNS::decode_message(data)
-					
+						
 					# The message id must match, and it can't be truncated:
-					if message.id == @request.message.id
-						@request.process_response!(message)
-					else
-						@request.logger.warn "[#{@request.message.id}] Received response with incorrect message id: #{message.id}" if @request.logger
-					end
+					@request.process_response!(message)
+				rescue Resolv::DNS::DecodeError => error
+					@request.process_response!(error)
 				end
 			end
 			
@@ -214,19 +222,16 @@ module RubyDNS
 						end
 					end
 
-					if @buffer.size == (@length + 2)
+					# If we have received more data than expected, should this be an error?
+					if @buffer.size >= (@length + 2)
 						data = @buffer.string.byteslice(2, @length)
 						
 						message = RubyDNS::decode_message(data)
 						
-						if message.id == @request.message.id
-							@request.process_response!(message)
-						else
-							@request.logger.warn "[#{@request.message.id}] Received response with incorrect message id: #{message.id}" if @request.logger
-						end
-					elsif @buffer.size > (@length + 2)
-						@request.try_next_server!
+						@request.process_response!(message)
 					end
+				rescue Resolv::DNS::DecodeError => error
+					@request.process_response!(error)
 				end
 			end
 		end

data/lib/rubydns/server.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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
@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require 'rubydns/transaction'
+require 'rubydns/extensions/logger'
 
 module RubyDNS
 	
@@ -213,10 +214,7 @@ module RubyDNS
 					transaction.errback do |response|
 						if Exception === response
 							@logger.error "Exception thrown while processing #{transaction}!"
-							@logger.error "#{response.class}: #{response.message}"
-							if response.backtrace
-								Array(response.backtrace).each { |at| @logger.error at }
-							end
+							RubyDNS.log_exception(@logger, response)
 						else
 							@logger.error "Failure while processing #{transaction}!"
 							@logger.error "#{response.inspect}"

data/lib/rubydns/system.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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

data/lib/rubydns/transaction.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 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
@@ -124,7 +124,7 @@ module RubyDNS
 					case response
 					when RubyDNS::Message
 						yield response
-					when RubyDNS::ResolverFailure
+					when RubyDNS::ResolutionFailure
 						failure!(:ServFail)
 					else
 						# This shouldn't ever happen, but if it does for some reason we shouldn't hang.