dnsruby 1.60.2 → 1.61.5

data/lib/dnsruby/version.rb

@@ -1,3 +1,3 @@
 module Dnsruby
-  VERSION = '1.60.2'
+  VERSION = '1.61.5'
 end

data/lib/dnsruby/zone_transfer.rb

@@ -33,6 +33,8 @@ module Dnsruby
     attr_reader :tsig
     #  Returns the tsigstate of the last transfer (nil if no TSIG signed transfer has occurred)
     attr_reader :last_tsigstate
+    # Sets the connect timeout in seconds
+    attr_accessor :connect_timeout
 
     # Sets the TSIG to sign the zone transfer with.
     # Pass in either a Dnsruby::RR::TSIG, or a key_name and key (or just a key)
@@ -54,6 +56,7 @@ module Dnsruby
       @tsig = nil
       @axfr = nil
       @src_address = nil
+      @connect_timeout = 5
     end
 
     #  Perform a zone transfer (RFC1995)
@@ -107,7 +110,8 @@ module Dnsruby
     def do_transfer(zone, server) #:nodoc: all
       @transfer_type = Types.new(@transfer_type)
       @state = :InitialSoa
-      socket = TCPSocket.new(server, @port, @src_address)
+      socket = Socket.tcp(server, @port, @src_address, connect_timeout: @connect_timeout)
+      # socket = TCPSocket.new(server, @port, @src_address)
       begin
         #  Send an initial query
         msg = Message.new(zone, @transfer_type, @klass)

data/test/localdns.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+require_relative 'spec_helper'
+
+require_relative "test_dnsserver"
+
+class SimpleTCPPipeliningUDPServer < Async::DNS::Server
+  PORT     = 53938
+  IP   = '127.0.0.1'
+
+  def initialize(**options)
+    super(options)
+
+    @handlers << TcpPipelineHandler.new(self, IP, PORT)
+    @handlers << Async::DNS::UDPServerHandler.new(self, IP, PORT)
+
+  end
+
+  def process(name, resource_class, transaction)
+    @logger.debug "name: #{name}"
+    transaction.respond!("93.184.216.34", { resource_class: ::Resolv::DNS::Resource::IN::A })
+  end
+
+end
+
+
+if __FILE__ == $0
+  RubyDNS::run_server(server_class: SimpleTCPPipeliningUDPServer)
+end

data/test/tc_caa.rb

@@ -16,7 +16,6 @@
 # ++
 
 require_relative 'spec_helper'
-require 'pry'
 
 class TestCAA < Minitest::Test
 

data/test/tc_dns.rb

@@ -247,6 +247,16 @@ class TestDNS < Minitest::Test
       assert_equal(a[0].name.to_s, 'a.t.net-dns.org',"Correct name (with persistent socket and #{method})")
       # assert_equal(a[0].name.to_s, 'a.t.dnsruby.validation-test-servers.nominet.org.uk',"Correct name (with persistent socket and #{method})")
     end
-
   end
+
+    def test_port
+      d = DNS.new({:port => 5353})
+      assert(d.to_s.include?"5353")
+    end
+
+    def test_port_nil
+        d = DNS.new({:port => nil})
+        assert(d.to_s.include? Dnsruby::Config::DEFAULT_PORT.to_s)
+      end
+
 end

data/test/tc_dnskey.rb

@@ -85,4 +85,33 @@ class DnskeyTest < Minitest::Test
     dnskey.protocol=3
 
   end
