net-dns 0.8.0 → 0.9.0

data/lib/net/dns/question.rb

@@ -1,20 +1,19 @@
 module Net
-  module DNS 
-
+  module DNS
     #
     # =Name
     #
     # Net::DNS::Question - DNS packet question class
     #
     # =Synopsis
-    # 
+    #
     #   require 'net/dns/question'
     #
     # =Description
     #
     # This class represent the Question portion of a DNS packet. The number
     # of question entries is stored in the +qdCount+ variable of an Header
-    # object. 
+    # object.
     #
     # A new object can be created passing the name of the query and the type
     # of answer desired, plus an optional argument containing the class:
@@ -26,13 +25,13 @@ module Net
     # packet, as when an answer is received.
     # To obtain the binary data from a question object you can use
     # the method Question#data:
-    # 
+    #
     #   question.data
     #      #=> "\006google\003com\000\000\001\000\001"
     #
     # A lot of methods were written to keep a compatibility layer with
     # the Perl version of the library, as long as methods name which are
-    # more or less the same. 
+    # more or less the same.
     #
     class Question
       include Names
@@ -40,18 +39,18 @@ module Net
       # Base error class.
       class Error < StandardError
       end
-      
+
       # An error in the +name+ part of a Question entry
       class NameInvalid < Error
       end
-      
+
       # +name+ part of a Question entry
-      attr_reader :qName 
+      attr_reader :qName
       # +type+ part of a Question entry
-      attr_reader :qType 
+      attr_reader :qType
       # +class+ part of a Question entry
-      attr_reader :qClass 
-      
+      attr_reader :qClass
+
       # Creates a new Net::DNS::Question object:
       #
       #   question = Net::DNS::Question.new("example.com")
@@ -60,8 +59,8 @@ module Net
       #      #=> "example.com                   MX      IN"
       #   question = Net::DNS::Question.new("example.com", Net::DNS::TXT, Net::DNS::HS)
       #      #=> "example.com                   TXT     HS"
-      
-      # If not specified, +type+ and +cls+ arguments defaults 
+
+      # If not specified, +type+ and +cls+ arguments defaults
       # to Net::DNS::A and Net::DNS::IN respectively.
       #
       def initialize(name, type = Net::DNS::A, cls = Net::DNS::IN)
@@ -83,18 +82,18 @@ module Net
         o.send(:new_from_binary, arg.to_s)
         o
       end
-      
+
       # Outputs binary data from a Question object
       #
       #   question.data
       #      #=> "\006google\003com\000\000\001\000\001"
       #
       def data
-        [pack_name(@qName),@qType.to_i,@qClass.to_i].pack("a*nn")
+        [pack_name(@qName), @qType.to_i, @qClass.to_i].pack("a*nn")
       end
-      
+
       # Return the binary data of the objects, plus an offset
-      # and an Hash with references to compressed names. For use in 
+      # and an Hash with references to compressed names. For use in
       # Net::DNS::Packet compressed packet creation.
       def comp_data
         arr = @qName.split(".")
@@ -103,20 +102,19 @@ module Net
         names = {}
         offset = Net::DNS::HFIXEDSZ
         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
           names[string] = offset
           offset += len
         end
         offset += 2 * Net::DNS::INT16SZ
         str += "\000"
-        [[str,@qType.to_i,@qClass.to_i].pack("a*nn"),offset,names]
+        [[str, @qType.to_i, @qClass.to_i].pack("a*nn"), offset, names]
       end
-      
-      
-      # 
+
+      #
       # call-seq:
       #   question.inspect -> string
       #
@@ -126,15 +124,15 @@ module Net
       #   q.inspect # => "google.com.                  IN      A       "
       #
       def inspect
-        if @qName.size > 29 then
-          len = @qName.size + 1
+        len = if @qName.size > 29
+          @qName.size + 1
         else
-          len = 29
+          29
         end
         [@qName, @qClass.to_s, @qType.to_s].pack("A#{len} A8 A8")
       end
-      
-      # 
+
+      #
       # call-seq:
       #   question.to_s -> string
       #
