net-dns2 0.8.2 → 0.8.3

data/lib/net/dns/rr.rb

@@ -3,7 +3,7 @@ require 'net/dns/names'
 require 'net/dns/rr/types'
 require 'net/dns/rr/classes'
 
-%w(a aaaa cname hinfo mr mx ns ptr soa srv txt).each do |file|
+%w(a aaaa cname hinfo mr mx ns ptr soa srv txt spf).each do |file|
   require "net/dns/rr/#{file}"
 end
 

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

@@ -92,9 +92,7 @@ module Net
               when IPAddr
                 input
               when Integer # Address in numeric form
-                tmp = [(input >> 24), (input >> 16) & 0xFF, (input >> 8) & 0xFF, input & 0xFF]
-                tmp = tmp.collect { |x| x.to_s }.join(".")
-                IPAddr.new(tmp)
+                IPAddr.new(input, Socket::AF_INET) # We know we are IPv4
               when String
                 IPAddr.new(input)
               else

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

@@ -7,13 +7,14 @@ module Net # :nodoc:
       #------------------------------------------------------------
       class SOA < RR
         attr_reader :mname, :rname, :serial, :refresh, :retry, :expire, :minimum
-        
+
         private
-        
+
         def build_pack
           @soa_pack = pack_name(@mname)
           @soa_pack += pack_name(@rname)
           @soa_pack += [@serial,@refresh,@retry,@expire,@minimum].pack("N5")
+          @rdlength = @soa_pack.size
         end
 
         def get_data
@@ -31,30 +32,36 @@ module Net # :nodoc:
             [:mname,:rname,:serial,:refresh,:retry,:expire,:minimum].each do |key|
               raise ArgumentError, "Missing field :#{key}" unless args.has_key? key
             end
-            @mname = args[:mname] if valid? args[:mname] 
-            @rname = args[:rname] if valid? args[:rname]
-            @serial = args[:serial] if number? args[:serial] 
-            @refresh = args[:refresh] if number? args[:refresh] 
-            @retry = args[:retry] if number? args[:retry] 
-            @expire = args[:expire] if number? args[:expire] 
-            @minimum = args[:minimum] if number? args[:minimum] 
+            @mname = args[:mname] if valid? args[:mname]
+            @rname = args[:rname] if rname? args[:rname]
+            @serial = args[:serial] if number? args[:serial]
+            @refresh = args[:refresh] if number? args[:refresh]
+            @retry = args[:retry] if number? args[:retry]
+            @expire = args[:expire] if number? args[:expire]
+            @minimum = args[:minimum] if number? args[:minimum]
           end
         end
-        
+
         def number?(num)
           if num.kind_of? Integer and num > 0
             true
           else
-            raise ArgumentError, "Wrong format field: #{num} not a number or less than zero"
+            false
           end
         end
 
+        def rname?(name)
+          mailbox, domain = name.split(/(?<!\\)\./, 2)
+          return true if valid? domain
+          return false
+        end
+
         def subclass_new_from_string(str)
           mname,rname,serial,refresh,ret,expire,minimum = str.strip.split(" ")
           @mname = mname if valid? mname
-          @rname = rname if valid? rname
-          @serial,@refresh,@retry,@expire,@minimum = [serial,refresh,ret,expire,minimum].collect do |i| 
-            i.to_i if valid? i.to_i
+          @rname = rname if rname? rname
+          @serial,@refresh,@retry,@expire,@minimum = [serial,refresh,ret,expire,minimum].collect do |i|
+            i.to_i if number? i.to_i
           end
         end
 
@@ -64,15 +71,15 @@ module Net # :nodoc:
           @serial,@refresh,@retry,@expire,@minimum = data.unpack("@#{offset} N5")
           return offset + 5*Net::DNS::INT32SZ
         end
-        
+
         private
-        
+
           def set_type
             @type = Net::DNS::RR::Types.new("SOA")
           end
-        
+
       end
-      
+
     end
   end
 end

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

@@ -19,6 +19,10 @@ module Net # :nodoc:
           @rdlength = @txt_pack.size
         end
 
+        def get_inspect
+          "\"#{@txt}\""
+        end
+
         def get_data
           @txt_pack
         end
@@ -33,18 +37,24 @@ module Net # :nodoc:
 
         def subclass_new_from_string(str)
           @txt = str.strip
+          if @txt[0] == '"' and @txt[-1] == '"'
+            @txt = @txt[1, @txt.length-2]
+          else
+            raise ArgumentError, "TXT RR data must be enclosed in \"quotes\""
+          end
         end
 
         def subclass_new_from_binary(data,offset)
           off_end = offset + @rdlength