+
+  def test_ecdsa_integrity
+    ecdsa_256_pub = 'example.com. 3600 IN DNSKEY 256 3 13 ( oJMRESz5E4gYzS/q6XD' +
+    'rvU1qMPYIjCWzJaOau8XNEZeqCYKD5ar0IRd8KqXXFJkqmVfRvMGPmM1x8fGAa2XhSA== )'
+
+    dnskey = Dnsruby::RR.create(ecdsa_256_pub)
+    assert_equal(3, dnskey.protocol)
+    assert_equal(256, dnskey.flags)
+    assert_equal(Dnsruby::Algorithms::ECDSAP256SHA256, dnskey.algorithm)
+    assert_equal(Dnsruby::RR::DNSKEY::ZONE_KEY, dnskey.flags & Dnsruby::RR::DNSKEY::ZONE_KEY)
+    assert_equal(0, dnskey.flags & Dnsruby::RR::DNSKEY::SEP_KEY)
+
+    dnskey2 = Dnsruby::RR.create(dnskey.to_s)
+    assert(dnskey2.to_s == dnskey.to_s, "#{dnskey} not equal to \n#{dnskey2}")
+
+    ecdsa_384_pub = 'example.com. 3600 IN DNSKEY 256 3 14 ( Bl2HDw98sGin4lNlx7n' +
+    'QX3w98jx6UhAgC73Jq+6LFlD12gnVTMHecM8Z GoTFSh+mV+qEPFZ5s3NbC4qvwUW0kkPb+0ip' +
+    'CuLRwZYhYKk7D+RDb+fX XozI9hhZrsXBcEhss )'
+
+    dnskey = Dnsruby::RR.create(ecdsa_384_pub)
+    assert_equal(3, dnskey.protocol)
+    assert_equal(256, dnskey.flags)
+    assert_equal(Dnsruby::Algorithms::ECDSAP384SHA384, dnskey.algorithm)
+    assert_equal(Dnsruby::RR::DNSKEY::ZONE_KEY, dnskey.flags & Dnsruby::RR::DNSKEY::ZONE_KEY)
+    assert_equal(0, dnskey.flags & Dnsruby::RR::DNSKEY::SEP_KEY)
+
+    dnskey2 = Dnsruby::RR.create(dnskey.to_s)
+    assert(dnskey2.to_s == dnskey.to_s, "#{dnskey} not equal to \n#{dnskey2}")
+  end
 end

data/test/tc_encoding.rb

@@ -0,0 +1,31 @@
+require_relative 'spec_helper'
+
+require 'socket'
+
+# @TODO@ We also need a test server so we can control behaviour of server to test
+# different aspects of retry strategy.
+# Of course, with Ruby's limit of 256 open sockets per process, we'd need to run
+# the server in a different Ruby process.
+
+class TestEncoding < Minitest::Test
+
+  include Dnsruby
+
+  Thread::abort_on_exception = true
+
+  Dnsruby::TheLog.level = Logger::DEBUG
+
+
+  def test_cdnskey
+    rrString = "tjeb.nl.\t3600\tIN\tCDNSKEY\t256 3 RSASHA1-NSEC3-SHA1 ( AwEAAcglEOS7bECRK5fqTuGTMJycmDhTzmUu/EQbAhKJOYJxDb5SG/RYqsJgzG7wgtGy0W1aP7I4k6SPtHmwcqjLaZLVUwRNWCGr2adjb9JTFyBR7F99Ngi11lEGM6Uiw/eDRk66lhoSGzohjj/rmhRTV6gN2+0ADPnafv3MBkPgryA3 ) ; key_tag=53177"
+    rr = RR.create(rrString)
+    puts rr
+    puts rrString
+    assert(rrString.to_s == rr.to_s)
+    m = Dnsruby::Message.new
+    m.add_additional(rr)
+    m2 = Message.decode(m.encode)
+    rr2 = m2.additional()[0]
+    assert(rr.to_s == rr2.to_s)
+  end
+end

data/test/tc_hs.rb

@@ -12,11 +12,12 @@ class TestDNS < Minitest::Test
   # the response returns with an rcode of NOTIMP and a Dnsruby::NotImp error.
   def test_hs_class_returns_notimp_code_and_error
     resolver_host = 'a.gtld-servers.net'
-    resolver = Resolver.new(resolver_host)
-    message = Message.new('test.com', 'A', 'HS')
+    resolver = Dnsruby::Resolver.new(resolver_host)
+    resolver.query_timeout = 20
+    message = Dnsruby::Message.new('test.com', 'A', 'HS')
     response, error = resolver.send_plain_message(message)
 
-    assert_equal(RCode::NOTIMP, response.rcode)
+    assert_equal(Dnsruby::RCode::NOTIMP, response.rcode)
     assert_equal(Dnsruby::NotImp, error.class)
   end
 

data/test/tc_long_labels.rb

