dnsruby 1.38 → 1.39

data/demo/digdlv.rb

@@ -71,7 +71,7 @@ if (type.upcase == "AXFR")
     
 else
 
-#  Dnsruby::TheLog.level=Logger::DEBUG
+  Dnsruby::TheLog.level=Logger::DEBUG
   begin
     answer = nil
     answer = res.query(name, type, klass)

data/lib/Dnsruby/resource/IN.rb

@@ -19,7 +19,7 @@ module Dnsruby
       NS, CNAME, DNAME, DNSKEY, SOA, PTR, HINFO, MINFO, MX, TXT,
       ISDN, MB, MG, MR, NAPTR, NSAP, OPT, RP, RT, X25,
       SPF, CERT, LOC, TSIG, TKEY, ANY, RRSIG, NSEC, DS, NSEC3,
-      NSEC3PARAM, DLV
+      NSEC3PARAM, DLV, SSHFP
     ] #:nodoc: all
     
     # module IN contains ARPA Internet specific RRs

data/lib/Dnsruby/resource/NAPTR.rb

@@ -52,16 +52,16 @@ module Dnsruby
           values = input.split(" ")
           @order = values [0].to_i
           @preference = values [1].to_i
-          @flags = values [2]
-          @service = values [3]
-          @regexp = values [4]
+          @flags = values [2].gsub!("\"", "")
+          @service = values [3].gsub!("\"", "")
+          @regexp = values [4].gsub!("\"", "")
           @replacement = Name.create(values[5])
         end
       end
       
       def rdata_to_string #:nodoc: all
         if (@order!=nil)
-          return "#{@order} #{@preference} #{@flags} #{@service} #{@regexp} #{@replacement}"
+          return "#{@order} #{@preference} \"#{@flags}\" \"#{@service}\" \"#{@regexp}\" #{@replacement}"
         else
           return ""
         end
@@ -79,9 +79,9 @@ module Dnsruby
       def self.decode_rdata(msg) #:nodoc: all
         order, = msg.get_unpack('n')
         preference, = msg.get_unpack('n')
-        flags, = msg.get_string
-        service, = msg.get_string
-        regexp, = msg.get_string
+        flags = msg.get_string
+        service = msg.get_string
+        regexp = msg.get_string
         replacement = msg.get_name
         return self.new([order, preference, flags, service, regexp, replacement])
       end

data/lib/Dnsruby/resource/NSEC.rb

@@ -66,7 +66,11 @@ module Dnsruby
       end
 
       def types=(t)
+        if (t && t.length > 0)
         @types = NSEC.get_types(t)
+        else
+          @types = []
+        end
       end
       
       def self.get_types(t)

data/lib/Dnsruby/resource/NSEC3.rb

@@ -164,7 +164,11 @@ module Dnsruby
       end
       
       def types=(t)
+        if (t && t.length > 0)
         @types = NSEC.get_types(t)
+        else
+          @types = []
+        end
       end
       
       def add_type(t)
@@ -256,7 +260,7 @@ module Dnsruby
       
       def from_string(input)
         if (input.length > 0)
-          data = input.split(" ")
+          data = input.split
           self.hash_alg=(data[0]).to_i
           self.flags=(data[1]).to_i
           self.iterations=(data[2]).to_i

data/lib/Dnsruby/resource/SSHFP.rb

@@ -0,0 +1,91 @@
+#--
+#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.
+#++
+module Dnsruby
+  class RR
+    class SSHFP < RR
+      ClassValue = nil #:nodoc: all
+      TypeValue = Types::SSHFP #:nodoc: all
+
+      attr_accessor :alg
+      attr_accessor :fptype
+      attr_accessor :fp
+
+      class Algorithms < CodeMapper
+        RSA = 1
+        DSS = 2
+        update()
+      end
+
+      class FpTypes < CodeMapper
+        SHA1 = 1
+        update()
+      end
+
+      def from_data(data) #:nodoc: all
+        alg, fptype, @fp = data
+        @alg = Algorithms.new(alg)
+        @fptype = FpTypes.new(fptype)
+      end
+
+      def from_hash(hash)
+        if hash[:alg]
+          @alg = Algorithms.new(hash[:alg])
+        end
+        if hash[:fptype]
+          @fptype = FpTypes.new(hash[:fptype])
+        end
+        if hash[:fp]
+          @fp = hash[:fp]
+        end
+      end
+
+      def from_string(input)
+        if (input.length > 0)
+          names = input.split(" ")
+          begin
+            @alg = Algorithms.new(names[0].to_i)
+          rescue ArgumentError
+            @alg = Algorithms.new(names[0])
+          end
+          begin
+            @fptype = FpTypes.new(names[1].to_i)
+          rescue ArgumentError
+            @fptype = FpTypes.new(names[1])
+          end
+          @fp = [names[2]].pack("H*")
+        end
+      end
+
+      def rdata_to_string
+        ret = "#{@alg.code} #{@fptype.code} "
+        ret += @fp.unpack("H*")[0]
+        return ret
+      end
+
+      def encode_rdata(msg, canonical=false) #:nodoc: all
+        msg.put_pack("c", @alg.code)
+        msg.put_pack("c", @fptype.code)
+        msg.put_bytes(@fp)
+      end
+
+      def self.decode_rdata(msg) #:nodoc: all
+        alg, fptype = msg.get_unpack("cc")
+        fp = msg.get_bytes
+        return self.new([alg, fptype, fp])
+      end
+    end
+  end
+end

