dnsruby 1.54 → 1.55

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3bf240da7425f65b0de26f548c79285a79f4e50b
+  data.tar.gz: 4c14a8ede6896cbd22365ed0f8fddef5598ef49e
+SHA512:
+  metadata.gz: c6b77e8e70661df99d525009677064d530fa8e4e7565bf89f9215b51d90be6dda40f1df47dcaee9ff8e26ebefe5da3d0ab2448c3a5a80a95e8229ef32df5f31b
+  data.tar.gz: ed19bc67dbf0f470ad098758e19f61d927bb459692e40d6d5972353aa7ff544082f162423758abc0e2717f96892f41b08648ed43c78f3713e730c9b3fd4f1654

data/README

@@ -56,4 +56,4 @@ not be run.
 Contact
 =======
 
-Use dnsruby rubyforge forums, or contact : alexd@nominet.org.uk
+alex@caerkettontech.com

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 Rake::RDocTask.new do |rd|
   rd.rdoc_files.include("lib/**/*.rb")
@@ -9,8 +9,15 @@ Rake::RDocTask.new do |rd|
 end
   
 task :test => :install do 
-  require 'rake/runtest'
-  Rake.run_tests 'test/ts_dnsruby.rb'
+#  require 'rake/runtest'
+#  Rake.run_tests 'test/ts_dnsruby.rb'
+  require 'rake/testtask'
+
+  Rake::TestTask.new do |t|
+    t.libs << "test"
+    t.test_files = FileList['test/ts_dnsruby.rb']
+    t.verbose = true
+  end
 end
 
 task :default => :install do

data/lib/Dnsruby/Resolver.rb

@@ -329,7 +329,7 @@ module Dnsruby
     #     end
     #   end
     #
-    def send_async(*args) # msg, client_queue, client_query_id)
+    def send_async(msg, client_queue, client_query_id = nil)
       if (!@configured)
         add_config_nameservers
       end
@@ -338,11 +338,11 @@ module Dnsruby
         @resolver_ruby = ResolverRuby.new(self)
       end
       #      }
-      client_query_id = @resolver_ruby.send_async(*args)
+      client_query_id = @resolver_ruby.send_async(msg, client_queue, client_query_id)
       if (@single_resolvers.length == 0)
         Thread.start {
           sleep(@query_timeout == 0 ? 1 : @query_timeout)
-          args[1].push([client_query_id, nil, ResolvTimeout.new("Query timed out - no nameservers configured")])
+          client_queue.push([client_query_id, nil, ResolvTimeout.new("Query timed out - no nameservers configured")])
         }
       end
       return client_query_id
@@ -796,16 +796,7 @@ module Dnsruby
       @query_list = {}
       @timeouts = {}
     end
-    def send_async(*args) # msg, client_queue, client_query_id=nil)
-      msg=args[0]
-      client_queue=nil
-      client_query_id=nil
-      client_queue=args[1]
-      if (args.length > 2)
-        client_query_id = args[2]
-      end
-
-      
+    def send_async(msg, client_queue, client_query_id=nil)
       # This is the whole point of the Resolver class.
       # We want to use multiple SingleResolvers to run a query.
       # So we kick off a system with select_thread where we send

data/lib/Dnsruby/code_mapper.rb

@@ -133,6 +133,10 @@ module Dnsruby
       @string = @@arrays[self.class].values[@code]
     end
         
+    def hash
+      @code
+    end
+
     def inspect
       return @string
     end    

data/lib/Dnsruby/message.rb

@@ -633,7 +633,15 @@ module Dnsruby
       end
       return o
     end
-    
+
+    def clone
+      Message.decode(self.encode)
+    end
+
+    def ==(msg2)
+      return self.to_s == msg2.to_s
+    end
+
     #In dynamic update packets, the question section is known as zone and
     #specifies the zone to be updated.
     alias :zone :question

data/lib/Dnsruby/resource/DS.rb

@@ -36,7 +36,8 @@ module Dnsruby
       class DigestTypes < CodeMapper
         update()
         add_pair("SHA-1", 1)