@@ -0,0 +1,46 @@
+require_relative 'spec_helper'
+
+include Dnsruby
+class TestPacket < Minitest::Test
+  def test_labels
+    wirePacket = %w{0 
+      68 5b 35 91 3a f7 00 0f 94 22 d9 51 08 00 45 00 05 12 71 65 40 00 3d 06 46 1f 2e e3 90 33
+      c0 a8 01 a3 00 35 e3 cf 94 d5 49 0a 88 da e7 1e 80 18 00 1d 6f 52 00 00 01 01 08 0a 8e 3a
+      a6 b1 1f 4d ce 28 c5 b1 c0 0c 00 0c 00 01 00 00 0b 49 00 12 0f 69 6d 70 72 6f 76 65 61 6e
+      61 6c 79 73 69 73 c0 65 c0 0c 00 0c 00 01 00 00 0b 49 00 0e 0b 77 69 6e 64 6f 77 73 72 75
+      62 79 d3 12 c0 0c 00 0c 00 01 00 00 0b 49 00 15 12 6d 69 63 72 6f 73 6f 66 74 66 6f 72 65
+      66 72 6f 6e 74 d3 bd c0 0c 00 0c 00 01 00 00 0b 49 00 11 09 6d 69 63 72 6f 73 6f 66 74 02
+      63 6f 02 6d 7a 00 c0 0c 00 0c 00 01 00 00 0b 49 00 12 09 77 69 6e 64 6f 77 73 78 70 03 6f
+      72 67 02 70 65 00 c0 0c 00 0c 00 01 00 00 0b 49 00 16 0f 65 75 67 72 61 6e 74 73 61 64 76
+      69 73 6f 72 03 63 6f 6d ca 49 c0 0c 00 0c 00 01 00 00 0b 49 00 14 11 64 65 66 79 61 6c 6c
+      63 68 61 6c 6c 65 6e 67 65 73 c5 97 c0 0c 00 0c 00 01 00 00 0b 49 00 18 15 63 6f 6e 73 6f
+      6c 69 64 61 74 65 64 6d 65 73 73 65 6e 67 65 72 c0 65 c0 0c 00 0c 00 01 00 00 0b 49 00 19
+      16 72 65 74 61 69 6c 65 78 65 63 75 74 69 76 65 73 65 6d 69 6e 61 72 c0 a7 c0 0c 00 0c 00
+      01 00 00 0b 49 00 0e 0b 63 74 72 6f 70 65 6e 6f 72 6d 65 c0 65 c0 0c 00 0c 00 01 00 00 0b
+      49 00 0e 0b 77 69 6e 64 6f 77 73 32 30 30 30 cc 6f c0 0c 00 0c 00 01 00 00 0b 49 00 1a 17
+      77 69 6e 64 6f 77 73 6d 6f 62 69 6c 65 63 6f 6d 6d 6d 75 6e 69 74 79 c0 41 c0 0c 00 0c 00
+      01 00 00 0b 49 00 11 0e 72 69 73 65 6f 66 70 65 72 61 74 68 69 61 c0 41 c0 0c 00 0c 00 01
+      00 00 0b 49 00 11 0e 72 65 6e 63 6f 6e 74 72 65 73 2d 33 36 30 c0 41 c0 0c 00 0c 00 01 00
+      00 0b 49 00 11 0e 66 75 74 75 72 65 70 6f 73 74 6d 61 69 6c c0 41 c0 0c 00 0c 00 01 00 00
+      0b 49 00 10 0d 72 65 73 70 6f 6e 73 65 70 6f 69 6e 74 cc 4d c0 0c 00 0c 00 01 00 00 0b 49
+      00 10 0d 74 61 76 75 74 61 74 72 6f 6e 63 68 65 c0 a7 c0 0c 00 0c 00 01 00 00 0b 49 00 09
+      06 66 6c 65 78 67 6f df 34 c0 0c 00 0c 00 01 00 00 0b 49 00 0e 09 77 69 6e 64 6f 77 73 78
+      70 02 73 68 00 c0 0c 00 0c 00 01 00 00 0b 49 00 16 13 73 6d 61 72 74 70 68 6f 6e 65 63 6f
+      6d 6d 75 6e 69 74 79 c0 a7 c0 0c 00 0c 00 01 00 00 0b 49 00 12 0f 63 65 6e 74 72 65 64 65
+      73 75 73 61 67 65 73 c0 65 c0 0c 00 0c 00 01 00 00 0b 49 00 0c 09 77 69 6e 64 6f 77 73 6e
+      74 fc 07 c0 0c 00 0c 00 01 00 00 0b 49 00 19 16 6c 65 73 2d 64 6f 69 67 74 73 2d 64 61 6e
+      73 2d 6c 65 2d 6e 65 7a c0 a7 c0 0c 00 0c 00 01 00 00 0b 49 00 13 10 74 65 63 68 6e 65 74
+      63 68 61 6c 6c 65 6e 67 65 c0 65 c0 0c 00 0c 00 01 00 00 0b 49 00 15 12 6d 69 63 72 6f 73 6f 66 74 66 6f 72 65 66 72 6f 6e 74 c0 41 c0 0c 00 0c 00 01 00 00 0b 49 00 10 0d 6c 65 73 62 6f 6e 73 6f 75 74 69 6c 73 c0 41 c0 0c 00 0c 00 01 00 00 0b 49 00 0d 0a 77 69 6e 74 65 72 6e 61 6c 73 c3 d6 c0 0c 00 0c 00 01 00 00 0b 49 00 23 0e 64 65 73 69 67 6e 65 64 66 6f 72 62 69 67 02 64 65 0e 64 65 73 69 67 6e 65 64 66 6f 72 62 69 67 c2 b2 c0 0c 00 0c 00 01 00 00 0b 49 00 13 10 77 69 6e 64 6f 77 73 76 69 73 74 61 62 6c 6f 67 c9 42 c0 0c 00 0c 00 01 00 00 0b 49 00 12 09 77 69 6e 64 6f 77 73 6e 74 03 6f 72 67 02 66 6a 00 c0 0c 00 0c 00 01 00 00 0b 49 00 0c 09 77 69 6e 64 6f 77 73 6e 74 c1 b6 c0 0c 00 0c 00 01 00 00 0b 49 00 0f 0c 6f 66 66 69 63 65 73 79 73 74 65 6d c2 18 c0 0c 00 0c 00 01 00 00 0b 49 00 0f 0c 74 72 65 79 72 65 73 65 61 72 63 68 c0 41 c0 0c 00 0c 00 01 00 00 0b 49 00 09 06 63 70 61 6e 64 6c c0 65 c0 0c 00 0c 00 01 00 00 0b 49 00 16 13 6f 66 66 72 65 2d 65 62 6c 6f 75 69 73 73 61 6e 74 65 73 c0 41 c0 0c 00 0c 00 01 00 00 0b 49 00 0d 0a 63 6f 68 6f 77 69 6e 65 72 79 c0 41 c0 0c 00 0c 00 01 00 00 0b 49 00 13 10 74 6f 64 6f 73 6c 6f 65 6e 74 69 65 6e 64 65 6e c0 41 c0 0c 00 0c 00 01 00 00 0b 49 00 0f 09 77 69 6e 64 6f 77 73 78 70 02 63 6f f1 03 c0 0c 00 0c 00 01 00 00 0b 49 00 0b 08 74 65 63 68 65 64 30 36 c0 65 c0 0c 00 0c 00 01 00 00 0b 49 00 09 06 66 6c 65 78 67 6f dd 7f c0 0c 00 0c 00 01 00 00 0b 49 00 0c 09 66 6f 72 65 66 72 6f 6e 74 cb 21 c0 0c 00 0c 00 01 00 00 0b 49 00 14 11 64 65 66 79 61 6c 6c 63 68 61 6c 6c 65 6e 67 65 73 cb 44 00 00 29 05 78 00 00 80 00 00 00
+    }
+    wirePacket.map!{|e| e.hex}
+    packetdata = wirePacket.pack('c*')
+
+    packet = Message.decode(packetdata)
+    assert(packet,                                 'new data returned something');         #28
+  end
+
+  def test_live
+    resolver = Dnsruby::Resolver.new
+    query = resolver.query('207.46.197.32', 'PTR', 'IN')
+  end
+end

