rubydns 0.6.7 → 0.7.0

data/lib/rubydns/version.rb

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

data/rubydns.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
 	spec.required_ruby_version = '>= 1.9.3'
 
-	spec.add_dependency("rexec", "~> 1.5.1")
+	spec.add_dependency("rexec", "~> 1.6.2")
 	spec.add_dependency("eventmachine", "~> 1.0.0")
 
 	spec.has_rdoc = "yard"

data/test/examples/dropping-dns.rb

@@ -50,7 +50,7 @@ class DroppingDaemon < RExec::Daemon::Base
 			match(/(m?i?c?r?o?s?o?f?t)/) do |transaction, match_data|
 				if match_data[1].size > 7
 					logger.info "Dropping domain MICROSOFT..."
-					transaction.failure!(:NXDomain)
+					transaction.fail!(:NXDomain)
 				else
 					# Pass the request to the otherwise handler
 					false
@@ -60,7 +60,7 @@ class DroppingDaemon < RExec::Daemon::Base
 			# Hmm....
 			match(/^(.+\.)?sco\./) do |transaction|
 				logger.info "Dropping domain SCO..."
-				transaction.failure!(:NXDomain)
+				transaction.fail!(:NXDomain)
 			end
 
 			# Default DNS handler

data/test/examples/fortune-dns.rb

@@ -79,7 +79,7 @@ class FortuneDNS < RExec::Daemon::Base
 				if fortune
 					transaction.respond!(*fortune.chunked)
 				else
-					transaction.failure!(:NXDomain)
+					transaction.fail!(:NXDomain)
 				end
 			end
 			
@@ -100,7 +100,7 @@ class FortuneDNS < RExec::Daemon::Base
 			
 			# Default DNS handler
 			otherwise do |transaction|
-				transaction.failure!(:NXDomain)
+				transaction.fail!(:NXDomain)
 			end
 		end
 	end

data/test/examples/soa-dns.rb

@@ -77,6 +77,6 @@ RubyDNS::run_server(:listen => [[:udp, "0.0.0.0", 5400]]) do
 	# Default DNS handler
 	otherwise do |transaction|
 		# Non-Existant Domain
-		transaction.failure!(:NXDomain)
+		transaction.fail!(:NXDomain)
 	end
 end

data/test/examples/wikipedia-dns.rb

@@ -103,13 +103,13 @@ class WikipediaDNS < RExec::Daemon::Base
 				end
 				
 				http.errback do
-					transaction.failure!(:ServFail)
+					transaction.fail!(:ServFail)
 				end
 			end
 			
 			# Default DNS handler
 			otherwise do |transaction|
-				transaction.failure!(:NXDomain)
+				transaction.fail!(:NXDomain)
 			end
 		end
 	end

data/test/test_daemon.rb

@@ -47,7 +47,7 @@ class BasicTestServer < RExec::Daemon::Base
 
 			# Default DNS handler
 			otherwise do |transaction|
-				transaction.failure!(:NXDomain)
+				transaction.fail!(:NXDomain)
 			end
 		end
 	end
@@ -68,7 +68,7 @@ class DaemonTest < Test::Unit::TestCase
 		assert_equal :running, RExec::Daemon::ProcessFile.status(BasicTestServer)
 		
 		EventMachine.run do
-			resolver = resolver = RubyDNS::Resolver.new(BasicTestServer::SERVER_PORTS)
+			resolver = RubyDNS::Resolver.new(BasicTestServer::SERVER_PORTS)
 		
 			resolver.query("test.local") do |response|
 				answer = response.answer.first
@@ -85,7 +85,7 @@ class DaemonTest < Test::Unit::TestCase
 		assert_equal :running, RExec::Daemon::ProcessFile.status(BasicTestServer)
 
 		EventMachine.run do
-			resolver = resolver = RubyDNS::Resolver.new(BasicTestServer::SERVER_PORTS)
+			resolver = RubyDNS::Resolver.new(BasicTestServer::SERVER_PORTS)
 
 			resolver.query("foobar") do |response|
 				answer = response.answer.first

