net-dns 0.8.0 → 0.9.0

data/lib/net/dns/names.rb

@@ -1,8 +1,6 @@
 module Net # :nodoc:
   module DNS
-
     module Names
-
       # Base error class.
       class Error < StandardError
       end
@@ -11,7 +9,6 @@ module Net # :nodoc:
       class ExpandError < Error
       end
 
-
       INT16SZ = 2
 
       # Expand a compressed name in a DNS Packet object. Please
@@ -23,29 +20,33 @@ module Net # :nodoc:
       # offset, which indicates the point in the packet in which the
       # parsing has arrived.
       #
-      def dn_expand(packet,offset)
+      def dn_expand(packet, offset)
         name = ""
         packetlen = packet.size
-        while true
-          raise ExpandError, "Offset is greater than packet lenght!" if packetlen < (offset+1)
+        loop do
+          raise ExpandError, "Offset is greater than packet lenght!" if packetlen < (offset + 1)
+
           len = packet.unpack("@#{offset} C")[0]
 
           if len == 0
             offset += 1
             break
           elsif (len & 0xC0) == 0xC0
-            raise ExpandError, "Packet ended before offset expand" if packetlen < (offset+INT16SZ)
+            raise ExpandError, "Packet ended before offset expand" if packetlen < (offset + INT16SZ)
+
             ptr = packet.unpack("@#{offset} n")[0]
             ptr &= 0x3FFF
-            name2 = dn_expand(packet,ptr)[0]
-            raise ExpandError, "Packet is malformed!" if name2 == nil
+            name2 = dn_expand(packet, ptr)[0]
+            raise ExpandError, "Packet is malformed!" if name2.nil?
+
             name += name2
             offset += INT16SZ
             break
           else
             offset += 1
-            raise ExpandError, "No expansion found" if packetlen < (offset+len)
-            elem = packet[offset..offset+len-1]
+            raise ExpandError, "No expansion found" if packetlen < (offset + len)
+
+            elem = packet[offset..offset + len - 1]
             name += "#{elem}."
             offset += len
           end
@@ -54,16 +55,18 @@ module Net # :nodoc:
       end
 
       def pack_name(name)
-        if name.size > 255 
+        if name.size > 255
           raise ArgumentError, "Name may not exceed 255 chars"
         end
+
         arr = name.split(".")
         str = ""
         arr.each do |elem|
           if elem.size > 63
             raise ArgumentError, "Label may not exceed 63 chars"
           end
-          str += [elem.size,elem].pack("Ca*")
+
+          str += [elem.size, elem].pack("Ca*")
         end
         str += [0].pack("C")
         str
@@ -74,22 +77,22 @@ module Net # :nodoc:
         ar = []
         string = ""
         arr.size.times do |i|
-          x = i+1
+          x = i + 1
           elem = arr[-x]
           len = elem.size
-          string = ((string.reverse)+([len,elem].pack("Ca*")).reverse).reverse
+          string = (string.reverse + [len, elem].pack("Ca*").reverse).reverse
           ar.unshift(string)
         end
-        return ar
+        ar
       end
 
-      def dn_comp(name,offset,compnames)
+      def dn_comp(name, offset, compnames)
         names = {}
         ptr = 0
         str = ""
         arr = names_array(name)
         arr.each do |entry|
-          if compnames.has_key?(entry)
+          if compnames.key?(entry)
             ptr = 0xC000 | compnames[entry]
             str += [ptr].pack("n")
             offset += INT16SZ
@@ -97,22 +100,21 @@ module Net # :nodoc:
           else
             len = entry.unpack("C")[0]
             elem = entry[1..len]
-            str += [len,elem].pack("Ca*")
-            names.update({"#{entry}" => offset})
+            str += [len, elem].pack("Ca*")
+            names.update(entry.to_s => offset)
             offset += len
           end
         end
-        return str,offset,names
+        [str, offset, names]
       end
 
       def valid?(name)
         if name =~ /^([a-z0-9]([-a-z0-9]*[a-z0-9])?\.)+((a[cdefgilmnoqrstuwxz]|aero|arpa)|(b[abdefghijmnorstvwyz]|biz)|(c[acdfghiklmnorsuvxyz]|cat|com|coop)|d[ejkmoz]|(e[ceghrstu]|edu)|f[ijkmor]|(g[abdefghilmnpqrstuwy]|gov)|h[kmnrtu]|(i[delmnoqrst]|info|int)|(j[emop]|jobs)|k[eghimnprwyz]|l[abcikrstuvy]|(m[acdghklmnopqrstuvwxyz]|mil|mobi|museum)|(n[acefgilopruz]|name|net)|(om|org)|(p[aefghklmnrstwy]|pro)|qa|r[eouw]|s[abcdeghijklmnortvyz]|(t[cdfghjklmnoprtvwz]|travel)|u[agkmsyz]|v[aceginu]|w[fs]|y[etu]|z[amw])$/i