-          @txt = ""
+          rs = []
           while offset < off_end
             len = data.unpack("@#{offset} C")[0]
             offset += 1
             str = data[offset..offset+len-1]
             offset += len
-            @txt << str << " "
+            rs << str
           end
+          @txt = rs.join(" ")
           return offset
         end
 

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

@@ -55,6 +55,7 @@ module Net # :nodoc:
           'RRSIG'     => 46,      # draft-ietf-dnsext-dnssec-2535typecode-change
           'NSEC'      => 47,      # draft-ietf-dnsext-dnssec-2535typecode-change
           'DNSKEY'    => 48,      # draft-ietf-dnsext-dnssec-2535typecode-change
+          'SPF'       => 99,      # RFC 4408
           'UINFO'     => 100,     # non-standard
           'UID'       => 101,     # non-standard
           'GID'       => 102,     # non-standard

data/net-dns.gemspec

@@ -2,20 +2,36 @@
 
 Gem::Specification.new do |s|
   s.name = "net-dns2"
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marco Ceresa", "Simone Carletti", "Christopher Carpenter"]
   s.date = "2014-05-12"
-  s.description = "Net::DNS is a pure Ruby DNS library, with a clean OO interface and an extensible API."
+  s.description = "Net::DNS is a pure Ruby DNS library, with a clean OO interface and an extensible API. The net-dns2 ruby gem is an actively maintained fork of the original net-dns."
   s.email = "mordocai@mordocai.net"
-  s.files = [".gitignore", ".travis.yml", "CHANGELOG.md", "Gemfile", "README.md", "Rakefile", "THANKS.rdoc", "demo/check_soa.rb", "demo/threads.rb", "lib/net/dns.rb", "lib/net/dns/core_ext.rb", "lib/net/dns/header.rb", "lib/net/dns/names.rb", "lib/net/dns/packet.rb", "lib/net/dns/question.rb", "lib/net/dns/resolver.rb", "lib/net/dns/resolver/socks.rb", "lib/net/dns/resolver/timeouts.rb", "lib/net/dns/rr.rb", "lib/net/dns/rr/a.rb", "lib/net/dns/rr/aaaa.rb", "lib/net/dns/rr/classes.rb", "lib/net/dns/rr/cname.rb", "lib/net/dns/rr/hinfo.rb", "lib/net/dns/rr/mr.rb", "lib/net/dns/rr/mx.rb", "lib/net/dns/rr/ns.rb", "lib/net/dns/rr/null.rb", "lib/net/dns/rr/ptr.rb", "lib/net/dns/rr/soa.rb", "lib/net/dns/rr/srv.rb", "lib/net/dns/rr/txt.rb", "lib/net/dns/rr/types.rb", "lib/net/dns/version.rb", "net-dns.gemspec", "test/header_test.rb", "test/names_test.rb", "test/packet_test.rb", "test/question_test.rb", "test/resolver_test.rb", "test/rr/a_test.rb", "test/rr/aaaa_test.rb", "test/rr/classes_test.rb", "test/rr/cname_test.rb", "test/rr/hinfo_test.rb", "test/rr/mr_test.rb", "test/rr/mx_test.rb", "test/rr/ns_test.rb", "test/rr/types_test.rb", "test/rr_test.rb", "test/test_helper.rb"]
+  s.files = [
+    ".gitignore", ".travis.yml", "CHANGELOG.md", "Gemfile", "README.md",
+    "Rakefile", "THANKS.rdoc", "demo/check_soa.rb", "demo/threads.rb",
+    "lib/net/dns.rb", "lib/net/dns/core_ext.rb", "lib/net/dns/header.rb",
+    "lib/net/dns/names.rb", "lib/net/dns/packet.rb", "lib/net/dns/question.rb",
+    "lib/net/dns/resolver.rb", "lib/net/dns/resolver/socks.rb",
+    "lib/net/dns/resolver/timeouts.rb", "lib/net/dns/rr.rb",
+    "lib/net/dns/rr/a.rb", "lib/net/dns/rr/aaaa.rb", "lib/net/dns/rr/classes.rb",
+    "lib/net/dns/rr/cname.rb", "lib/net/dns/rr/hinfo.rb", "lib/net/dns/rr/mr.rb",
+    "lib/net/dns/rr/mx.rb", "lib/net/dns/rr/ns.rb", "lib/net/dns/rr/null.rb",
+    "lib/net/dns/rr/ptr.rb", "lib/net/dns/rr/soa.rb", "lib/net/dns/rr/srv.rb",
+    "lib/net/dns/rr/txt.rb", "lib/net/dns/rr/types.rb", "lib/net/dns/version.rb",
+    "net-dns.gemspec"
+  ]
   s.homepage = "http://github.com/mordocai/net-dns"
   s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  s.rubygems_version = "1.0.0"
   s.summary = "Pure Ruby DNS library, fork with fixes."
