brakeman 0.7.1 → 0.7.2

data/lib/checks/base_check.rb

@@ -56,9 +56,9 @@ class BaseCheck < SexpProcessor
     process exp[1] if sexp? exp[1]
     process exp[3]
 
-    if ALL_PARAMETERS.include? exp[1] or ALL_PARAMETERS.include? exp or params? exp[1]
+    if params? exp[1]
       @has_user_input = :params
-    elsif exp[1] == COOKIES or exp == COOKIES or cookies? exp[1]
+    elsif cookies? exp[1]
       @has_user_input = :cookies
     elsif sexp? exp[1] and model_name? exp[1][1]
       @has_user_input = :model
@@ -173,20 +173,16 @@ class BaseCheck < SexpProcessor
   #expression
   def has_immediate_user_input? exp
     if exp.nil?
-      return false
+      false
     elsif params? exp
       return :params, exp
     elsif cookies? exp
       return :cookies, exp
     elsif call? exp
-      if sexp? exp[1]
-        if ALL_PARAMETERS.include? exp[1] or params? exp[1]
-          return :params, exp
-        elsif exp[1] == COOKIES or cookies? exp[1]
-          return :cookies, exp
-        else
-          false
-        end
+      if params? exp[1]
+        return :params, exp
+      elsif cookies? exp[1]
+        return :cookies, exp
       else
         false
       end

data/lib/checks/check_cross_site_scripting.rb

@@ -202,9 +202,9 @@ class CheckCrossSiteScripting < BaseCheck
       @matched = false
     elsif sexp? exp[1] and model_name? exp[1][1]
       @matched = :model
-    elsif cookies? exp or cookies? target or COOKIES == exp or COOKIES == target 
+    elsif cookies? exp
       @matched = :cookies
-    elsif @inspect_arguments and (ALL_PARAMETERS.include?(exp) or params? exp)
+    elsif @inspect_arguments and params? exp
       @matched = :params
     elsif @inspect_arguments
       process args

data/lib/checks/check_escape_function.rb

@@ -10,7 +10,7 @@ class CheckEscapeFunction < BaseCheck
     if version_between?('2.0.0', '2.3.13') and RUBY_VERSION < '1.9.0' 
 
       warn :warning_type => 'Cross Site Scripting',
-        :message => 'Versions before 2.3.14 have a vulnerability in escape method when used with Ruby 1.8. Upgrade or apply patches as needed.',
+        :message => 'Versions before 2.3.14 have a vulnerability in escape method when used with Ruby 1.8: CVE-2011-2931',
         :confidence => CONFIDENCE[:high]
     end
   end

data/lib/checks/check_filter_skipping.rb

@@ -10,7 +10,7 @@ class CheckFilterSkipping < BaseCheck
     if version_between?('3.0.0', '3.0.9') and uses_arbitrary_actions?
 
       warn :warning_type => "Default Routes",
-        :message => "Versions before 3.0.10 have a vulnerability which allows filters to be bypassed. Upgrade or apply patches as needed.",
+        :message => "Versions before 3.0.10 have a vulnerability which allows filters to be bypassed: CVE-2011-2929",
         :confidence => CONFIDENCE[:high]
     end
   end

data/lib/checks/check_quote_table_name.rb

@@ -17,9 +17,9 @@ class CheckQuoteTableName < BaseCheck
       end
 
       if tracker.config[:rails_version] =~ /^3/
-        message = "Versions before 3.0.10 have a vulnerability in quote_table_name. Upgrade or apply patches as needed."
+        message = "Versions before 3.0.10 have a vulnerability in quote_table_name: CVE-2011-2930"
       else
-        message = "Versions before 2.3.14 have a vulnerability in quote_table_name. Upgrade or apply patches as needed."
+        message = "Versions before 2.3.14 have a vulnerability in quote_table_name: CVE-2011-2930"
       end
 
       warn :warning_type => "SQL Injection",

data/lib/checks/check_response_splitting.rb

@@ -10,7 +10,7 @@ class CheckResponseSplitting < BaseCheck
     if version_between?('2.3.0', '2.3.13')
 
       warn :warning_type => "Response Splitting",
-        :message => "Versions before 2.3.14 have a vulnerability content type handling allowing injection of headers. Upgrade or apply patches as needed.",
+        :message => "Versions before 2.3.14 have a vulnerability content type handling allowing injection of headers: CVE-2011-3186",
         :confidence => CONFIDENCE[:med]
 
     end

data/lib/checks/check_strip_tags.rb

@@ -11,9 +11,9 @@ class CheckStripTags < BaseCheck
         version_between?('3.0.0', '3.0.9')) and uses_strip_tags?
 
       if tracker.config[:rails_version] =~ /^3/
-        message = "Versions before 3.0.10 have a vulnerability in strip_tags. Upgrade or apply patches as needed."
+        message = "Versions before 3.0.10 have a vulnerability in strip_tags: CVE-2011-2931"
       else
-        message = "Versions before 2.3.13 have a vulnerability in strip_tags. Upgrade or apply patches as needed."
+        message = "Versions before 2.3.13 have a vulnerability in strip_tags: CVE-2011-2931"
       end
 
       warn :warning_type => "Cross Site Scripting",

data/lib/util.rb

@@ -127,11 +127,36 @@ module Util
 
   #Check if _exp_ is a params hash
   def params? exp
-    exp.is_a? Sexp and exp.node_type == :params
+    if exp.is_a? Sexp
+      return true if exp.node_type == :params or ALL_PARAMETERS.include? exp
+
+      if exp.node_type == :call
+        if params? exp[1]
+          return true
+        elsif exp[2] == :[]
+          return params? exp[1]
+        end
+      end
+    end
+
+    false
   end
 
   def cookies? exp
-    exp.is_a? Sexp and exp.node_type == :cookies
+    if exp.is_a? Sexp
+      return true if exp.node_type == :cookies or exp == COOKIES
+
+      if exp.node_type == :call
+        if cookies? exp[1]
+          return true
+        elsif exp[2] == :[]
+          return cookies? exp[1]
+        end
+      end
+    end
+
+    false
+
   end
 
   #Check if _exp_ is a Sexp.

data/lib/version.rb

@@ -1 +1 @@
-Version = "0.7.1"
+Version = "0.7.2"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Justin Collins
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-18 00:00:00 -07:00
+date: 2011-08-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency