rubydns 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4deb19b1b3f2428b941ec102d2cc15a640ad8211
-  data.tar.gz: 13c3d5e62e811bbb25c2eee5123195c608b30303
+  metadata.gz: 898751427b20f0b4ca38ef3847c63846cb0f31bb
+  data.tar.gz: 87e103c621007b21ac049a3e00ebed1ea03b066b
 SHA512:
-  metadata.gz: 532c64c0de7e2893704ff62e1cd523a155dacbc42e332aef20c44723d5fce08218cbfa371cb458049a94cf30a4d885b3787a8ee1ee2b525f21afa7d4dad5e0d0
-  data.tar.gz: 250674b3f8554f7ceb493fdd0b0f7a4b8d1cee949ce27b16276db5ef83fe5ab2868fce3a8e4037976f8a307538bf116b0775271a6b07445f29f909448f4b3c4d
+  metadata.gz: 0d7600616e59ed6bf93c7da9b892d2dc71e181512ef1f85721057214bf86eb28c36b614013cc947685111a136b6fb57279411ed3ffe8a69bb1757782f34f9f5a
+  data.tar.gz: 16a27d29545fd438089be5f31bc5db1395038e5ddf06edc7913926ab5430f5c9f4f067b6485c70a4ea2cb5058766c0ebbe6a2ae2050bf3dda5d78ab9d5c477fb

data/README.md

@@ -107,7 +107,7 @@ These benchmarks are included in the unit tests.
 
 ## Compatibility
 
-### Migrating from RubyDNS 0.8.x 0.9.x
+### Migrating from RubyDNS 0.8.x to 0.9.x
 
 RubyDNS 0.9.0 is based on a branch which replaced EventMachine with Celluloid. This reduces the complexity in writing concurrent systems hugely, but it is also a largely untested code path. RubyDNS 0.8.x using EventMachine has been tested over 4 years now by many projects.
 

data/examples/README.md

@@ -13,7 +13,7 @@ By default this server will listen for UDP requests on port 5300 and does not ne
 To start the server, ensure that you're in the examples subdirectory and type
 
     bundle
-    bundle exec ./flakey-dns.rb
+    bundle exec ./flakey-dns.rb start
 
 To see it in action you can then query some domains.  For example,
 
@@ -51,7 +51,7 @@ system.
 To start the server, ensure that you're in the examples subdirectory and type
 
     bundle
-    sudo bundle exec ./fortune-dns.rb
+    sudo bundle exec ./fortune-dns.rb start
 
 To create a new fortune type
 
@@ -98,7 +98,7 @@ By default this server will listen for UDP requests on port 5300 and does not ne
 To start the server, ensure that you're in the examples subdirectory and type
 
     bundle
-    sudo bundle exec ./geoip-dns.rb
+    sudo bundle exec ./geoip-dns.rb start
 
 To see the behavior, run a DNS query against the server where you are running the GeoIPDNS
 daemon.  Depending on the continent to which the client machine's IP address is mapped,
@@ -124,7 +124,7 @@ system.
 To start the server, ensure that you're in the examples subdirectory and type
 
     bundle
-    sudo bundle exec ./wikipedia-dns.rb
+    sudo bundle exec ./wikipedia-dns.rb start
 
 To query Wikipedia, pick a term - say, 'helium' - and make a DNS query like
 

data/examples/flakey-dns.rb

@@ -39,6 +39,10 @@ class FlakeyDNS < Process::Daemon
 
 	def startup
 		RubyDNS.run_server(listen: INTERFACES) do
+			# Use a Celluloid supervisor so the system recovers if the actor dies
+			fallback_resolver_supervisor =
+			  RubyDNS::Resolver.supervise(RubyDNS::System.nameservers)
+
 			# Fail the resolution of certain domains ;)
 			match(/(m?i?c?r?o?s?o?f?t)/) do |transaction, match_data|
 				if match_data[1].size > 7
@@ -59,14 +63,10 @@ class FlakeyDNS < Process::Daemon
 			# Default DNS handler
 			otherwise do |transaction|
 				logger.info 'Passing DNS request upstream...'
-				transaction.passthrough!(FlakeyDNS.fallback_resolver)
+				transaction.passthrough!(fallback_resolver_supervisor.actors.first)
 			end
 		end
 	end
-
-	def self.fallback_resolver
-		@resolver ||= RubyDNS::Resolver.new(RubyDNS::System.nameservers)
-	end
 end
 
 FlakeyDNS.daemonize

data/examples/geoip-dns.rb

@@ -58,6 +58,8 @@ class GeoIPDNS < Process::Daemon
 
 	def startup
 		RubyDNS.run_server(listen: INTERFACES) do
