rubydns 0.6.2 → 0.6.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDQzNGMwMWNhMTU4MDViZWRjYjc0NzJiMDNlZmE5MmU3MmEwMTc0NQ==
+    MGQ5MTRkMjlkNDRiZGQ2OGIxYzc4NWZhMGY1YzQxYTdkNTIyMGE5Ng==
   data.tar.gz: !binary |-
-    NmRiZTY5OTg3MzYwMWNiMWQxN2ZhMGI0ZTgzMTg2YmM3NWFjYTY1ZA==
+    YTAzYWRhYTQxZWY0MGI3NTAyNmE1OTIzZmYwNThjODY3NTYwODNhNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTQ0NjAzNzRlMTEyZTI5ZGM4YThhMGM1ZjhmOGI3Mzg5YjFhNThkYTEzOWRk
-    NzM5MDQwNmJlMDA3ZjcyY2FjNWI2NTBkNGMyZGFlZGIxMzRlMzE1YjQyODE0
-    Y2IyYTM2MDg5MmQ4Mjc2MDcyMDYzNWY3OWFkY2RjYzVhMmM5NGQ=
+    NzA1NTM4MmVkYTQ5YmQ0NjU3MmMyOWVlZGVjMWY0MmI5ZDg0OWYxZDMzYzQz
+    NWU4YTM5MTE5N2IwZGYxYTJhMDk0NGQyYjNjNGNlZDVkYWFmNGNkYjYyYWM4
+    ZTk4ZWI0NzI1MjNkYjVjNTI2MTc2MWJkMzNmOGU0OTJhM2EzZTA=
   data.tar.gz: !binary |-
-    ODkzMGViNTZjZmNhZWQ3OGY4NTY4Mzc0MzZmN2I3NjNiOTBhMzNmODM3MjY5
-    NTk2MmE4N2MzYWE1YzgzMTI4MjU2NTRlNjEwZDJmOGUyZTE3NzQwZmFmNzVi
-    ZTVjYTBkYjA1ZDg4Mjc5ZDI3YjA3ZmNlOTc4YzJiOTcyODA2MTY=
+    NTlkYzgxNzFmY2IwM2I3NTdmMjExOTAzODIwZGY3YjMwZDQ0Y2E2ZTc2MDQ3
+    NDE0MWUzZTJmZDg1ZGIxYTRkMzU3MzhiMjBjZDM1ZTM4NTQzODcwOTRkODE1
+    ZWJmYzBhMzA1MWNlMzA5MjZiZjVhZGRiMmIzZDg0MTVmMmVhOWM=

data/lib/rubydns/transaction.rb

@@ -115,12 +115,19 @@ module RubyDNS
 		#
 		# A second argument, options, provides some control over the passthrough process.
 		# :force => true, ensures that the query will occur even if recursion is not requested.
+		# :name => resource_name, override the name for the request as it is passed to 
+		# the resolver. Implies :force.
+		# :resource_class => class, overried the resource class for a request as it is passed
+		# to the resolver.
 		def passthrough(resolver, options = {}, &block)
-			if @query.rd || options[:force]
+			if @query.rd || options[:force] || options[:name]
 				# Resolver is asynchronous, so we are now deferred:
 				defer!
 
-				resolver.query(name, resource_class) do |response|
+				query_name = options[:name] || name
+				query_resource_class = options[:resource_class] || resource_class
+
+				resolver.query(query_name, query_resource_class) do |response|
 					case response
 					when RubyDNS::Message
 						yield response

data/lib/rubydns/version.rb

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

data/test/examples/wikipedia-dns.rb

