dnstraverse 0.1.11 → 0.1.13

data/lib/dnstraverse/decoded_query.rb

@@ -127,10 +127,12 @@ module DNSTraverse
       @cacheable_good, @cacheable_bad = msg_cacheable(@message, @bailiwick)
       @endname = msg_follow_cnames(@message, :qname => @qname, :qtype => @qtype,
                                    :bailiwick => @bailiwick)
-      return process_restart unless inside_bailiwick?(@endname)
+      return process_cname_loop if @endname.nil?
+      ## return process_restart unless inside_bailiwick?(@endname)
       return process_error if @message.rcode != NOERROR
       @answers = msg_answers?(@message, :qname => @endname, :qtype => qtype)
       return process_answered if @answers
+      return process_restart if @endname != @qname
       return process_nodata if @auth_soa.size > 0 or @auth_ns.size == 0
       return process_referral unless @auth_ns.empty?
       return process_restart
@@ -141,6 +143,10 @@ module DNSTraverse
       @exception_message = @message.to_s
     end
     
+    def process_cname_loop
+      @status = :cname_loop
+    end
+
     def process_restart
       @status = :restart
     end
@@ -181,17 +187,19 @@ module DNSTraverse
     
     def to_s
       case @status
-        when :error
+      when :error
         return "Error: #{@error_message}"
-        when :exception
+      when :exception
         return "Exception: #{@exception_message}"
-        when :nodata
+      when :cname_loop
+        return "CNANE loop"
+      when :nodata
         return "No data"
-        when :answered
+      when :answered
         return "Answered (#{@answers.size} entries)"
-        when :referral
+      when :referral
         return "Referral to #{@authoritynames.join(',')}"
-        when :restart
+      when :restart
         return "Query re-start with #{@endname}"
       end
     end

data/lib/dnstraverse/message_utility.rb

@@ -144,23 +144,31 @@ module DNSTraverse
       return ns, soa, other      
     end
     
+    # follow any CNAMEs in the message and return the final name
+    # return nil if there is a loop
     def msg_follow_cnames(msg, args)
       name = args[:qname]
       type = args[:qtype]
       bw = args[:bailiwick].to_s
       bwend = ".#{args[:bailiwick]}"
+      seen = {}
       while true do
+        seen[name] = true
         return name if msg_answers?(msg, :qname => name, :qtype => type)
         if not ans = msg_answers?(msg, :qname => name, :qtype => 'CNAME') then
           return name
         end
         target = ans[0].domainname.to_s
         Log.debug { "CNAME encountered from #{name} to #{target}"}
-        if bw and (target.casecmp(bw) != 0 and name !~ /#{bwend}$/i) then
+        if name !~ /#{bwend}$/i then
           # target outside of bailiwick, don't follow any more CNAMEs.
           return target
         end
         name = target
+        if seen[name] then
+          Log.debug { "CNAME loop detected" }
+          return nil
+        end
       end
     end
     

data/lib/dnstraverse/referral.rb

@@ -506,7 +506,9 @@ module DNSTraverse
           puts "Lame referral from #{referral.parent.server} " + 
             "(#{referral.parent_ip}) to #{where}"
         when :loop
-          puts "Loop encountered at #{response.server} "
+          puts "Loop encountered at #{response.server}"
+        when :cname_loop
+          puts "CNAME loop encountered at #{response.server}"
         when :error
           puts "#{response.error_message} at #{where}"
         when :nodata

data/lib/dnstraverse/summary_stats.rb

@@ -95,6 +95,8 @@ module DNSTraverse
             o << "#{prefix}#{txt_prob sinfo[:prob]} found no glue"
           when :loop
             o << "#{prefix}#{txt_prob sinfo[:prob]} resulted in a loop"
+          when :cname_loop
+            o << "#{prefix}#{txt_prob sinfo[:prob]} resulted in a CNAME loop"
           else
             o << "#{prefix}#{txt_prob sinfo[:prob]} #{type}"
           end

data/lib/dnstraverse/version.rb

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

metadata

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