data/test/test_message.rb

@@ -0,0 +1,41 @@
+require 'rubydns'
+
+class MessageTest < Test::Unit::TestCase
+	def setup
+	end
+	
+	def teardown
+	end
+
+  def hex2bin(hexstring)
+    ret = "\x00" * (hexstring.length / 2)
+    ret.force_encoding("BINARY")
+    offset = 0
+    while offset < hexstring.length
+      hex_byte = hexstring[offset..(offset+1)]
+      ret.setbyte(offset/2, hex_byte.to_i(16))
+      offset += 2
+    end
+    ret
+  end
+
+	def test_good_decode
+    data = hex2bin("1d008180000100080000000103777777057961686f6f03636f6d0000010001c00c000500010000012c000f0666642d667033037767310162c010c02b000500010000012c00090664732d667033c032c046000500010000003c00150e64732d616e792d6670332d6c666203776131c036c05b000500010000012c00120f64732d616e792d6670332d7265616cc06ac07c000100010000003c0004628afc1ec07c000100010000003c0004628bb495c07c000100010000003c0004628bb718c07c000100010000003c0004628afd6d0000291000000000000000")
+		
+    decoded = RubyDNS.decode_message(data)
+    assert_equal(RubyDNS::Message, decoded.class)
+    assert_equal(0x1d00, decoded.id)
+    assert_equal(1, decoded.question.count)
+    assert_equal(8, decoded.answer.count)
+    assert_equal(0, decoded.authority.count)
+    assert_equal(1, decoded.additional.count)
+	end
+	
+	def test_bad_AAAA_length
+    data = hex2bin("ea9e8180000100010000000108626169636169636e03636f6d00001c0001c00c001c00010000011e000432177b770000291000000000000000")
+		
+    assert_raise(Resolv::DNS::DecodeError) do
+      RubyDNS.decode_message(data)
+    end
+	end
+end

data/test/test_passthrough.rb

@@ -49,19 +49,23 @@ class TestPassthroughServer < RExec::Daemon::Base
 
 			# Default DNS handler
 			otherwise do |transaction|
-				transaction.failure!(:NXDomain)
+				transaction.fail!(:NXDomain)
 			end
 		end
 	end
 end
 
 class PassthroughTest < Test::Unit::TestCase
+	# LOG_PATH = File.join(__dir__, "log/TestPassthroughServer.log")
+	
 	def setup
+		# system("rm", LOG_PATH)
 		TestPassthroughServer.start
 	end
 	
 	def teardown
 		TestPassthroughServer.stop
+		# system("cat", LOG_PATH)
 	end
 	
 	def test_basic_dns

data/test/test_rules.rb

@@ -39,7 +39,7 @@ class RulesTest < Test::Unit::TestCase
 	end
 	
 	def test_string_pattern
-		rule = RubyDNS::Server::Rule.new(["foobar", IN::A], @true_callback)
+		rule = RubyDNS::RuleBasedServer::Rule.new(["foobar", IN::A], @true_callback)
 		
 		assert rule.call(@server, "foobar", IN::A)
 		assert !rule.call(@server, "barfoo", IN::A)
@@ -47,7 +47,7 @@ class RulesTest < Test::Unit::TestCase
 	end
 	
 	def test_regexp_pattern
-		rule = RubyDNS::Server::Rule.new([/foo/, IN::A], @true_callback)
+		rule = RubyDNS::RuleBasedServer::Rule.new([/foo/, IN::A], @true_callback)
 		
 		assert rule.call(@server, "foobar", IN::A)
 		assert !rule.call(@server, "barbaz", IN::A)
@@ -64,7 +64,7 @@ class RulesTest < Test::Unit::TestCase
 			name.size == 6
 		end
 		
-		rule = RubyDNS::Server::Rule.new([callback], @true_callback)
+		rule = RubyDNS::RuleBasedServer::Rule.new([callback], @true_callback)
 		
 		assert rule.call(@server, "foobar", IN::A)
 		assert !rule.call(@server, "foobarbaz", IN::A)