-  s.test_files = ["test/header_test.rb", "test/names_test.rb", "test/packet_test.rb", "test/question_test.rb", "test/resolver_test.rb", "test/rr/a_test.rb", "test/rr/aaaa_test.rb", "test/rr/classes_test.rb", "test/rr/cname_test.rb", "test/rr/hinfo_test.rb", "test/rr/mr_test.rb", "test/rr/mx_test.rb", "test/rr/ns_test.rb", "test/rr/types_test.rb", "test/rr_test.rb", "test/test_helper.rb"]
+#  s.test_files = [
+#    "spec/fixtures/resolv.conf", "spec/resolver_spec.rb", "spec/spec_helper.rb",
+#    "spec/unit/resolver/dns_timeout_spec.rb", "spec/unit/tcp_timeout_spec.rb",
+#    "spec/unit/udp_timeout_spec.rb"
+#  ]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
   s.license = 'Ruby'
 
   if s.respond_to? :specification_version then
@@ -24,13 +40,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rake>, ["~> 10.0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<rake>, ["~> 10.0"])
       s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
     s.add_dependency(%q<rake>, ["~> 10.0"])
     s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
   end
 
   s.add_runtime_dependency "packetfu"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-dns2
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Marco Ceresa
@@ -30,32 +30,47 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packetfu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Net::DNS is a pure Ruby DNS library, with a clean OO interface and an
-  extensible API.
+  extensible API. The net-dns2 ruby gem is an actively maintained fork of the original
+  net-dns.
 email: mordocai@mordocai.net
 executables: []
 extensions: []
@@ -96,22 +111,6 @@ files:
 - lib/net/dns/rr/types.rb
 - lib/net/dns/version.rb
 - net-dns.gemspec
-- test/header_test.rb
-- test/names_test.rb
-- test/packet_test.rb
-- test/question_test.rb
-- test/resolver_test.rb
-- test/rr/a_test.rb
-- test/rr/aaaa_test.rb
-- test/rr/classes_test.rb
-- test/rr/cname_test.rb
-- test/rr/hinfo_test.rb
-- test/rr/mr_test.rb
-- test/rr/mx_test.rb
-- test/rr/ns_test.rb
-- test/rr/types_test.rb
-- test/rr_test.rb
-- test/test_helper.rb
 homepage: http://github.com/mordocai/net-dns
 licenses:
 - Ruby
@@ -122,35 +121,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Pure Ruby DNS library, fork with fixes.
-test_files:
-- test/header_test.rb
-- test/names_test.rb
-- test/packet_test.rb
-- test/question_test.rb
-- test/resolver_test.rb
-- test/rr/a_test.rb
-- test/rr/aaaa_test.rb
-- test/rr/classes_test.rb
-- test/rr/cname_test.rb
-- test/rr/hinfo_test.rb
-- test/rr/mr_test.rb
-- test/rr/mx_test.rb
-- test/rr/ns_test.rb
-- test/rr/types_test.rb
-- test/rr_test.rb
-- test/test_helper.rb
-has_rdoc: 
+test_files: []

data/test/header_test.rb

@@ -1,167 +0,0 @@
-require 'test_helper'
-require 'net/dns/header'
-
-class HeaderTest < Test::Unit::TestCase
-  include Net::DNS
-  
-  def setup
-
-    @default = Header.new
-    @hash = Header.new(:id => 441,
-                       :qr => 1,
-                       :opCode => Header::IQUERY,
-                       :aa => 1,
-                       :tc => 1,
-                       :rd => 0,
-                       :cd => 0,
-                       :ad => 0,
-                       :ra => 1,
-                       :rCode => Header::RCode::FORMAT,
-                       :qdCount => 1,
-                       :anCount => 2,
-                       :nsCount => 3,
-                       :arCount => 3)
-    
-    @modified = Header.new
-    @modified.id = 442
-    @modified.qr = true
-    @modified.opCode = Header::IQUERY
-    @modified.aa = true
-    @modified.tc = true
-    @modified.rd = false
-    @modified.cd = false
-    @modified.ra = true
-    @modified.rCode = Header::RCode::FORMAT
-    @modified.qdCount = 1
-    @modified.anCount = 2
-    @modified.nsCount = 3
-    @modified.arCount = 3
-
-    @data = @modified.data
-    num = [(@data.unpack("n")[0]+1)].pack("n")
-    @data[0],@data[1] = num[0], num[1]
-    @binary = Header.parse(@data)
-    
-  end
-
-  def test_simple
-    assert_equal(@default.query?, true)
-    assert_equal(@default.response?, false)
-    assert_equal(@default.opCode, Header::QUERY)
-    assert_equal(@default.auth?, false)
-    assert_equal(@default.truncated?, false)
-    assert_equal(@default.recursive?, true)
-    assert_equal(@default.checking?, true)
-    assert_equal(@default.verified?, false)
-    assert_equal(@default.r_available?, false)
-    assert_equal(@default.rCode.code, Header::RCode::NOERROR)
-    assert_equal(@default.qdCount, 1)
-    assert_equal(@default.anCount, 0)
-    assert_equal(@default.nsCount, 0)
-    assert_equal(@default.arCount, 0)
-
-    assert_equal(@hash.id, 441)    
-    assert_equal(@hash.query?, false)
-    assert_equal(@hash.response?, true)
-    assert_equal(@hash.opCode, Header::IQUERY)
-    assert_equal(@hash.auth?, true)
-    assert_equal(@hash.truncated?, true)
-    assert_equal(@hash.recursive?, false)
-    assert_equal(@hash.checking?, true)
-    assert_equal(@hash.verified?, false)
-    assert_equal(@hash.r_available?, true)
-    assert_equal(@hash.rCode.code, Header::RCode::FORMAT)
-    assert_equal(@hash.qdCount, 1)
-    assert_equal(@hash.anCount, 2)
-    assert_equal(@hash.nsCount, 3)
-    assert_equal(@hash.arCount, 3)
-    
-    assert_equal(@modified.id, 442)    
-    assert_equal(@modified.query?, false)
-    assert_equal(@modified.response?, true)
-    assert_equal(@modified.opCode, Header::IQUERY)
-    assert_equal(@modified.auth?, true)
-    assert_equal(@modified.truncated?, true)
-    assert_equal(@modified.recursive?, false)
-    assert_equal(@modified.checking?, true)
-    assert_equal(@modified.verified?, false)
-    assert_equal(@modified.r_available?, true)
-    assert_equal(@modified.rCode.code, Header::RCode::FORMAT)
-    assert_equal(@modified.qdCount, 1)
-    assert_equal(@modified.anCount, 2)
-    assert_equal(@modified.nsCount, 3)
-    assert_equal(@modified.arCount, 3)
-    
-    assert_equal(@binary.data, @data)
-
-    assert_equal(@binary.id, 443)    
-    assert_equal(@binary.query?, false)
-    assert_equal(@binary.response?, true)
-    assert_equal(@binary.opCode, Header::IQUERY)
-    assert_equal(@binary.auth?, true)
-    assert_equal(@binary.truncated?, true)
-    assert_equal(@binary.recursive?, false)
-    assert_equal(@binary.checking?, true)
-    assert_equal(@binary.verified?, false)
-    assert_equal(@binary.r_available?, true)
-    assert_equal(@binary.rCode.code, Header::RCode::FORMAT)
-    assert_equal(@binary.qdCount, 1)
-    assert_equal(@binary.anCount, 2)
-    assert_equal(@binary.nsCount, 3)
-    assert_equal(@binary.arCount, 3)
-    
-    assert_raises(ArgumentError) do
-      Header.new(Array.new)
-    end
-    assert_raises(ArgumentError) do
-      Header.parse(Array.new)
-    end
-    assert_raises(ArgumentError) do
-      Header.parse("aa")
-    end
-    assert_raises(ArgumentError) do
-      @default.id = 1000000
-    end
-    assert_raises(ArgumentError) do
-      @default.qr=2
-    end
-    assert_raises(Header::WrongOpcodeError) do
-      @default.opCode=4
-    end
-    assert_raises(ArgumentError) do
-      @default.aa=2
-    end
-    assert_raises(ArgumentError) do
-      @default.tc=2
-    end
-    assert_raises(Header::WrongRecursiveError) do
-      @default.recursive=2
-    end
-    assert_raises(ArgumentError) do
-      @default.ra=2
-    end
-    assert_raises(ArgumentError) do
-      @default.cd=2
-    end
-    assert_raises(ArgumentError) do
-      @default.ad=2
-    end
-    assert_raises(ArgumentError) do
-      @default.rCode=46
-    end
-    assert_raises(Header::WrongCountError) do
-      @default.qdCount=100000
-    end
-    assert_raises(Header::WrongCountError) do
-      @default.anCount=100000
-    end
-    assert_raises(Header::WrongCountError) do
-      @default.nsCount=100000
-    end
-    assert_raises(Header::WrongCountError) do
-      @default.arCount=100000
-    end
-  end    
-
-end
-