brakeman-lib 4.5.0 → 4.5.1

data/lib/brakeman/checks/check_model_attr_accessible.rb

@@ -25,7 +25,7 @@ class Brakeman::CheckModelAttrAccessible < Brakeman::BaseCheck
 
         SUSP_ATTRS.each do |susp_attr, confidence|
           if susp_attr.is_a?(Regexp) and susp_attr =~ attribute.to_s or susp_attr == attribute
-            warn :model => name,
+            warn :model => model,
               :file => model.file,
               :warning_type => "Mass Assignment",
               :warning_code => :dangerous_attr_accessible,

data/lib/brakeman/checks/check_model_attributes.rb

@@ -2,9 +2,6 @@ require 'brakeman/checks/base_check'
 
 #Check if mass assignment is used with models
 #which inherit from ActiveRecord::Base.
-#
-#If tracker.options[:collapse_mass_assignment] is +true+ (default), all models
-#which do not use attr_accessible will be reported in a single warning
 class Brakeman::CheckModelAttributes < Brakeman::BaseCheck
   Brakeman::Checks.add self
 
@@ -15,26 +12,19 @@ class Brakeman::CheckModelAttributes < Brakeman::BaseCheck
 
     #Roll warnings into one warning for all models
     if tracker.options[:collapse_mass_assignment]
-      no_accessible_names = []
-      protected_names = []
-
-      check_models do |name, model|
-        if model.attr_protected.nil?
-          no_accessible_names << name.to_s
-        elsif not tracker.options[:ignore_attr_protected]
-          protected_names << name.to_s
-        end
-      end
+      Brakeman.notify "[Notice] The `collapse_mass_assignment` option has been removed."
+    end
 
-      unless no_accessible_names.empty?
-        warn :model => no_accessible_names.sort.join(", "),
+    check_models do |name, model|
+      if model.attr_protected.nil?
+        warn :model => model,
+          :file => model.file,
+          :line => model.top_line,
           :warning_type => "Attribute Restriction",
           :warning_code => :no_attr_accessible,
           :message => msg("Mass assignment is not restricted using ", msg_code("attr_accessible")),
           :confidence => :high
-      end
-
-      unless protected_names.empty?
+      elsif not tracker.options[:ignore_attr_protected]
         message, confidence, link = check_for_attr_protected_bypass
 
         if link
@@ -43,41 +33,13 @@ class Brakeman::CheckModelAttributes < Brakeman::BaseCheck
           warning_code = :attr_protected_used
         end
 
-        warn :model => protected_names.sort.join(", "),
+        warn :model => model,
+          :file => model.file,
+          :line => model.attr_protected.first.line,
           :warning_type => "Attribute Restriction",
           :warning_code => warning_code,
           :message => message,
-          :confidence => confidence,
-          :link => link
-      end
-    else #Output one warning per model
-
-      check_models do |name, model|
-        if model.attr_protected.nil?
-          warn :model => name,
-            :file => model.file,
-            :line => model.top_line,
-            :warning_type => "Attribute Restriction",
-            :warning_code => :no_attr_accessible,
-            :message => msg("Mass assignment is not restricted using ", msg_code("attr_accessible")),
-            :confidence => :high
-        elsif not tracker.options[:ignore_attr_protected]
-          message, confidence, link = check_for_attr_protected_bypass
-
-          if link
-            warning_code = :CVE_2013_0276
-          else
-            warning_code = :attr_protected_used
-          end
-
-          warn :model => name,
-            :file => model.file,
-            :line => model.attr_protected.first.line,
-            :warning_type => "Attribute Restriction",
-            :warning_code => warning_code,
-            :message => message,
-            :confidence => confidence
-        end
+          :confidence => confidence
       end
     end
   end

data/lib/brakeman/checks/check_model_serialize.rb

@@ -54,7 +54,7 @@ class Brakeman::CheckModelSerialize < Brakeman::BaseCheck
         confidence = :high
       end
 
-      warn :model => model.name,
+      warn :model => model,
         :warning_type => "Remote Code Execution",
         :warning_code => :CVE_2013_0277,
         :message => msg("Serialized attributes are vulnerable in ", msg_version(rails_version), ", upgrade to ", msg_version(@upgrade_version), " or patch"),

data/lib/brakeman/checks/check_nested_attributes_bypass.rb

@@ -22,17 +22,17 @@ class Brakeman::CheckNestedAttributesBypass < Brakeman::BaseCheck
       if opts = model.options[:accepts_nested_attributes_for]
         opts.each do |args|
           if args.any? { |a| allow_destroy? a } and args.any? { |a| reject_if? a }
