net-dns 0.8.0 → 0.20.0

data/lib/net/dns/header.rb

@@ -1,6 +1,5 @@
 module Net
   module DNS
-
     # DNS packet header class
     #
     # The Net::DNS::Header class represents the header portion of a
@@ -37,7 +36,6 @@ module Net
     # more or less the same.
     #
     class Header
-
       # A wrong +count+ parameter has been passed.
       class WrongCountError < ArgumentError
       end
@@ -54,7 +52,6 @@ module Net
       class Error < StandardError
       end
 
-
       # DNS Header RCode handling class
       #
       # It should be used internally by Net::DNS::Header class. However, it's still
@@ -103,7 +100,6 @@ module Net
       # More RCodes has to come for TSIGs and other operations.
       #
       class RCode
-
         # Constant for +rcode+ Response Code No Error
         NOERROR = 0
         # Constant for +rcode+ Response Code Format Error
@@ -117,33 +113,31 @@ module Net
         # Constant for +rcode+ Response Code Refused Error
         REFUSED = 5
 
-
-
         RCodeType = %w[NoError FormErr ServFail NXDomain NotImp
-                      Refused YXDomain YXRRSet NXRRSet NotAuth NotZone]
+                       Refused YXDomain YXRRSet NXRRSet NotAuth NotZone].freeze
 
         RCodeErrorString = ["No errors",
-          "The name server was unable to interpret the query",
-          "The name server was unable to process this query due to problem with the name server",
-          "Domain name referenced in the query does not exists",
-          "The name server does not support the requested kind of query",
-          "The name server refuses to perform the specified operation for policy reasons",
-          "",
-          "",
-          "",
-          "",
-          ""]
-
-        attr_reader :code, :type, :explanation
+                            "The name server was unable to interpret the query",
+                            "The name server was unable to process this query due to problem with the name server",
+                            "Domain name referenced in the query does not exists",
+                            "The name server does not support the requested kind of query",
+                            "The name server refuses to perform the specified operation for policy reasons",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",].freeze
+
+        attr_reader :code
+        attr_reader :type
+        attr_reader :explanation
 
         def initialize(code)
-          if (0..10).include? code
-            @code         = code
-            @type         = RCodeType[code]
-            @explanation  = RCodeErrorString[code]
-          else
-            raise ArgumentError, "RCode `#{code}' out of range"
-          end
+          raise ArgumentError, "RCode `#{code}' out of range" unless (0..10).cover? code
+
+          @code         = code
+          @type         = RCodeType[code]
+          @explanation  = RCodeErrorString[code]
         end
 
         def to_s
@@ -151,7 +145,6 @@ module Net
         end
       end
 
-
       # Constant for +opCode+ query
       QUERY   = 0
       # Constant for +opCode+ iquery
@@ -159,7 +152,7 @@ module Net
       # Constant for +opCode+ status
       STATUS  = 2
       # Array with given strings
-      OPARR = %w[QUERY IQUERY STATUS]
+      OPARR = %w[QUERY IQUERY STATUS].freeze
 
       # Reader for +id+ attribute
       attr_reader :id
@@ -212,11 +205,9 @@ module Net
       # See also each option for a detailed explanation of usage.
       #
       def initialize(arg = {})
-        if arg.kind_of? Hash
-          new_from_hash(arg)
-        else
-          raise ArgumentError, "Wrong argument class `#{arg.class}'"
-        end
+        raise ArgumentError, "Wrong argument class `#{arg.class}'" unless arg.is_a? Hash
+
+        new_from_hash(arg)
       end
 
       # Creates a new Net::DNS::Header object from binary data, which is
@@ -232,13 +223,11 @@ module Net
       #     #=> "true" if it comes from authoritative name server
       #
       def self.parse(arg)
-        if arg.kind_of? String
-          o = allocate
-          o.send(:new_from_binary, arg)
-          o
-        else
-          raise ArgumentError, "Wrong argument class `#{arg.class}'"
-        end
+        raise ArgumentError, "Wrong argument class `#{arg.class}'" unless arg.is_a? String
+
+        o = allocate
+        o.send(:new_from_binary, arg)
+        o
       end
 
       # Inspect method, prints out all the options and relative values.
@@ -253,24 +242,24 @@ module Net
       # way of display output.
       #
       def inspect
-        ";; id = #@id\n" +
-          if false # @opCode == "UPDATE"
-            #do stuff
-          else
-            ";; qr = #@qr\t" +
-              "opCode: #{opCode_str}\t" +
-              "aa = #@aa\t" +
-              "tc = #@tc\t" +
-              "rd = #@rd\n" +
-              ";; ra = #@ra\t" +
-              "ad = #@ad\t" +
-              "cd = #@cd\t" +
-              "rcode = #{@rCode.type}\n" +
-              ";; qdCount = #@qdCount\t"+
-              "anCount = #@anCount\t"+
-              "nsCount = #@nsCount\t"+
-              "arCount = #@arCount\n"
-          end
+        ";; id = #{@id}\n" +
+            if false # @opCode == "UPDATE"
+              # do stuff
+            else
+              ";; qr = #{@qr}\t" \
+                "opCode: #{opCode_str}\t" \
+                "aa = #{@aa}\t" \
+                "tc = #{@tc}\t" \
+                "rd = #{@rd}\n" \
+                ";; ra = #{@ra}\t" \
+                "ad = #{@ad}\t" \
+                "cd = #{@cd}\t" \
+                "rcode = #{@rCode.type}\n" \
+                ";; qdCount = #{@qdCount}\t" \
+                "anCount = #{@anCount}\t" \
+                "nsCount = #{@nsCount}\t" \
+                "arCount = #{@arCount}\n"
+            end
       end
 
       # The Net::DNS::Header#format method prints out the header
@@ -297,7 +286,7 @@ module Net
       def format
         del = ("+-" * 16) + "+\n"
         len = del.length
-        str = del + "|" + @id.to_s.center(len-3) + "|\n"
+        str = del + "|" + @id.to_s.center(len - 3) + "|\n"
         str += del + "|" + @qr.to_s
         str += "|" + @opCode.to_s.center(7)
         str += "|" + @aa.to_s
@@ -307,10 +296,10 @@ module Net
         str += "|" + @ad.to_s
         str += "|" + @cd.to_s.center(3)
         str += "|" + @rCode.to_s.center(7) + "|\n"
-        str += del + "|" + @qdCount.to_s.center(len-3) + "|\n"
-        str += del + "|" + @anCount.to_s.center(len-3) + "|\n"
-        str += del + "|" + @nsCount.to_s.center(len-3) + "|\n"
-        str += del + "|" + @arCount.to_s.center(len-3) + "|\n" + del
+        str += del + "|" + @qdCount.to_s.center(len - 3) + "|\n"
+        str += del + "|" + @anCount.to_s.center(len - 3) + "|\n"
+        str += del + "|" + @nsCount.to_s.center(len - 3) + "|\n"
+        str += del + "|" + @arCount.to_s.center(len - 3) + "|\n" + del
         str
       end
 
@@ -323,8 +312,8 @@ module Net
       def data
         arr = []
         arr.push(@id)
-        arr.push((@qr<<7)|(@opCode<<3)|(@aa<<2)|(@tc<<1)|@rd)
-        arr.push((@ra<<7)|(@ad<<5)|(@cd<<4)|@rCode.code)
+        arr.push((@qr << 7) | (@opCode << 3) | (@aa << 2) | (@tc << 1) | @rd)
+        arr.push((@ra << 7) | (@ad << 5) | (@cd << 4) | @rCode.code)
         arr.push(@qdCount)
         arr.push(@anCount)
         arr.push(@nsCount)
@@ -336,11 +325,9 @@ module Net
       # performing security tests.
       #
       def id=(val)
-        if (0..65535).include? val
-          @id = val
-        else
-          raise ArgumentError, "ID `#{val}' out of range"
-        end
+        raise ArgumentError, "ID `#{val}' out of range" unless (0..65_535).cover? val
+
+        @id = val
       end
 
       # Checks whether the header is a query (+qr+ bit set to 0)
@@ -361,7 +348,7 @@ module Net
           @qr = 1
         when false
           @qr = 0
-        when 0,1
+        when 0, 1
           @qr = val
         else
           raise ArgumentError, ":qr must be true(or 1) or false(or 0)"
@@ -399,11 +386,9 @@ module Net
       #   header.opCode = Header::STATUS
       #
       def opCode=(val)
-        if (0..2).include? val
-          @opCode = val
-        else
-          raise WrongOpcodeError, "Wrong opCode value (#{val}), must be QUERY, IQUERY or STATUS"
-        end
+        raise WrongOpcodeError, "Wrong opCode value (#{val}), must be QUERY, IQUERY or STATUS" unless (0..2).cover? val
+
+        @opCode = val
       end
 
       # Checks whether the response is authoritative
@@ -433,7 +418,7 @@ module Net
           @aa = 1
         when false
           @aa = 0
-        when 0,1
+        when 0, 1
           @aa = val
         else
           raise ArgumentError, ":aa must be true(or 1) or false(or 0)"
@@ -471,7 +456,7 @@ module Net
           @tc = 1
         when false
           @tc = 0
-        when 0,1
+        when 0, 1
           @tc = val
         else
           raise ArgumentError, ":tc must be true(or 1) or false(or 0)"
@@ -536,7 +521,7 @@ module Net
           @ra = 1
         when false
           @ra = 0
-        when 0,1
+        when 0, 1
           @ra = val
         else
           raise ArgumentError, ":ra must be true(or 1) or false(or 0)"
@@ -560,7 +545,7 @@ module Net
           @cd = 1
         when false
           @cd = 0
-        when 0,1
+        when 0, 1
           @cd = val
         else
           raise ArgumentError, ":cd must be true(or 1) or false(or 0)"
@@ -588,7 +573,7 @@ module Net
           @ad = 1
         when false
           @ad = 0
-        when 0,1
+        when 0, 1
           @ad = val
         else
           raise ArgumentError, ":ad must be true(or 1) or false(or 0)"
@@ -604,7 +589,7 @@ module Net
       #     #=> was unable to interpret the query
       #
       def rCode_str
-        return rCode.type, rCode.explanation
+        [rCode.type, rCode.explanation]
       end
 
       # Checks for errors in the DNS packet
@@ -627,44 +612,36 @@ module Net
       # Sets the number of entries in a question section
       #
       def qdCount=(val)
-        if (0..65535).include? val
-          @qdCount = val
-        else
-          raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535"
-        end
+        raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535" unless (0..65_535).cover? val
+
+        @qdCount = val
       end
 
       # Sets the number of RRs in an answer section
       #
       def anCount=(val)
-        if (0..65535).include? val
-          @anCount = val
-        else
-          raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535"
-        end
+        raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535" unless (0..65_535).cover? val
+
+        @anCount = val
       end
 
       # Sets the number of RRs in an authority section
       #
       def nsCount=(val)
-        if (0..65535).include? val
-          @nsCount = val
-        else
-          raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535"
-        end
+        raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535" unless (0..65_535).cover? val
+
+        @nsCount = val
       end
 
       # Sets the number of RRs in an addictional section
       #
       def arCount=(val)
-        if (0..65535).include? val
-          @arCount = val
-        else
-          raise WrongCountError, "Wrong number of count: `#{val}' must be 0-65535"
-        end
+        raise WrongCountError, "Wrong number of count: `#{val}' must be 0-65535" unless (0..65_535).cover? val
+
+        @arCount = val
       end
 
-    private
+      private
 
       def new_from_scratch
         @id = genID # generate ad unique id
@@ -679,13 +656,14 @@ module Net
         unless str.size == Net::DNS::HFIXEDSZ
           raise ArgumentError, "Header binary data has wrong size: `#{str.size}' bytes"
         end
+
         arr = str.unpack("n C2 n4")
-        @id          =  arr[0]
+        @id = arr[0]
         @qr          = (arr[1] >> 7) & 0x01
         @opCode      = (arr[1] >> 3) & 0x0F
         @aa          = (arr[1] >> 2) & 0x01
         @tc          = (arr[1] >> 1) & 0x01
-        @rd          =  arr[1] & 0x1
+        @rd = arr[1] & 0x1
         @ra          = (arr[2] >> 7) & 0x01
         @ad          = (arr[2] >> 5) & 0x01
         @cd          = (arr[2] >> 4) & 0x01
@@ -698,16 +676,14 @@ module Net
 
       def new_from_hash(hash)
         new_from_scratch
-        hash.each do |key,val|
-          eval "self.#{key.to_s} = val"
+        hash.each do |key, val|
+          eval "self.#{key} = val"
         end
       end
 
       def genID
-        rand(65535)
+        rand(65_535)
       end
-
     end
-
   end
 end

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,11 +9,10 @@ module Net # :nodoc:
       class ExpandError < Error
       end
 
-
       INT16SZ = 2
 
       # Expand a compressed name in a DNS Packet object. Please
-      # see RFC1025 for an explanation of how the compression
+      # see RFC1035 for an explanation of how the compression
       # in DNS packets works, how may it be useful and how should
       # be handled.
       #
@@ -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)
-          len = packet.unpack("@#{offset} C")[0]
+        loop do
+          raise ExpandError, "Offset is greater than packet length!" if packetlen < (offset + 1)
+
+          len = packet.unpack1("@#{offset} C")
 
           if len == 0
             offset += 1
             break
           elsif (len & 0xC0) == 0xC0
-            raise ExpandError, "Packet ended before offset expand" if packetlen < (offset+INT16SZ)
-            ptr = packet.unpack("@#{offset} n")[0]
+            raise ExpandError, "Packet ended before offset expand" if packetlen < (offset + INT16SZ)
+
+            ptr = packet.unpack1("@#{offset} n")
             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,45 +77,42 @@ 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
             break
           else
-            len = entry.unpack("C")[0]
+            len = entry.unpack1("C")
             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
-        else
-          raise ArgumentError, "Invalid FQDN: #{name}"
-        end
-      end
+        raise ArgumentError, "Invalid FQDN: #{name}" unless 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
 
+        name
+      end
     end
   end
 end