dnsruby 1.39 → 1.40

data/lib/dnsruby.rb

@@ -269,6 +269,7 @@ module Dnsruby
     DHCID     = 49      # RFC 4701
     NSEC3     = 50      # RFC still pending at time of writing
     NSEC3PARAM= 51      # RFC still pending at time of writing
+    HIP       = 55      # RFC 5205
     SPF       = 99      # RFC 4408
     UINFO     = 100     # non-standard
     UID       = 101     # non-standard
@@ -372,6 +373,7 @@ module Dnsruby
   
   # http://www.iana.org/assignments/dns-sec-alg-numbers/
   class Algorithms < CodeMapper
+    RESERVED   = 0
     RSAMD5     = 1
     DH         = 2
     DSA        = 3
@@ -568,6 +570,7 @@ module Dnsruby
     require 'Dnsruby/update'
     require 'Dnsruby/zone_transfer'
     require 'Dnsruby/dnssec'
+    require 'Dnsruby/zone_reader'
     
     #Default Resolver to use for Dnsruby class methods
     DefaultResolver = self.new

data/test/tc_hip.rb

@@ -0,0 +1,70 @@
+
+#--
+#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 TestHIP < Test::Unit::TestCase
+  def test_hip
+    [{"www.example.com.      IN  HIP ( 2 200100107B1A74DF365639CC39F1D578
+                                AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D )" =>
+          [2, "200100107B1A74DF365639CC39F1D578", "AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D", []]},
+
+      {"www.example.com.      IN  HIP ( 2 200100107B1A74DF365639CC39F1D578
+                                AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D
+                                rvs.example.com. )" =>
+          [2, "200100107B1A74DF365639CC39F1D578", "AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D",
+          ["rvs.example.com"]]},
+      {"www.example.com.      IN  HIP ( 2 200100107B1A74DF365639CC39F1D578
+                                AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D
+                                rvs1.example.com.
+                                rvs2.example.com. )" =>
+          [2, "200100107B1A74DF365639CC39F1D578", "AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D",
+          ["rvs1.example.com", "rvs2.example.com"]]},
+    ].each {|hash|
+      hash.each {|txt, data|
+
+
+        hip = RR.create(txt)
+        assert(hip.pk_algorithm == data[0])
+        assert(hip.hit_string == data[1])
+        assert(hip.public_key_string == data[2])
+        hip.rsvs.each {|in_rsv|
+          assert(data[3].include?in_rsv.to_s)
+        }
+        assert(data[3].length == hip.rsvs.length)
+
+
+        m = Dnsruby::Message.new
+        m.add_additional(hip)
+        data = m.encode
+        m2 = Dnsruby::Message.decode(data)
+        hip2 = m2.additional()[0]
+        assert(hip.pk_algorithm == hip2.pk_algorithm)
+        assert(hip.hit_string == hip2.hit_string)
+        assert(hip.public_key_string == hip2.public_key_string)
+        hip.rsvs.each {|in_rsv|
+          assert(hip2.rsvs.include?in_rsv)
+        }
+        assert(hip2.rsvs.length == hip.rsvs.length)
+        assert(hip == hip2)
+      }
+    }
+  end
+
+end
+ 

data/test/tc_ipseckey.rb