@@ -145,44 +143,43 @@ module Net
       #   q.inspect # => "google.com.                  IN      A       "
       #
       def to_s
-        "#{self.inspect}"
+        inspect.to_s
       end
-      
-      
+
       private
-      
+
       def build_qName(str)
         result = ""
         offset = 0
         loop do
           len = str.unpack("@#{offset} C")[0]
           break if len == 0
+
           offset += 1
-          result += str[offset..offset+len-1]
+          result += str[offset..offset + len - 1]
           result += "."
           offset += len
         end
         result
       end
-      
+
       def check_name(input)
         name = input.to_s.strip
         if name =~ /[^\w\.\-_]/
           raise NameInvalid, "Invalid Question Name `#{name}'"
         end
+
         name
       end
-      
+
       def new_from_binary(data)
-        str,type,cls = data.unpack("a#{data.size - 4}nn")
+        str, type, cls = data.unpack("a#{data.size - 4}nn")
         @qName = build_qName(str)
         @qType = Net::DNS::RR::Types.new type
         @qClass = Net::DNS::RR::Classes.new cls
       rescue StandardError => e
         raise ArgumentError, "Invalid data: #{data.inspect}"
       end
-
     end
-    
   end
 end

data/lib/net/dns/resolver.rb

@@ -27,7 +27,6 @@ end
 
 module Net
   module DNS
-
     include Logger::Severity
 
     # = Net::DNS::Resolver - DNS resolver class
@@ -87,7 +86,6 @@ module Net
     #      % setenv RES_OPTIONS "retrans:3 retry:2 debug"
     #
     class Resolver
-
       class Error < StandardError
       end
 
@@ -99,30 +97,28 @@ module Net
       # the description for each parameter to have an
       # explanation of its usage.
       Defaults = {
-        :config_file => "/etc/resolv.conf",
-        :log_file => $stdout,
-        :port => 53,
-        :searchlist => [],
-        :nameservers => [IPAddr.new("127.0.0.1")],
-        :domain => "",
-        :source_port => 0,
-        :source_address => IPAddr.new("0.0.0.0"),
-        :source_address_inet6 => IPAddr.new('::'),
-        :retry_interval => 5,
-        :retry_number => 4,
-        :recursive => true,
-        :defname => true,
-        :dns_search => true,
-        :use_tcp => false,
-        :ignore_truncated => false,
-        :packet_size => 512,
-        :tcp_timeout => TcpTimeout.new(5),
-        :udp_timeout => UdpTimeout.new(5),
-      }
-
+        config_file: "/etc/resolv.conf",
+        log_file: $stdout,
+        port: 53,
+        searchlist: [],
+        nameservers: [IPAddr.new("127.0.0.1")],
+        domain: "",
+        source_port: 0,
+        source_address: IPAddr.new("0.0.0.0"),
+        source_address_inet6: IPAddr.new('::'),
+        retry_interval: 5,
+        retry_number: 4,
+        recursive: true,
+        defname: true,
+        dns_search: true,
+        use_tcp: false,
+        ignore_truncated: false,
+        packet_size: 512,
+        tcp_timeout: TcpTimeout.new(5),
+        udp_timeout: UdpTimeout.new(5),
+      }.freeze
 
       class << self
-
         C = Object.const_get(defined?(RbConfig) ? :RbConfig : :Config)::CONFIG
 
         # Quick resolver method. Bypass the configuration using
@@ -142,10 +138,8 @@ module Net
         def platform_windows?
           !!(C["host_os"] =~ /msdos|mswin|djgpp|mingw/i)
         end
-
       end
 
-
       # Creates a new resolver object.
       #
       # Argument +config+ can either be empty or be an hash with
@@ -255,8 +249,6 @@ module Net
         # 4) defaults (and /etc/resolv.conf for config)
         #------------------------------------------------------------
 
-
-
         #------------------------------------------------------------
         # Parsing config file
         #------------------------------------------------------------
@@ -270,10 +262,11 @@ module Net
         #------------------------------------------------------------
         # Parsing arguments
         #------------------------------------------------------------