data/test/tc_name.rb

@@ -80,4 +80,23 @@ class TestName < Minitest::Test
     n2 = Name.create("nall.all.")
     assert(n1 == n2, n1.to_s)
   end
+
+  def test_punycode
+    [
+      [
+        "møllerriis.com",
+        "xn--mllerriis-l8a.com"
+      ],
+      [
+        "フガフガ。hogehoge.エグザンプル.JP",
+        "xn--mcka5jb.hogehoge.xn--ickqs6k2dyb.jp"
+      ],
+      [
+        "フガ#フガ。hogehoge.エグザンプル.JP",
+        "xn--#-yeub5nc.hogehoge.xn--ickqs6k2dyb.jp"
+      ]
+    ].each do |tc|
+      assert_equal(Dnsruby::Name.create(tc[0]).to_s, tc[1])
+    end
+  end
 end

data/test/tc_resolv.rb

@@ -20,6 +20,7 @@ require_relative '../lib/dnsruby/resolv'
 class TestResolv < Minitest::Test
 
   RELATIVE_NAME = 'google-public-dns-a.google.com'
+  SHORT_RELATIVE_NAME = 'dns.google'
   ABSOLUTE_NAME = RELATIVE_NAME + '.'
   IPV4_ADDR     = '8.8.8.8'
   IPV6_ADDR     = '2001:4860:4860::8888'