@@ -0,0 +1,70 @@
+
+#--
+#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 TestIPSECKEY < Test::Unit::TestCase
+  def test_ipseckey
+    [{"38.1.0.192.in-addr.arpa. 7200 IN     IPSECKEY ( 10 3 2
+                    mygateway.example.com.
+                     AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ== )" =>
+          ["mygateway.example.com", "AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==",
+          10, 3, 2]},
+
+      {"38.2.0.192.in-addr.arpa. 7200 IN     IPSECKEY ( 10 1 2
+                    192.0.2.38
+                    AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ== )" =>
+          ["192.0.2.38", "AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==", 10, 1, 2]},
+      {"38.2.0.192.in-addr.arpa. 7200 IN     IPSECKEY ( 10 0 2
+                    .
+                    AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ== )" =>
+          ["", "AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==", 10, 0, 2]},
+      {"38.2.0.192.in-addr.arpa. 7200 IN     IPSECKEY ( 10 1 2
+                    192.0.2.3
+                    AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ== )" =>
+          ["192.0.2.3", "AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==", 10, 1, 2]},
+      {"0.d.4.0.3.0.e.f.f.f.3.f.0.1.2.01.0.0.0.0.0.2.8.B.D.0.1.0.0.2.ip6.arpa. 7200 IN     IPSECKEY ( 10 2 2
+                    2001:0DB8:0:8002::2000:1
+                    AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ== )" =>
+          ["2001:DB8:0:8002::2000:1", "AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==",
+        10, 2, 2]}
+    ].each {|hash|
+      hash.each {|txt, data|
+
+
+      ipseckey = RR.create(txt)
+      assert(ipseckey.precedence == data[2])
+      assert(ipseckey.gateway_type == data[3])
+      assert(ipseckey.algorithm == data[4])
+      assert(ipseckey.gateway.to_s == data[0])
+      assert(ipseckey.public_key_string == data[1])
+
+      m = Dnsruby::Message.new
+      m.add_additional(ipseckey)
+      data = m.encode
+      m2 = Dnsruby::Message.decode(data)
+      ipseckey2 = m2.additional()[0]
+      assert(ipseckey.gateway_type == ipseckey2.gateway_type)
+      assert(ipseckey.algorithm == ipseckey2.algorithm)
+      assert(ipseckey.gateway == ipseckey2.gateway)
+      assert(ipseckey == ipseckey2)
+    }
+    }
+  end
+
+end

data/test/tc_rr.rb

@@ -167,11 +167,16 @@ class TestRR < Test::Unit::TestCase
       :certtype   => 3,
       :keytag			 => 1,
       :alg    => 1,
-      :cert  => '123456789abcdefghijklmnopqrstuvwxyz',
+      :cert  => 'ffsayw1dvk7higuvhn56r26uwjx/',
     },
     {	#[25]
       :type         => Types.SPF,
       :strings      => 'txt-txtdata',
+    },
+        {
+      :type         => Types.KX,
+      :preference   => 10,
+      :exchange     => 'kx-exchange.example.com',
     },
     ]
     
@@ -265,4 +270,35 @@ class TestRR < Test::Unit::TestCase
     update.add('example.com.','NAPTR', 3600, '1 0 "s" "SIP+D2T" "" _sip._tcp.example.com.')
     update.encode
   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/")
+#    rr = RR.create("all.rr.org.             IN      WKS             128.32.0.10 UDP who route timed domain")
+    rr = RR.create('selector._domainkey.all.rr.org. IN      TXT             "v=DKIM1; n=Use=20DKIM; p=AwEAAZfbYw8SffZwsbrCLbC+JLErREIF6Yfe9aqsa1Pz6tpGWiLxm9rSL6/YoBvNP3UWX91YDF0JMo6lhu3UIZjITvIwDhx+RJYko9vLzaaJKXGf3ygy6z+deWoZJAV1lTY0Ltx9genboe88CSCHw9aSLkh0obN9Ck8R6zAMYR19ciM/; t=s"')
+  end
+
+  def test_dhcid
+    rr = RR.create("all.rr.org.		IN	DHCID		AAIBY2/AuCccgoJbsaxcQc9TUapptP69lOjxfNuVAA2kjEA=")
+      m = Dnsruby::Message.new
+      m.add_additional(rr)
+      data = m.encode
+      m2 = Dnsruby::Message.decode(data)
+      rr2 = m2.additional()[0]
+      assert(rr == rr2)
+  end
+
+  def test_loc
+    rr = RR.create("all.rr.org.		IN	LOC		42 21 54 N 71 06 18 W -24m 30m")
+    assert(rr.vert_pre == 1000)
+    assert(rr.horiz_pre == 1000000)
+    lon = rr.longitude
+#    rr2 = RR.create("all.rr.org.	1209600	IN	LOC	42 21 54.000 N 71 06 18.000 W 4294967272m 30m 10000m 10m")
+#    print rr2.longitude
+#    assert(rr2.longitude = lon)
+#    print rr.to_s + "\n"
+#    print rr2.to_s + "\n"
+#    assert(rr.longitude == rr2.longitude)
+#    assert(rr == rr2)
+  end
 end