-        config.each do |key,val|
-          next if key == :log_file or key == :config_file
+        config.each do |key, val|
+          next if (key == :log_file) || (key == :config_file)
+
           begin
-            eval "self.#{key.to_s} = val"
+            eval "self.#{key} = val"
           rescue NoMethodError
             raise ArgumentError, "Option #{key} not valid"
           end
@@ -309,7 +302,7 @@ module Net
           @config[:searchlist] = [arg] if valid? arg
           @logger.info "Searchlist changed to value #{@config[:searchlist].inspect}"
         when Array
-          @config[:searchlist] = arg if arg.all? {|x| valid? x}
+          @config[:searchlist] = arg if arg.all? { |x| valid? x }
           @logger.info "Searchlist changed to value #{@config[:searchlist].inspect}"
         else
           raise ArgumentError, "Wrong argument format, neither String nor Array"
@@ -325,7 +318,7 @@ module Net
         @config[:nameservers].map(&:to_s)
       end
 
-      alias_method :nameserver, :nameservers
+      alias nameserver nameservers
 
       # Set the list of resolver nameservers.
       # +arg+ can be a single ip address or an array of addresses.
@@ -356,26 +349,27 @@ module Net
         when Array
           @config[:nameservers] = []
           arg.each do |x|
-            @config[:nameservers] << case x
-                                     when String
-                                       begin
-                                         IPAddr.new(x)
-                                       rescue ArgumentError
-                                         nameservers_from_name(arg)
-                                         return
-                                       end
-                                     when IPAddr
-                                       x
-                                     else
-                                       raise ArgumentError, "Wrong argument format"
-                                     end
+            val = case x
+            when String
+              begin
+                IPAddr.new(x)
+              rescue ArgumentError
+                nameservers_from_name(arg)
+                return
+              end
+            when IPAddr
+              x
+            else
+              raise ArgumentError, "Wrong argument format"
+            end
+            @config[:nameservers] << val
           end
           @logger.info "Nameservers list changed to value #{@config[:nameservers].inspect}"
         else
           raise ArgumentError, "Wrong argument format, neither String, Array nor IPAddr"
         end
       end
-      alias_method("nameserver=","nameservers=")
+      alias_method("nameserver=", "nameservers=")
 
       # Return a string with the default domain.
       def domain
@@ -408,7 +402,7 @@ module Net
       # The default is port 53.
       #
       def port=(num)
-        if (0..65535).include? num
+        if (0..65_535).cover? num
           @config[:port] = num
           @logger.info "Port number changed to #{num}"
         else
@@ -440,7 +434,8 @@ module Net
         unless root?
           raise ResolverPermissionError, "Are you root?"
         end
-        if (0..65535).include?(num)
+
+        if (0..65_535).cover?(num)
           @config[:source_port] = num
         else
           raise ArgumentError, "Wrong port number #{num}"
@@ -462,7 +457,7 @@ module Net
       def source_address_inet6
         @config[:source_address_inet6].to_s
       end
-      
+
       # Set the local source address from which the resolver sends its queries.
       #
       #   res.source_address = "172.16.100.1"
@@ -492,9 +487,9 @@ module Net
         end
 
         begin
-          port = rand(64000)+1024
+          port = rand(1024..65_023)
           @logger.warn "Try to determine state of source address #{addr} with port #{port}"
-          a = TCPServer.new(addr.to_s,port)
+          a = TCPServer.new(addr.to_s, port)
         rescue SystemCallError => e
           case e.errno
           when 98 # Port already in use!
@@ -552,7 +547,7 @@ module Net
       # Set the number of times the resolver will try a query.
       # Default 4 times.
       def retry_number=(num)
-        if num.kind_of? Integer and num > 0
+        if num.is_a?(Integer) && (num > 0)
           @config[:retry_number] = num
           @logger.info "Retrasmissions number changed to #{num}"
         else
@@ -571,8 +566,8 @@ module Net
       def recursive?
         @config[:recursive]
       end
-      alias_method :recurse, :recursive?
-      alias_method :recursive, :recursive?
+      alias recurse recursive?
+      alias recursive recursive?
 
       # Sets whether or not the resolver should perform recursive
       # queries. Default is true.