-        add_pair("SHA-2", 2 )
+        add_pair("SHA-256", 2 )
+        add_pair("SHA-384", 4)
       end
   
       ClassValue = nil #:nodoc: all
@@ -123,7 +124,10 @@ module Dnsruby
             digestbin = OpenSSL::Digest::SHA1.digest(data)
             return digestbin
         elsif (digest_type.code == 2) 
-            digestbin = Digest::SHA256.digest(data)
+            digestbin = OpenSSL::Digest::SHA256.digest(data)
+            return digestbin
+        elsif (digest_type.code == 4)
+            digestbin = OpenSSL::Digest::SHA384.digest(data)
             return digestbin
         end
 

data/lib/Dnsruby/resource/SRV.rb

@@ -59,13 +59,13 @@ module Dnsruby
         
         def from_hash(hash)
           if hash[:priority]
-            @priority = hash[:priority].to_int
+            @priority = hash[:priority].to_i
           end
           if hash[:weight]
-            @weight = hash[:weight].to_int
+            @weight = hash[:weight].to_i
           end
           if hash[:port]
-            @port = hash[:port].to_int
+            @port = hash[:port].to_i
           end
           if hash[:target]
             @target= Name.create(hash[:target])

data/lib/dnsruby.rb

@@ -104,7 +104,7 @@ require 'Dnsruby/TheLog'
 module Dnsruby
 
   # @TODO@ Remember to update version in dnsruby.gemspec!
-  VERSION = 1.54
+  VERSION = 1.55
   def Dnsruby.version
     return VERSION
   end
@@ -141,7 +141,7 @@ module Dnsruby
     NOTAUTH = 9       # RFC 2136
     NOTZONE = 10       # RFC 2136
     
-#    BADVERS = 16 # an EDNS ExtendedRCode
+    #    BADVERS = 16 # an EDNS ExtendedRCode
     BADSIG = 16
     BADKEY = 17
     BADTIME = 18
@@ -266,7 +266,7 @@ module Dnsruby
     CERT      = 37      # RFC 2538
     DNAME     = 39      # RFC 2672
     OPT       = 41      # RFC 2671
-#    APL       = 42      # RFC 3123
+    #    APL       = 42      # RFC 3123
     DS        = 43      # RFC 4034
     SSHFP     = 44      # RFC 4255
     IPSECKEY  = 45      # RFC 4025
@@ -384,10 +384,11 @@ module Dnsruby
     RSAMD5     = 1
     DH         = 2
     DSA        = 3
-    ECC        = 4
     RSASHA1    = 5
     RSASHA256  = 8
     RSASHA512  = 10
+    ECDSAP256SHA256 = 13
+    ECDSAP384SHA384 = 14
     INDIRECT   = 252
     PRIVATEDNS = 253
     PRIVATEOID = 254
@@ -396,6 +397,8 @@ module Dnsruby
     add_pair("DSA-NSEC3-SHA1", 6)
     # Referred to as Algorithms.RSASHA1_NSEC3_SHA1
     add_pair("RSASHA1-NSEC3-SHA1", 7)
+    # Referred to as Algorithms.ECC_GOST
+    add_pair("ECC-GOST",12)
   end  
 
   # http://www.iana.org/assignments/dnssec-nsec3-parameters/dnssec-nsec3-parameters.xhtml

data/test/tc_dnsruby.rb

@@ -22,24 +22,24 @@ require 'dnsruby'
 include Dnsruby
 class TestDnsruby < Test::Unit::TestCase
   def test_dnsruby
-    a = Resolv.getaddress("www.ruby-lang.org")
-    assert_equal(a.to_s, "221.186.184.68")
-    a = Resolv.getaddresses("www.ruby-lang.org")
+    a = Resolv.getaddress("google-public-dns-a.google.com.")
+    assert_equal(a.to_s, "8.8.8.8")
+    a = Resolv.getaddresses("google-public-dns-a.google.com.")
     assert(a.length==1)
-    assert_equal(a[0].to_s, "221.186.184.68")
-    Resolv.each_address("www.ruby-lang.org") {|address| assert_equal(address, "221.186.184.68")}
+    assert_equal(a[0].to_s, "8.8.8.8")
+    Resolv.each_address("google-public-dns-a.google.com.") {|address| assert_equal(address, "8.8.8.8")}
     