@@ -53,16 +54,16 @@ class TestResolv < Minitest::Test
 
   def test_resolv_address_to_name
 
-    assert_equal(RELATIVE_NAME, Dnsruby::Resolv.getname(IPV4_ADDR).to_s)
+    assert_equal(SHORT_RELATIVE_NAME, Dnsruby::Resolv.getname(IPV4_ADDR).to_s)
 
     assert_raises(Dnsruby::ResolvError) do
-      Dnsruby::Resolv.getname(RELATIVE_NAME)
+      Dnsruby::Resolv.getname(SHORT_RELATIVE_NAME)
     end
 
     names = Dnsruby::Resolv.getnames(IPV4_ADDR)
     assert_equal(1, names.size)
-    assert_equal(RELATIVE_NAME, names.first.to_s)
-    Dnsruby::Resolv.each_name(IPV4_ADDR) { |name| assert_equal(RELATIVE_NAME, name.to_s)}
+    assert_equal(SHORT_RELATIVE_NAME, names.first.to_s)
+    Dnsruby::Resolv.each_name(IPV4_ADDR) { |name| assert_equal(SHORT_RELATIVE_NAME, name.to_s)}
   end
 
   def test_resolv_address_to_address

data/test/tc_resolver.rb

@@ -138,7 +138,7 @@ class TestResolver < Minitest::Test
     ret.each_answer do |answer|
       if (answer.type==Types.PTR)
         no_pointer=false
-        assert(answer.domainname.to_s=~/google-public-dns/)
+        assert(answer.domainname.to_s=~/google/)
       end
     end
     assert(!no_pointer)
@@ -171,7 +171,7 @@ class TestResolver < Minitest::Test
     # test timeout behaviour for different retry, retrans, total timeout etc.
     # Problem here is that many sockets will be created for queries which time out.
     #  Run a query which will not respond, and check that the timeout works
-    if (!RUBY_PLATFORM=~/darwin/)
+    if (RUBY_PLATFORM !~ /darwin/)
       start=stop=0
       retry_times = 3
       retry_delay=1
@@ -374,5 +374,31 @@ class TestRawQuery < Minitest::Test
     assert_equal KEY, options[:key]
     assert_equal ALGO, options[:algorithm]
   end
+  
+  def test_threads
+    resolver = Dnsruby::Resolver.new(nameserver: ["8.8.8.8", "8.8.4.4"])
+        resolver.query("google.com", "MX")
+         resolver.query("google.com", "MX")
+          resolver.query("google.com", "MX")
+          begin
+            resolver.query("googlöe.com", "MX") 
+          rescue Dnsruby::ResolvError => e
+            # fine
+          end
+          resolver.query("google.com", "MX")
+          resolver.query("google.com", "MX")
+          begin
+            resolver.query("googlöe.com", "MX")
+          rescue Dnsruby::ResolvError => e
+            # fine
+          end
+          begin
+            resolver.query("googlöe.com", "MX") 
+          rescue Dnsruby::ResolvError => e
+            # fine
+          end
+#          Dnsruby::Cache.delete("googlöe.com", "MX")
+          
+  end
 end
 

data/test/tc_rr-opt.rb

@@ -28,10 +28,13 @@ class TestRrOpt < Minitest::Test
   # This works only with send_plain_message, not send_message, query, etc.
   def test_plain_respects_bufsize
 
-    resolver = Resolver.new('a.gtld-servers.net')
+
+      resolver = Resolver.new(['a.gtld-servers.net', 'b.gtld-servers.net', 'c.gtld-servers.net'])
+      resolver.query_timeout=20
 
     run_test = ->(bufsize) do
 
