net-dns2 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: ed3f3e2f37539751f0eb14cebde9652653c2774b
-  data.tar.gz: 83dbbb4ff3215849a7394cefa7eac3a49a55e326
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGJiMWM3NGY5YzgxMmM0OTk4NmQxYmM4NTA1ODg3YjMyN2QyZTYxMA==
+  data.tar.gz: !binary |-
+    MDRkYjY2YzBhZWRiNzM1OWM0ODY1MzgwNmI1Mjk1ZjZiODE1YWQ2Mw==
 SHA512:
-  metadata.gz: ca5ba8110bdd4feb9d12e2228aa1147943c38100e45c0412862b7dbabe547010eb452aceb9ca393f64b00f2e9e1425ab9380e55dbf132e06d402695101fd97f6
-  data.tar.gz: 4e3be6b483ae98e989072aa04142da0a04199397bd9be6a6eeac7b917bb0e78452dbd5047a199dd3b70381952e684ffc49dfdfe51931ec26bbecaf71f8ef2748
+  metadata.gz: !binary |-
+    ZGFhZmIxZjQxODMxM2U5Y2MxNWIzM2QzYjYwNzkwOTU1NmVkN2RkYTVjYTNj
+    ZmNlNjQ1YzA1YTA3OTliZjMyNzFkOTM1MGM5ZWFiOGRlMTc3Y2IwYzdjNmM5
+    YmJkMDkzNTQ3NjZiNDY5NWIyYTljMjEzZGE3OGExNmUwMmU0NGY=
+  data.tar.gz: !binary |-
+    NDU5NTA1NzBmNTZiZmZhZGYxZjEwOGZkMDJkZTNiNWY1OTEzNDMwZmJlMmI5
+    ZWQzYWZlMTBlZWY5YzhkYWZhNmQ1OTgzMjMzN2U1ZjRkN2EyMDk5ZTBmNGZj
+    Y2RkNWM5NzJlNGViNDRjNWRiYzBjYzAyN2E0NTEwMTI4OTVmODc=

data/.travis.yml

@@ -1,20 +1,12 @@
 language: ruby
 
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  # - jruby-18mode
-  # - jruby-19mode
-  - rbx-18mode
-  # - ruby-head
-  # - jruby-head
+  - 2.1.0
+  - ruby-head
 
 notifications:
   recipients:
     - mordocai@mordocai.net
-
-matrix:
-  allow_failures:
-    - rvm: 2.0.0

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## Release 0.8.3
+ - FIXED: Packet size cannot be set issue #1
+ - FIXED: Now raise exception if raw sockets are requested and we are not
+          running as root issue #23
+ - FIXED: Rake can build gem, travis file updated to test up to
+	    ruby-head issue #30
+ - FIXED: Merged in pending bluemonk pull requests issue #29, remaining
+          fixes are from these
+ - FIXED: Cannot get TXT record issue #13
+	  https://github.com/bluemonk/net-dns/pull/42
+ - FIXED: Various fixes by neoraider
+	  https://github.com/bluemonk/net-dns/pull/36
+ - FIXED: query_tcp fix by nbaum
+	  https://github.com/bluemonk/net-dns/pull/63
+ - FIXED: Text fixes by chrislundquist
+	  https://github.com/bluemonk/net-dns/pull/52
+          https://github.com/bluemonk/net-dns/pull/51
+ - CHANGED: Support SPF records by winebarrel
+	    https://github.com/bluemonk/net-dns/pull/57
+ - CHANGED: Simplified nameserver settings
+	    https://github.com/bluemonk/net-dns/pull/60
+
 ## Release 0.8.2
  - FIXED: Exception when using new raw support issue #2
  - FIXED: Gemspec file has wrong emails

data/README.md

