net-dns 0.8.0 → 0.20.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,45 @@ 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]
+          len = str.unpack1("@#{offset} C")
           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\.\-_]/
+        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")
+        raise NameInvalid if data.size <= 4
+
+        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
+      rescue StandardError
         raise ArgumentError, "Invalid data: #{data.inspect}"
       end
-
     end
-    
   end
 end

data/lib/net/dns/resolver/socks.rb

@@ -2,18 +2,16 @@ require 'socket'
 require 'ipaddr'
 
 class RawSocket # :nodoc:
-
   @@id_arr = []
-  
-  def initialize(src_addr,dest_addr)
-    
+
+  def initialize(src_addr, dest_addr)
     # Define socket
     begin
       @socket = Socket.new PF_INET, SOCK_RAW, IPPROTO_RAW
     rescue SystemCallError => e
       raise SystemCallError, "You must be root to use raw sockets! #{e}"
     end
-    
+
     @socket.setsockopt IPPROTO_IP, IP_HDRINCL, 1
 
     # Checks addresses
@@ -26,7 +24,7 @@ class RawSocket # :nodoc:
 
     # Set correct protocol version in the header
     @version = @dest_addr.ipv4? ? "0100" : "0110"
-    
+
     # Total lenght: must be overridden by subclasses
     @tot_lenght = 20
 
@@ -38,49 +36,48 @@ class RawSocket # :nodoc:
     @id = 1234
 
     # Generate peer sockaddr
-    @to = Socket.pack_sockaddr_in @dest_port, @dest_addr.to_s    
+    @to = Socket.pack_sockaddr_in @dest_port, @dest_addr.to_s
   end
 
   def send(payload = '')
-    packet = make_ip_header([[ @version+'0101', 'B8' ],            # version, hlen
-                              [ 0, 'C' ],                          # tos
-                              [ @tot_lenght + payload.size, 'n' ], # total len
-                              [ @id, 'n' ],                        # id
-                              [ 0, 'n' ],                          # flags, offset
-                              [ 64, 'C' ],                         # ttl
-                              [ @protocol, 'C' ],                  # protocol
-                              [ 0, 'n' ],                          # checksum
-                              [ @src_addr.to_i, 'N' ],             # source
-                              [ @dest_addr.to_i, 'N' ],            # destination
-                            ])
+    packet = make_ip_header([
+      [@version + '0101', 'B8'],          # version, hlen
+      [0, 'C'],                           # tos
+      [@tot_lenght + payload.size, 'n'],  # total len
+      [@id, 'n'],                         # id
+      [0, 'n'],                           # flags, offset
+      [64, 'C'],                          # ttl
+      [@protocol, 'C'],                   # protocol
+      [0, 'n'],                           # checksum
+      [@src_addr.to_i, 'N'],              # source
+      [@dest_addr.to_i, 'N'], # destination
+    ])
     packet << make_transport_header(payload.size)
     packet << [payload].pack("a*")
-    @socket.send(packet,0,@to)
-  end 
+    @socket.send(packet, 0, @to)
+  end
 
   private
-  
-  def check_addr addr
+
+  def check_addr(addr)
     case addr
-      when String
-        IPAddr.new(addr)
-      when IPAddr
-        addr
-      else
-        raise ArgumentError, "Wrong address format: #{addr}"
-    end
-  end
-  
-  def check_port port
-    if (1..65535).include? port and port.kind_of? Integer
-      port
+    when String
+      IPAddr.new(addr)
+    when IPAddr
+      addr
     else
-      raise ArgumentError, "Port #{port} not valid"
+      raise ArgumentError, "Wrong address format: #{addr}"
     end
   end
-  
+
+  def check_port(port)
+    raise ArgumentError, "Port #{port} not valid" unless (1..65_535).cover?(port) && port.is_a?(Integer)
+
+    port
+  end
+
   def genID
-    while (@@id_arr.include?(q = rand(65535)))
+    while @@id_arr.include?(q = rand(65_535))
     end
     @@id_arr.push(q)
     q