+
       create_test_query = ->(bufsize) do
         message = Message.new('com', Types.ANY, Classes.IN)
         message.add_additional(RR::OPT.new(bufsize))
@@ -40,13 +43,16 @@ class TestRrOpt < Minitest::Test
 
       query = create_test_query.(bufsize)
       response, _error = resolver.send_plain_message(query)
+      if (_error != nil) then
+        print "Error at #{bufsize} : #{_error}"
+      end
       # puts "\nBufsize is #{bufsize}, binary message size is #{response.encode.size}"
       assert_equal(true, response.header.tc)
       assert(response.encode.size <= bufsize)
     end
 
-    run_test.(512)
-    run_test.(612)
+    #run_test.(512)
+    #run_test.(612)
     run_test.(4096)
   end
 

data/test/tc_rr.rb

@@ -285,6 +285,39 @@ class TestRR < Minitest::Test
     update.encode
   end
 
+  def test_uri
+    rrString = "_ftp._tcp.\t300\tIN\tURI\t10\ 1 \"ftp://ftp1.example.com/public\""
+    rr = RR.create(rrString)
+    assert(rrString.to_s == rr.to_s)
+    m = Dnsruby::Message.new
+    m.add_additional(rr)
+    m2 = Message.decode(m.encode)
+    rr2 = m2.additional()[0]
+    assert(rr == rr2)
+  end
+
+  def test_cds
+    rrString = "dskey.example.com.\t86400\tIN\tCDS\t60485 RSASHA1 1 ( 2BB183AF5F22588179A53B0A98631FAD1A292118 )"
+    rr = RR.create(rrString)
+    assert(rrString.to_s == rr.to_s)
+    m = Dnsruby::Message.new
+    m.add_additional(rr)
+    m2 = Message.decode(m.encode)
+    rr2 = m2.additional()[0]
+    assert(rr.to_s == rr2.to_s)
+  end
+
+  def test_cdnskey
+    rrString = "tjeb.nl.\t3600\tIN\tCDNSKEY\t256 3 RSASHA1-NSEC3-SHA1 ( AwEAAcglEOS7bECRK5fqTuGTMJycmDhTzmUu/EQbAhKJOYJxDb5SG/RYqsJgzG7wgtGy0W1aP7I4k6SPtHmwcqjLaZLVUwRNWCGr2adjb9JTFyBR7F99Ngi11lEGM6Uiw/eDRk66lhoSGzohjj/rmhRTV6gN2+0ADPnafv3MBkPgryA3 ) ; key_tag=53177"
+    rr = RR.create(rrString)
+    assert(rrString.to_s == rr.to_s)
+    m = Dnsruby::Message.new
+    m.add_additional(rr)
+    m2 = Message.decode(m.encode)
+    rr2 = m2.additional()[0]
+    assert(rr.to_s == rr2.to_s)
+  end
+
   def test_cert
     rr = RR.create("test.kht.se. 60 IN CERT PGP 0 0 mQGiBDnY2vERBAD3cOxqoAYHYzS+xttvuyN9wZS8CrgwLIlT8Ewo/CCFI11PEO+gJyNPvWPRQsyt1SE60reaIsie2bQTg3DYIg0PmH+ZOlNkpKesPULzdlw4Rx3dD/M3Lkrm977h4Y70ZKC+tbvoYKCCOIkUVevny1PVZ+mB94rb0mMgawSTrct03QCg/w6aHNJFQV7O9ZQ1Fir85M3RS8cEAOo4/1ASVudz3qKZQEhU2Z9O2ydXqpEanHfGirjWYi5RelVsQ9IfBSPFaPAWzQ24nvQ18NU7TgdDQhP4meZXiVXcLBR5Mee2kByf2KAnBUF9aah5s8wZbSrC6u8xEZLuiauvWmCUIWe0Ylc1/L37XeDjrBI2pT+k183X119d6Fr1BACGfZVGsot5rxBUEFPPSrBqYXG/0hRYv9Eq8a4rJAHK2IUWYfivZgL4DtrJnHlha+H5EPQVYkIAN3nGjXoHmosY+J3Sk+GyR+dCBHEwCkoHMKph3igczCEfxAWgqKeYd5mf+QQq2JKrkn2jceiIO7s3CrepeEFAjDSGuxhZjPJVm7QoRGFuaWVsIFAuIE1haG9uZXkgPGRhbm1AcHJpbWUuZ3VzaGkub3JnPohOBBARAgAOBQI52NrxBAsDAQICGQEACgkQ+75aMGJLskn6LgCbBXUD7UmGla5e1zyhuY667hP3F+UAoJIeDZJyRFkQAmb+u8KekRyLD1MLtDJEYW5pZWwgTWFob25leSAoU2Vjb25kYXJ5IEVtYWlsKSA8Z3VzaGlAZ3VzaGkub3JnPohgBBMRAgAgBQJF1J/XAhsjBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ+75aMGJLskkVhACggsivQ9qLhfdA1rGm6f8LRJBSC4wAoI930h+/hshClj6AkNwGRtHdf5XJuQINBDnY2vQQCAD2Qle3CH8IF3KiutapQvMF6PlTETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33TGSGSfgMg71l6RfUodNQ+PVZX9x2Uk89PY3bzpnhV5JZzf24rnRPxfx2vIPFRzBhznzJZv8V+bv9kV7HAarTW56NoKVyOtQa8L9GAFgr5fSI/VhOSdvNILSd5JEHNmszbDgNRR0PfIizHHxbLY7288kjwEPwpVsYjY67VYy4XTjTNP18F1dDox0YbN4zISy1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWakXUGfnHy9iUsiGSa6q6Jew1XpMgs7AAICB/9eGjzF2gDh6U7I72x/6bSdlExx2LvIF92OZKc0S55IOS4Lgzs7Hbfm1aOL4oJt7wBg94xkF4cerxz7y8R9J+k3GNl14KOjbYaMAh1rdxdAzikYMH1p1hS78GMtwxky6jE5en87BGGMmnbC84JlxwN+MD7diu8D0Gkgjj/pxOp32D5jEe02wBPVjFTpFLJjpFniLUY6AohRDEdSuZwWPuoKVWhpeWkasNn5qgwGyDREbXpyPsU02BkwE4JiGs+JMMdOn9KMh5dxiuwsMM9gHiQZS3mSNBBKPWI5ZXsdStVFvapjf2FUFDXLUbTROPv1Xhqf0u7YYORFnWeVtvzKIxVaiEYEGBECAAYFAjnY2vQACgkQ+75aMGJLsklBWgCeN7z9xk52y/aoaCuF6hYb0d+3k98AoMRxvHuXI1Nc2FXY/x65PwHiUbaY")
     rr = RR.create("all.rr.org.             IN      CERT            6 0 0 FFsAyW1dVK7hIGuvhN56r26UwJx/")

