rubydns 0.5.0 → 0.5.1

data/test/test_daemon.rb

@@ -9,11 +9,13 @@ require 'rexec'
 require 'rexec/daemon'
 
 class BasicTestServer < RExec::Daemon::Base
+	SERVER_PORTS = [[:udp, '127.0.0.1', 5350], [:tcp, '127.0.0.1', 5350]]
+
 	@@base_directory = File.dirname(__FILE__)
 
 	def self.run
 		# Start the RubyDNS server
-		RubyDNS::run_server(:listen => [[:udp, "0.0.0.0", 5300], [:tcp, "0.0.0.0", 5300]]) do
+		RubyDNS::run_server(:listen => SERVER_PORTS) do
 			match("test.local", IN::A) do |transaction|
 				transaction.respond!("192.168.1.1")
 			end
@@ -45,7 +47,7 @@ class DaemonTest < Test::Unit::TestCase
 		assert_equal :running, RExec::Daemon::ProcessFile.status(BasicTestServer)
 		
 		EventMachine.run do
-			resolver = resolver = RubyDNS::Resolver.new([[:udp, "127.0.0.1", 5300], [:tcp, "127.0.0.1", 5300]])
+			resolver = resolver = RubyDNS::Resolver.new(BasicTestServer::SERVER_PORTS)
 		
 			resolver.query("test.local") do |response|
 				answer = response.answer.first
@@ -62,7 +64,7 @@ class DaemonTest < Test::Unit::TestCase
 		assert_equal :running, RExec::Daemon::ProcessFile.status(BasicTestServer)
 
 		EventMachine.run do
-			resolver = resolver = RubyDNS::Resolver.new([[:udp, "127.0.0.1", 5300], [:tcp, "127.0.0.1", 5300]])
+			resolver = resolver = RubyDNS::Resolver.new(BasicTestServer::SERVER_PORTS)
 
 			resolver.query("foobar") do |response|
 				answer = response.answer.first

data/test/test_passthrough.rb

@@ -9,13 +9,15 @@ require 'rexec'
 require 'rexec/daemon'
 
 class TestPassthroughServer < RExec::Daemon::Base
+	SERVER_PORTS = [[:udp, '127.0.0.1', 5340], [:tcp, '127.0.0.1', 5340]]
+	
 	@@base_directory = File.dirname(__FILE__)
 
 	def self.run
 		resolver = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
 		
 		# Start the RubyDNS server
-		RubyDNS::run_server(:listen => [[:udp, "0.0.0.0", 5300], [:tcp, "0.0.0.0", 5300]]) do
+		RubyDNS::run_server(:listen => SERVER_PORTS) do
 			match(/.*\.com/, IN::A) do |match, transaction|
 				transaction.passthrough!(resolver)
 			end
@@ -43,7 +45,7 @@ class PassthroughTest < Test::Unit::TestCase
 		assert_equal :running, RExec::Daemon::ProcessFile.status(TestPassthroughServer)
 		
 		EventMachine.run do
-			resolver = RubyDNS::Resolver.new([[:udp, "127.0.0.1", 5300], [:tcp, "127.0.0.1", 5300]])
+			resolver = RubyDNS::Resolver.new(TestPassthroughServer::SERVER_PORTS)
 		
 			resolver.query("google.com") do |response|
 				answer = response.answer.first

data/test/test_rules.rb

@@ -0,0 +1,53 @@
+
+require 'helper'
+require 'pathname'
+
+require 'rubydns'
+require 'rubydns/resolver'
+require 'rubydns/extensions/string'
+
+class RulesTest < Test::Unit::TestCase
+	IN = Resolv::DNS::Resource::IN
+	
+	def setup
+		@server = RubyDNS::Server.new
+		@true_callback = Proc.new { true }
+	end
+	
+	def teardown
+	end
+	
+	def test_string_pattern
+		rule = RubyDNS::Server::Rule.new(["foobar", IN::A], @true_callback)
+		
+		assert rule.call(@server, "foobar", IN::A)
+		assert !rule.call(@server, "barfoo", IN::A)
+		assert !rule.call(@server, "foobar", IN::TXT)
+	end
+	
+	def test_regexp_pattern
+		rule = RubyDNS::Server::Rule.new([/foo/, IN::A], @true_callback)
+		
+		assert rule.call(@server, "foobar", IN::A)
+		assert !rule.call(@server, "barbaz", IN::A)
+		assert !rule.call(@server, "foobar", IN::TXT)
+	end
+	
+	def test_callback_pattern
+		calls = 0
+		
+		callback = Proc.new do |name, resource_class|
+			# A counter used to check the number of times this block was invoked.
+			calls += 1
+			
+			name.size == 6
+		end
+		
+		rule = RubyDNS::Server::Rule.new([callback], @true_callback)
+		
+		assert rule.call(@server, "foobar", IN::A)
+		assert !rule.call(@server, "foobarbaz", IN::A)
+		
+		assert_equal 2, calls
+	end
+end

data/test/test_slow_server.rb

@@ -0,0 +1,77 @@
+
+require 'helper'
+require 'pathname'
+
+require 'rubydns'
+require 'rubydns/resolver'
+require 'rubydns/extensions/string'
+
+class SlowServer < RExec::Daemon::Base
+	SERVER_PORTS = [[:udp, '127.0.0.1', 5330], [:tcp, '127.0.0.1', 5330]]
+	
+	@@base_directory = File.dirname(__FILE__)
+
+	Name = Resolv::DNS::Name
+	IN = Resolv::DNS::Resource::IN
+
+	def self.run
+		RubyDNS::run_server(:listen => SERVER_PORTS) do
+			match(/\.*.com/, IN::A) do |match, transaction|
+				transaction.defer!
+			
+				# No domain exists, after 5 seconds:
+				EventMachine::Timer.new(2) do
+					transaction.failure!(:NXDomain)
+				end
+			end
+		
+			otherwise do |transaction|
+				transaction.failure!(:NXDomain)
+			end
+		end
+	end
+end
+
+class SlowServerTest < Test::Unit::TestCase
+	def setup
+		SlowServer.start
+	end
+	
+	def teardown
+		SlowServer.stop
+	end
+	
+	def test_slow_request
+		start_time = Time.now
+		end_time = nil
+		
+		resolver = RubyDNS::Resolver.new(SlowServer::SERVER_PORTS, :timeout => 10)
+		
+		EventMachine::run do
+			resolver.query("apple.com", IN::A) do |response|
+				end_time = Time.now
+				
+				EventMachine::stop
+			end
+		end
+		
+		assert (end_time - start_time) > 2.0
+	end
+	
+	def test_normal_request
+		start_time = Time.now
+		end_time = nil
+		
+		resolver = RubyDNS::Resolver.new(SlowServer::SERVER_PORTS, :timeout => 10)
+		
+		EventMachine::run do
+			resolver.query("oriontransfer.org", IN::A) do |response|
+				end_time = Time.now
+				
+				EventMachine::stop
+			end
+		end
+		
+		assert (end_time - start_time) < 2.0
+	end
+end

data/test/test_truncation.rb

@@ -7,6 +7,8 @@ require 'rubydns/resolver'
 require 'rubydns/extensions/string'
 
 class TruncatedServer < RExec::Daemon::Base
+	SERVER_PORTS = [[:udp, '127.0.0.1', 5320], [:tcp, '127.0.0.1', 5320]]
+	
 	@@base_directory = File.dirname(__FILE__)
 
 	Name = Resolv::DNS::Name
@@ -14,7 +16,7 @@ class TruncatedServer < RExec::Daemon::Base
 
 	def self.run
 		# Start the RubyDNS server
-		RubyDNS::run_server(:listen => [[:udp, '0.0.0.0', 5320], [:tcp, '0.0.0.0', 5320]]) do
+		RubyDNS::run_server(:listen => SERVER_PORTS) do
 			match("truncation", IN::TXT) do |transaction|
 				text = "Hello World! " * 100
 				transaction.respond!(*text.chunked)
@@ -38,7 +40,7 @@ class TruncationTest < Test::Unit::TestCase
 	end
 	
 	def test_tcp_failover
-		resolver = RubyDNS::Resolver.new([[:udp, '127.0.0.1', 5320], [:tcp, '127.0.0.1', 5320]])
+		resolver = RubyDNS::Resolver.new(TruncatedServer::SERVER_PORTS)
 		
 		EventMachine::run do
 			resolver.query("truncation", IN::TXT) do |response|

metadata

@@ -1,48 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
+  version: 0.5.1
   prerelease: 
-  version: 0.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rexec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
-  type: :runtime
-  name: rexec
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :runtime
-  name: eventmachine
 description: 
 email: samuel@oriontransfer.org
 executables:
@@ -53,8 +53,13 @@ extra_rdoc_files: []
 files:
 - bin/rd-dns-check
 - bin/rd-resolve-test
-- lib/rubydns.rb
 - lib/rubydns/chunked.rb
+- lib/rubydns/extensions/hexdump.rb
+- lib/rubydns/extensions/resolv.rb
+- lib/rubydns/extensions/string-1.8.rb
+- lib/rubydns/extensions/string-1.9.2.rb
+- lib/rubydns/extensions/string-1.9.3.rb
+- lib/rubydns/extensions/string.rb
 - lib/rubydns/handler.rb
 - lib/rubydns/message.rb
 - lib/rubydns/resolver.rb
@@ -62,31 +67,34 @@ files:
 - lib/rubydns/system.rb
 - lib/rubydns/transaction.rb
 - lib/rubydns/version.rb