-            warn_about_nested_attributes name, model, args
+            warn_about_nested_attributes model, args
           end
         end
       end
     end
   end
 
-  def warn_about_nested_attributes name, model, args
+  def warn_about_nested_attributes model, args
     message = msg(msg_version(rails_version), " does not call ", msg_code(":reject_if"), " option when ", msg_code(":allow_destroy"), " is ", msg_code("false"), " ", msg_cve("CVE-2015-7577"))
 
-    warn :model => name,
+    warn :model => model,
       :warning_type => "Nested Attributes",
       :warning_code => :CVE_2015_7577,
       :message => message,

data/lib/brakeman/checks/check_secrets.rb

@@ -35,6 +35,6 @@ class Brakeman::CheckSecrets < Brakeman::BaseCheck
 
   def looks_like_secret? name
     # REST_AUTH_SITE_KEY is the pepper in Devise
-    name.match /password|secret|(rest_auth_site|api)_key$/i
+    name.match(/password|secret|(rest_auth_site|api)_key$/i)
   end
 end

data/lib/brakeman/checks/check_session_settings.rb

@@ -19,7 +19,7 @@ class Brakeman::CheckSessionSettings < Brakeman::BaseCheck
   def run_check
     settings = tracker.config.session_settings 
 
-    check_for_issues settings, @app_tree.expand_path("config/environment.rb")
+    check_for_issues settings, @app_tree.file_path("config/environment.rb")
 
     ["session_store.rb", "secret_token.rb"].each do |file|
       if tracker.initializers[file] and not ignored? file
@@ -42,13 +42,13 @@ class Brakeman::CheckSessionSettings < Brakeman::BaseCheck
   #in Rails 4.x apps
   def process_attrasgn exp
     if not tracker.options[:rails3] and exp.target == @session_settings and exp.method == :session=
-      check_for_issues exp.first_arg, @app_tree.expand_path("config/initializers/session_store.rb")
+      check_for_issues exp.first_arg, @app_tree.file_path("config/initializers/session_store.rb")
     end
 
     if tracker.options[:rails3] and settings_target?(exp.target) and
       (exp.method == :secret_token= or exp.method == :secret_key_base=) and string? exp.first_arg
 
-      warn_about_secret_token exp.line, @app_tree.expand_path("config/initializers/secret_token.rb")
+      warn_about_secret_token exp.line, @app_tree.file_path("config/initializers/secret_token.rb")
     end
 
     exp
@@ -58,7 +58,7 @@ class Brakeman::CheckSessionSettings < Brakeman::BaseCheck
   #in Rails 3.x apps
   def process_call exp
     if tracker.options[:rails3] and settings_target?(exp.target) and exp.method == :session_store
-      check_for_rails3_issues exp.second_arg, @app_tree.expand_path("config/initializers/session_store.rb")
+      check_for_rails3_issues exp.second_arg, @app_tree.file_path("config/initializers/session_store.rb")
     end
 
     exp
@@ -109,10 +109,10 @@ class Brakeman::CheckSessionSettings < Brakeman::BaseCheck
   end
 
   def check_secrets_yaml
-    secrets_file = "config/secrets.yml"
+    secrets_file = @app_tree.file_path("config/secrets.yml")
 
-    if @app_tree.exists? secrets_file and not ignored? "secrets.yml" and not ignored? "config/*.yml"
-      yaml = @app_tree.read secrets_file
+    if secrets_file.exists? and not ignored? "secrets.yml" and not ignored? "config/*.yml"
+      yaml = secrets_file.read
       require 'date' # https://github.com/dtao/safe_yaml/issues/80
       require 'safe_yaml/load'
       begin
@@ -127,7 +127,7 @@ class Brakeman::CheckSessionSettings < Brakeman::BaseCheck
         unless secret.include? "<%="
           line = yaml.lines.find_index { |l| l.include? secret } + 1
 
-          warn_about_secret_token line, @app_tree.expand_path(secrets_file)
+          warn_about_secret_token line, @app_tree.file_path(secrets_file)
         end
       end
     end
@@ -163,9 +163,9 @@ class Brakeman::CheckSessionSettings < Brakeman::BaseCheck
 
   def ignored? file
     [".", "config", "config/initializers"].each do |dir|
-      ignore_file = "#{dir}/.gitignore"
+      ignore_file = @app_tree.file_path("#{dir}/.gitignore")
       if @app_tree.exists? ignore_file
-        input = @app_tree.read(ignore_file)
+        input = ignore_file.read 
 
         return true if input.include? file
       end

data/lib/brakeman/checks/check_simple_format.rb

@@ -5,6 +5,11 @@ class Brakeman::CheckSimpleFormat < Brakeman::CheckCrossSiteScripting
 
   @description = "Checks for simple_format XSS vulnerability (CVE-2013-6416) in certain versions"
 
+  def initialize *args
+    super
+    @found_any = false
+  end
+
   def run_check
     if version_between? "4.0.0", "4.0.1"
       @inspect_arguments = true

data/lib/brakeman/checks/check_skip_before_filter.rb

@@ -38,7 +38,7 @@ class Brakeman::CheckSkipBeforeFilter < Brakeman::BaseCheck
         :message => msg("Use whitelist (", msg_code(":only => [..]"), ") when skipping authentication"),
         :code => filter,
         :confidence => :medium,
-        :link => "authentication_whitelist",
+        :link_path => "authentication_whitelist",
         :file => controller.file
     end
   end

data/lib/brakeman/checks/check_sql.rb

@@ -21,7 +21,8 @@ class Brakeman::CheckSQL < Brakeman::BaseCheck
     @sql_targets = [:average, :calculate, :count, :count_by_sql, :delete_all, :destroy_all,
                     :find_by_sql, :maximum, :minimum, :pluck, :sum, :update_all]
     @sql_targets.concat [:from, :group, :having, :joins, :lock, :order, :reorder, :where] if tracker.options[:rails3]
-    @sql_targets << :find_by << :find_by! << :not if tracker.options[:rails4]
+    @sql_targets.concat [:find_by, :find_by!, :find_or_create_by, :find_or_create_by!, :find_or_initialize_by, :not] if tracker.options[:rails4]
+    @sql_targets << :delete_by << :destroy_by if tracker.options[:rails6]
 
     if version_between?("2.0.0", "3.9.9") or tracker.config.rails_version.nil?
       @sql_targets << :first << :last << :all
@@ -71,23 +72,23 @@ class Brakeman::CheckSQL < Brakeman::BaseCheck
     scope_calls = []
 
     if version_between?("2.1.0", "3.0.9")
-      ar_scope_calls(:named_scope) do |name, args|
+      ar_scope_calls(:named_scope) do |model, args|
         call = make_call(nil, :named_scope, args).line(args.line)
-        scope_calls << scope_call_hash(call, name, :named_scope)
+        scope_calls << scope_call_hash(call, model, :named_scope)
       end
     elsif version_between?("3.1.0", "9.9.9")
-      ar_scope_calls(:scope) do |name, args|
+      ar_scope_calls(:scope) do |model, args|
         second_arg = args[2]
         next unless sexp? second_arg
 
         if second_arg.node_type == :iter and node_type? second_arg.block, :block, :call, :safe_call
-          process_scope_with_block(name, args)
+          process_scope_with_block(model, args)
         elsif call? second_arg
           call = second_arg
-          scope_calls << scope_call_hash(call, name, call.method)
+          scope_calls << scope_call_hash(call, model, call.method)
         else
           call = make_call(nil, :scope, args).line(args.line)
-          scope_calls << scope_call_hash(call, name, :scope)
+          scope_calls << scope_call_hash(call, model, :scope)
         end
       end
     end
@@ -96,37 +97,34 @@ class Brakeman::CheckSQL < Brakeman::BaseCheck
   end
 
   def ar_scope_calls(symbol_name = :named_scope, &block)
-    return_array = []
     active_record_models.each do |name, model|
       model_args = model.options[symbol_name]
       if model_args
         model_args.each do |args|
-          yield name, args
-          return_array << [name, args]
+          yield model, args
         end
       end
     end
-    return_array
   end
 
-  def scope_call_hash(call, name, method)
-    { :call => call, :location => { :type => :class, :class => name }, :method => :named_scope }
+  def scope_call_hash(call, model, method)
+    { :call => call, :location => { :type => :class, :class => model.name, :file => model.file }, :method => :named_scope }
   end
 
 
-  def process_scope_with_block model_name, args
+  def process_scope_with_block model, args
     scope_name = args[1][1]
     block = args[-1][-1]
 
     # Search lambda for calls to query methods
     if block.node_type == :block
       find_calls = Brakeman::FindAllCalls.new(tracker)
-      find_calls.process_source(block, :class => model_name, :method => scope_name)
+      find_calls.process_source(block, :class => model.name, :method => scope_name, :file => model.file)
       find_calls.calls.each { |call| process_result(call) if @sql_targets.include?(call[:method]) }
     elsif call? block
       while call? block
         process_result :target => block.target, :method => block.method, :call => block,
