dnstraverse 0.1.7 → 0.1.8

data/bin/dnstraverse

@@ -247,7 +247,6 @@ begin
   if options[:summary_results] then
     puts "Summary Results:"
     print result.summary_stats.text
-    puts
   end
 rescue Interrupt => e
   $stderr.puts "Interrupted by user"

data/lib/dnstraverse/info_cache.rb

@@ -99,6 +99,7 @@ module DNSTraverse
         starters.push({ :name => nameserver, :ips => ips })
       end
       newbailiwick = ns[0].name.to_s
+      newbailiwick = nil if newbailiwick == '' # back to root
       Log.debug { "For domain #{domain} using start servers: " +
         starters.map { |x| x[:name] }.join(', ') }
       return starters, newbailiwick

data/lib/dnstraverse/referral.rb

@@ -484,20 +484,21 @@ module DNSTraverse
         referral = data[:referral]
         where = "#{referral.server} (#{response.ip})"
         case response.status
-          when :exception
+        when :exception
           puts "#{response.exception_message} at #{where}"
-          when :noglue
+        when :noglue
           puts "No glue at #{referral.parent.server} " + 
             "(#{response.ip}) for #{referral.server}"
-          when :referral_lame
-          puts "Lame referral from #{where}"
-          when :loop
+        when :referral_lame
+          puts "Lame referral from #{referral.parent.server} " + 
+            "(#{referral.parent_ip}) to #{where}"
+        when :loop
           puts "Loop encountered at #{response.server} "
-          when :error
+        when :error
           puts "#{response.error_message} at #{where}"
-          when :nodata
+        when :nodata
           puts "NODATA (for this type) at #{where}"
-          when :answered
+        when :answered
           puts "Answer from #{where}"
           if results then
             for rr in data[:response].answers do

data/lib/dnstraverse/response.rb

@@ -55,7 +55,7 @@ module DNSTraverse
     # this is why exception name/message is added for exception types
     def update_stats_key
       r = @decoded_query
-      @stats_key = "key:#{r.ip}:#{@server}:#{@status}:#{r.qname}:#{r.qclass}:#{r.qtype}"
+      @stats_key = "key:#{@status}:#{r.ip}:#{@server}:#{r.qname}:#{r.qclass}:#{r.qtype}"
       if @stats == :exception and r.message.is_a? Exception then
         @stats_key+= ":#{r.message}"
       end
@@ -69,6 +69,15 @@ module DNSTraverse
       ###@auth_ns = @auth_soa = @auth_other = nil
     end
     
+    def inside_bailiwick?(name)
+      return true if @bailiwick.nil?
+      bwend = ".#{@bailiwick}"
+      namestr = name.to_s
+      return true if namestr.casecmp(@bailiwick) == 0
+      return true if namestr =~ /#{bwend}$/i
+      return false
+    end
+
     # enrich the decoded_query to do the cache, lame checking and get starters
     def evaluate
       @status = @decoded_query.status # use this as a base
@@ -78,13 +87,16 @@ module DNSTraverse
         @infocache.add(@decoded_query.cacheable_good)
       end
       case @decoded_query.status
-        when :restart
+      when :restart
         @starters, @starters_bailiwick = @infocache.get_startservers(@decoded_query.endname)
-        when :referral
+      when :referral
         @starters, @starters_bailiwick = @infocache.get_startservers(@decoded_query.endname)
+        unless @decoded_query.bailiwick.nil? or @starters_bailiwick =~ /\.#{@decoded_query.bailiwick}$/
+          @status = :referral_lame
+        end
         starternames = @starters.map { |x| x[:name].to_s.downcase }
         if starternames.sort != @decoded_query.authoritynames.sort
-          @status = :referral_lame
+          @decoded_query.warnings_add "Referred authority names do not match query cache expectations"
         end
       end
     end

data/lib/dnstraverse/summary_stats.rb

@@ -85,7 +85,7 @@ module DNSTraverse
           case type
           when :nodata
             o << "#{prefix}#{txt_prob sinfo[:prob]} found no such record"
-          when :lame_referral
+          when :referral_lame
             o << "#{prefix}#{txt_prob sinfo[:prob]} resulted in a lame referral"
           when :exception
             o << "#{prefix}#{txt_prob sinfo[:prob]} resulted in an exception"

data/lib/dnstraverse/version.rb

@@ -2,7 +2,7 @@ module DNSTraverse
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 7
+    PATCH = 8
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dnstraverse
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - James Ponder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 +01:00
+date: 2011-08-20 00:00:00 +01:00
 default_executable: dnstraverse
 dependencies: 
 - !ruby/object:Gem::Dependency