-          return name
+          name
         else
           raise ArgumentError, "Invalid FQDN: #{name}"
         end
       end
-
     end
   end
 end

data/lib/net/dns/packet.rb

@@ -6,7 +6,6 @@ require 'net/dns/rr'
 
 module Net
   module DNS
-
     #
     # = Net::DNS::Packet
     #
@@ -91,7 +90,6 @@ module Net
       class PacketError < Error
       end
 
-
       attr_reader :header, :question, :answer, :authority, :additional
       attr_reader :answerfrom, :answersize
 
@@ -107,7 +105,7 @@ module Net
       # This class no longer instantiate object from binary data coming from
       # network streams. Please use <tt>Net::DNS::Packet.parse</tt> instead.
       def initialize(name, type = Net::DNS::A, cls = Net::DNS::IN)
-        @header = Net::DNS::Header.new(:qdCount => 1)
+        @header = Net::DNS::Header.new(qdCount: 1)
         @question = [Net::DNS::Question.new(name, type, cls)]
         @answer = []
         @authority = []
@@ -116,7 +114,6 @@ module Net
         @logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
       end
 
-
       # Checks if the packet is a QUERY packet
       def query?
         @header.opCode == Net::DNS::Header::QUERY
@@ -129,7 +126,7 @@ module Net
       #   puts "Packet is #{packet_data.size} bytes long"
       #
       def data
-        qdcount=ancount=nscount=arcount=0
+        qdcount = ancount = nscount = arcount = 0
         data = @header.data
         headerlength = data.length
 
@@ -138,15 +135,15 @@ module Net
           qdcount += 1
         end
         @answer.each do |rr|
-          data += rr.data#(data.length)
+          data += rr.data # (data.length)
           ancount += 1
         end
         @authority.each do |rr|
-          data += rr.data#(data.length)
+          data += rr.data # (data.length)
           nscount += 1
         end
         @additional.each do |rr|
-          data += rr.data#(data.length)
+          data += rr.data # (data.length)
           arcount += 1
         end
 
@@ -168,33 +165,33 @@ module Net
       def data_comp
         offset = 0
         compnames = {}
-        qdcount=ancount=nscount=arcount=0
+        qdcount = ancount = nscount = arcount = 0
         data = @header.data
         headerlength = data.length
 
         @question.each do |question|
-          str,offset,names = question.data
+          str, offset, names = question.data
           data += str
           compnames.update(names)
           qdcount += 1
         end
 
         @answer.each do |rr|
-          str,offset,names = rr.data(offset,compnames)
+          str, offset, names = rr.data(offset, compnames)
           data += str
           compnames.update(names)
           ancount += 1
         end
 
         @authority.each do |rr|
-          str,offset,names = rr.data(offset,compnames)
+          str, offset, names = rr.data(offset, compnames)
           data += str
           compnames.update(names)
           nscount += 1
         end
 
         @additional.each do |rr|
-          str,offset,names = rr.data(offset,compnames)
+          str, offset, names = rr.data(offset, compnames)
           data += str
           compnames.update(names)
           arcount += 1
@@ -212,39 +209,39 @@ module Net
       # of this <tt>Net::DNS::Packet</tt> instance.
       def inspect
         retval = ""
-        if @answerfrom != "0.0.0.0:0" and @answerfrom
-          retval += ";; Answer received from #@answerfrom (#{@answersize} bytes)\n;;\n"
+        if (@answerfrom != "0.0.0.0:0") && @answerfrom
+          retval += ";; Answer received from #{@answerfrom} (#{@answersize} bytes)\n;;\n"
         end
 
         retval += ";; HEADER SECTION\n"
         retval += @header.inspect
 
         retval += "\n"
-        section = (@header.opCode == "UPDATE") ? "ZONE" : "QUESTION"
+        section = @header.opCode == "UPDATE" ? "ZONE" : "QUESTION"
         retval += ";; #{section} SECTION (#{@header.qdCount} record#{@header.qdCount == 1 ? '' : 's'}):\n"
         @question.each do |qr|
           retval += ";; " + qr.inspect + "\n"
         end
 