data/lib/Dnsruby/resource/generic.rb

@@ -149,4 +149,5 @@ require 'Dnsruby/resource/NSEC'
 require 'Dnsruby/resource/DS'
 require 'Dnsruby/resource/NSEC3'
 require 'Dnsruby/resource/NSEC3PARAM'
-require 'Dnsruby/resource/DLV'
+require 'Dnsruby/resource/DLV'
+require 'Dnsruby/resource/SSHFP'

data/test/tc_nsec3.rb

@@ -20,6 +20,8 @@ require 'dnsruby'
 class Nsec3Test < Test::Unit::TestCase
   INPUT = "2t7b4g4vsa5smi47k61mv5bv1a22bojr.example. 3600 IN NSEC3 1 1 12 aabbccdd ( " + 
     "2vptu5timamqttgl4luu9kg21e0aor3s A RRSIG )"
+  INPUT2 = "2t7b4g4vsa5smi47k61mv5bv1a22bojr.example. 3600 IN NSEC3 1 1 12 aabbccdd " +
+    "2vptu5timamqttgl4luu9kg21e0aor3s"
   include Dnsruby
   def test_nsec_from_string
     nsec = Dnsruby::RR.create(INPUT)
@@ -32,6 +34,16 @@ class Nsec3Test < Test::Unit::TestCase
     
     nsec2 = Dnsruby::RR.create(nsec.to_s)
     assert(nsec2.to_s == nsec.to_s)
+
+    nsec = Dnsruby::RR.create(INPUT2)
+    assert_equal([], nsec.types)
+    assert(nsec.opt_out?)
+    assert_equal(12, nsec.iterations)
+    assert_equal("aabbccdd", nsec.salt)
+    assert_equal(Dnsruby::Nsec3HashAlgorithms.SHA_1, nsec.hash_alg)
+
+    nsec2 = Dnsruby::RR.create(nsec.to_s)
+    assert(nsec2.to_s == nsec.to_s)
   end
 
   def test_base32

data/test/tc_sshfp.rb

@@ -0,0 +1,41 @@
+ 
+#--
+#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'
+include Dnsruby
+class TestSSHFP < Test::Unit::TestCase
+  def test_sshfp
+    txt = "apt-blade6.nominet.org.uk. 85826 IN	SSHFP	1 1 6D4CF7C68E3A959990855099E15D6E0D4DEA4FFF"
+    sshfp = RR.create(txt)
+    assert(sshfp.type == Types.SSHFP)
+    assert(sshfp.alg == RR::SSHFP::Algorithms.RSA)
+    assert(sshfp.fptype == RR::SSHFP::FpTypes.SHA1)
+    assert(sshfp.fp.unpack("H*")[0].upcase == "6D4CF7C68E3A959990855099E15D6E0D4DEA4FFF")
+    
+    m = Dnsruby::Message.new
+    m.add_additional(sshfp)
+    data = m.encode
+    m2 = Dnsruby::Message.decode(data)
+    sshfp2 = m2.additional()[0]
+    assert(sshfp.fptype == sshfp2.fptype)
+    assert(sshfp.alg == sshfp2.alg)
+    assert(sshfp.fp == sshfp2.fp)
+    assert(sshfp == sshfp2)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dnsruby
 version: !ruby/object:Gem::Version 
-  version: "1.38"
+  version: "1.39"
 platform: ruby
 authors: 
 - AlexD
@@ -9,7 +9,7 @@ autorequire: dnsruby
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 +01:00
+date: 2009-10-16 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -61,6 +61,7 @@ files:
 - test/tc_single_resolver.rb
 - test/tc_soak.rb
 - test/tc_soak_base.rb
+- test/tc_sshfp.rb
 - test/tc_tcp.rb
 - test/tc_tkey.rb
 - test/tc_tsig.rb
@@ -116,6 +117,7 @@ files:
 - lib/Dnsruby/resource/SOA.rb
 - lib/Dnsruby/resource/SPF.rb
 - lib/Dnsruby/resource/SRV.rb
+- lib/Dnsruby/resource/SSHFP.rb
 - lib/Dnsruby/resource/TKEY.rb
 - lib/Dnsruby/resource/TSIG.rb
 - lib/Dnsruby/resource/TXT.rb