dnsruby 1.60.1 → 1.60.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfb5e0f9d0b657bba3a0ad8d8edde456e253d638
-  data.tar.gz: 4c80209c7c2e6823e1958e9c79c0665805c0f9a0
+  metadata.gz: 286d5426865cf680082a434f91ceb9004ef616ca
+  data.tar.gz: b6dfef1f6420e1246c074c86de4ddac5260ba02a
 SHA512:
-  metadata.gz: 2f53ebb527626d922813c53b4c8cd8daa73ff22721a812ea55963c28201b44da43c7be779316fb9e3041a7183e0c7c3ef99faf73a69fb9fb9845b70ce428f31f
-  data.tar.gz: b93907dc484ddd07a0fcd2b8eaeebbc92d261c23bd2046ce7c6159c75a3fe350eae485977b6afcac44bcdf999501d2eb4255f92118f1e8f0e682193d74db9dfa
+  metadata.gz: d447b1b997edfad80524e859f7088143e6b48dc3da6fdbf942777ff8d1f8ad40d09944b8679965ea1623804ecc92c54814d271d7faec73e858a5836d14196173
+  data.tar.gz: 5f4c06324994a7c07b2257cfaef48b2f482305189fad014a846cf88ccd91988e480949c3279f824e401724a1be7fd83d8427fc766a2b486f898c04430bcdab51

data/RELEASE_NOTES.md

@@ -1,5 +1,13 @@
 # Release Notes
 
+## v1.60.2
+
+* Fix deletion of TXT records with spaces in dynamic updates (thanks Sean Dilda)
+* Fix use of non-default ports in Dnsruby::Resolver (thanks Thomas Morgan)
+* Fix NAPTR encoding for null rdata dynamic update packets
+* Fix CAA resource record encoding
+* Avoid changing ruby global thread abort behavior (thanks Brent Cook)
+
 ## v1.60.1
 
 * DNSSEC validation switched OFF by default (but can still be switched on)

data/lib/dnsruby/resolver.rb