@@ -1,7 +1,9 @@
 # Net::DNS
 [![Build Status](https://travis-ci.org/mordocai/net-dns.svg?branch=master)](https://travis-ci.org/mordocai/net-dns)
 
-Net::DNS is a DNS library written in pure Ruby. It started as a port of Perl Net::DNS module, but it evolved in time into a full Ruby library.  
+https://rubygems.org/gems/net-dns2
+
+Net::DNS is a DNS library written in pure Ruby. It started as a port of Perl Net::DNS module, but it evolved in time into a full Ruby library.
 
 
 ## Features
@@ -9,6 +11,7 @@ Net::DNS is a DNS library written in pure Ruby. It started as a port of Perl Net
 - Complete OO interface
 - Clean and intuitive API
 - Modular and flexible
+- Source address spoofing (via source_address= on Net::DNS::Resolver)
 
 
 ## Requirements
@@ -20,21 +23,21 @@ Net::DNS is a DNS library written in pure Ruby. It started as a port of Perl Net
 
 The best way to install this library is via [RubyGems](https://rubygems.org/).
 
-    $ gem install net-dns
+    $ gem install net-dns2
 
 You might need administrator privileges on your system to install the gem.
 
 
 ## API Documentation
 
-Visit the page http://rdoc.info/gems/net-dns
+Visit the page http://rdoc.info/gems/net-dns2
 
 
 ## Trivial resolver
 
 The simplest way to use the library is to invoke the Resolver() method:
 
-    require 'rubygems' 
+    require 'rubygems'
     require 'net/dns'
     p Resolver("www.google.com")
 
@@ -47,21 +50,21 @@ The output is compatible with BIND zone files and it's the same you would get wi
     ;; qr = 1       opCode: QUERY   aa = 0  tc = 0  rd = 1
     ;; ra = 1       ad = 0  cd = 0  rcode = NoError
     ;; qdCount = 1  anCount = 3     nsCount = 4     arCount = 4
-    
+
     ;; QUESTION SECTION (1 record):
     ;; google.com.                  IN      A
-    
+
     ;; ANSWER SECTION (3 records):
     google.com.             212     IN      A       74.125.45.100
     google.com.             212     IN      A       74.125.67.100
     google.com.             212     IN      A       209.85.171.100
-    
+
     ;; AUTHORITY SECTION (4 records):
     google.com.             345512  IN      NS      ns1.google.com.
     google.com.             345512  IN      NS      ns4.google.com.
     google.com.             345512  IN      NS      ns2.google.com.
     google.com.             345512  IN      NS      ns3.google.com.
-    
+
     ;; ADDITIONAL SECTION (4 records):
     ns1.google.com.         170275  IN      A       216.239.32.10
     ns2.google.com.         170275  IN      A       216.239.34.10
@@ -81,7 +84,7 @@ Same for Net::DNS::Resolver.start():
 As optional parameters, +TYPE+ and +CLASS+ can be specified.
 
     p Net::DNS::Resolver.start("google.com", Net::DNS::MX)
-    
+
     ;; Answer received from localhost:53 (316 bytes)
     ;;
     ;; HEADER SECTION
@@ -89,10 +92,10 @@ As optional parameters, +TYPE+ and +CLASS+ can be specified.
     ;; qr = 1       opCode: QUERY   aa = 0  tc = 0  rd = 1
     ;; ra = 1       ad = 0  cd = 0  rcode = NoError
     ;; qdCount = 1  anCount = 4     nsCount = 4     arCount = 8
-    
+
     ;; QUESTION SECTION (1 record):
     ;; google.com.                  IN      MX
-    
+
     ;; ANSWER SECTION (4 records):
     google.com.             10800   IN      MX      10 smtp2.google.com.
     google.com.             10800   IN      MX      10 smtp3.google.com.
@@ -115,16 +118,16 @@ A DNS packet is divided into 5 sections:
 You can access each section by calling the attribute with the same name on a Packet object:
 
     packet = Net::DNS::Resolver.start("google.com")
-    
+
     header = packet.header
     answer = packet.answer
-    
+
     puts "The packet is #{packet.data.size} bytes"
     puts "It contains #{header.anCount} answer entries"
-    
+
     answer.any? {|ans| p ans}
-    
-The output is 
+
+The output is
 
     The packet is 378 bytes
     It contains 3 answer entries

data/Rakefile

@@ -1,80 +1,25 @@
 require 'rubygems'
 require 'bundler'
+require 'rspec'
 
 $:.unshift(File.dirname(__FILE__) + '/lib')
 require 'net/dns'
 
 
-# Common package properties
-PKG_NAME    = ENV['PKG_NAME']    || 'net-dns'
-PKG_VERSION = ENV['PKG_VERSION'] || Net::DNS::VERSION
-
-
-# Run test by default.
-task :default => [:test, :spec]
-
-
-spec = Gem::Specification.new do |s|
-  s.name              = PKG_NAME
-  s.version           = PKG_VERSION
-  s.summary           = "Pure Ruby DNS library."
-  s.description       = "Net::DNS is a pure Ruby DNS library, with a clean OO interface and an extensible API."
-
-  s.required_ruby_version = ">= 1.8.7"
-
-  s.authors           = ["Marco Ceresa", "Simone Carletti"]
-  s.email             = ["ceresa@gmail.com", "weppos@weppos.net"]
-  s.homepage          = "http://github.com/bluemonk/net-dns"
-  s.rubyforge_project = "net-dns"
-
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "yard"
-
-  s.files             = `git ls-files`.split("\n")
-  s.test_files        = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_paths     = %w( lib )
-end
-
-
-require 'rubygems/package_task'
-
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Build the gemspec file #{spec.name}.gemspec"
-task :gemspec do
-  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-  File.open(file, "w") {|f| f << spec.to_ruby }
-end
-
-
-require 'rake/testtask'
-
-# Run all the tests in the /test folder
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"]
-  t.verbose = true
-end
-
+task :default => [:spec, :gem]
 
+require 'rake'
 require 'rspec/core/rake_task'
-begin
-  require 'fuubar'
-rescue LoadError
-end
 
-RSpec::Core::RakeTask.new do |t|
-  t.verbose = !!ENV["VERBOSE"]
-  t.rspec_opts  = []
-  t.rspec_opts << ['--format', 'Fuubar'] if defined?(Fuubar)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
+  t.rspec_opts = ["-r ./spec/spec_helper.rb"]
 end
 
+require 'rubygems/package_task'
+Gem::PackageTask.new(Gem::Specification.load("net-dns.gemspec")).define
 
 require 'yard'
-
 YARD::Rake::YardocTask.new(:yardoc) do |y|
   y.options = ["--output-dir", "yardoc"]
 end

data/lib/net/dns.rb

@@ -71,6 +71,7 @@ module Net
       RRSIG     = 46
       NSEC      = 47
       DNSKEY    = 48
+      SPF       = 99
       UINFO     = 100
       UID       = 101
       GID       = 102

data/lib/net/dns/header.rb

@@ -152,14 +152,17 @@ module Net
       end
 
 
+      # Listing: http://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-5
       # Constant for +opCode+ query
       QUERY   = 0
       # Constant for +opCode+ iquery
       IQUERY  = 1
       # Constant for +opCode+ status
       STATUS  = 2
+      # Constant for +opCode+ notify
+      NOTIFY  = 4
       # Array with given strings
-      OPARR = %w[QUERY IQUERY STATUS]
+      OPARR = %w[QUERY IQUERY STATUS UNASSIGNED NOTIFY]
 
       # Reader for +id+ attribute
       attr_reader :id
@@ -391,6 +394,7 @@ module Net
       # * QUERY is the standard DNS query
       # * IQUERY is the inverse query
       # * STATUS is used to query the nameserver for its status
+      # * NOTIFY is to notify a slave that it should check for an updated SOA on the master
       #
       # Example:
       #
@@ -399,10 +403,10 @@ module Net
       #   header.opCode = Header::STATUS
       #
       def opCode=(val)
-        if (0..2).include? val
+        if [0, 1, 2, 4].include? val
           @opCode = val
         else
-          raise WrongOpcodeError, "Wrong opCode value (#{val}), must be QUERY, IQUERY or STATUS"
+          raise WrongOpcodeError, "Wrong opCode value (#{val}), must be QUERY, IQUERY, STATUS, or NOTIFY"
         end
       end
 

data/lib/net/dns/names.rb

@@ -15,7 +15,7 @@ module Net # :nodoc:
       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.
       #
@@ -27,7 +27,7 @@ module Net # :nodoc:
         name = ""
         packetlen = packet.size
         while true
-          raise ExpandError, "Offset is greater than packet lenght!" if packetlen < (offset+1)
+          raise ExpandError, "Offset is greater than packet length!" if packetlen < (offset+1)
           len = packet.unpack("@#{offset} C")[0]
 
           if len == 0
@@ -54,7 +54,7 @@ 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(".")
@@ -106,13 +106,21 @@ module Net # :nodoc:
       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}"
+        return false if name.length < 1 or name.length > 255
+
+        return true if name == '.' # the root domain is the only valid domain that begins with a dot
+
+        parts = name.split('.', -1)
+        parts.delete_at(parts.length-1) if parts.last.empty? # the domain may end with a dot
+
+        parts.each do |part|
+          if not part =~ /^[a-z0-9]([-a-z0-9]*[a-z0-9])?$/i or part.length < 1 or part.length > 63
+            return false
+          end
         end
-      end
 
+        return true
+      end
     end
   end
 end

data/lib/net/dns/packet.rb

@@ -97,18 +97,26 @@ module Net
 
       # Creates a new instance of <tt>Net::DNS::Packet</tt> class. Arguments are the
       # canonical name of the resource, an optional type field and an optional
-      # class field. The record type and class can be omitted; they default
-      # to +A+ and +IN+.
+      # class field. If the arguments are omitted, no question is added to the new packet;
+      # type and class default to +A+ and +IN+ if a name is given.
       #
+      #   packet = Net::DNS::Packet.new
       #   packet = Net::DNS::Packet.new("www.example.com")
       #   packet = Net::DNS::Packet.new("example.com", Net::DNS::MX)
       #   packet = Net::DNS::Packet.new("example.com", Net::DNS::TXT, Net::DNS::CH)
       #
       # 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)
-        @question = [Net::DNS::Question.new(name, type, cls)]
+      def initialize(name = nil, type = Net::DNS::A, cls = Net::DNS::IN)
+        default_qdcount = 0
+        @question = []
+
+        if not name.nil?
+          default_qdcount = 1
+          @question = [Net::DNS::Question.new(name, type, cls)]
+        end
+
+        @header = Net::DNS::Header.new(:qdCount => default_qdcount)
         @answer = []
         @authority = []
         @additional = []
@@ -119,7 +127,7 @@ module Net
 
       # Checks if the packet is a QUERY packet
       def query?
-        @header.opCode == Net::DNS::Header::QUERY
+        @header.query?
       end
 
       # Returns the packet object in binary data, suitable
@@ -542,7 +550,7 @@ module Net
               @additional << rrobj
               @logger.debug rrobj.inspect
             rescue NameError => e
-              warn "Net::DNS supported record type: #{e.message}"
+              warn "Net::DNS unsupported record type: #{e.message}"
             end
           end
 

data/lib/net/dns/resolver.rb

@@ -345,38 +345,8 @@ module Net
       # The default is 127.0.0.1 (localhost)
       #
       def nameservers=(arg)
-        case arg
-        when String
-          begin
-            @config[:nameservers] = [IPAddr.new(arg)]
-            @logger.info "Nameservers list changed to value #{@config[:nameservers].inspect}"
-          rescue ArgumentError # arg is in the name form, not IP
-            nameservers_from_name(arg)
-          end
-        when IPAddr
-          @config[:nameservers] = [arg]
-          @logger.info "Nameservers list changed to value #{@config[:nameservers].inspect}"
-        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
-          end
-          @logger.info "Nameservers list changed to value #{@config[:nameservers].inspect}"
-        else
-          raise ArgumentError, "Wrong argument format, neither String, Array nor IPAddr"
-        end
+        @config[:nameservers] = convert_nameservers_arg_to_ips(arg)
+        @logger.info "Nameservers list changed to value #{@config[:nameservers].inspect}"
       end
       alias_method("nameserver=","nameservers=")
 
@@ -395,6 +365,15 @@ module Net
         @config[:packet_size]
       end
 
+      def packet_size=(arg)
+        if arg.respond_to? :to_i
+          @config[:packet_size] = arg.to_i
+          @logger.info "Packet size changed to value #{@config[:packet_size].inspect}"
+        else
+          @logger.error "Packet size not set, #{arg.class} does not respond to to_i"
+        end
+      end
+
       # Get the port number to which the resolver sends queries.
       #
       #   puts "Sending queries to port #{res.port}"
@@ -508,8 +487,12 @@ module Net
             @logger.warn "Port already in use"
             retry
           when 99 # Address is not valid: raw socket
-            @raw = true
-            @logger.warn "Using raw sockets"
+            if Process.uid == 0
+              @raw = true
+              @logger.warn "Using raw sockets"
+            else
+              raise RuntimeError, "Raw sockets requested but not running as root."
+            end
           else
             raise SystemCallError, e
           end
@@ -1080,7 +1063,7 @@ 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].first.to_s
           self.nameservers = arr[1]
         else
           nameservers = []
@@ -1123,6 +1106,24 @@ module Net
         end
       end
 
+      def convert_nameservers_arg_to_ips(arg)
+        if arg.kind_of? IPAddr
+          [arg]
+        elsif arg.respond_to? :map
+          arg.map{|x| convert_nameservers_arg_to_ips(x) }.flatten
+        elsif arg.respond_to? :to_a
+          arg.to_a.map{|x| convert_nameservers_arg_to_ips(x) }.flatten
+        elsif arg.respond_to? :to_s
+          begin
+            [IPAddr.new(arg.to_s)]
+          rescue ArgumentError # arg is in the name form, not IP
+            nameservers_from_name(arg)
+          end
+        else
+          raise ArgumentError, "Wrong nameservers argument format, cannot convert to array of IPAddrs"
+        end
+      end
+
       def nameservers_from_name(arg)
         arr = []
         arg.split(" ").each do |name|
@@ -1130,26 +1131,21 @@ module Net
             arr << ip
           end
         end
-        @config[:nameservers] << arr
+        arr
       end
 
       def make_query_packet(string, type, cls)
-        case string
-        when IPAddr
-          name = string.reverse
+        begin
+          name = IPAddr.new(string.chomp(".")).reverse
           type = Net::DNS::PTR
-          @logger.warn "PTR query required for address #{string}, changing type to PTR"
-        when /\d/ # Contains a number, try to see if it's an IP or IPv6 address
-          begin
-            name = IPAddr.new(string.chomp(".")).reverse
-            type = Net::DNS::PTR
-          rescue ArgumentError
-            name = string if valid? string
-          end
-        else
+        rescue ArgumentError
           name = string if valid? string
         end
 
+        if name.nil?
+          raise ArgumentError, "Bad query string"
+        end
+
         # Create the packet
         packet = Net::DNS::Packet.new(name, type, cls)
 
@@ -1208,13 +1204,16 @@ module Net
             socket.close
           end
         end
+        ans
       end
 
       def query_udp(packet, packet_data)
         socket4 = UDPSocket.new
         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])
+        if @config[:nameservers].any? { |ns| ns.ipv6? }
+          socket6 = UDPSocket.new(Socket::AF_INET6)
+          socket6.bind(@config[:source_address_inet6].to_s,@config[:source_port])
+        end
 
         ans = nil
         response = ""