-        unless @answer.size == 0
+        unless @answer.empty?
           retval += "\n"
-          section = (@header.opCode == "UPDATE") ? "PREREQUISITE" : "ANSWER"
+          section = @header.opCode == "UPDATE" ? "PREREQUISITE" : "ANSWER"
           retval += ";; #{section} SECTION (#{@header.anCount} record#{@header.anCount == 1 ? '' : 's'}):\n"
           @answer.each do |rr|
             retval += rr.inspect + "\n"
           end
         end
 
-        unless @authority.size == 0
+        unless @authority.empty?
           retval += "\n"
-          section = (@header.opCode == "UPDATE") ? "UPDATE" : "AUTHORITY"
+          section = @header.opCode == "UPDATE" ? "UPDATE" : "AUTHORITY"
           retval += ";; #{section} SECTION (#{@header.nsCount} record#{@header.nsCount == 1 ? '' : 's'}):\n"
           @authority.each do |rr|
             retval += rr.inspect + "\n"
           end
         end
 
-        unless @additional.size == 0
+        unless @additional.empty?
           retval += "\n"
           retval += ";; ADDITIONAL SECTION (#{@header.arCount} record#{@header.arCount == 1 ? '' : 's'}):\n"
           @additional.each do |rr|
@@ -254,7 +251,7 @@ module Net
 
         retval
       end
-      alias_method :to_s, :inspect
+      alias to_s inspect
 
       # Delegates to <tt>Net::DNS::Header#truncated?</tt>.
       def truncated?
@@ -264,7 +261,7 @@ module Net
       # Assigns a <tt>Net::DNS::Header</tt> <tt>object</tt>
       # to this <tt>Net::DNS::Packet</tt> instance.
       def header=(object)
-        if object.kind_of? Net::DNS::Header
+        if object.is_a? Net::DNS::Header
           @header = object
         else
           raise ArgumentError, "Argument must be a Net::DNS::Header object"
@@ -276,7 +273,7 @@ module Net
       def question=(object)
         case object
         when Array
-          if object.all? {|x| x.kind_of? Net::DNS::Question}
+          if object.all? { |x| x.is_a? Net::DNS::Question }
             @question = object
           else
             raise ArgumentError, "Some of the elements is not an Net::DNS::Question object"
@@ -292,16 +289,16 @@ module Net
       # to the answer section of this <tt>Net::DNS::Packet</tt> instance.
       def answer=(object)
         case object
-          when Array
-            if object.all? {|x| x.kind_of? Net::DNS::RR}
-              @answer = object
-            else
-              raise ArgumentError, "Some of the elements is not an Net::DNS::RR object"
-            end
-          when Net::DNS::RR
-            @answer = [object]
+        when Array
+          if object.all? { |x| x.is_a? Net::DNS::RR }
+            @answer = object
           else
-            raise ArgumentError, "Invalid argument, not a RR object nor an array of objects"
+            raise ArgumentError, "Some of the elements is not an Net::DNS::RR object"
+          end
+        when Net::DNS::RR
+          @answer = [object]
+        else
+          raise ArgumentError, "Invalid argument, not a RR object nor an array of objects"
         end
       end
 
@@ -309,16 +306,16 @@ module Net
       # to the additional section of this <tt>Net::DNS::Packet</tt> instance.
       def additional=(object)
         case object
-          when Array
-            if object.all? {|x| x.kind_of? Net::DNS::RR}
-              @additional = object
-            else
-              raise ArgumentError, "Some of the elements is not an Net::DNS::RR object"
-            end
-          when Net::DNS::RR
-            @additional = [object]
+        when Array
+          if object.all? { |x| x.is_a? Net::DNS::RR }
+            @additional = object
           else
-            raise ArgumentError, "Invalid argument, not a RR object nor an array of objects"
+            raise ArgumentError, "Some of the elements is not an Net::DNS::RR object"
+          end
+        when Net::DNS::RR
+          @additional = [object]
+        else
+          raise ArgumentError, "Invalid argument, not a RR object nor an array of objects"
         end
       end
 
@@ -326,16 +323,16 @@ module Net
       # to the authority section of this <tt>Net::DNS::Packet</tt> instance.
       def authority=(object)
         case object