-         :location => { :type => :class, :class => model_name, :method => scope_name }
+          :location => { :type => :class, :class => model.name, :method => scope_name, :file => model.file }
 
         block = block.target
       end
@@ -187,7 +185,7 @@ class Brakeman::CheckSQL < Brakeman::BaseCheck
                         else
                           check_find_arguments call.last_arg
                         end
-                      when :where, :having, :find_by, :find_by!, :not
+                      when :where, :having, :find_by, :find_by!, :find_or_create_by, :find_or_create_by!, :find_or_initialize_by,:not, :delete_by, :destroy_by
                         check_query_arguments call.arglist
                       when :order, :group, :reorder
                         check_order_arguments call.arglist

data/lib/brakeman/checks/check_validation_regex.rb

@@ -17,7 +17,7 @@ class Brakeman::CheckValidationRegex < Brakeman::BaseCheck
 
   def run_check
     active_record_models.each do |name, model|
-      @current_model = name
+      @current_model = model
       format_validations = model.options[:validates_format_of]
 
       if format_validations

data/lib/brakeman/file_parser.rb

@@ -5,16 +5,16 @@ module Brakeman
   class FileParser
     attr_reader :file_list
 
-    def initialize tracker, app_tree
+    def initialize tracker
       @tracker = tracker
       @timeout = @tracker.options[:parser_timeout]
-      @app_tree = app_tree
+      @app_tree = @tracker.app_tree
       @file_list = {}
     end
 
     def parse_files list, type
       read_files list, type do |path, contents|
-        if ast = parse_ruby(contents, path)
+        if ast = parse_ruby(contents, path.relative)
           ASTFile.new(path, ast)
         end
       end
@@ -24,7 +24,9 @@ module Brakeman
       @file_list[type] ||= []
 
       list.each do |path|
-        result = yield path, read_path(path)
+        file = @app_tree.file_path(path)
+
+        result = yield file, file.read
         if result
           @file_list[type] << result
         end
@@ -50,9 +52,5 @@ module Brakeman
         nil
       end
     end
-
-    def read_path path
-      @app_tree.read_path path
-    end
   end
 end

data/lib/brakeman/file_path.rb

@@ -0,0 +1,71 @@
+require 'pathname'
+
+module Brakeman
+  # Class to represent file paths within Brakeman.
+  # FilePath objects track both the relative and absolute paths
+  # to make it easier to manage paths.
+  class FilePath
+    attr_reader :absolute, :relative
+    @cache = {}
+
+    # Create a new FilePath using an AppTree object.
+    #
+    # Note that if the path is already a FilePath, that path will
+    # be returned unaltered.
+    #
+    # Additionally, paths are cached. If the absolute path already has
+    # a FilePath in the cache, that existing FilePath will be returned.
+    def self.from_app_tree app_tree, path
+      return path if path.is_a? Brakeman::FilePath
+
+      absolute = app_tree.expand_path(path).freeze
+
+      if fp = @cache[absolute]
+        return fp
+      end
+
+      relative = app_tree.relative_path(path).freeze
+
+      self.new(absolute, relative).tap { |fp| @cache[absolute] = fp }
+    end
+
+    # Create a new FilePath with the given absolute and relative paths.
+    def initialize absolute_path, relative_path
+      @absolute = absolute_path
+      @relative = relative_path
+    end
+
+    # Read file from absolute path.
+    def read
+      File.read self.absolute
+    end
+
+    # Check if absolute path exists.
+    def exists?
+      File.exist? self.absolute
+    end
+
+    # Compare FilePaths. Raises an ArgumentError unless both objects are FilePaths.
+    def <=> rhs
+      raise ArgumentError unless rhs.is_a? Brakeman::FilePath
+      self.relative <=> rhs.relative
+    end
+
+    # Compare FilePaths. Raises an ArgumentError unless both objects are FilePaths.
+    def == rhs
+      return false unless rhs.is_a? Brakeman::FilePath
+
+      self.absolute == rhs.absolute
+    end
+
+    # Returns a string with the absolute path.
+    def to_str
+      self.absolute
+    end
+
+    # Returns a string with the absolute path.
+    def to_s
+      self.to_str
+    end
+  end
+end

data/lib/brakeman/options.rb

@@ -82,6 +82,13 @@ module Brakeman::Options
           options[:rails5] = true
         end
 
+        opts.on "-6", "--rails6", "Force Rails 6 mode" do
+          options[:rails3] = true
+          options[:rails4] = true
+          options[:rails5] = true
+          options[:rails6] = true
+        end
+
         opts.separator ""
         opts.separator "Scanning options:"