data/test/tc_soak.rb

@@ -19,72 +19,39 @@ require_relative 'spec_helper'
 # require_relative 'tc_single_resolver'
 require_relative 'tc_soak_base'
 require_relative 'test_dnsserver'
+require_relative 'localdns'
 
 
 # This class tries to soak test the Dnsruby library.
 # It can't do this very well, owing to the small number of sockets allowed to be open simultaneously.
 # @TODO@ Future versions of dnsruby will allow random streaming over a fixed number of (cycling) random sockets,
 # so this test can be beefed up considerably at that point.
-# @todo@ A test DNS server running on localhost is really needed here
-
-class MyServer < RubyDNS::Server
-
-  include Dnsruby
-
-  IP   = "127.0.0.1"
-  PORT = 53927
-
-  @@stats = Stats.new
-
-  def self.stats
-    @@stats
-  end
-
-  def process(name, resource_class, transaction)
-    transaction.respond!("93.184.216.34", { resource_class: Resolv::DNS::Resource::IN::A })
-    Celluloid.logger.debug "got message"
-  end
-end
-
-class PipeliningServer < MyServer
-  def run
-    fire(:setup)
-
-    link NioTcpPipeliningHandler.new(self, IP, PORT, 5) #5 max request
-    link RubyDNS::UDPHandler.new(self, IP, PORT)
-
-    fire(:start)
-  end
-end
 
 class TestSingleResolverSoak < Minitest::Test
 
-  IP   = MyServer::IP
-  PORT = MyServer::PORT
+  IP   = SimpleTCPPipeliningUDPServer::IP
+  PORT = SimpleTCPPipeliningUDPServer::PORT
 
   def initialize(arg)
     super(arg)
-    self.class.init
   end
 
