rubydns 0.8.1 → 0.8.4

data/test/performance/bind9/named.conf

@@ -0,0 +1,14 @@
+
+options {
+	directory "./";
+
+	listen-on-v6 { none; };
+	listen-on { 127.0.0.1; };
+
+	pid-file "./named.pid";
+};
+
+zone "local" {
+	type master;
+	file "./local.zone";
+};

data/test/performance/million.rb

@@ -0,0 +1,87 @@
+#!/usr/bin/env ruby
+
+# 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 'rubydns'
+require 'benchmark'
+
+require 'stackprof'
+
+Name = Resolv::DNS::Name
+IN = Resolv::DNS::Resource::IN
+
+# Generate a million A record "domains":
+
+million = {}
+
+Benchmark.bm do |x|
+	x.report("Generate names") do
+		(1..1_000_000).each do |i|
+			domain = "domain#{i}.local"
+	
+			million[domain] = "#{69}.#{(i >> 16)%256}.#{(i >> 8)%256}.#{i%256}"
+		end
+	end
+end
+
+# Run the server:
+
+StackProf.run(mode: :cpu, out: 'rubydns.stackprof') do
+	RubyDNS::run_server(:listen => [[:udp, '0.0.0.0', 5300]]) do
+		@logger.level = Logger::WARN
+	
+		match(//, IN::A) do |transaction|
+			transaction.respond!(million[transaction.name])
+		end
+		
+		# Default DNS handler
+		otherwise do |transaction|
+			logger.info "Passing DNS request upstream..."
+			transaction.fail!(:NXDomain)
+			
+			EventMachine::stop
+		end
+	end
+end
+
+# Expected output:
+#
+# > dig @localhost -p 5300 domain1000000
+# 
+# ; <<>> DiG 9.8.3-P1 <<>> @localhost -p 5300 domain1000000
+# ; (3 servers found)
+# ;; global options: +cmd
+# ;; Got answer:
+# ;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 50336
+# ;; flags: qr aa rd; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 0
+# ;; WARNING: recursion requested but not available
+# 
+# ;; QUESTION SECTION:
+# ;domain1000000.			IN	A
+# 
+# ;; ANSWER SECTION:
+# domain1000000.		86400	IN	A	69.15.66.64
+# 
+# ;; Query time: 1 msec
+# ;; SERVER: 127.0.0.1#5300(127.0.0.1)
+# ;; WHEN: Fri May 16 19:17:48 2014
+# ;; MSG SIZE  rcvd: 47
+# 

data/test/test_daemon.rb

@@ -29,10 +29,12 @@ require 'process/daemon'
 class BasicTestServer < Process::Daemon
 	SERVER_PORTS = [[:udp, '127.0.0.1', 5350], [:tcp, '127.0.0.1', 5350]]
 
-	@@base_directory = File.dirname(__FILE__)
-
 	IN = Resolv::DNS::Resource::IN
 
+	def working_directory
+		File.expand_path("../tmp", __FILE__)
+	end
+
 	def startup
 		# Start the RubyDNS server
 		RubyDNS::run_server(:listen => SERVER_PORTS) do
@@ -44,6 +46,10 @@ class BasicTestServer < Process::Daemon
 				transaction.respond!("192.168.1.2")
 			end
 
+			match(/peername/, IN::A) do |transaction|
+				transaction.respond!(transaction[:connection].peername[1])
+			end
+
 			# Default DNS handler
 			otherwise do |transaction|
 				transaction.fail!(:NXDomain)
@@ -96,4 +102,20 @@ class DaemonTest < MiniTest::Test
 			end
 		end
 	end
+	
+	def test_peername
+		assert_equal :running, BasicTestServer.status
+
+		EventMachine.run do
+			resolver = RubyDNS::Resolver.new(BasicTestServer::SERVER_PORTS)
+
+			resolver.query("peername") do |response|
+				answer = response.answer.first
+				
+				assert_equal "127.0.0.1", answer[2].address.to_s
+				
+				EventMachine.stop
+			end
+		end
+	end
 end

data/test/test_passthrough.rb

@@ -30,7 +30,7 @@ class PassthroughServer < Process::Daemon
 	SERVER_PORTS = [[:udp, '127.0.0.1', 5340], [:tcp, '127.0.0.1', 5340]]
 	
 	def working_directory
-		File.join(__dir__, "tmp")
+		File.expand_path("../tmp", __FILE__)
 	end
 	
 	Name = Resolv::DNS::Name

data/test/test_resolver_performance.rb

@@ -86,6 +86,7 @@ class ResolverPerformanceTest < MiniTest::Test
 		rubydns_resolved = {}
 		resolv_resolved = {}
 		
+		puts nil, "Comparing resolvers..."
 		Benchmark.bm(20) do |x|
 			x.report("RubyDNS::Resolver") do
 				resolver = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
@@ -113,7 +114,7 @@ class ResolverPerformanceTest < MiniTest::Test
 			end
 		end
 		
-		DOMAINS.each do |domain|
+		DOMAINS.first(3).each do |domain|
 			# We don't really care if the responses aren't identical - they should be most of the time but due to the way DNS works this isn't always the case:
 			refute_empty resolv_resolved[domain]
 			refute_empty rubydns_resolved[domain]

data/test/test_server_performance.rb

@@ -0,0 +1,134 @@
+#!/usr/bin/env ruby
+
+# 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 'minitest/autorun'
+
+require 'rubydns'
+require 'process/daemon'
+
+require 'benchmark'
+
+class ServerPerformanceRubyDNS < Process::Daemon
+	IN = Resolv::DNS::Resource::IN
+	
+	def working_directory
+		File.expand_path("../tmp", __FILE__)
+	end
+	
+	def startup
+		million = {}
+		
+		puts "Generating domains..."
+		(1..5_000).each do |i|
+			domain = "domain#{i}.local"
+	
+			million[domain] = "#{69}.#{(i >> 16)%256}.#{(i >> 8)%256}.#{i%256}"
+		end
+		
+		puts "Starting DNS server..."
+		RubyDNS::run_server(:listen => [[:udp, '0.0.0.0', 5300]]) do
+			@logger.level = Logger::WARN
+			
+			match(//, IN::A) do |transaction|
+				puts "Responding to #{transaction.name}"
+				transaction.respond!(million[transaction.name])
+			end
+		
+			# Default DNS handler
+			otherwise do |transaction|
+				transaction.fail!(:NXDomain)
+			end
+		end
+	end
+end
+
+class ServerPerformanceBind9 < Process::Daemon
+	def working_directory
+		File.expand_path("../performance/bind9", __FILE__)
+	end
+	
+	def startup
+		exec(self.class.named_executable, "-c", "named.conf", "-f", "-p", "5400", "-g")
+	end
+	
+	def self.named_executable
+		# Check if named executable is available:
+		@named ||= `which named`.chomp
+	end
+end
+
+class ServerPerformanceTest < MiniTest::Test
+	DOMAINS = (1..1000).collect do |i|
+		"domain#{i}.local"
+	end
+	
+	def setup
+		@servers = []
+		@servers << ["RubyDNS::Server", 5300]
+		
+		ServerPerformanceRubyDNS.start
+		
+		unless ServerPerformanceBind9.named_executable.empty?
+			ServerPerformanceBind9.start
+			@servers << ["Bind9", 5400]
+		end
+		
+		# Give the daemons some time to start up:
+		sleep 2
+	end
+	
+	def teardown
+		ServerPerformanceRubyDNS.stop
+		
+		unless ServerPerformanceBind9.named_executable.empty?
+			ServerPerformanceBind9.stop
+		end
+	end
+	
+	def test_server_performance
+		resolved = {}
+		
+		puts nil, "Testing server performance..."
+		Benchmark.bm(20) do |x|
+			@servers.each do |name, port|
+				x.report(name) do
+					# Number of requests remaining since this is an asynchronous event loop:
+					5.times do
+						pending = DOMAINS.size
+						
+						EventMachine::run do
+							resolver = RubyDNS::Resolver.new([[:udp, '127.0.0.1', port]])
+						
+							DOMAINS.each do |domain|
+								resolver.addresses_for(domain) do |addresses|
+									resolved[domain] = addresses
+					
+									EventMachine::stop if (pending -= 1) == 0
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end

data/test/test_slow_server.rb

@@ -29,10 +29,8 @@ require 'process/daemon'
 class SlowServer < Process::Daemon
 	SERVER_PORTS = [[:udp, '127.0.0.1', 5330], [:tcp, '127.0.0.1', 5330]]
 	
-	@@base_directory = File.dirname(__FILE__)
-
 	def working_directory
-		File.join(__dir__, "tmp")
+		File.expand_path("../tmp", __FILE__)
 	end
 	
 	IN = Resolv::DNS::Resource::IN

data/test/test_truncation.rb

@@ -30,10 +30,8 @@ require 'process/daemon'
 class TruncatedServer < Process::Daemon
 	SERVER_PORTS = [[:udp, '127.0.0.1', 5320], [:tcp, '127.0.0.1', 5320]]
 	
-	@@base_directory = File.dirname(__FILE__)
-	
 	def working_directory
-		File.join(__dir__, "tmp")
+		File.expand_path("../tmp", __FILE__)
 	end
 	
 	IN = Resolv::DNS::Resource::IN

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.4
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: process-daemon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: "\t\tRubyDNS is a high-performance DNS server which can be easily integrated
@@ -80,9 +80,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - README.md
 - Rakefile
@@ -109,13 +109,18 @@ files:
 - test/examples/test-dns-2.rb
 - test/examples/wikipedia-dns.rb
 - test/hosts.txt
+- test/performance/benchmark.rb
+- test/performance/bind9/generate-local.rb
+- test/performance/bind9/local.zone
+- test/performance/bind9/named.conf
+- test/performance/million.rb
 - test/test_daemon.rb
-- test/test_domains.txt
 - test/test_message.rb
 - test/test_passthrough.rb
 - test/test_resolver.rb
 - test/test_resolver_performance.rb
 - test/test_rules.rb
+- test/test_server_performance.rb
 - test/test_slow_server.rb
 - test/test_system.rb
 - test/test_truncation.rb
@@ -129,17 +134,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An easy to use DNS server and resolver for Ruby.
@@ -152,13 +157,18 @@ test_files:
 - test/examples/test-dns-2.rb
 - test/examples/wikipedia-dns.rb
 - test/hosts.txt
+- test/performance/benchmark.rb
+- test/performance/bind9/generate-local.rb
+- test/performance/bind9/local.zone
+- test/performance/bind9/named.conf
+- test/performance/million.rb
 - test/test_daemon.rb
-- test/test_domains.txt
 - test/test_message.rb
 - test/test_passthrough.rb
 - test/test_resolver.rb
 - test/test_resolver_performance.rb
 - test/test_rules.rb
+- test/test_server_performance.rb
 - test/test_slow_server.rb
 - test/test_system.rb
 - test/test_truncation.rb

data/test/test_domains.txt

@@ -1,185 +0,0 @@
-0.channel18.facebook.com
-2leep.com
-EVIntl-ocsp.verisign.com
-EVSecure-ocsp.verisign.com
-a.tribalfusion.com
-a1059.g.akamai.net
-a126.g.akamai.net
-a1338.g.akamai.net
-a199.gi3.akamai.net
-a248.e.akamai.net
-a696.g.akamai.net
-a803.g.akamai.net
-ad.doubleclick.net
-ad.yieldmanager.com
-ad1.netshelter.net
-ad2.netshelter.net
-address.yahoo.com
-ads.adbrite.com
-ads.trademe.co.nz
-ads.tw.adsonar.com
-ads1.perfadbrite.com.akadns.net
-adsfac.us
-ajax.googleapis.com
-aleccolocco.blogspot.com
-anycast-asia.quantserve.com.akadns.net
-apps.facebook.com
-appspot.l.google.com
-ayako.oriontransfer.org
-b.scorecardresearch.com
-b1.adbrite.com
-backend.deviantart.com
-blog.nominet.org.uk
-c.fsdn.com
-cache-01.cleanprint.net
-clients.l.google.com
-clients1.google.com
-cms.myspacecdn.com
-configuration.apple.com
-d.yimg.com
-d1.openx.org
-data.coremetrics.com
-developer.apple.com
-devimages.apple.com
-dg.specificclick.net
-digg.analytics.live.com
-digg.com
-e.vistaprint.com
-englishrussia.com
-feeds.digg.com
-feeds.dzone.com
-feeds.feedburner.com
-feeds2.feedburner.com
-filetransfer.msg.yahoo.com
-filterforge.com
-financier.oriontransfer.co.nz
-gems.oriontransfer.org
-ghs.l.google.com
-googleads.g.doubleclick.net
-googlemail-pop.l.google.com
-groups.google.com
-hat.bmanpn.com
-hogbaysoftware.appspot.com
-i.creativecommons.org
-id.google.com
-images.apple.com
-images.macrumors.com
-images.trademe.co.nz
-img.slate.com
-js.adsonar.com
-js.revsci.net
-kotaku.com
-l.sharethis.com
-l.yimg.com
-lambda-the-ultimate.org
-login.facebook.com
-login.live.com
-login.messaging.aol.com
-login.oscar.aol.com
-login.yahoo.com
-lus.sharethis.com.akadns.net
-m1.2mdn.net
-mac.com
-mail.google.com
-mail.mac.com
-mail.me.com
-managingosx.wordpress.com
-maps.google.com
-marketing.vistaprint.com
-media.digg.com
-media.washingtonpost.com
-messenger.hotmail.com
-metrics.washingtonpost.com
-metro-amz-lb1-1649407802.us-east-1.elb.amazonaws.com
-mm.chitika.net
-news.ycombinator.com
-o.aolcdn.com
-o.sa.aol.com
-ocsp.verisign.net
-odb.outbrain.com
-omega.contacts.msn.com
-omega.contacts.msn.com.nsatc.net
-pagead2.googlesyndication.com
-partner.googleadservices.com
-partnerad.l.google.com
-pixel.quantserve.com
-pop.googlemail.com
-ps.friendconnect.gmodules.com
-publish.iwork.com
-r1rk9np7bpcsfoeekl0khkd2juj27q3o.friendconnect.gmodules.com
-rad.msn.com
-regretfulmorning.com
-resources.infolinks.com
-rss.lists.apple.com
-rss.slashdot.org
-s24.sitemeter.com
-s26.sitemeter.com
-s7.addthis.com
-safebrowsing-cache.google.com
-safebrowsing.clients.google.com
-scripts.chitika.net
-scsa.msg.yahoo.com
-seal.verisign.com
-sec.westpac.co.nz
-secure-nz.imrworldwide.com
-shared-hosted-1561031087.us-east-1.elb.amazonaws.com
-slashdot.org
-slate.cleanprint.net
-spacemusic.libsyn.com
-ssl-google-analytics.l.google.com
-ssl-hints.netflame.cc
-ssl.google-analytics.com
-static.ak.connect.facebook.com
-static.ak.facebook.com
-static.getclicky.com
-stats.wordpress.com
-syndication.thedailywtf.com
-tags.expo9.exponential.com
-talk.google.com
-time.asia.apple.com
-tools.google.com
-votes.buzz.yahoo.com
-widgets.outbrain.com
-wiki.oriontransfer.org
-www-google-analytics.l.google.com
-www.acquire.co.nz
-www.apple.com
-www.apple.com.akadns.net
-www.applejoe.com
-www.apples.com
-www.ascent.co.nz
-www.bing.com
-www.blogcdn.com
-www.blogger.com
-www.blogsmithmedia.com
-www.co2stats.com
-www.demonoid.com
-www.digg.com
-www.drobostore.com
-www.dzone.com
-www.em6live.co.nz
-www.engadget.com
-www.facebook.com
-www.filterforge.com
-www.friendconnect.gmodules.com
-www.geekologie.com
-www.google-analytics.com
-www.google.com
-www.idevgames.com
-www.iwatchstuff.com
-www.l.google.com
-www.linuxquestions.org
-www.lucidsystems.org
-www.macrumors.com
-www.michael.net.nz
-www.potionfactory.com
-www.recipepuppy.com
-www.slashdot.org
-www.slate.com
-www.sqlite.org
-www.trademe.co.nz
-www.vistaprint.com
-www.washingtonpost.com
-www.westpac.co.nz
-www4.l.google.com
-z.digg.com