@@ -0,0 +1,119 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+# 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 'rubygems'
+
+require 'rexec'
+require 'rexec/daemon'
+
+require 'rubygems'
+
+require 'rubydns'
+require 'rubydns/extensions/string'
+
+require 'em-http'
+require 'cgi'
+require 'nokogiri'
+require 'json'
+
+require 'digest/md5'
+
+# You might need to change the user name "daemon". This can be a user name or a user id.
+RUN_AS = "daemon"
+
+if RExec.current_user != "root"
+	$stderr.puts "Sorry, this command needs to be run as root!"
+	exit 1
+end
+
+module Wikipedia
+	def self.summary_url(title)
+		"http://en.wikipedia.org/w/api.php?action=parse&page=#{CGI.escape title}&prop=text&section=0&format=json"
+	end
+	
+	def self.extract_summary(json_text)
+		document = JSON::parse(json_text)
+		return Nokogiri::HTML(document["parse"]["text"]["*"]).css('p')[0].text
+	rescue
+		return "Invalid Article."
+	end
+end
+
+# To use, start the daemon and try:
+# dig @localhost fortune CNAME
+class WikipediaDNS < RExec::Daemon::Base
+	@@base_directory = File.dirname(__FILE__)
+
+	Name = Resolv::DNS::Name
+	IN = Resolv::DNS::Resource::IN
+
+	def self.run
+		# Don't buffer output (for debug purposes)
+		$stderr.sync = true
+		
+		cache = {}
+		stats = {:requested => 0}
+		
+		# Start the RubyDNS server
+		RubyDNS::run_server do
+			on(:start) do
+				RExec.change_user(RUN_AS)
+				if ARGV.include?("--debug")
+					@logger.level = Logger::DEBUG
+				else
+					@logger.level = Logger::WARN
+				end
+			end
+			
+			match(/stats\.wikipedia/, IN::TXT) do |transaction|
+				transaction.respond!(*stats.inspect.chunked)
+			end
+			
+			match(/(.+)\.wikipedia/, IN::TXT) do |transaction, match_data|
+				title = match_data[1]
+				stats[:requested] += 1
+				
+				transaction.defer!
+				
+				http = EventMachine::HttpRequest.new(Wikipedia.summary_url(title)).get
+		
+				http.callback do
+					summary = Wikipedia.extract_summary(http.response)
+					transaction.respond!(*summary.chunked)
+				end
+				
+				http.errback do
+					transaction.failure!(:ServFail)
+				end
+			end
+			
+			# Default DNS handler
+			otherwise do |transaction|
+				transaction.failure!(:NXDomain)
+			end
+		end
+	end
+end
+
+# RExec daemon runner
+WikipediaDNS.daemonize

data/test/test_passthrough.rb

@@ -43,6 +43,10 @@ class TestPassthroughServer < RExec::Daemon::Base
 				transaction.passthrough!(resolver)
 			end
 
+			match(/a-(.*\.org)/) do |transaction, match_data|
+				transaction.passthrough!(resolver, :name => match_data[1])
+			end
+
 			# Default DNS handler
 			otherwise do |transaction|
 				transaction.failure!(:NXDomain)
@@ -75,6 +79,26 @@ class PassthroughTest < Test::Unit::TestCase
 			end
 		end
 		
+		assert answer != nil
+		assert answer.count > 0
+	end
+	
+	def test_basic_dns_prefix
+		answer = nil
+		
+		assert_equal :running, RExec::Daemon::ProcessFile.status(TestPassthroughServer)
+		
+		EventMachine.run do
+			resolver = RubyDNS::Resolver.new(TestPassthroughServer::SERVER_PORTS)
+		
+			resolver.query("a-slashdot.org") do |response|
+				answer = response.answer.first
+				
+				EventMachine.stop
+			end
+		end
+		
+		assert answer != nil
 		assert answer.count > 0
 	end
 end

data/test/test_resolver.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexec
@@ -83,6 +83,7 @@ files:
 - test/examples/soa-dns.rb
 - test/examples/test-dns-1.rb
 - test/examples/test-dns-2.rb
+- test/examples/wikipedia-dns.rb
 - test/helper.rb
 - test/hosts.txt
 - test/test_daemon.rb
@@ -123,6 +124,7 @@ test_files:
 - test/examples/soa-dns.rb
 - test/examples/test-dns-1.rb
 - test/examples/test-dns-2.rb
+- test/examples/wikipedia-dns.rb
 - test/helper.rb
 - test/hosts.txt
 - test/test_daemon.rb