@@ -487,6 +487,7 @@ module Dnsruby
         @config.nameserver.each do |ns|
           res = PacketSender.new({
               server:             ns,
+              port:               @port,
               dnssec:             @dnssec,
               use_tcp:            @use_tcp,
               no_tcp:             @no_tcp,

data/lib/dnsruby/resource/CAA.rb

@@ -54,15 +54,17 @@ module Dnsruby
       end
 
       def encode_rdata(msg, canonical=false) #:nodoc: all
-        msg.put_pack('n', flag)
+        msg.put_pack('C', flag)
         msg.put_string(@property_tag)
-        msg.put_string(@property_value)
+        # We don't put a length byte on the final string.
+        msg.put_bytes(@property_value)
       end
 
       def self.decode_rdata(msg) #:nodoc: all
-        flag, = msg.get_unpack('n')
+        flag, = msg.get_unpack('C')
         property_tag = msg.get_string
-        property_value = msg.get_string
+        # The final string has no length byte - its length is implicit as the remainder of the packet length
+        property_value = msg.get_bytes
         return self.new("#{flag} #{property_tag} \"#{property_value}\"")
       end
     end

data/lib/dnsruby/resource/NAPTR.rb

@@ -52,7 +52,7 @@ module Dnsruby
       end
 
       def from_string(input) #:nodoc: all
-        if (input.length > 0)
+        if (input.strip.length > 0)
           values = input.split(" ")
           @order = values [0].to_i
           @preference = values [1].to_i
@@ -76,12 +76,14 @@ module Dnsruby
       end
 
       def encode_rdata(msg, canonical=false) #:nodoc: all
-        msg.put_pack('n', @order)
-        msg.put_pack('n', @preference)
-        msg.put_string(@flags)
-        msg.put_string(@service)
-        msg.put_string(@regexp)
-        msg.put_name(@replacement, true)
+        if (@order != nil)
+          msg.put_pack('n', @order)
+          msg.put_pack('n', @preference)
+          msg.put_string(@flags)
+          msg.put_string(@service)
+          msg.put_string(@regexp)
+          msg.put_name(@replacement, true)
+        end
       end
 
       def self.decode_rdata(msg) #:nodoc: all

data/lib/dnsruby/select_thread.rb

@@ -24,7 +24,6 @@ require 'set'
 require 'singleton'
 require 'dnsruby/validator_thread.rb'
 module Dnsruby
-  Thread::abort_on_exception = true
   class SelectThread #:nodoc: all
     class SelectWakeup < RuntimeError; end
     include Singleton

data/lib/dnsruby/update.rb

@@ -1,12 +1,12 @@
 # --
 # 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.
@@ -20,81 +20,81 @@ module Dnsruby
 
   # The first example below shows a complete program; subsequent examples
   # show only the creation of the update packet.
-  # 
+  #
   # == Add a new host
-  # 
+  #
   #  require 'Dnsruby'
-  # 
+  #
   #  # Create the update packet.
   #  update = Dnsruby::Update.new('example.com')
-  # 
+  #
   #  # Prerequisite is that no A records exist for the name.
   #  update.absent('foo.example.com.', 'A')
-  # 
+  #
   #  # Add two A records for the name.
   #  update.add('foo.example.com.', 'A', 86400, '192.168.1.2')
   #  update.add('foo.example.com.', 'A', 86400, '172.16.3.4')
-  # 
+  #
   #  # Send the update to the zone's primary master.
   #  res = Dnsruby::Resolver.new({:nameserver => 'primary-master.example.com'})
-  # 
+  #
   #  begin
   #      reply = res.send_message(update)
   #      print "Update succeeded\n"
   #   rescue Exception => e
   #      print 'Update failed: #{e}\n'
   #   end
-  # 
+  #
   # == Add an MX record for a name that already exists
-  # 
+  #
   #     update = Dnsruby::Update.new('example.com')
   #     update.present('example.com')
-  #     update.add('example.com', Dnsruby::Types.MX, 10, 'mailhost.example.com')
-  # 
+  #     update.add('example.com', Dnsruby::Types.MX, 86400, 10, 'mailhost.example.com')
+  #
   # == Add a TXT record for a name that doesn't exist
-  # 
+  #
   #     update = Dnsruby::Update.new('example.com')
   #     update.absent('info.example.com')
   #     update.add('info.example.com', Types.TXT, 86400, "yabba dabba doo"')
-  # 
+  #
   # == Delete all A records for a name
-  # 
+  #
   #     update = Dnsruby::Update.new('example.com')
   #     update.present('foo.example.com', 'A')
   #     update.delete('foo.example.com', 'A')
-  # 
+  #
   # == Delete all RRs for a name
-  # 
+  #
   #     update = Dnsruby::Update.new('example.com')
   #     update.present('byebye.example.com')
   #     update.delete('byebye.example.com')
-  # 
+  #
   # == Perform a signed update
-  # 
+  #
   #     key_name = 'tsig-key'
   #     key      = 'awwLOtRfpGE+rRKF2+DEiw=='
-  # 
+  #
   #     update = Dnsruby::Update.new('example.com')
-  #     update.add('foo.example.com', 'A', 86400, 10.1.2.3'))
-  #     update.add('bar.example.com', 'A', 86400, 10.4.5.6'))
+  #     update.add('foo.example.com', 'A', 86400, '10.1.2.3'))
+  #     update.add('bar.example.com', 'A', 86400, '10.4.5.6'))
   #     res.tsig=(key_name,key)
-  # 
+  #
   class Update < Message
     # Returns a Dnsruby::Update object suitable for performing a DNS
     # dynamic update.  Specifically, it creates a message with the header
     # opcode set to UPDATE and the zone record type to SOA (per RFC 2136,
     # Section 2.3).
-    # 
+    #
     # Programs must use the push method to add RRs to the prerequisite,
     # update, and additional sections before performing the update.
-    # 
+    #
     # Arguments are the zone name and the class.  If the zone is omitted,
     # the default domain will be taken from the resolver configuration.
     # If the class is omitted, it defaults to IN.
     #     packet = Dnsruby::Update.new
     #     packet = Dnsruby::Update.new('example.com')
     #     packet = Dnsruby::Update.new('example.com', 'HS')
-    # 
+    #
     def initialize(zone=nil, klass=nil)
 
       #  sort out the zone section (RFC2136, section 2.3)
@@ -115,25 +115,25 @@ module Dnsruby
     end
 
     # Ways to create the prerequisite records (exists, notexists, inuse, etc. - RFC2136, section 2.4)
-    # 
+    #
     #       (1)  RRset exists (value independent).  At least one RR with a
     #            specified NAME and TYPE (in the zone and class specified by
     #            the Zone Section) must exist.
-    # 
+    #
     #            update.present(name, type)
-    # 
+    #
     #       (2)  RRset exists (value dependent).  A set of RRs with a
     #            specified NAME and TYPE exists and has the same members
     #            with the same RDATAs as the RRset specified here in this
     #            Section.
-    # 
+    #
     #            update.present(name, type, rdata)
-    # 
+    #
     #       (4)  Name is in use.  At least one RR with a specified NAME (in
     #            the zone and class specified by the Zone Section) must exist.
     #            Note that this prerequisite is NOT satisfied by empty
     #            nonterminals.
-    # 
+    #
     #            update.present(name)
     def present(*args)
       ttl = 0
@@ -159,18 +159,18 @@ module Dnsruby
 
     # Ways to create the prerequisite records (exists, notexists, inuse, etc. - RFC2136, section 2.4)
     # Can be called with one arg :
-    # 
+    #
     #    update.absent(name)
     #       (5)  Name is not in use.  No RR of any type is owned by a
     #            specified NAME.  Note that this prerequisite IS satisfied by
     #            empty nonterminals.
-    # 
+    #
     # Or with two :
-    # 
+    #
     #    update.absent(name, type)
     #       (3)  RRset does not exist.  No RRs with a specified NAME and TYPE
     #           (in the zone and class denoted by the Zone Section) can exist.
-    # 
+    #
     def absent(*args)
       ttl = 0
       rdata = ""
@@ -191,16 +191,16 @@ module Dnsruby
 
     # Ways to create the update records (add, delete, RFC2136, section 2.5)
     #   " 2.5.1 - Add To An RRset
-    # 
+    #
     #    RRs are added to the Update Section whose NAME, TYPE, TTL, RDLENGTH
     #    and RDATA are those being added, and CLASS is the same as the zone
     #    class.  Any duplicate RRs will be silently ignored by the primary
     #    master."
-    # 
+    #
     #    update.add(rr)
     #    update.add([rr1, rr2])
     #    update.add(name, type, ttl, rdata)
-    # 
+    #
     def add(*args)
       zoneclass=zone()[0].zclass
       case args[0]
@@ -244,17 +244,17 @@ module Dnsruby
     end
 
     # Ways to create the update records (add, delete, RFC2136, section 2.5)
-    # 
+    #
     # 2.5.2 - Delete An RRset
     #    update.delete(name, type)
-    # 
-    # 
+    #
+    #
     # 2.5.3 - Delete All RRsets From A Name
     #    update.delete(name)
-    # 
+    #
     # 2.5.4 - Delete An RR From An RRset
     #   update.delete(name, type, rdata)
-    # 
+    #
     def delete(*args)
       ttl = 0
       klass = Classes.ANY
@@ -268,11 +268,28 @@ module Dnsruby
         resource = RR.create("#{args[0]} #{ttl} #{klass} #{args[1]} #{rdata}")
         add_update(resource)
       when 3 # name, type, rdata
-        resource = RR.create("#{args[0]} #{ttl} IN #{args[1]} #{args[2]}")
+        name = args[0]
+        type = args[1]
+        rdata = args[2]
+        if (Types.new(type) == Types.TXT)
+          instring = "#{name} #{ttl} IN #{type} ";
+          if (String === rdata)
+            instring += " '#{rdata}'"
+          elsif (Array === rdata)
+            rdata.length.times {|rcounter|
+            instring += " '#{rdata[rcounter]}' "
+            }
+          else
+            instring += rdata
+          end
+          resource = RR.create(instring)
+        else
+          resource = RR.create("#{name} #{ttl} IN #{type} #{rdata}")
+        end
         resource.klass = Classes.NONE
         add_update(resource)
       end
       return resource
     end
   end
-end
+end

data/lib/dnsruby/version.rb

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

data/test/tc_update.rb

@@ -274,6 +274,18 @@ class TestUpdate < Minitest::Test
     assert(update.to_s.index("test signed update"))
   end
 
+  def test_delete_txt
+    update = Update.new 'example.com'
+    update.delete 'test.example.com', 'TXT', 'foo bar'
+
+    encoded_msg = Message.decode update.encode
+    rr = encoded_msg.authority.first
+    assert_equal rr.name.to_s, 'test.example.com', 'delete_txt - right name'
+    assert_equal 0, rr.ttl, 'delete_txt - right ttl'
+    assert_equal 'TXT', rr.type.string, 'delete_txt - right type'
+    assert_equal ['foo bar'], rr.rdata, 'delete_txt - right rdata'
+  end
+
   def test_array
     update = Update.new
     update.add("target_name", "TXT", 100, ['"test signed update"', 'item#2'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dnsruby
 version: !ruby/object:Gem::Version
-  version: 1.60.1
+  version: 1.60.2
 platform: ruby
 authors:
 - Alex Dalitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry