net-dns 0.8.0 → 0.20.0

data/lib/net/dns/rr/txt.rb

@@ -1,7 +1,6 @@
 module Net # :nodoc:
   module DNS
     class RR
-
       #------------------------------------------------------------
       # RR type TXT
       #------------------------------------------------------------
@@ -13,7 +12,7 @@ module Net # :nodoc:
         def build_pack
           str = ""
           @txt.split(" ").each do |txt|
-            str += [txt.length,txt].pack("C a*")
+            str += [txt.length, txt].pack("C a*")
           end
           @txt_pack = str
           @rdlength = @txt_pack.size
@@ -24,38 +23,34 @@ module Net # :nodoc:
         end
 
         def subclass_new_from_hash(args)
-          if args.has_key? :txt
-            @txt = args[:txt].strip
-          else
-            raise ArgumentError, ":txt field is mandatory but missing"
-          end
+          raise ArgumentError, ":txt field is mandatory but missing" unless args.key? :txt
+
+          @txt = args[:txt].strip
         end
 
         def subclass_new_from_string(str)
           @txt = str.strip
         end
 
-        def subclass_new_from_binary(data,offset)
+        def subclass_new_from_binary(data, offset)
           off_end = offset + @rdlength
           @txt = ""
           while offset < off_end
-            len = data.unpack("@#{offset} C")[0]
+            len = data.unpack1("@#{offset} C")
             offset += 1
-            str = data[offset..offset+len-1]
+            str = data[offset..offset + len - 1]
             offset += len
             @txt << str << " "
           end
-          return offset
+          offset
         end
 
         private
 
-          def set_type
-            @type = Net::DNS::RR::Types.new("TXT")
-          end
-
+        def set_type
+          @type = Net::DNS::RR::Types.new("TXT")
+        end
       end
-
     end
   end
 end

data/lib/net/dns/rr/types.rb

@@ -1,95 +1,111 @@
 module Net # :nodoc:
   module DNS
-
     class RR
-
       # This is an auxiliary class to handle RR type field in a DNS packet.
       class Types
-
         TYPES = {
-          'SIGZERO'   => 0,       # RFC2931 consider this a pseudo type
-          'A'         => 1,       # RFC 1035, Section 3.4.1
-          'NS'        => 2,       # RFC 1035, Section 3.3.11
-          'MD'        => 3,       # RFC 1035, Section 3.3.4 (obsolete)
-          'MF'        => 4,       # RFC 1035, Section 3.3.5 (obsolete)
-          'CNAME'     => 5,       # RFC 1035, Section 3.3.1
-          'SOA'       => 6,       # RFC 1035, Section 3.3.13
-          'MB'        => 7,       # RFC 1035, Section 3.3.3
-          'MG'        => 8,       # RFC 1035, Section 3.3.6
-          'MR'        => 9,       # RFC 1035, Section 3.3.8
-          'NULL'      => 10,      # RFC 1035, Section 3.3.10
-          'WKS'       => 11,      # RFC 1035, Section 3.4.2 (deprecated)
-          'PTR'       => 12,      # RFC 1035, Section 3.3.12
-          'HINFO'     => 13,      # RFC 1035, Section 3.3.2
-          'MINFO'     => 14,      # RFC 1035, Section 3.3.7
-          'MX'        => 15,      # RFC 1035, Section 3.3.9
-          'TXT'       => 16,      # RFC 1035, Section 3.3.14
-          'RP'        => 17,      # RFC 1183, Section 2.2
-          'AFSDB'     => 18,      # RFC 1183, Section 1
-          'X25'       => 19,      # RFC 1183, Section 3.1
-          'ISDN'      => 20,      # RFC 1183, Section 3.2
-          'RT'        => 21,      # RFC 1183, Section 3.3
-          'NSAP'      => 22,      # RFC 1706, Section 5
-          'NSAP_PTR'  => 23,      # RFC 1348 (obsolete)
-          # The following 2 RRs are impemented in Net::DNS::SEC, TODO
-          'SIG'       => 24,      # RFC 2535, Section 4.1
-          'KEY'       => 25,      # RFC 2535, Section 3.1
-          'PX'        => 26,      # RFC 2163,
-          'GPOS'      => 27,      # RFC 1712 (obsolete)
-          'AAAA'      => 28,      # RFC 1886, Section 2.1
-          'LOC'       => 29,      # RFC 1876
-          # The following RR is implemented in Net::DNS::SEC, TODO
-          'NXT'       => 30,      # RFC 2535, Section 5.2
-          'EID'       => 31,      # draft-ietf-nimrod-dns-xx.txt
-          'NIMLOC'    => 32,      # draft-ietf-nimrod-dns-xx.txt
-          'SRV'       => 33,      # RFC 2052
-          'ATMA'      => 34,      # ???
-          'NAPTR'     => 35,      # RFC 2168
-          'KX'        => 36,      # RFC 2230
-          'CERT'      => 37,      # RFC 2538
-          'DNAME'     => 39,      # RFC 2672
-          'OPT'       => 41,      # RFC 2671
-          # The following 4 RRs are implemented in Net::DNS::SEC TODO
-          'DS'        => 43,      # draft-ietf-dnsext-delegation-signer
-          'SSHFP'     => 44,      # draft-ietf-secsh-dns (No RFC # yet at time of coding)
-          'RRSIG'     => 46,      # draft-ietf-dnsext-dnssec-2535typecode-change
-          'NSEC'      => 47,      # draft-ietf-dnsext-dnssec-2535typecode-change
-          'DNSKEY'    => 48,      # draft-ietf-dnsext-dnssec-2535typecode-change
-          'UINFO'     => 100,     # non-standard
-          'UID'       => 101,     # non-standard
-          'GID'       => 102,     # non-standard
-          'UNSPEC'    => 103,     # non-standard
-          'TKEY'      => 249,     # RFC 2930
-          'TSIG'      => 250,     # RFC 2931
-          'IXFR'      => 251,     # RFC 1995
-          'AXFR'      => 252,     # RFC 1035
-          'MAILB'     => 253,     # RFC 1035 (MB, MG, MR)
-          'MAILA'     => 254,     # RFC 1035 (obsolete - see MX)
-          'ANY'       => 255,     # RFC 1035
-        }
+          'SIGZERO' => 0,     # RFC2931 consider this a pseudo type
+          'A' => 1,           # RFC 1035, Section 3.4.1
+          'NS' => 2,          # RFC 1035, Section 3.3.11
+          'MD' => 3,          # RFC 1035, Section 3.3.4 (obsolete)
+          'MF' => 4,          # RFC 1035, Section 3.3.5 (obsolete)
+          'CNAME' => 5,       # RFC 1035, Section 3.3.1
+          'SOA' => 6,         # RFC 1035, Section 3.3.13
+          'MB' => 7,          # RFC 1035, Section 3.3.3 (obsolete)
+          'MG' => 8,          # RFC 1035, Section 3.3.6 (obsolete)
+          'MR' => 9,          # RFC 1035, Section 3.3.8 (obsolete)
+          'NULL' => 10,       # RFC 1035, Section 3.3.10 (obsolete)
+          'WKS' => 11,        # RFC 1035, Section 3.4.2 (obsolete)
+          'PTR' => 12,        # RFC 1035, Section 3.3.12
+          'HINFO' => 13,      # RFC 1035, Section 3.3.2
+          'MINFO' => 14,      # RFC 1035, Section 3.3.7 (obsolete)
+          'MX' => 15,         # RFC 1035, Section 3.3.9
+          'TXT' => 16,        # RFC 1035, Section 3.3.14
+          'RP' => 17,         # RFC 1183, Section 2.2 (obsolete)
+          'AFSDB' => 18,      # RFC 1183, Section 1
+          'X25' => 19,        # RFC 1183, Section 3.1 (obsolete)
+          'ISDN' => 20,       # RFC 1183, Section 3.2 (obsolete)
+          'RT' => 21,         # RFC 1183, Section 3.3 (obsolete)
+          'NSAP' => 22,       # RFC 1706, Section 5 (obsolete)
+          'NSAP_PTR' => 23,   # RFC 1348 (obsolete) (obsolete)
+          'SIG' => 24,        # RFC 2535, Section 4.1 (obsolete)
+          'KEY' => 25,        # RFC 2535, Section 3.1 (obsolete)
+          'PX' => 26,         # RFC 2163, (obsolete)
+          'GPOS' => 27,       # RFC 1712 (obsolete)
+          'AAAA' => 28,       # RFC 1886, Section 2.1
+          'LOC' => 29,        # RFC 1876
+          'NXT' => 30,        # RFC 2535, Section 5.2 (obsolete)
+          'EID' => 31,        # draft-ietf-nimrod-dns-xx.txt (obsolete)
+          'NIMLOC' => 32,     # draft-ietf-nimrod-dns-xx.txt (obsolete)
+          'SRV' => 33,        # RFC 2052
+          'ATMA' => 34,       # ??? (obsolete)
+          'NAPTR' => 35,      # RFC 2168
+          'KX' => 36,         # RFC 2230
+          'CERT' => 37,       # RFC 2538
+          'DNAME' => 39,      # RFC 2672
+          'OPT' => 41,        # RFC 2671
+          'APL' => 42,        # RFC 3123 (obsolete)
+          'DS' => 43,         # RFC 4034
+          'SSHFP' => 44,      # RFC 4255
+          'IPSECKEY' => 45,   # RFC 4025
+          'RRSIG' => 46,      # RFC 4034
+          'NSEC' => 47,       # RFC 4034
+          'DNSKEY' => 48,     # RFC 4034
+          'DHCID' => 49,      # RFC 4701
+          'NSEC3' => 50,      # RFC 5155
+          'NSEC3PARAM' => 51, # RFC 5155
+          'TLSA' => 52,       # RFC 6698
+          'SMIMEA' => 53,     # RFC 8162
+          'HIP' => 55,        # RFC 8005
+          'CDS' => 59,        # RFC 7344
+          'CDNSKEY' => 60,    # RFC 7344
+          'OPENPGPKEY' => 61, # RFC 7929
+          'CSYNC' => 62,      # RFC 7477
+          'ZONEMD' => 63,     # RFC 8976
+          'SVCB' => 64,       # RFC 9460
+          'HTTPS' => 65,      # RFC 9460
+          'SPF' => 99,        # RFC 4408 (obsolete)
+          'UINFO' => 100,     # non-standard (obsolete)
+          'UID' => 101,       # non-standard (obsolete)
+          'GID' => 102,       # non-standard (obsolete)
+          'UNSPEC' => 103,    # non-standard (obsolete)
+          'EUI48' => 108,     # RFC 7043
+          'EUI64' => 109,     # RFC 7043
+          'TKEY' => 249,      # RFC 2930
+          'TSIG' => 250,      # RFC 2931
+          'IXFR' => 251,      # RFC 1995
+          'AXFR' => 252,      # RFC 1035
+          'MAILB' => 253,     # RFC 1035 (MB, MG, MR) (obsolete)
+          'MAILA' => 254,     # RFC 1035 (obsolete - see MX)
+          'ANY' => 255,       # RFC 1035
+          'URI' => 256,       # RFC 7553
+          'CAA' => 257,       # RFC 6844
+        }.freeze
 
         # The default value when type is nil in Resource Records
         @@default = TYPES["A"]
 
+        def self.default
+          @@default
+        end
+
         # Be able to control the default type to assign when
         # type is +nil+. Default to +A+
         def self.default=(str)
-          if TYPES.has_key? str
-            @@default = TYPES[str]
-          else
-            raise ArgumentError, "Unknown type #{str}"
-          end
+          raise ArgumentError, "Unknown type #{str}" unless TYPES.key? str
+
+          @@default = TYPES[str]
         end
 
         # Checks whether +type+ is a valid RR type.
         def self.valid?(type)
           case type
-            when String
-              TYPES.has_key?(type)
-            when Fixnum
-              TYPES.invert.has_key?(type)
-            else
-              raise ArgumentError, "Wrong type class: #{type.class}"
+          when String
+            TYPES.key?(type)
+          when Integer
+            TYPES.invert.key?(type)
+          else
+            raise ArgumentError, "Wrong type class: #{type.class}"
           end
         end
 
@@ -97,14 +113,13 @@ module Net # :nodoc:
         # given the numeric value
         def self.to_str(type)
           case type
-            when Fixnum
-              if TYPES.invert.has_key? type
-                TYPES.invert[type]
-              else
-                raise ArgumentError, "Unknown type number #{type}"
-              end
-            else
-              raise ArgumentError, "Wrong type class: #{type.class}"
+          when Integer
+            raise ArgumentError, "Unknown type number #{type}" unless TYPES.invert.key? type
+
+            TYPES.invert[type]
+
+          else
+            raise ArgumentError, "Wrong type class: #{type.class}"
           end
         end
 
@@ -112,7 +127,7 @@ module Net # :nodoc:
         # in a format suited for regexps
         def self.regexp
           # Longest ones go first, so the regex engine will match AAAA before A.
-          TYPES.keys.sort { |a,b| b.length <=> a.length }.join("|")
+          TYPES.keys.sort { |a, b| b.length <=> a.length }.join("|")
         end
 
         # Creates a new object representing an RR type. Performs some
@@ -123,7 +138,7 @@ module Net # :nodoc:
           when String
             # type in the form "A" or "NS"
             new_from_string(type.upcase)
-          when Fixnum
+          when Integer
             # type in numeric form
             new_from_num(type)
           when nil
@@ -157,37 +172,31 @@ module Net # :nodoc:
           @num.to_s
         end
 
-
         private
 
-          # Constructor for string data type.
-          def new_from_string(type)
-            case type
-            when /^TYPE\\d+/
-              # TODO!!!
-            else
-              # String with name of type
-              if TYPES.has_key? type
-                @str = type
-                @num = TYPES[type]
-              else
-                raise ArgumentError, "Unknown type #{type}"
-              end
-            end
-          end
+        # Constructor for string data type.
+        def new_from_string(type)
+          case type
+          when /^TYPE\\d+/
+            # TODO!!!
+          else
+            # String with name of type
+            raise ArgumentError, "Unknown type #{type}" unless TYPES.key? type
+
+            @str = type
+            @num = TYPES[type]
 
-          # Contructor for numeric data type.
-          def new_from_num(type)
-            if TYPES.invert.has_key? type
-              @num = type
-              @str = TYPES.invert[type]
-            else
-              raise ArgumentError, "Unkown type number #{type}"
-            end
           end
+        end
 
-      end
+        # Contructor for numeric data type.
+        def new_from_num(type)
+          raise ArgumentError, "Unkown type number #{type}" unless TYPES.invert.key? type
 
+          @num = type
+          @str = TYPES.invert[type]
+        end
+      end
     end
   end
 end