-  def self.init
-    unless @initialized
-      Celluloid.boot
-      # By default, Celluloid logs output to console. Use Dnsruby.log instead.
-      Celluloid.logger = Dnsruby.log
-      @initialized = true
-    end
+  def teardown
+    Celluloid.shutdown
   end
 
   SINGLE_RESOLVER_QUERY_TIMES = 63
 
   def setup
-    # Instantiate a new server
-    # For each query respond with 93.184.216.34
-
-    @@supervisor ||= RubyDNS::run_server(asynchronous: true,
-                                         server_class: PipeliningServer)
+    # Instantiate a local dns server
+    pipe = IO.popen("./test/localdns.rb")
+    @dnspid = pipe.pid
+    sleep 1
+  end
 
+  def teardown
+    Process.kill("KILL", @dnspid)
+    sleep 1
   end
 
   def test_many_asynchronous_queries_one_single_resolver
@@ -115,14 +82,14 @@ class TestSingleResolverSoak < Minitest::Test
     q = Queue.new
     timeout_count = 0
     resolvers = Array.new(num_resolvers) do
-      SingleResolver.new(server:                     IP,
-                         port:                       PORT,
-                         do_caching:                 false,
-                         do_validation:              false,
-                         tcp_pipelining:             pipelining,
-                         packet_timeout:             10,
-                         tcp_pipelining_max_queries: 5,
-                         use_tcp:                    tcp)
+      Dnsruby::SingleResolver.new(server:                     IP,
+                                  port:                       PORT,
+                                  do_caching:                 false,
+                                  do_validation:              false,
+                                  tcp_pipelining:             pipelining,
+                                  packet_timeout:             10,
+                                  tcp_pipelining_max_queries: 5,
+                                  use_tcp:                    tcp)
     end
     start = Time.now
 
@@ -130,7 +97,7 @@ class TestSingleResolverSoak < Minitest::Test
     #  this test while we're not using single sockets.
     #  We run four queries per iteration, so we're limited to 64 runs.
     messages = TestSoakBase::Rrs.map do |data|
-      message = Message.new(data[:name], data[:type])
+      message = Dnsruby::Message.new(data[:name], data[:type])
       message.do_validation = false
       message.do_caching    = false
       message
@@ -141,9 +108,9 @@ class TestSingleResolverSoak < Minitest::Test
     receive_thread = Thread.new do
       query_count.times do
         _id, ret, error = q.pop
-        if error.is_a?(ResolvTimeout)
+        if error.is_a?(Dnsruby::ResolvTimeout)
           timeout_count+=1
-        elsif ret.class != Message
+        elsif ret.class != Dnsruby::Message
           p "ERROR RETURNED : #{error}"
         end
       end
@@ -193,7 +160,7 @@ class TestSingleResolverSoak < Minitest::Test
             packet=nil
             begin
               packet = res.query(data[:name], data[:type])
-            rescue ResolvTimeout
+            rescue Dnsruby::ResolvTimeout
               mutex.synchronize { timeout_count += 1 }
               next
             end
@@ -248,19 +215,19 @@ class TestSingleResolverSoak < Minitest::Test
             end
             q = Queue.new
 
-            message = Message.new(data[:name], data[:type])
+            message = Dnsruby::Message.new(data[:name], data[:type])
             message.do_validation = false
             message.do_caching    = false
 
             res.send_async(message, q, [i,j])
 
             id, packet, error = q.pop
-            if (error.class == ResolvTimeout)
+            if (error.class == Dnsruby::ResolvTimeout)
               mutex.synchronize {
                 timeout_count+=1
               }
               next
-            elsif (packet.class!=Message)
+            elsif (packet.class!=Dnsruby::Message)
               puts "ERROR! #{error}"
             end
 
@@ -278,13 +245,12 @@ class TestSingleResolverSoak < Minitest::Test
     assert(timeout_count < query_count * 0.1, "#{timeout_count} of #{query_count} timed out!")
   end
 
-
   def create_default_single_resolver
-    SingleResolver.new(server:         IP,
-                       port:           PORT,
-                       do_caching:     false,
-                       do_validation:  false,
-                       packet_timeout: 10)
+    Dnsruby::SingleResolver.new(server:         IP,
+                                port:           PORT,
+                                do_caching:     false,
+                                do_validation:  false,
+                                packet_timeout: 10)
 
   end
 end