-          when Array
-            if object.all? {|x| x.kind_of? Net::DNS::RR}
-              @authority = object
-            else
-              raise ArgumentError, "Some of the elements is not an Net::DNS::RR object"
-            end
-          when Net::DNS::RR
-            @authority = [object]
+        when Array
+          if object.all? { |x| x.is_a? Net::DNS::RR }
+            @authority = object
           else
-            raise ArgumentError, "Invalid argument, not a RR object nor an array of objects"
+            raise ArgumentError, "Some of the elements is not an Net::DNS::RR object"
+          end
+        when Net::DNS::RR
+          @authority = [object]
+        else
+          raise ArgumentError, "Invalid argument, not a RR object nor an array of objects"
         end
       end
 
@@ -351,6 +348,7 @@ module Net
       def each_address(&block)
         @answer.each do |elem|
           next unless elem.class == Net::DNS::RR::A
+
           yield elem.address
         end
       end
@@ -365,6 +363,7 @@ module Net
       def each_nameserver(&block)
         @answer.each do |elem|
           next unless elem.class == Net::DNS::RR::NS
+
           yield elem.nsdname
         end
       end
@@ -379,6 +378,7 @@ module Net
       def each_mx(&block)
         @answer.each do |elem|
           next unless elem.class == Net::DNS::RR::MX
+
           yield elem.preference, elem.exchange
         end
       end
@@ -393,6 +393,7 @@ module Net
       def each_cname(&block)
         @answer.each do |elem|
           next unless elem.class == Net::DNS::RR::CNAME
+
           yield elem.cname
         end
       end
@@ -407,6 +408,7 @@ module Net
       def each_ptr(&block)
         @answer.each do |elem|
           next unless elem.class == Net::DNS::RR::PTR
+
           yield elem.ptrdname
         end
       end
@@ -436,7 +438,6 @@ module Net
         header.rCode.code == Net::DNS::Header::RCode::NAME
       end
 
-
       # Creates a new instance of <tt>Net::DNS::Packet</tt> class from binary data,
       # taken out from a network stream. For example:
       #
@@ -459,105 +460,101 @@ module Net
 
       private
 
-        # New packet from binary data
-        def new_from_data(data, from = nil)
-          unless from
-            if data.kind_of? Array
-              data, from = data
-            else
-              from = [0, 0, "0.0.0.0", "unknown"]
-            end
+      # New packet from binary data
+      def new_from_data(data, from = nil)
+        unless from
+          if data.is_a? Array
+            data, from = data
+          else
+            from = [0, 0, "0.0.0.0", "unknown"]
           end
+        end
 
-          @answerfrom = from[2] + ":" + from[1].to_s
-          @answersize = data.size
-          @logger = Logger.new $stdout
-          @logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
-
-          #------------------------------------------------------------
-          # Header section
-          #------------------------------------------------------------
-          offset = Net::DNS::HFIXEDSZ
-          @header = Net::DNS::Header.parse(data[0..offset-1])
-
-          @logger.debug ";; HEADER SECTION"
-          @logger.debug @header.inspect
-
-          #------------------------------------------------------------
-          # Question section
-          #------------------------------------------------------------
-          section = @header.opCode == "UPDATE" ? "ZONE" : "QUESTION"
-          @logger.debug ";; #{section} SECTION (#{@header.qdCount} record#{@header.qdCount == 1 ? '': 's'})"
-
-          @question = []
-          @header.qdCount.times do
-            qobj,offset = parse_question(data,offset)
-            @question << qobj
-            @logger.debug ";; #{qobj.inspect}"
-          end
+        @answerfrom = from[2] + ":" + from[1].to_s
+        @answersize = data.size
+        @logger = Logger.new $stdout
+        @logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
 
-          #------------------------------------------------------------
-          # Answer/prerequisite section
-          #------------------------------------------------------------
-          section = @header.opCode == "UPDATE" ? "PREREQUISITE" : "ANSWER"
-          @logger.debug ";; #{section} SECTION (#{@header.qdCount} record#{@header.qdCount == 1 ? '': 's'})"
-
-          @answer = []
-          @header.anCount.times do
-            begin
-              rrobj,offset = Net::DNS::RR.parse_packet(data,offset)
-              @answer << rrobj
-              @logger.debug rrobj.inspect
-            rescue NameError => e
-              warn "Net::DNS unsupported record type: #{e.message}"
-            end
-          end
+        #------------------------------------------------------------
+        # Header section
+        #------------------------------------------------------------
+        offset = Net::DNS::HFIXEDSZ
+        @header = Net::DNS::Header.parse(data[0..offset - 1])
+
+        @logger.debug ";; HEADER SECTION"
+        @logger.debug @header.inspect
+
+        #------------------------------------------------------------
+        # Question section
+        #------------------------------------------------------------
+        section = @header.opCode == "UPDATE" ? "ZONE" : "QUESTION"
+        @logger.debug ";; #{section} SECTION (#{@header.qdCount} record#{@header.qdCount == 1 ? '' : 's'})"
+
+        @question = []
+        @header.qdCount.times do
+          qobj, offset = parse_question(data, offset)
+          @question << qobj
+          @logger.debug ";; #{qobj.inspect}"
+        end
 
