lib/codesake/dawn/kb/ruby_version_check.rb in codesake-dawn-0.72 vs lib/codesake/dawn/kb/ruby_version_check.rb in codesake-dawn-0.75

@@ -19,35 +19,59 @@
           @safe_rubies.each do |ss|
             vv_e << ss[:engine]
             vv_a << ss[:version]
             vv_p << ss[:patchlevel].split("p")[1].to_i
           end
+
           vengine = self.is_vulnerable_engine?(detected_ruby[:engine], vv_e)
           vv = self.is_vulnerable_version?(detected_ruby[:version], vv_a)
+          ve = false
 
-          # Since we have also the patch level a fixes version can be the same
-          # as the vulnerable... we must consider this
-          ve = self.is_same_version?(detected_ruby[:version], vv_a) unless vv
-          vp = is_vulnerable_patchlevel?(detected_ruby[:patchlevel], vv_p) if ve
+          ve = self.is_same_version?(detected_ruby[:version], vv_a) 
+          vp = is_vulnerable_patchlevel?(detected_ruby[:patchlevel], detected_ruby[:version]) 
 
-          return true if ( vv and vengine )
-          return (ve and vp and vengine )
+          # XXX Debug statements to be replaced with logger call
+          debug_me("D:#{self.name}, VENGINE=#{vengine}, VV=#{vv}, VE=#{ve}, VP=#{vp}->#{vv && vengine}, #{(ve && vp && vengine )}")
+          debug_me("S:#{@safe_rubies}")
+          debug_me("DD:#{@detected_ruby}")
+
+
+          if ( vv && vengine)
+            @status = vp if ve
+            @status = true unless ve
+          else
+            @status = (ve && vp && vengine )
+          end
+
+          debug_me("STATUS:#{@status}")
+          
+          return @status
+
+          # return true if ( vv && vengine )
+          # return (ve && vp && vengine )
         end
         
         def is_vulnerable_engine?(target, fixes = [])
           fixes.each do |f|
             return true if f == target
           end
+          false
         end
 
         def is_same_version?(target, fixes = [])
           fixes.each do |f|
+            debug_me("F=#{f}, TARGET=#{target}")
             return true if f == target
           end
           false
         end
 
-        def is_vulnerable_patchlevel?(target, fixes = [])
+        def is_vulnerable_patchlevel?(target, version)
+          fixes = []
+          @safe_rubies.each do |ss|
+            fixes << ss[:patchlevel].split("p")[1].to_i if ss[:version] == version
+          end
+
           t = target.split("p")[1].to_i
           fixes.each do |f|
             return true if f > t
           end
           false