data/test/test_slow_server.rb

@@ -38,16 +38,18 @@ class SlowServer < RExec::Daemon::Base
 	def self.run
 		RubyDNS::run_server(:listen => SERVER_PORTS) do
 			match(/\.*.com/, IN::A) do |transaction|
-				transaction.defer!
-			
-				# No domain exists, after 5 seconds:
-				EventMachine::Timer.new(5) do
-					transaction.failure!(:NXDomain)
+				defer do |fiber|
+					# No domain exists, after 2 seconds:
+					EventMachine::Timer.new(2) do
+						transaction.fail!(:NXDomain)
+					
+						fiber.resume
+					end
 				end
 			end
 		
 			otherwise do |transaction|
-				transaction.failure!(:NXDomain)
+				transaction.fail!(:NXDomain)
 			end
 		end
 	end

data/test/test_truncation.rb

@@ -36,6 +36,8 @@ class TruncatedServer < RExec::Daemon::Base
 	IN = Resolv::DNS::Resource::IN
 
 	def self.run
+		# RubyDNS::log_bad_messages!("bad.log")
+		
 		# Start the RubyDNS server
 		RubyDNS::run_server(:listen => SERVER_PORTS) do
 			match("truncation", IN::TXT) do |transaction|
@@ -45,7 +47,7 @@ class TruncatedServer < RExec::Daemon::Base
 			
 			# Default DNS handler
 			otherwise do |transaction|
-				transaction.failure!(:NXDomain)
+				transaction.fail!(:NXDomain)
 			end
 		end
 	end
@@ -65,8 +67,6 @@ class TruncationTest < Test::Unit::TestCase
 		
 		EventMachine::run do
 			resolver.query("truncation", IN::TXT) do |response|
-				
-				
 				text = response.answer.first
 				
 				assert_equal "Hello World! " * 100, text[2].strings.join

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -55,19 +55,17 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- .yardopts
 - Gemfile
 - README.md
 - Rakefile
 - bin/rd-dns-check
 - bin/rd-resolve-test
 - lib/rubydns.rb
+- lib/rubydns/binary_string.rb
 - lib/rubydns/chunked.rb
-- lib/rubydns/extensions/hexdump.rb
 - lib/rubydns/extensions/logger.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
@@ -88,6 +86,7 @@ files:
 - test/hosts.txt
 - test/test_daemon.rb
 - test/test_domains.txt
+- test/test_message.rb
 - test/test_passthrough.rb
 - test/test_resolver.rb
 - test/test_rules.rb
@@ -114,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: An easy to use DNS server and resolver for Ruby.
@@ -130,9 +129,11 @@ test_files:
 - test/hosts.txt
 - test/test_daemon.rb
 - test/test_domains.txt
+- test/test_message.rb
 - 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
+has_rdoc: yard

data/lib/rubydns/extensions/hexdump.rb

@@ -1,38 +0,0 @@
-# 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 'stringio'
-
-class String
-	def hexdump
-		i = 1
-		out = StringIO.new
-		
-		out.puts "Size: #{self.bytesize}"
-		while (self.length > 16*(i-1))
-			a = self.slice(16*(i-1)..(16*i)-1)
-			out.printf("%06x: %4.4x %4.4x %4.4x %4.4x   %4.4x %4.4x %4.4x %4.4x ", (i-1)*16,  *a.unpack("n16"))
-			out.printf("|%s|\n", a.tr("^\040-\176","."))
-			i += 1
-		end
-		
-		return out.string
-	end
-end

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

@@ -1,35 +0,0 @@
-# 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 'stringio'
-
-class String
-	def bytesize
-		size
-	end
-	
-	def byteslice(*args)
-		self[*args]
-	end
-end
-
-module RubyDNS
-	BinaryStringIO = StringIO
-end

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

@@ -1,29 +0,0 @@
-# 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 'stringio'
-require 'rubydns/extensions/string-1.9.3'
-
-class String
-	def byteslice(*args)
-		self.dup.force_encoding("BINARY").slice(*args)
-	end
-end
-