@@ -581,14 +576,14 @@ module Net
       #
       def recursive=(bool)
         case bool
-        when TrueClass,FalseClass
+        when TrueClass, FalseClass
           @config[:recursive] = bool
           @logger.info("Recursive state changed to #{bool}")
         else
           raise ArgumentError, "Argument must be boolean"
         end
       end
-      alias_method :recurse=, :recursive=
+      alias recurse= recursive=
 
       # Return a string representing the resolver state, suitable
       # for printing on the screen.
@@ -599,13 +594,13 @@ module Net
       def state
         str = ";; RESOLVER state:\n;; "
         i = 1
-        @config.each do |key,val|
-          if key == :log_file or key == :config_file
-            str << "#{key}: #{val} \t"
+        @config.each do |key, val|
+          str << if (key == :log_file) || (key == :config_file)
+            "#{key}: #{val} \t"
           else
-            str << "#{key}: #{eval(key.to_s)} \t"
+            "#{key}: #{eval(key.to_s)} \t"
           end
-          str << "\n;; " if i % 2 == 0
+          str << "\n;; " if i.even?
           i += 1
         end
         str
@@ -633,7 +628,7 @@ module Net
       #
       def defname=(bool)
         case bool
-        when TrueClass,FalseClass
+        when TrueClass, FalseClass
           @config[:defname] = bool
           @logger.info("Defname state changed to #{bool}")
         else
@@ -645,29 +640,29 @@ module Net
       def dns_search
         @config[:dns_search]
       end
-      alias_method :dnsrch, :dns_search
+      alias dnsrch dns_search
 
       # Set the flag +dns_search+ in a boolean state. If +dns_search+
       # is true, when using the Resolver#search method will be applied
       # the search list. Default is true.
       def dns_search=(bool)
         case bool
-        when TrueClass,FalseClass
+        when TrueClass, FalseClass
           @config[:dns_search] = bool
           @logger.info("DNS search state changed to #{bool}")
         else
           raise ArgumentError, "Argument must be boolean"
         end
       end
-      alias_method("dnsrch=","dns_search=")
+      alias_method("dnsrch=", "dns_search=")
 
       # Get the state of the use_tcp flag.
       #
       def use_tcp?
         @config[:use_tcp]
       end
-      alias_method :usevc, :use_tcp?
-      alias_method :use_tcp, :use_tcp?
+      alias usevc use_tcp?
+      alias use_tcp use_tcp?
 
       # If +use_tcp+ is true, the resolver will perform all queries
       # using TCP virtual circuits instead of UDP datagrams, which
@@ -681,7 +676,7 @@ module Net
       #
       def use_tcp=(bool)
         case bool
-        when TrueClass,FalseClass
+        when TrueClass, FalseClass
           @config[:use_tcp] = bool
           @logger.info("Use tcp flag changed to #{bool}")
         else
@@ -693,11 +688,11 @@ module Net
       def ignore_truncated?
         @config[:ignore_truncated]
       end
-      alias_method :ignore_truncated, :ignore_truncated?
+      alias ignore_truncated ignore_truncated?
 
       def ignore_truncated=(bool)
         case bool
-        when TrueClass,FalseClass
+        when TrueClass, FalseClass
           @config[:ignore_truncated] = bool
           @logger.info("Ignore truncated flag changed to #{bool}")
         else
@@ -807,7 +802,7 @@ module Net
       # Note that this will destroy the precedent logger.
       #
       def logger=(logger)
-        if logger.kind_of? Logger
+        if logger.is_a? Logger
           @logger.close
           @logger = logger
         else
@@ -861,31 +856,29 @@ module Net
       # Returns a Net::DNS::Packet object. If you need to examine the response packet
       # whether it contains any answers or not, use the Resolver#query method instead.
       #
-      def search(name,type=Net::DNS::A,cls=Net::DNS::IN)
-
-        return query(name,type,cls) if name.class == IPAddr
+      def search(name, type = Net::DNS::A, cls = Net::DNS::IN)
+        return query(name, type, cls) if name.class == IPAddr
 
         # If the name contains at least one dot then try it as is first.
         if name.include? "."
           @logger.debug "Search(#{name},#{Net::DNS::RR::Types.new(type)},#{Net::DNS::RR::Classes.new(cls)})"
