dnstraverse 0.1.4 → 0.1.6

data/bin/dnstraverse

@@ -118,9 +118,10 @@ options[:allstats] = false
 options[:saveobjects] = false
 options[:fast] = true
 options[:udpsize] = 2048
-options[:maxdepth] = 24
+options[:maxdepth] = 10
 options[:retries] = 2
 options[:results] = true
+options[:summary_results] = true
 options[:quiet] = false
 
 opts = OptionParser.new
@@ -134,7 +135,7 @@ opts.on("-t", "--type TYPE", Dnsruby::Types.constants,
 opts.on("--udp-size SIZE", "UDP packet size (default 2048).  Set to 512 to turn off EDNS0.") { |o| options[:udpsize] = o }
 opts.on("--allow-tcp", "Try using tcp if udp truncated (default true)") { |o| options[:allow_tcp] = o }
 opts.on("--always-tcp", "Always use tcp (default false)") { |o| options[:always_tcp] = o }
-opts.on("--max-depth DEPTH", "Maximum traversal depth (default 24)") { |o| options[:maxdepth] = o }
+opts.on("--max-depth DEPTH", "Maximum traversal depth (default 10)") { |o| options[:maxdepth] = o }
 opts.on("--retries TIMES", "Number of 2s retries before timing out (default 2)") { |o| options[:retries] = o }
 opts.on("--[no-]follow-aaaa", "Only follow AAAA records for referrals (default false)") { |o| options[:follow_aaaa] = o }
 opts.on("--[no-]root-aaaa", "Look for IPv6 addresses for root servers (default false)") { |o| options[:root_aaaa] = o }
@@ -144,6 +145,7 @@ opts.on("--[no-]show-servers", "Display list of servers seen (default false)") {
 opts.on("--[no-]show-versions", "Display versions of dns servers (default true)") { |o| options[:versions] = o }
 opts.on("--[no-]show-all-stats", "Display statistics as we go (default false)") { |o| options[:allstats] = o }
 opts.on("--[no-]show-results", "Display the results (default true)") { |o| options[:results] = o }
+opts.on("--[no-]show-summary-results", "Display the summary results (default true)") { |o| options[:summary_results] = o }
 opts.on("--save-objects") { |o| options[:saveobjects] = o }
 opts.on("--[no-]fast", "Fast mode (default true) turn off to be more accurate" ) { |o| options[:fast] = o }
 opts.on_tail("-h", "--help", "Show full help") { puts opts; exit }
@@ -240,6 +242,12 @@ begin
   if options[:results] then
     puts "Results:"
     result.stats_display(:results => true, :spacing => true)
+    puts
+  end
+  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/decoded_query.rb

@@ -32,7 +32,6 @@ module DNSTraverse
     attr_reader :answers # :answered only
     attr_reader :warnings # warnings about this query
     attr_reader :authoritynames # auth_ns converted to array of strings
-    #    attr_reader :stats_key
     
     def initialize(args)
       @message = args[:message] || nil # skip query - use this message/exception

data/lib/dnstraverse/referral.rb

@@ -298,7 +298,6 @@ module DNSTraverse
         serverweight = @serverweights[ip] # set at initialize or at resolve
         if ip =~ /^key:/ then # resolve failed for some reason
           # pull out the statistics on the resolution and copy over
-          raise "duplicate key found" if @stats[ip] # assertion
           if @stats_resolve[ip][:prob] != serverweight then # assertion
             $stderr.puts "#{@stats_resolve[ip][:prob]} vs #{serverweight}"
             @stats_resolve[ip].each_pair do |a,b|
@@ -306,13 +305,27 @@ module DNSTraverse
             end
             raise "unexpected probability" 
           end
-          @stats[ip] = @stats_resolve[ip].dup
+          if @stats[ip] then
+            # the same condition was found on another IP of this referral
+            # and we've already added this key before
+            # most likely this is an exception
+            @stats[ip][:prob]+= @stats_resolve[ip][:prob]
+          else
+            # copy over the resolve statistics to the final stats
+            @stats[ip] = @stats_resolve[ip].dup
+          end
           next
         end
         if @children[ip] then
           stats_calculate_children(@stats, @children[ip], serverweight)
         else
           response = @responses[ip]
+          prob = serverweight
+          if @stats[response.stats_key] then
+            # the same condition was found as a result of resolve stage and
+            # when we asked the server. most likely this is an exception.
+            prob+= @stats[response.stats_key][:prob]
+          end
           @stats[response.stats_key] = { :prob => serverweight,
             :response => response, :referral => self }
         end
@@ -345,19 +358,23 @@ module DNSTraverse
       @server.nil? ? true : false
     end
     
+    # process this Referral object:
+    #   query each IP in @serverips and create a Response object
+    #   return an array of children
     def process(args)
       raise "This Referral object has already been processed" if processed?
       raise "You need to resolve this Referral object" unless resolved?
-      if (server) then
-        process_normal(args)
-      else
+      @processed = true
+      unless (server) then
         # special case - no server means start from the top with the roots
         process_add_roots(args)
+        return @children.values.flatten
       end
+      process_normal(args)
       # return a set of Referral objects that need to be processed
-      # XXX flatten really necessary?
-      @processed = true
-      return @children.values.flatten.select {|x| x.is_a? Referral}
+      # this is just using @serverips for ordering the children properly
+      # because we numbered them all already
+      return @serverips.map {|ip| @children[ip] }.flatten.select {|x| x.is_a? Referral }
     end
     
     def process_add_roots(args)
@@ -377,11 +394,16 @@ module DNSTraverse
     
     def process_normal(args)
       Log.debug { "process " + self.to_s }
+      childsets = @serverips.reject {|ip| ip =~ /^key:/ }.count
+      childset = 0
       for ip in @serverips do
+        childset+= 1
         Log.debug { "Process normal #{ip}" }
         next if ip =~ /^key:/ # resolve failed on something
         m = nil
-        if @refid.scan(/\./).length >= @maxdepth.to_i then
+        # resolves get an extra .0. so strip those out before counting
+        current_depth = @refid.split('.').select {|x| x != '0' }.length
+        if current_depth >= @maxdepth.to_i then
           m = RuntimeError.new "Maxdepth #{@maxdepth} exceeded"
         end
         Log.debug { "Process normal #{ip} - making response" }
@@ -396,15 +418,15 @@ module DNSTraverse
         case r.status
           when :restart, :referral then
           Log.debug { "Process normal #{ip} - making referrals" }
+          refid =  childsets == 1 ? @refid :  "#{@refid}.#{childset}"
+          refkey = childsets == 1 ? @refkey : "#{@refkey}.#{childsets}"
           @children[ip] = make_referrals(:qname => r.endname,
                                          :starters => r.starters,
                                          :bailiwick => r.starters_bailiwick,
                                          :infocache => r.infocache,
+                                         :refid => refid, :refkey => refkey,
                                          :parent_ip => ip)
           Log.debug { "Process normal #{ip} - done making referrals" }
-          # XXX shouldn't be any children unless referrals
-          #when :referral_lame then
-          #@children[ip] = RuntimeError.new "Improper or lame delegation"
         end
       end
     end
@@ -414,12 +436,12 @@ module DNSTraverse
       children = Array.new
       child_refid = 1
       for starter in starters do
-        refargs = {
+        refargs = args.merge({
           :server => starter[:name],
           :serverips => starter[:ips],
-          :refid => "#{@refid}.#{child_refid}",
-          :refkey => "#{@refkey}.#{starters.count}"
-        }.merge(args)
+          :refid => "#{args[:refid]}.#{child_refid}",
+          :refkey => "#{args[:refkey]}.#{starters.count}"
+        })
         children.push make_referral(refargs)
         child_refid+= 1
       end

data/lib/dnstraverse/response.rb

@@ -50,9 +50,15 @@ module DNSTraverse
       super
     end
     
+    # set the statistics key - this is used to decide when to merge statistics
+    # together.  the same key = merge, different key = keep separate
+    # 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}"
+      if @stats == :exception and r.message.is_a? Exception then
+        @stats_key+= ":#{r.message}"
+      end
     end
     
     # clean up the workings

data/lib/dnstraverse/summary_stats.rb

@@ -66,6 +66,44 @@ module DNSTraverse
       end
     end
 
+    def text(args = {})
+      prefix = args[:prefix] || '  '
+      indent = args[:indent] || "#{prefix}          "
+      o = ''
+      each_summary do |type, sinfo|
+        if type == :answered then
+          each_answer do |prob, records|
+            initial = "#{prefix}#{txt_prob prob} answered with "
+            rr_prefix = "\n" + (' ' * initial.length)
+            o << initial
+            o << records.map {|x| x.to_s.gsub(/\s+/, ' ') }.join(rr_prefix) + "\n"
+          end
+        end
+      end
+      each_summary do |type, sinfo|
+        if type != :answered then
+          case type
+          when :nodata
+            o << "#{prefix}#{txt_prob sinfo[:prob]} found no such record"
+          when :lame_referral
+            o << "#{prefix}#{txt_prob sinfo[:prob]} resulted in a lame referral"
+          when :exception
+            o << "#{prefix}#{txt_prob sinfo[:prob]} resulted in an exception"
+          when :error
+            o << "#{prefix}#{txt_prob sinfo[:prob]} resulted in an error"
+          when :noglue
+            o << "#{prefix}#{txt_prob sinfo[:prob]} found no glue"
+          when :loop
+            o << "#{prefix}#{txt_prob sinfo[:prob]} resulted in a loop"
+          else
+            o << "#{prefix}#{txt_prob sinfo[:prob]} #{type}"
+          end
+          o << "\n"
+        end
+      end
+      return o
+    end
+
     private
     def get_summary_stats(referral)
       s = {}
@@ -90,5 +128,11 @@ module DNSTraverse
       end
       return a
     end
+
+    def txt_prob(prob)
+      t = sprintf("%.1f%%", prob * 100).sub(/\.0%/, '%')
+      return sprintf("%5s", t) # 99.9%
+    end
+
   end
 end

data/lib/dnstraverse/traverser.rb

@@ -74,7 +74,8 @@ module DNSTraverse
       stage = opts[:stage] or raise "must pass option :stage"
       refres = refobj.referral_resolution?
       p = (refres == true ? @progress_resolve : @progress_main)
-      p.call(:state => @state, :referral => refobj, :stage => stage)
+      newopts = opts.merge({:state => @state, :referral => refobj})
+      p.call(newopts)
     end
 
     ### change to get_all or something?
@@ -197,11 +198,21 @@ module DNSTraverse
         end
         # put a placeholder on the stack
         stack << r << :calc_answer
-        # get the children
+        # get children, one set per IP address of this name server in array
         children = r.process({})
         # now report progress.  we already can tell whether this will be
         # completed in fast mode or not, so we report this information
+        total_sets = children.map { |c| c.parent_ip }.uniq.count
+        # if there is more than one set (i.e. a DNS server has more than one
+        # IP address and we had to do multiple queries), the children will
+        # been numbered with an extra set digit, and we want to report this to
+        # the user interface
+        seen_parent_ip = Hash.new
         children.each do |c|
+          if total_sets > 1 and not seen_parent_ip.include?(c.parent_ip) then
+            report_progress c, :stage => :new_referral_set
+            seen_parent_ip[c.parent_ip] = true
+          end
           if @fast
             key = "#{c.qname}:#{c.qclass}:#{c.qtype}:#{c.server}:#{c.txt_ips_verbose}".downcase!
             stage = @answered.key?(key) ? :new_fast : :new

data/lib/dnstraverse/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dnstraverse
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - James Ponder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 +01:00
+date: 2011-08-17 00:00:00 +01:00
 default_executable: dnstraverse
 dependencies: 
 - !ruby/object:Gem::Dependency