@@ -103,34 +100,31 @@ class RawSocket # :nodoc:
     data[-3] = checksum
     data.pack(template)
   end
-  
+
   def make_transport_header
     ""
   end
-  
 end
 
 class UdpRawSocket < RawSocket # :nodoc:
+  def initialize(src_addr, src_port, dest_addr, dest_port)
+    super(src_addr, dest_addr)
 
-  def initialize(src_addr,src_port,dest_addr,dest_port)
-    
-    super(src_addr,dest_addr)
-    
     # Check ports
     @src_port  = check_port src_port
     @dest_port = check_port dest_port
-    
+
     # Total lenght: must be overridden by subclasses
     @tot_lenght = 20 + 8 # 8 bytes => UDP Header
 
     # Protocol: must be overridden by subclasses
     @protocol = 17 # UDP protocol
 
-    @to = Socket.pack_sockaddr_in @dest_port, @dest_addr.to_s    
+    @to = Socket.pack_sockaddr_in @dest_port, @dest_addr.to_s
   end
 
   private
-  
+
   def make_udp_header(parts)
     template = ''
     data = []
@@ -139,16 +133,14 @@ class UdpRawSocket < RawSocket # :nodoc:
       template << part[-1]
     end
     data.pack(template)
-  end 
-  
+  end
+
   def make_transport_header(pay_size)
     make_udp_header([
-                      [ @src_port, 'n'],         # source port
-                      [ @dest_port, 'n' ],       # destination port
-                      [ 8 + pay_size, 'n' ],     # len
-                      [ 0, 'n' ]                 # checksum (mandatory)
-                    ]) 
+      [@src_port, 'n'], # source port
+      [@dest_port, 'n'],       # destination port
+      [8 + pay_size, 'n'],     # len
+      [0, 'n'], # checksum (mandatory)
+    ])
   end
-  
 end
-

data/lib/net/dns/resolver/timeouts.rb

@@ -3,28 +3,19 @@ require 'timeout'
 module Net # :nodoc:
   module DNS
     class Resolver
-
       class DnsTimeout
-
         attr_reader :seconds
 
-
         def initialize(seconds)
-          if seconds.is_a? Numeric and seconds >= 0
-            @seconds = seconds
-          else
-            raise ArgumentError, "Invalid value for tcp timeout"
-          end
+          raise ArgumentError, "Invalid value for tcp timeout" unless seconds.is_a?(Numeric) && seconds >= 0
+
+          @seconds = seconds
         end
 
         # Returns a string representation of the timeout corresponding
         # to the number of <tt>@seconds</tt>.
         def to_s
-          if @seconds == 0
-            @output.to_s
-          else
-            @seconds.to_s
-          end
+          @seconds == 0 ? @output.to_s : @seconds.to_s
         end
 
         def pretty_to_s
@@ -37,27 +28,26 @@ module Net # :nodoc:
         # If @seconds is 0 or nil, no timeout is set.
         def timeout(&block)
           raise LocalJumpError, "no block given" unless block_given?
+
           Timeout.timeout(@seconds, &block)
         end
 
-
         private
 
-          def transform(secs)
-            case secs
-              when 0
-                to_s
-              when 1..59
-                "#{secs} seconds"
-              when 60..3559
-                "#{secs / 60} minutes and #{secs % 60} seconds"
-              else
-                hours = secs / 3600
-                secs -= (hours * 3600)
-                "#{hours} hours, #{secs / 60} minutes and #{secs % 60} seconds"
-            end
+        def transform(secs)
+          case secs
+          when 0
+            to_s
+          when 1..59
+            "#{secs} seconds"
+          when 60..3559
+            "#{secs / 60} minutes and #{secs % 60} seconds"
+          else
+            hours = secs / 3600
+            secs -= (hours * 3600)
+            "#{hours} hours, #{secs / 60} minutes and #{secs % 60} seconds"
           end
-
+        end
       end
 
       class TcpTimeout < DnsTimeout
@@ -73,7 +63,6 @@ module Net # :nodoc:
           super
         end
       end
-
     end
   end
-end
+end