-          ans = query(name,type,cls)
+          ans = query(name, type, cls)
           return ans if ans.header.anCount > 0
         end
 
         # If the name doesn't end in a dot then apply the search list.
-        if name !~ /\.$/ and @config[:dns_search]
+        if name !~ /\.$/ && @config[:dns_search]
           @config[:searchlist].each do |domain|
             newname = name + "." + domain
             @logger.debug "Search(#{newname},#{Net::DNS::RR::Types.new(type)},#{Net::DNS::RR::Classes.new(cls)})"
-            ans = query(newname,type,cls)
+            ans = query(newname, type, cls)
             return ans if ans.header.anCount > 0
           end
         end
 
         # Finally, if the name has no dots then try it as is.
         @logger.debug "Search(#{name},#{Net::DNS::RR::Types.new(type)},#{Net::DNS::RR::Classes.new(cls)})"
-        query(name+".",type,cls)
-
+        query(name + ".", type, cls)
       end
 
       # Performs a DNS query for the given name; the search list
@@ -912,19 +905,17 @@ module Net
       # packet whether it contains any answers or not, use the Resolver#query
       # method instead.
       #
-      def query(name,type=Net::DNS::A,cls=Net::DNS::IN)
-
-        return send(name,type,cls) if name.class == IPAddr
+      def query(name, type = Net::DNS::A, cls = Net::DNS::IN)
+        return send(name, type, cls) if name.class == IPAddr
 
         # If the name doesn't contain any dots then append the default domain.
-        if name !~ /\./ and name !~ /:/ and @config[:defname]
+        if name !~ /\./ && name !~ /:/ && @config[:defname]
           name += "." + @config[:domain]
         end
 
         @logger.debug "Query(#{name},#{Net::DNS::RR::Types.new(type)},#{Net::DNS::RR::Classes.new(cls)})"
 
-        send(name,type,cls)
-
+        send(name, type, cls)
       end
 
       # Performs a DNS query for the given name.  Neither the
@@ -950,19 +941,19 @@ module Net
       #
       #   ip = IPAddr.new("172.16.100.2")
       #   packet = res.query(ip)
-      #   
+      #
       #   packet = res.query("172.16.100.2")
       #
       # Use +packet.header.ancount+ or +packet.answer+ to find out if there
       # were any records in the answer section.
       #
       def query(argument, type = Net::DNS::A, cls = Net::DNS::IN)
-        if @config[:nameservers].size == 0
+        if @config[:nameservers].empty?
           raise Resolver::Error, "No nameservers specified!"
         end
 
         method = :query_udp
-        packet = if argument.kind_of? Net::DNS::Packet
+        packet = if argument.is_a? Net::DNS::Packet
           argument
         else
           make_query_packet(argument, type, cls)
@@ -1004,7 +995,7 @@ module Net
           end
         end
 
-        ans = self.send(method, packet, packet_data)
+        ans = send(method, packet, packet_data)
 
         unless ans
           message = "No response from nameservers list"
@@ -1012,20 +1003,20 @@ module Net
           raise NoResponseError, message
         end
 
-        @logger.info "Received #{ans[0].size} bytes from #{ans[1][2]+":"+ans[1][1].to_s}"
-        response = Net::DNS::Packet.parse(ans[0],ans[1])
+        @logger.info "Received #{ans[0].size} bytes from #{ans[1][2] + ':' + ans[1][1].to_s}"
+        response = Net::DNS::Packet.parse(ans[0], ans[1])
 
-        if response.header.truncated? and not ignore_truncated?
+        if response.header.truncated? && !ignore_truncated?
           @logger.warn "Packet truncated, retrying using TCP"
           self.use_tcp = true
           begin
-            return query(argument,type,cls)
+            return query(argument, type, cls)
           ensure
             self.use_tcp = false
           end
         end
 
-        return response
+        response
       end
 
       # Performs a zone transfer for the zone passed as a parameter.
