Dnsruby 0.6.0 → 1.0

data/test/tc_event_machine_single_res.rb

@@ -3,7 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 require 'rubygems'
 require 'test/unit'
 require 'eventmachine'
-require 'Dnsruby'
+require 'dnsruby'
 
 class EventMachineTestSingleResolver < Test::Unit::TestCase
   Dnsruby::Resolver.use_eventmachine(true)
@@ -11,6 +11,7 @@ class EventMachineTestSingleResolver < Test::Unit::TestCase
 #    Dnsruby::TheLog.level=Logger::DEBUG
     Dnsruby::Resolver.use_eventmachine(true)
     Dnsruby::Resolver.start_eventmachine_loop(true)
+    sleep(0.01)
   end
   def teardown
     Dnsruby::Resolver.use_eventmachine(false)    
@@ -31,7 +32,6 @@ class EventMachineTestSingleResolver < Test::Unit::TestCase
       assert(item[0] <= id)
       assert(item[0] >= 0)
     end
-    Dnsruby::TheLog.level=Logger::ERROR
   end
   
   def test_tcp
@@ -67,7 +67,7 @@ class EventMachineTestSingleResolver < Test::Unit::TestCase
     assert(id==1)
     assert(ret==nil)
     assert(error.class == Dnsruby::ResolvTimeout)
-    p "Difference = #{end_time-start}"
+#    p "Difference = #{end_time-start}"
     assert(end_time - start >= 1.9)
     assert(end_time - start <= 2.2)
   end
@@ -84,7 +84,7 @@ class EventMachineTestSingleResolver < Test::Unit::TestCase
     end_time = Time.now
     assert(id==1)
     assert(ret==nil)
-    p "Difference = #{end_time-start}"
+#    p "Difference = #{end_time-start}"
     assert(error.class == Dnsruby::ResolvTimeout)
     assert(end_time - start >= 1.9)
     assert(end_time - start <= 2.2)

data/test/tc_event_machine_soak.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'eventmachine'
-require 'Dnsruby'
+require 'dnsruby'
 begin
   require 'test/tc_soak_base'
 rescue Exception

data/test/tc_packet_unique_push.rb