-- lib/rubydns/extensions/hexdump.rb
-- lib/rubydns/extensions/resolv-1.8.rb
-- lib/rubydns/extensions/resolv-1.9.rb
-- lib/rubydns/extensions/string-1.8.rb
-- lib/rubydns/extensions/string-1.9.2.rb
-- lib/rubydns/extensions/string-1.9.3.rb
-- lib/rubydns/extensions/string.rb
-- test/daemon1.rb
-- test/daemon2.rb
-- test/example1.rb
-- test/fortune-dns.rb
+- lib/rubydns.rb
+- test/examples/GeoLiteCountry.dat
+- test/examples/dropping-dns.rb
+- test/examples/fortune-dns.rb
+- test/examples/geoip-dns.rb
+- test/examples/log/DroppingDaemon.log
+- test/examples/log/FortuneDNS.log
+- test/examples/log/GeoIPDNSDaemon.log
+- test/examples/log/TestDaemon.log
+- test/examples/run/DroppingDaemon.pid
+- test/examples/run/GeoIPDNSDaemon.pid
+- test/examples/soa-dns.rb
+- test/examples/test-dns-1.rb
+- test/examples/test-dns-2.rb
 - test/helper.rb
 - test/hosts.txt
-- test/soa_example1.rb
+- test/log/BasicTestServer.log
+- test/log/SlowServer.log
+- test/log/TestPassthroughServer.log
+- test/log/TruncatedServer.log
 - test/test_daemon.rb
 - test/test_domains.txt
 - test/test_passthrough.rb
 - test/test_resolver.rb
+- test/test_rules.rb
+- test/test_slow_server.rb
 - test/test_system.rb
 - test/test_truncation.rb
-- test/log/BasicTestServer.log
-- test/log/FortuneDNS.log
-- test/log/TestPassthroughServer.log
-- test/log/TruncatedServer.log
-- test/TruncatedServer/log/daemon.log
 - rakefile.rb
 - Gemfile
 - README.md
@@ -101,10 +109,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 2002549777813010636
       version: '0'
       segments:
       - 0
+      hash: 1826136753171810618
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/rubydns/extensions/resolv-1.9.rb

@@ -1,111 +0,0 @@
-# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
-# 
-# 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 'resolv'
-
-class Resolv
-	class DNS
-		# This issue was not fixed in 1.9.3 but the proposed patch works as expected:
-		# https://bugs.ruby-lang.org/issues/4788
-		def fetch_resource(name, typeclass)
-			lazy_initialize
-			requester = make_udp_requester
-			senders = {}
-			begin
-				@config.resolv(name) {|candidate, tout, nameserver, port|
-					msg = Message.new
-					msg.rd = 1
-					msg.add_question(candidate, typeclass)
-					unless sender = senders[[candidate, nameserver, port]]
-						sender = senders[[candidate, nameserver, port]] =
-						requester.sender(msg, candidate, nameserver, port)
-					end
-					reply, reply_name = requester.request(sender, tout)
-					case reply.rcode
-					when RCode::NoError
-						if reply.tc == 1 and not Requester::TCP === requester
-							requester.close
-							# Retry via TCP:
-							requester = make_tcp_requester(nameserver, port)
-							senders = {}
-							# This will use TCP for all remaining candidates (assuming the
-							# current candidate does not already respond successfully via
-							# TCP).  This makes sense because we already know the full
-							# response will not fit in an untruncated UDP packet.
-							redo
-						else
-							yield(reply, reply_name)
-						end
-						return
-					when RCode::NXDomain
-						raise Config::NXDomain.new(reply_name.to_s)
-					else
-						raise Config::OtherResolvError.new(reply_name.to_s)
-					end
-				}
-			ensure
-				requester.close
-			end
-		end
-
-		def each_resource(name, typeclass, &proc)
-			fetch_resource(name, typeclass) do |reply, reply_name|
-				extract_resources(reply, reply_name, typeclass, &proc)
-			end
-		end
-
-		# Queries the given DNS server and returns its response in its entirety.
-		# This allows such responses to be passed upstream with little or no
-		# modification/reinterpretation.
-		def query(name, typeclass)
-			fetch_resource(name, typeclass) do |reply, reply_name|
-				return reply, reply_name
-			end
-		end
-
-		class Message
-			# Merge the given message with this message. A number of heuristics are
-			# applied in order to ensure that the result makes sense. For example,
-			# If the current message is not recursive but is being merged with a
-			# message that was recursive, this bit is maintained. If either message
-			# is authoritive, then the result is also authoritive.
-			#
-			# Modifies the current message in place.
-			def merge! (other)
-				# Authoritive Answer
-				@aa = @aa && other.aa
-
-				@question += other.question
-				@answer += other.answer
-				@authority += other.authority
-				@additional += other.additional
-
-				# Recursion Available
-				@ra = @ra || other.ra
-
-				# Result Code (Error Code)
-				@rcode = other.rcode unless other.rcode == 0
-
-				# Recursion Desired
-				@rd = @rd || other.rd
-			end
-		end
-	end
-end