@@ -1052,7 +1043,7 @@ module Net
         query(name, Net::DNS::MX, cls).answer.each do |entry|
           arr << entry if entry.type == 'MX'
         end
-        arr.sort_by { |a| a.preference }
+        arr.sort_by(&:preference)
       end
 
       private
@@ -1062,20 +1053,21 @@ module Net
         if self.class.platform_windows?
           require 'win32/resolv'
           arr = Win32::Resolv.get_resolv_info
-          self.domain = arr[0].to_s
+          self.domain = arr[0][0]
           self.nameservers = arr[1]
         else
           nameservers = []
           IO.foreach(@config[:config_file]) do |line|
-            line.gsub!(/\s*[;#].*/,"")
+            line.gsub!(/\s*[;#].*/, "")
             next unless line =~ /\S/
+
             case line
             when /^\s*domain\s+(\S+)/
-              self.domain = $1
+              self.domain = Regexp.last_match(1)
             when /^\s*search\s+(.*)/
-              self.searchlist = $1.split(" ")
+              self.searchlist = Regexp.last_match(1).split(" ")
             when /^\s*nameserver\s+(.*)/
-              nameservers << $1.split(" ")
+              nameservers << Regexp.last_match(1).split(" ")
             end
           end
           self.nameservers = nameservers.flatten
@@ -1095,7 +1087,7 @@ module Net
         end
         if ENV['RES_OPTIONS']
           ENV['RES_OPTIONS'].split(" ").each do |opt|
-            name,val = opt.split(":")
+            name, val = opt.split(":")
             begin
               eval("self.#{name} = #{val}")
             rescue NoMethodError
@@ -1145,22 +1137,21 @@ module Net
       end
 
       def query_tcp(packet, packet_data)
-
         ans = nil
         length = [packet_data.size].pack("n")
 
         @config[:nameservers].each do |ns|
           begin
             buffer = ""
-            socket = Socket.new(Socket::AF_INET,Socket::SOCK_STREAM,0)
-            socket.bind(Socket.pack_sockaddr_in(@config[:source_port],@config[:source_address].to_s))
+            socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+            socket.bind(Socket.pack_sockaddr_in(@config[:source_port], @config[:source_address].to_s))
 
-            sockaddr = Socket.pack_sockaddr_in(@config[:port],ns.to_s)
+            sockaddr = Socket.pack_sockaddr_in(@config[:port], ns.to_s)
 
             @config[:tcp_timeout].timeout do
               socket.connect(sockaddr)
               @logger.info "Contacting nameserver #{ns} port #{@config[:port]}"
-              socket.write(length+packet_data)
+              socket.write(length + packet_data)
               ans = socket.recv(Net::DNS::INT16SZ)
               len = ans.unpack("n")[0]
 
@@ -1171,9 +1162,9 @@ module Net
                 next
               end
 
-              while (buffer.size < len)
+              while buffer.size < len
                 left = len - buffer.size
-                temp,from = socket.recvfrom(left)
+                temp, from = socket.recvfrom(left)
                 buffer += temp
               end
 
@@ -1182,7 +1173,7 @@ module Net
                 next
               end
             end
-            return [buffer,["",@config[:port],ns.to_s,ns.to_s]]
+            return [buffer, ["", @config[:port], ns.to_s, ns.to_s]]
           rescue TimeoutError
             @logger.warn "Nameserver #{ns} not responding within TCP timeout, trying next one"
             next
@@ -1194,9 +1185,9 @@ module Net
 
       def query_udp(packet, packet_data)
         socket4 = UDPSocket.new
-        socket4.bind(@config[:source_address].to_s,@config[:source_port])
+        socket4.bind(@config[:source_address].to_s, @config[:source_port])
         socket6 = UDPSocket.new(Socket::AF_INET6)
-        socket6.bind(@config[:source_address_inet6].to_s,@config[:source_port])
+        socket6.bind(@config[:source_address_inet6].to_s, @config[:source_port])
 
         ans = nil
         response = ""
@@ -1229,7 +1220,6 @@ module Net
           true
         end
       end
-
     end
   end
 end