@@ -48,7 +48,7 @@ class TestPacketUniquePush < Test::Unit::TestCase
     RR.create('bar.example.com 60 IN A 10.0.0.1'),
     ],
     [ 
-    2,
+    1, # RFC 2136 section 1.1
     RR.create('foo.example.com 60 IN A 10.0.0.1'),
     RR.create('foo.example.com 60 IN A 10.0.0.1'),
     RR.create('foo.example.com 90 IN A 10.0.0.1'),

data/test/tc_question.rb

@@ -29,24 +29,23 @@ class TestQuestion < Test::Unit::TestCase
     assert_equal(type, q.qtype, "qType()")
     assert_equal(klass, q.qclass, "qClass()")
     
-#    #
-#    # Check the aliases
-#    #
-#    assert_equal(q.zname,  domain, 'zName()'  );
-#    assert_equal(q.ztype,  type,   'zType()'  );
-#    assert_equal(q.zclass, klass,  'zClass()' );
-#    @todo@ !!
+    #
+    # Check the aliases
+    #
+    assert_equal(q.zname.to_s,  domain, 'zName()'  );
+    assert_equal(q.ztype,  type,   'zType()'  );
+    assert_equal(q.zclass, klass,  'zClass()' );
     
-#    #
-#    # Check that we can change stuff
-#    #
-#    q.qname=('example.net');
-#    q.qtype=('A');
-#    q.qclass=('CH');
-#    
-#    assert_equal('example.net', q.qname.to_s,  'qName()'  );
-#    assert_equal(q.qtype,  Types.A,           'qType()'  );
-#    assert_equal(q.qclass, Classes.CH,          'qClass()' );
+    #
+    # Check that we can change stuff
+    #
+    q.qname=('example.net');
+    q.qtype=('A');
+    q.qclass=('CH');
+    
+    assert_equal('example.net', q.qname.to_s,  'qName()'  );
+    assert_equal(q.qtype,  Types.A,           'qType()'  );
+    assert_equal(q.qclass, Classes.CH,          'qClass()' );
     
   end
 end

data/test/tc_res_config.rb

@@ -15,7 +15,7 @@
 #++
 require 'rubygems'
 require 'test/unit'
-require 'Dnsruby'
+require 'dnsruby'
 class TestResolverConfig < Test::Unit::TestCase
   def setup
     Dnsruby::Config.reset

data/test/tc_res_opt.rb

@@ -47,6 +47,7 @@ class TestResOpt < Test::Unit::TestCase
   end
   
   def test_no_file
+    Dnsruby::TheLog.level=Logger::FATAL
     res=nil
     begin
       res = DNS.new('nosuch.txt')
@@ -58,6 +59,7 @@ class TestResOpt < Test::Unit::TestCase
       assert_equal(["0.0.0.0"], res.nameserver,"No nameservers should be set for #{test} = #{input}")
     rescue Exception
     end
+#    Dnsruby::TheLog.level=Logger::ERROR
   end
   
   def test_config_hash_singleresolver
@@ -141,6 +143,7 @@ class TestResOpt < Test::Unit::TestCase
   
   def test_bad_config
     res=nil
+    Dnsruby::TheLog.level=Logger::FATAL
     
     bad_input = {
       :tsig_rr        => 'set',
@@ -180,6 +183,7 @@ class TestResOpt < Test::Unit::TestCase
         rescue Exception
         end
       end
+#      Dnsruby::TheLog.level=Logger::ERROR
     end
   end
 end

data/test/tc_resolver.rb

@@ -96,7 +96,6 @@ class TestResolver < Test::Unit::TestCase
     id, m, err = q.pop
     assert(id==q)
     assert(m == nil)
-    print err.class
     assert(err.kind_of?(OtherResolvError) || err.kind_of?(IOError), "OtherResolvError or IOError expected : got #{err.class}")
   end
   

data/test/tc_rr-opt.rb

@@ -16,17 +16,15 @@
 require 'rubygems'
 require 'test/unit'
 require 'dnsruby'
+require 'socket.so'
 include Dnsruby
 class TestRrOpt < Test::Unit::TestCase
-  def test_RrOpt
+  def test_rropt
     size=2048;
     ednsflags=0x9e22;
     
-    optrr = RR::OPT.new(
-    			  :name         => '',
-			  :class => size,  # Decimal UDPpayload
-			  :flags    => ednsflags # first bit set see RFC 3225
-    )
+    optrr = RR::OPT.new(size, ednsflags)
+    
     assert(optrr.d_o,"DO bit set")
     optrr.d_o=false
     assert_equal(optrr.flags,0x1e22,"Clearing do, leaving the other bits ");
@@ -39,4 +37,45 @@ class TestRrOpt < Test::Unit::TestCase
     assert_equal(optrr.payloadsize=(1498),1498,"Size set")
     
   end
+  
+  def test_resolver_opt_application
+    # Set up a server running on localhost. Get the resolver to send a
+    # query to it with the UDP size set to 4096. Make sure that it is received
+    # correctly.
+    socket = UDPSocket.new
+    socket.bind("127.0.0.1", 0)
+    port = socket.addr[1]
+    q = Queue.new
+    Thread.new {
+      s = socket.recvfrom(65536)
+      print s.length
+      received_query = s[0]
+      socket.connect(s[1][2], s[1][1])
+      q.push(Message.decode(received_query))
+      socket.send(received_query,0)
+    }
+    
+    # Now send query
+    res = Resolver.new("127.0.0.1")
+    res.port = port
+    res.udp_size = 4096
+    assert(res.udp_size == 4096)
+    res.query("example.com")
+    
+    # Now get received query from the server
+    p = q.pop
+    # Now check the query was what we expected
+    assert(p.header.arcount == 1)
+    assert(p.additional()[0].type = Types.OPT)
+    assert(p.additional()[0].klass.code == 4096)
+  end
+  
+  def test_large_packet
+    # Query TXT for overflow.dnsruby.validation-test-servers.nominet.org.uk
+    # with a large udp_size
+    res = SingleResolver.new
+    res.udp_size = 4096
+    ret = res.query("overflow.dnsruby.validation-test-servers.nominet.org.uk", Types.TXT)
+    assert(ret.header.rcode == RCode.NoError)
+  end
 end

data/test/tc_single_resolver.rb

@@ -15,10 +15,9 @@
 #++
 require 'rubygems'
 require 'test/unit'
-require 'Dnsruby'
+require 'dnsruby'
 include Dnsruby
 class TestSingleResolver < Test::Unit::TestCase
-  # @todo@ Test udppacketsize
   Thread::abort_on_exception = true
   #  Dnsruby::TheLog.level=Logger::DEBUG
   
@@ -81,7 +80,6 @@ class TestSingleResolver < Test::Unit::TestCase
       id,ret, error = q.pop
       assert(id==msg)
       assert(ret==nil)
-      p error
       assert(error.class == ResolvTimeout)
     end
   end

data/test/tc_soak.rb

@@ -15,7 +15,7 @@
 #++
 require 'rubygems'
 require 'test/unit'
-require 'Dnsruby'
+require 'dnsruby'
 begin
 require 'test/tc_single_resolver'
 rescue LoadError
@@ -77,7 +77,6 @@ class TestSingleResolverSoak < Test::Unit::TestCase
     end
     query_count.times do |i|
       id,ret, error = q.pop
-      #      p "Got response #{i}"
       if (error.class == ResolvTimeout)
         timed_out+=1
       elsif (ret.class != Message)
@@ -120,7 +119,6 @@ class TestSingleResolverSoak < Test::Unit::TestCase
             begin
               packet = res.query(data[:name], data[:type])
             rescue ResolvTimeout
-              #              p "TIMEOUT for Thread #{i}, reply #{j}, type #{data[:type]}"
               mutex.synchronize {
                 timed_out+=1
               }
@@ -180,7 +178,6 @@ class TestSingleResolverSoak < Test::Unit::TestCase
             res.send_async(Message.new(data[:name], data[:type]), q, [i,j])
             id, packet, error = q.pop
             if (error.class == ResolvTimeout)
-              #              p "TIMEOUT for Thread #{i}, reply #{j}, type #{data[:type]}"
               mutex.synchronize {
                 timed_out+=1
               }
@@ -189,7 +186,6 @@ class TestSingleResolverSoak < Test::Unit::TestCase
               p "ERROR! #{error}"
             end
             
-            #            p packet.to_s
             assert(packet)
             assert_equal(packet.question[0].qclass,    'IN',             'Class correct'           )
           end

data/test/tc_soak_base.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'test/unit'
-require 'Dnsruby'
+require 'dnsruby'
 
 class TestSoakBase # < Test::Unit::TestCase
   include Dnsruby

data/test/tc_tcp.rb

@@ -15,7 +15,7 @@
 #++
 require 'rubygems'
 require 'test/unit'
-require 'Dnsruby'
+require 'dnsruby'
 class TestTcp < Test::Unit::TestCase
   def test_TCP
     res = Dnsruby::Resolver.new()

data/test/tc_tkey.rb

@@ -69,38 +69,7 @@ class TestTKey < Test::Unit::TestCase
     assert_equal(Dnsruby::Classes.IN,                       z.zclass, 'zclass correct')         #5
     assert_equal(Dnsruby::Types.TKEY,                     z.ztype,  'ztype correct')          #6       
     
+    #@TODO@ Test TKEY against server!
     
   end
-  
-  def test_tsig
-    
-    name="example.com."
-    key = "1234"
-    print key.to_s + "\n"
-    tsig = Dnsruby::RR.create({
-        :name        => name,
-        :type        => "TSIG",
-        :ttl         => 0,
-        :klass       => "ANY",
-        :algorithm   => "HMAC-MD5.SIG-ALG.REG.INT.",
-        :time_signed => 1189686346,
-        :fudge       => 300,
-        :key         => key,
-        :error       => 0
-      })
-
-
-    message = Dnsruby::Message.new
-    message.header.id=(1234)
-    tsig.apply(message)
-    
-    mac_string = Base64.encode64(message.additional[0].mac)
-    print mac_string + "\n"
-    
-    assert_equal("S8w22c0nlOhC9wNwwHPY7g==", mac_string, "MAC wrong")
-        
-    res = Dnsruby::Resolver.new
-    response = res.send_message(message)
-    print response+"\n"
   end
-end

data/test/tc_tsig.rb

@@ -0,0 +1,196 @@
+#--
+#Copyright 2007 Nominet UK
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License. 
+#You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0 
+#
+#Unless required by applicable law or agreed to in writing, software 
+#distributed under the License is distributed on an "AS IS" BASIS, 
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+#See the License for the specific language governing permissions and 
+#limitations under the License.
+#++
+require 'rubygems'
+require 'test/unit'
+require 'dnsruby'
+require "digest/md5"
+class TestTSig < Test::Unit::TestCase
+  KEY_NAME="rubytsig"
+  KEY = "8n6gugn4aJ7MazyNlMccGKH1WxD2B3UvN/O/RA6iBupO2/03u9CTa3Ewz3gBWTSBCH3crY4Kk+tigNdeJBAvrw=="
+  def is_empty(string)
+    return (string == "; no data" || string == "; rdlength = 0")
+  end
+  def test_signed_update
+    Dnsruby::Resolver::use_eventmachine(false)
+    run_test_client_signs
+    run_test_resolver_signs
+  end
+  def test_signed_update_em
+    begin
+      Dnsruby::Resolver::use_eventmachine(true)
+    rescue RuntimeError
+      Dnsruby::TheLog.error("EventMachine not installed - not running tsig EM tests")
+      return 
+    end
+    run_test_client_signs
+    run_test_resolver_signs
+    Dnsruby::Resolver::use_eventmachine(false)
+  end
+  
+  def run_test_client_signs
+    tsig = Dnsruby::RR.create({
+      :name        => KEY_NAME,
+      :type        => "TSIG",
+      :ttl         => 0,
+      :klass       => "ANY",
+      :algorithm   => "hmac-md5",
+      :fudge       => 300,
+      :key         => KEY,
+      :error       => 0
+    })
+    
+    update = Dnsruby::Update.new("validation-test-servers.nominet.org.uk")
+    # Generate update record name, and test it has been made. Then delete it and check it has been deleted
+    update_name = generate_update_name
+    update.absent(update_name)
+    update.add(update_name, 'TXT', 100, "test signed update")
+    tsig.apply(update)
+    assert(update.signed?, "Update has not been signed")
+    
+    res = Dnsruby::Resolver.new("ns0.validation-test-servers.nominet.org.uk")
+    res.recurse=false
+    res.query_timeout = 10
+    response = res.send_message(update)
+    
+    assert_equal( Dnsruby::RCode.NOERROR, response.header.rcode)
+    assert(response.verified?, "Response has not been verified")
+    
+    # Now check the record exists
+    rr = res.query(update_name, 'TXT')
+    assert_equal("test signed update", rr.answer()[0].strings.join(" "), "TXT record has not been created in zone")
+    
+    # Now delete the record
+    update = Dnsruby::Update.new("validation-test-servers.nominet.org.uk")
+    update.present(update_name, 'TXT')
+    update.delete(update_name)
+    tsig.apply(update)
+    assert(update.signed?, "Update has not been signed")
+    response = res.send_message(update)
+    assert_equal( Dnsruby::RCode.NOERROR, response.header.rcode)
+    assert(response.verified?, "Response has not been verified")
+    
+    # Now check the record does not exist
+    begin
+      rr = res.query(update_name, 'TXT')
+      assert(false)
+    rescue Dnsruby::NXDomain
+    end
+  end
+  
+  @@fudge = 0
+  def generate_update_name
+    update_name = Time.now.to_i.to_s + @@fudge.to_s
+    @@fudge+=1
+    update_name += ".update.validation-test-servers.nominet.org.uk"
+    return update_name
+  end
+  
+  def run_test_resolver_signs
+    res = Dnsruby::Resolver.new("ns0.validation-test-servers.nominet.org.uk")
+    res.query_timeout=10
+    res.tsig=KEY_NAME, KEY
+    
+    update = Dnsruby::Update.new("validation-test-servers.nominet.org.uk")
+    # Generate update record name, and test it has been made. Then delete it and check it has been deleted
+    update_name = generate_update_name
+    update.absent(update_name)
+    update.add(update_name, 'TXT', 100, "test signed update")
+    assert(!update.signed?, "Update has been signed")
+    
+    response = res.send_message(update)
+    
+    assert_equal( Dnsruby::RCode.NOERROR, response.header.rcode)
+    assert(response.verified?, "Response has not been verified")
+    
+    # Now check the record exists
+    rr = res.query(update_name, 'TXT')
+    assert_equal("test signed update", rr.answer()[0].strings.join(" "), "TXT record has not been created in zone")
+    
+    # Now delete the record
+    update = Dnsruby::Update.new("validation-test-servers.nominet.org.uk")
+    update.present(update_name, 'TXT')
+    update.delete(update_name)
+    tsig = Dnsruby::RR.create({
+      :type => 'TSIG', :klass => 'ANY',
+      :name        => KEY_NAME,
+      :key         => KEY
+    })
+    tsig.apply(update)
+    assert(update.signed?, "Update has not been signed")
+    response = res.send_message(update)
+    assert_equal( Dnsruby::RCode.NOERROR, response.header.rcode)
+    assert(response.verified?, "Response has not been verified")
+    
+    # Now check the record does not exist
+    begin
+      rr = res.query(update_name, 'TXT')
+      assert(false)
+    rescue Dnsruby::NXDomain
+    end
+  end
+  
+  def test_message_signing
+    m = Dnsruby::Message.new("example.com")
+    m.set_tsig("name", "key")
+    assert(!m.signed?)
+    m.encode
+    assert(m.signed?)
+    
+    m = Dnsruby::Message.new("example.com")
+    m.set_tsig("name", "key")
+    assert(!m.signed?)
+    m.sign!    
+    assert(m.signed?)
+    
+    m = Dnsruby::Message.new("example.com")
+    assert(!m.signed?)
+    m.sign!("name", "key")
+    assert(m.signed?)
+  end
+  
+  def test_signed_zone_transfer
+    # test TSIG over TCP session
+    axfr
+    ixfr
+  end
+  
+  def axfr
+    zt = Dnsruby::ZoneTransfer.new
+    zt.transfer_type = Dnsruby::Types.AXFR
+    zt.tsig=KEY_NAME, KEY
+    zt.server = "ns0.validation-test-servers.nominet.org.uk"
+    zone = zt.transfer("validation-test-servers.nominet.org.uk")
+    assert(zone.length > 0)
+    assert(zt.last_tsigstate==:Verified)
+  end
+  
+  def ixfr
+    zt = Dnsruby::ZoneTransfer.new
+    zt.transfer_type = Dnsruby::Types.IXFR
+    zt.server = "ns0.validation-test-servers.nominet.org.uk"
+    zt.tsig = Dnsruby::RR.create({
+      :type => 'TSIG', :klass => 'ANY',
+      :name        => KEY_NAME,
+      :key         => KEY
+    })
+    zt.serial = 2007090401
+    deltas = zt.transfer("validation-test-servers.nominet.org.uk")
+    assert(deltas.length > 0)
+    assert(deltas[0].class == Dnsruby::ZoneTransfer::Delta)
+    assert_equal("Should show up in transfer", deltas[0].adds[1].data)
+    assert(zt.last_tsigstate==:Verified)
+  end
+end