-          #------------------------------------------------------------
-          # Authority/update section
-          #------------------------------------------------------------
-          section = @header.opCode == "UPDATE" ? "UPDATE" : "AUTHORITY"
-          @logger.debug ";; #{section} SECTION (#{@header.nsCount} record#{@header.nsCount == 1 ? '': 's'})"
-
-          @authority = []
-          @header.nsCount.times do
-            begin
-              rrobj,offset = Net::DNS::RR.parse_packet(data,offset)
-              @authority << rrobj
-              @logger.debug rrobj.inspect
-            rescue NameError => e
-              warn "Net::DNS unsupported record type: #{e.message}"
-            end
-          end
+        #------------------------------------------------------------
+        # Answer/prerequisite section
+        #------------------------------------------------------------
+        section = @header.opCode == "UPDATE" ? "PREREQUISITE" : "ANSWER"
+        @logger.debug ";; #{section} SECTION (#{@header.qdCount} record#{@header.qdCount == 1 ? '' : 's'})"
 
-          #------------------------------------------------------------
-          # Additional section
-          #------------------------------------------------------------
-          @logger.debug ";; ADDITIONAL SECTION (#{@header.arCount} record#{@header.arCount == 1 ? '': 's'})"
-
-          @additional = []
-          @header.arCount.times do
-            begin
-              rrobj,offset = Net::DNS::RR.parse_packet(data,offset)
-              @additional << rrobj
-              @logger.debug rrobj.inspect
-            rescue NameError => e
-              warn "Net::DNS supported record type: #{e.message}"
-            end
+        @answer = []
+        @header.anCount.times do
+          begin
+            rrobj, offset = Net::DNS::RR.parse_packet(data, offset)
+            @answer << rrobj
+            @logger.debug rrobj.inspect
+          rescue NameError => e
+            warn "Net::DNS unsupported record type: #{e.message}"
           end
+        end
+
+        #------------------------------------------------------------
+        # Authority/update section
+        #------------------------------------------------------------
+        section = @header.opCode == "UPDATE" ? "UPDATE" : "AUTHORITY"
+        @logger.debug ";; #{section} SECTION (#{@header.nsCount} record#{@header.nsCount == 1 ? '' : 's'})"
 
+        @authority = []
+        @header.nsCount.times do
+          begin
+            rrobj, offset = Net::DNS::RR.parse_packet(data, offset)
+            @authority << rrobj
+            @logger.debug rrobj.inspect
+          rescue NameError => e
+            warn "Net::DNS unsupported record type: #{e.message}"
+          end
         end
 
+        #------------------------------------------------------------
+        # Additional section
+        #------------------------------------------------------------
+        @logger.debug ";; ADDITIONAL SECTION (#{@header.arCount} record#{@header.arCount == 1 ? '' : 's'})"
 
-        # Parse question section
-        def parse_question(data,offset)
-          size = (dn_expand(data, offset)[1] - offset) + (2 * Net::DNS::INT16SZ)
-          return [Net::DNS::Question.parse(data[offset, size]), offset + size]
-        rescue StandardError => e
-          raise PacketError, "Caught exception, maybe packet malformed => #{e.message}"
+        @additional = []
+        @header.arCount.times do
+          begin
+            rrobj, offset = Net::DNS::RR.parse_packet(data, offset)
+            @additional << rrobj
+            @logger.debug rrobj.inspect
+          rescue NameError => e
+            warn "Net::DNS unsupported record type: #{e.message}"
+          end
         end
+      end
 
+      # Parse question section
+      def parse_question(data, offset)
+        size = (dn_expand(data, offset)[1] - offset) + (2 * Net::DNS::INT16SZ)
+        [Net::DNS::Question.parse(data[offset, size]), offset + size]
+      rescue StandardError => e
+        raise PacketError, "Caught exception, maybe packet malformed => #{e.message}"
+      end
     end
-
   end
 end