+			fallback_resolver_supervisor =
+			  RubyDNS::Resolver.supervise(RubyDNS::System.nameservers)
 			match(//, IN::A) do |transaction|
 				logger.debug 'In block'
 
@@ -82,15 +84,11 @@ class GeoIPDNS < Process::Daemon
 			# Default DNS handler
 			otherwise do |transaction|
 				logger.debug 'In otherwise'
-				transaction.passthrough!(GeoIPDNS.fallback_resolver)
+				transaction.passthrough!(fallback_resolver_supervisor.actors.first)
 			end
 		end
 	end
 
-	def self.fallback_resolver
-		@resolver ||= RubyDNS::Resolver.new(RubyDNS::System.nameservers)
-	end
-
 	# Maps each continent code to a fixed IP address for the response.
 	# A simple mapper to demonstrate the behavior.
 	def self.answer_for_continent_code(code)

data/examples/wikipedia-dns.rb

@@ -81,7 +81,8 @@ class WikipediaDNS < Process::Daemon
 
 		stats = { requested: 0 }
 
-		fetcher = HttpFetcher.new
+		# Use a Celluloid supervisor so the system recovers if the actor dies
+		fetcher = HttpFetcher.supervise
 
 		# Start the RubyDNS server
 		RubyDNS.run_server do
@@ -102,7 +103,7 @@ class WikipediaDNS < Process::Daemon
 				title = match_data[1]
 				stats[:requested] += 1
 
-				response = fetcher.get(Wikipedia.summary_url(title))
+				response = fetcher.actors.first.get(Wikipedia.summary_url(title))
 
 				summary =
 					Wikipedia.extract_summary(response).force_encoding('ASCII-8BIT')

data/lib/rubydns/handler.rb

@@ -124,7 +124,9 @@ module RubyDNS
 	
 	class UDPHandler < UDPSocketHandler
 		def initialize(server, host, port)
-			socket = UDPSocket.new
+			family = RubyDNS::address_family(host)
+			socket = UDPSocket.new(family)
+			
 			socket.bind(host, port)
 			
 			super(server, socket)

data/lib/rubydns/resolver.rb

@@ -147,7 +147,8 @@ module RubyDNS
 		end
 		
 		def try_udp_server(request, host, port)
-			socket = UDPSocket.new
+			family = RubyDNS::address_family(host)
+			socket = UDPSocket.new(family)
 			
 			socket.send(request.packet, 0, host, port)
 			

data/lib/rubydns/transaction.rb

@@ -22,7 +22,7 @@ module RubyDNS
 	
 	# This class provides all details of a single DNS question and response. This is used by the DSL to provide DNS related functionality.
 	# 
-	# The main functions to complete the trasaction are: {#append!} (evaluate a new query and append the results), {#passthrough!} (pass the query to an upstream server), {#respond!} (compute a specific response) and {#fail!} (fail with an error code).
+	# The main functions to complete the transaction are: {#append!} (evaluate a new query and append the results), {#passthrough!} (pass the query to an upstream server), {#respond!} (compute a specific response) and {#fail!} (fail with an error code).
 	class Transaction
 		# The default time used for responses (24 hours).
 		DEFAULT_TTL = 86400

data/lib/rubydns/transport.rb

@@ -19,10 +19,15 @@
 # THE SOFTWARE.
 
 require 'stringio'
+require 'ipaddr'
 
 require_relative 'message'
 
 module RubyDNS
+	def self.address_family(host)
+		return IPAddr.new(host).family
+	end
+	
 	# A helper class for processing incoming network data.
 	class BinaryStringIO < StringIO
 		def initialize

data/lib/rubydns/version.rb

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

data/spec/rubydns/ipv6_spec.rb

@@ -0,0 +1,70 @@
+#!/usr/bin/env ruby
+
+# Copyright, 2014, 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'
+require 'rubydns/system'
+
+module RubyDNS::SocketSpec
+	IN = Resolv::DNS::Resource::IN
+	
+	describe RubyDNS::TCPSocketHandler do
+		before(:all) do
+			Celluloid.shutdown
+			Celluloid.boot
+		end
+	
+		it "should create server with existing TCP socket" do
+			@server = RubyDNS::run_server(:listen => [[:tcp, '::', 2002]], asynchronous: true) do
+				resolver = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
+				
+				match(/.*\.com/, IN::A) do |transaction|
+					transaction.passthrough!(resolver)
+				end
+			end
+			
+			resolver = RubyDNS::Resolver.new([[:tcp, '::1', 2002]])
+			response = resolver.query('google.com')
+			expect(response.class).to be == RubyDNS::Message
+		end
+	end
+	
+	describe RubyDNS::UDPSocketHandler do
+		before(:all) do
+			Celluloid.shutdown
+			Celluloid.boot
+		end
+		
+		it "should create server with existing UDP socket" do
+			@server = RubyDNS::run_server(:listen => [[:udp, '::', 2002]], asynchronous: true) do
+				resolver = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
+			
+				match(/.*\.com/, IN::A) do |transaction|
+					transaction.passthrough!(resolver)
+				end
+			end
+			
+			resolver = RubyDNS::Resolver.new([[:udp, '::1', 2002]])
+			response = resolver.query('google.com')
+			expect(response.class).to be == RubyDNS::Message
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -153,6 +153,7 @@ files:
 - spec/rubydns/daemon_spec.rb
 - spec/rubydns/hosts.txt
 - spec/rubydns/injected_supervisor_spec.rb
+- spec/rubydns/ipv6_spec.rb
 - spec/rubydns/message_spec.rb
 - spec/rubydns/passthrough_spec.rb
 - spec/rubydns/resolver_performance_spec.rb
@@ -200,6 +201,7 @@ test_files:
 - spec/rubydns/daemon_spec.rb
 - spec/rubydns/hosts.txt
 - spec/rubydns/injected_supervisor_spec.rb
+- spec/rubydns/ipv6_spec.rb
 - spec/rubydns/message_spec.rb
 - spec/rubydns/passthrough_spec.rb
 - spec/rubydns/resolver_performance_spec.rb