-    n = Resolv.getname("210.251.121.214")
-    assert_equal(n, "ci.ruby-lang.org")
+    n = Resolv.getname("8.8.8.8")
+    assert_equal(n, "google-public-dns-a.google.com")
     begin
-      ret = Resolv.getname("www.ruby-lang.org")
+      ret = Resolv.getname("google-public-dns-a.google.com.")
       assert(false, ret)
     rescue Exception => e
       assert(e.kind_of?(ResolvError))
     end
-    n = Resolv.getnames("210.251.121.214")
+    n = Resolv.getnames("8.8.8.8")
     assert(n.length==1)
-    assert_equal(n[0], "ci.ruby-lang.org")
-    Resolv.each_name("210.251.121.214") {|name| assert_equal(name, "ci.ruby-lang.org")}
+    assert_equal(n[0], "google-public-dns-a.google.com")
+    Resolv.each_name("8.8.8.8") {|name| assert_equal(name, "google-public-dns-a.google.com")}
   end
 end

data/test/tc_hash.rb

@@ -0,0 +1,45 @@
+#--
+#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.
+#++
+begin
+  require 'rubygems'
+rescue LoadError
+end
+
+require 'test/unit'
+require 'set'
+require 'dnsruby'
+
+module Dnsruby
+
+class TestHash < Test::Unit::TestCase
+
+  def test_types_hash
+    object1 = Types.new(Types::NSEC3)
+    object2 = Types.new(Types::NSEC3)
+    assert(object1 == object2)
+    assert(object1.hash == object2.hash, "Hashes differed: #{object1.hash} != #{object2.hash}")
+  end
+
+  def test_types_set
+    object1 = Types.new(Types::NSEC3)
+    object2 = Types.new(Types::NSEC3)
+    assert(object1 == object2)
+    set = Set.new([object1, object2])
+    assert(set.size == 1, "Two equal objects should result in a set size of 1, but instead the size was #{set.size}.")
+  end
+
+end
+end

data/test/tc_name.rb

@@ -64,7 +64,8 @@ class TestName < Test::Unit::TestCase
     names.push(Name.create("z.example"))
     names.push(Name.create("\001.z.example"))
     names.push(Name.create("*.z.example"))
-    names.push(Name.create("\200.z.example"))
+#    names.push(Name.create("\200.z.example"))
+    names.push(Name.create(["c8"].pack("H*")+".z.example"))
     names.each_index {|i|
       if (i < (names.length() - 1))
         assert(names[i].canonically_before(names[i+1]))

data/test/tc_packet.rb

@@ -289,4 +289,12 @@ f4 00 31 04 64 6e 73 31 05 69 63 61 6e 6e 03 6f
     assert(section_rrsets["authority"].length == 1)
     assert(section_rrsets["additional"].length == 0)
   end
+
+  def test_clone
+    m = Message.new("blah.example.com", "DNSKEY", "IN")
+    m.header.rcode=4
+    m2 = m.clone
+    assert_equal(m.to_s, m2.to_s, "Clone to_s failed")
+    assert_equal(m, m2, "Clone failed")
+  end
 end

data/test/tc_recur.rb

@@ -22,7 +22,7 @@ class TestRecur < Test::Unit::TestCase
     Dnsruby::PacketSender.clear_caches
     r = Dnsruby::Recursor.new
 #    Dnsruby::TheLog.level = Logger::DEBUG
-    ret = r.query("uk-dnssec.nic.uk", Dnsruby::Types.DNSKEY)
+    ret = r.query("uk", Dnsruby::Types.DNSKEY)
 #    print ret
     assert(ret && ret.answer.length > 0)
 #    ret = r.query_dorecursion("aaa.bigzone.uk-dnssec.nic.uk", Dnsruby::Types.DNSKEY)

data/test/tc_tcp.rb

@@ -55,9 +55,11 @@ class TestTcp < Test::Unit::TestCase
       ts.close
     }
     ret = nil