data/test/tc_verifier.rb

@@ -52,52 +52,6 @@ class VerifierTest < Test::Unit::TestCase
     verifier = Dnsruby::SingleVerifier.new(nil)
     verifier.verify_rrset(rrset, key512)
   end
-
-  def test_sha2_zone
-    key1 = Dnsruby::RR.create("example.com.    3600    IN      DNSKEY  256 3 8 AwEAAeTXG9RkEnPqrs1gTA
-+7R2YdovW5HrObuMcsgIjfgAupTXX7NHBVUVX0oF2x8fJIeYt9pTuogTuUhw9/
-kJrCI43VWa7xbsMkTbyj1/
-wrfZB25nZnt4DQiqpYm8AZ3XmRBilibsGubVvrzWiQLC1gGXKUJ7JyQyL98G9ODUH2bmnb
-  ;{id = 43938 (zsk), size = 1024b}")
-    key2 = Dnsruby::RR.create("example.com.    3600    IN      DNSKEY  257 3 8
-AwEAAeLAE37+XYbieMtOqPRMbimhCjcyc/bSTbMQtKioxzjzgBPu/gVgHTeITJa
-+IBFOD763HkzmG6ZIEcNAagCLg6+xeTnp017CBWWgnU+ksXdjgQ5KLfM/g4d2TL/Xf/BZJP
-+JcIYqx3BNDT//bJpuwXqk6WkMtHGDSfSugel26TvgxG9X9xTaJh0u/
-QMFpm9H4IyQ8557cYAG04z8Yx3PszE5niE6JGho7Qpv2YhpsuLh7dneUTtdqFajdyqU0lZ3iDHnrfm7ve75LorIMPB0FqIo8Q
-+hqV/U44QB/gTuXiBPjxje6D6WLWJdisIKflYZjUBD0FxuOXZQ5+RFVMV5RSc= ;{id =
-18976 (ksk), size = 2048b}")
-    rrset = Dnsruby::RRSet.new(key1)
-    rrset.add(key2)
-    sig2 = Dnsruby::RR.create("example.com.    3600    IN      RRSIG   DNSKEY 8 2 3600 20091109083537
-20091012083537 18976 example.com. 0S/8cNh9otTenbcqQ2C5fxglGLrkI/EHp/
-8Y3NDbJ5M50xUzrXd91wjDCE2X/z7UNGeBtyFRqm2ZeId4MygBIBsFaqOr98X8qQo3qpZ/
-ZtudmSSlk8X77bnKzsBxdLQgtE/REiT6j556zJJ9LtQ/
-yHgdMmJa5BNPYbQDpJdzJGIYLe1Gx8edOqcPt0LAc3FmjB096Gmlt7JpIWJXrh2Q82eDTkLiEpv7ePAimduKh14
-+ERi6mLKFDaQjnfkwZ7/zjw6Ekp3a7L9Pa4S/OKUis/TarEQJf
-+w9yAVKKL8HCIFKOXfn1rOWZ8LIEzlmUmOVOV03F1Paww+9fJaG+WDhpQ== ;{id =
-18976}")
-    rrset.add(sig2)
-    verifier = Dnsruby::SingleVerifier.new(nil)
-    verifier.verify_rrset(rrset, key2)
-    sig = Dnsruby::RR.create("example.com.    3600    IN      RRSIG   DNSKEY 8 2 3600 20091109083537  
-20091012083537 43938 example.com. TXaNGZ4QklUIlPtXaGhNegER 
-+uwJAvM9fSmnSt55FiMrMgkJDb6b/ 
-GTyOF6INgKopO1wZRZI0iWaPUI0SRow6 
-+X8Idpk05uG7Two5R9uMGX0hu8PWc8BzuAxgeyawCYkXwXQ6Ah0PF9xkc/ 
-Xlieo6T34XsoeHmKjmjMWs1KdFkU= ;{id = 43938}")
-    rrset.add(sig)
-    verifier.verify_rrset(rrset, key1)
-    txt = Dnsruby::RR.create('example.com.    86400   IN      TXT     "v=spf1 -all"')
-    rrset = Dnsruby::RRSet.new(txt)
-    txt_sig = Dnsruby::RR.create("example.com.    86400   IN      RRSIG   TXT 8 2 86400 20091109083536
-20091012083536 43938 example.com. rZcuxDZ7QO1oBSqwlV
-+1ar7RTvwWOCYpgZy6oxXQMWkxONXnHVQO32yl
-+3WzROW4tYHfFpsdyvo1BCT1PRRXLcLFGJd/
-T3Y6ciiq5ZzsesfYV0aChOUhseX7MnMjsaLGbmDDVmGqW78nsoBjv9g
-+0YshQa7E1ctz2aQ2sorWN+E= ;{id = 43938}")
-    rrset.add(txt_sig)
-    verifier.verify_rrset(rrset, key1)
-  end
   
   def test_se_query
     # Run some queries on the .se zone

data/test/ts_offline.rb

@@ -39,6 +39,7 @@ 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"
 
 begin
   require "openssl"
@@ -54,4 +55,4 @@ rescue Exception => e
 end
 if (have_openssl)
     require "test/tc_ds.rb"
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dnsruby
 version: !ruby/object:Gem::Version 
-  version: "1.39"
+  version: "1.40"
 platform: ruby
 authors: 
 - AlexD
@@ -9,7 +9,7 @@ autorequire: dnsruby
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 +01:00
+date: 2009-11-12 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,8 @@ files:
 - test/tc_ds.rb
 - test/tc_escapedchars.rb
 - test/tc_header.rb
+- test/tc_hip.rb
+- test/tc_ipseckey.rb
 - test/tc_itar.rb
 - test/tc_misc.rb
 - test/tc_name.rb
@@ -92,14 +94,18 @@ files:
 - lib/Dnsruby/resource/AAAA.rb
 - lib/Dnsruby/resource/AFSDB.rb
 - lib/Dnsruby/resource/CERT.rb
+- lib/Dnsruby/resource/DHCID.rb
 - lib/Dnsruby/resource/DLV.rb
 - lib/Dnsruby/resource/DNSKEY.rb
 - lib/Dnsruby/resource/domain_name.rb
 - lib/Dnsruby/resource/DS.rb
 - lib/Dnsruby/resource/generic.rb
 - lib/Dnsruby/resource/HINFO.rb
+- lib/Dnsruby/resource/HIP.rb
 - lib/Dnsruby/resource/IN.rb
+- lib/Dnsruby/resource/IPSECKEY.rb
 - lib/Dnsruby/resource/ISDN.rb
+- lib/Dnsruby/resource/KX.rb
 - lib/Dnsruby/resource/LOC.rb
 - lib/Dnsruby/resource/MINFO.rb
 - lib/Dnsruby/resource/MX.rb
@@ -128,6 +134,7 @@ files:
 - lib/Dnsruby/TheLog.rb
 - lib/Dnsruby/update.rb
 - lib/Dnsruby/validator_thread.rb
+- lib/Dnsruby/zone_reader.rb
 - lib/Dnsruby/zone_transfer.rb
 - lib/dnsruby.rb
 - demo/axfr.rb
@@ -170,6 +177,6 @@ rubyforge_project: dnsruby
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Ruby DNS implementation
+summary: Ruby DNS(SEC) implementation
 test_files: 
 - test/ts_offline.rb