+    sleep(1)
     client_thread = Thread.new {
-      res = Dnsruby::SingleResolver.new("127.0.0.1")
-      res.port = port
+#      res = Dnsruby::SingleResolver.new("127.0.0.1")
+      res = Dnsruby::SingleResolver.new("localhost")
+       res.port = port
       res.use_tcp = true
       res.src_port=src_port
       ret=res.query("example.com")
@@ -68,15 +70,16 @@ class TestTcp < Test::Unit::TestCase
       assert(ret.is_a?(Dnsruby::Message))
   end
   
-  def test_no_tcp
-    # Try to get a long response (which is truncated) and check that we have
-    # tc bit set
-    res = Dnsruby::Resolver.new()
-    res.udp_size = 512
-    res.no_tcp = true
-    ret = res.query("overflow.dnsruby.validation-test-servers.nominet.org.uk", Dnsruby::Types.TXT)
-    assert(ret.header.tc, "Message should be truncated with no TCP")
-  end
+#  def test_no_tcp
+#    # Try to get a long response (which is truncated) and check that we have
+#    @TODO@ FIX THIS TEST!!!
+#    # tc bit set
+#    res = Dnsruby::Resolver.new()
+#    res.udp_size = 512
+#    res.no_tcp = true
+#    ret = res.query("overflow.dnsruby.validation-test-servers.nominet.org.uk", Dnsruby::Types.TXT)
+#    assert(ret.header.tc, "Message should be truncated with no TCP")
+#  end
 
   class HackMessage < Dnsruby::Message
     def wipe_additional

data/test/ts_dnsruby.rb

@@ -13,5 +13,5 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
-require "test/ts_online.rb"
-require "test/ts_offline.rb"
+require_relative "ts_online.rb"
+require_relative "ts_offline.rb"

data/test/ts_offline.rb

@@ -20,30 +20,31 @@ end
 require 'dnsruby'
 Dnsruby.log.level = Logger::FATAL
 require "test/unit"
-require "test/tc_header.rb"
-require "test/tc_name.rb"
-require "test/tc_misc.rb"
-require "test/tc_packet.rb"
-require "test/tc_packet_unique_push.rb"
-require "test/tc_question.rb"
-require "test/tc_res_file.rb"
-require "test/tc_res_opt.rb"
-require "test/tc_res_config.rb"
-#require "test/tc_res_env.rb"
-require "test/tc_rr-txt.rb"
-require "test/tc_rr-unknown.rb"
-require "test/tc_rr.rb"
-require "test/tc_rrset.rb"
-require "test/tc_tkey.rb"
-require "test/tc_update.rb"
-require "test/tc_escapedchars.rb"
-require "test/tc_dnskey.rb"
-require "test/tc_rrsig.rb"
-require "test/tc_nsec.rb"
-require "test/tc_nsec3.rb"
-require "test/tc_nsec3param.rb"
-require "test/tc_ipseckey.rb"
-require "test/tc_naptr.rb"
+require_relative 'tc_header.rb'
+require_relative "tc_name.rb"
+require_relative "tc_misc.rb"
+require_relative "tc_hash.rb"
+require_relative "tc_packet.rb"
+require_relative "tc_packet_unique_push.rb"
+require_relative "tc_question.rb"
+require_relative "tc_res_file.rb"
+require_relative "tc_res_opt.rb"
+require_relative "tc_res_config.rb"
+#require_relative "tc_res_env.rb"
+require_relative "tc_rr-txt.rb"
+require_relative "tc_rr-unknown.rb"
+require_relative "tc_rr.rb"
+require_relative "tc_rrset.rb"
+require_relative "tc_tkey.rb"
+require_relative "tc_update.rb"
+require_relative "tc_escapedchars.rb"
+require_relative "tc_dnskey.rb"
+require_relative "tc_rrsig.rb"
+require_relative "tc_nsec.rb"
+require_relative "tc_nsec3.rb"
+require_relative "tc_nsec3param.rb"
+require_relative "tc_ipseckey.rb"
+require_relative "tc_naptr.rb"
 
 begin
   require "openssl"
@@ -58,5 +59,5 @@ rescue Exception => e
     puts "-----------------------------------------------------------------------"
 end
 if (have_openssl)
-    require "test/tc_ds.rb"
+    require_relative "tc_ds.rb"
 end

data/test/ts_online.rb

@@ -41,14 +41,14 @@ if (online)
   print "Running online tests. These tests send UDP packets - some may be lost.\n"
   print "If you get the odd timeout error with these tests, try running them again.\n"
   print "It may just be that some UDP packets got lost the first time...\n"
-  require "test/tc_resolver.rb"
-  require "test/tc_dnsruby.rb"
-  #  require "test/tc_inet6.rb"
-  #  require "test/tc_recurse.rb"
-  require "test/tc_tcp.rb"
-#  require "test/tc_queue.rb"
-  require "test/tc_recur.rb"
-  #  require "test/tc_soak.rb"
+  require_relative "tc_resolver.rb"
+  require_relative "tc_dnsruby.rb"
+  #  require_relative "tc_inet6.rb"
+  #  require_relative "tc_recurse.rb"
+  require_relative "tc_tcp.rb"
+#  require_relative "tc_queue.rb"
+  require_relative "tc_recur.rb"
+  #  require_relative "tc_soak.rb"
 
   # Check if we can contact the server - if we can't, then abort the test 
   # (but tell user that test has not been run due to connectivity problems)
@@ -61,18 +61,18 @@ if (online)
     server_up = true
   rescue Exception
     puts "----------------------------------------"
-    puts "Cannot connect to test server\n\t"+$!+"\n"
+    puts "Cannot connect to test server\n\t"+$!.to_s+"\n"
     puts "\n\nNo tests targetting this server will be run!!\n\n"
     puts "----------------------------------------"
   end
   if (server_up)
 
-    require "test/tc_single_resolver.rb"
-    require "test/tc_axfr.rb"
-    require "test/tc_cache.rb"
-    require "test/tc_dns.rb"
-    require "test/tc_rr-opt.rb"
-    require "test/tc_res_config.rb"
+    require_relative "tc_single_resolver.rb"
+    require_relative "tc_axfr.rb"
+    require_relative "tc_cache.rb"
+    require_relative "tc_dns.rb"
+    require_relative "tc_rr-opt.rb"
+    require_relative "tc_res_config.rb"
 
     have_openssl = false
     begin
@@ -88,13 +88,13 @@ if (online)
       puts "-------------------------------------------------------------------------"
     end
     if (have_openssl)
-      require "test/tc_tsig.rb"
+      require_relative "tc_tsig.rb"
       puts "------------------------------------------------------"
       puts "Running DNSSEC test - may fail if OpenSSL not complete"
       puts "------------------------------------------------------"      
-      require "test/tc_verifier.rb"
-      require "test/tc_dlv.rb"
-      require "test/tc_validator.rb"
+      require_relative "tc_verifier.rb"
+      require_relative "tc_dlv.rb"
+      require_relative "tc_validator.rb"
     end
 
 #    have_em = false

metadata

@@ -1,34 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dnsruby
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 54
-  version: "1.54"
+version: !ruby/object:Gem::Version
+  version: '1.55'
 platform: ruby
-authors: 
+authors:
 - AlexD
 autorequire: dnsruby
 bindir: bin
 cert_chain: []
-
-date: 2013-06-12 00:00:00 +01:00
-default_executable: 
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: alexd@nominet.org.uk
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - DNSSEC
 - EXAMPLES
 - README
 - EVENTMACHINE
-files: 
+files:
 - Rakefile
 - test/custom.txt
 - test/resolv.conf
@@ -40,6 +31,7 @@ files:
 - test/tc_dnsruby.rb
 - test/tc_ds.rb
 - test/tc_escapedchars.rb
+- test/tc_hash.rb
 - test/tc_header.rb
 - test/tc_hip.rb
 - test/tc_ipseckey.rb
@@ -154,35 +146,28 @@ files:
 - EXAMPLES
 - README
 - EVENTMACHINE
-has_rdoc: true
 homepage: http://rubyforge.org/projects/dnsruby/
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: dnsruby
-rubygems_version: 1.3.6
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby DNS(SEC) implementation
-test_files: 
+test_files:
 - test/ts_offline.rb