brakeman 3.7.0 → 3.7.1

data/bundle/ruby/2.3.0/gems/{tilt-2.0.7 → tilt-2.0.8}/lib/tilt/template.rb

@@ -264,6 +264,7 @@ module Tilt
             Thread.current[:tilt_vars] = [self, locals]
             class << self
               this, locals = Thread.current[:tilt_vars]
+              locals = locals
               this.instance_eval do
                 #{local_code}
       RUBY

data/bundle/ruby/2.3.0/gems/{tilt-2.0.7 → tilt-2.0.8}/test/tilt_typescript_test.rb

@@ -14,6 +14,10 @@ begin
       assert_equal Tilt::TypeScriptTemplate, Tilt['test.ts']
     end
 
+    test "is registered for '.tsx' files" do
+      assert_equal Tilt::TypeScriptTemplate, Tilt['test.tsx']
+    end
+
     test "compiles and evaluates the template on #render" do
       template = Tilt::TypeScriptTemplate.new { @ts }
       assert_match @js, template.render

data/bundle/ruby/2.3.0/gems/{tilt-2.0.7 → tilt-2.0.8}/tilt.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'tilt'
-  s.version = '2.0.7'
-  s.date = '2017-03-19'
+  s.version = '2.0.8'
+  s.date = '2017-07-24'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description

data/lib/brakeman.rb

@@ -511,6 +511,14 @@ module Brakeman
     end
   end
 
+  def self.debug= val
+    @debug = val
+  end
+
+  def self.quiet= val
+    @quiet = val
+  end
+
   class DependencyError < RuntimeError; end
   class NoBrakemanError < RuntimeError; end
   class NoApplication < RuntimeError; end

data/lib/brakeman/commandline.rb

@@ -0,0 +1,179 @@
+require 'brakeman/options'
+
+module Brakeman
+
+  # Implements handling of running Brakeman from the command line.
+  class Commandline
+    class << self
+
+      # Main method to run Brakeman from the command line.
+      #
+      # If no options are provided, ARGV will be parsed and used instead.
+      # Otherwise, the options are expected to be a Hash like the one returned
+      # after ARGV is parsed.
+      def start options = nil, app_path = "."
+
+        unless options
+          options, app_path = parse_options ARGV
+        end
+
+        run options, app_path
+      end
+
+      # Runs everything:
+      #
+      # - `set_interrupt_handler`
+      # - `early_exit_options`
+      # - `set_options`
+      # - `check_latest`
+      # - `run_report`
+      def run options, default_app_path = "."
+        set_interrupt_handler options
+        early_exit_options options
+        set_options options, default_app_path
+        check_latest if options[:ensure_latest]
+        run_report options
+      end
+
+      # Check for the latest version.
+      #
+      # If the latest version is newer, quit with a message.
+      def check_latest
+        if error = Brakeman.ensure_latest
+          quit Brakeman::Not_Latest_Version_Exit_Code, error
+        end
+      end
+
+      # Runs a comparison report based on the options provided.
+      def compare_results options
+        require 'json'
+        vulns = Brakeman.compare options.merge(:quiet => options[:quiet])
+
+        if options[:comparison_output_file]
+          File.open options[:comparison_output_file], "w" do |f|
+            f.puts JSON.pretty_generate(vulns)
+          end
+
+          Brakeman.notify "Comparison saved in '#{options[:comparison_output_file]}'"
+        else
+          puts JSON.pretty_generate(vulns)
+        end
+
+        if options[:exit_on_warn] && vulns[:new].count > 0
+          quit Brakeman::Warnings_Found_Exit_Code
+        end
+      end
+
+      # Handle options that exit without generating a report.
+      def early_exit_options options
+        if options[:list_checks] or options[:list_optional_checks]
+          Brakeman.list_checks options
+          quit
+        elsif options[:create_config]
+          Brakeman.dump_config options
+          quit
+        elsif options[:show_help]
+          puts Brakeman::Options.create_option_parser({})
+          quit
+        elsif options[:show_version]
+          require 'brakeman/version'
+          puts "brakeman #{Brakeman::Version}"
+          quit
+        end
+      end
+
+      # Parse ARGV-style array of options.
+      #
+      # Exits if options are invalid.
+      #
+      # Returns an option hash and the app_path.
+      def parse_options argv
+        begin
+          options, _ = Brakeman::Options.parse! argv
+        rescue OptionParser::ParseError => e
+          $stderr.puts e.message
+          $stderr.puts "Please see `brakeman --help` for valid options"
+          quit(-1)
+        end
+
+        if argv[-1]
+          app_path = argv[-1]
+        else
+          app_path = "."
+        end
+
+        return options, app_path
+      end
+
+      # Exits with the given exit code and prints out the message, if given.
+      #
+      # Override this method for different behavior.
+      def quit exit_code = 0, message = nil
+        warn message if message
+        exit exit_code
+      end
+
+      # Runs a regular report based on the options provided.
+      def regular_report options
+        tracker = run_brakeman options 
+
+        if options[:exit_on_warn] and not tracker.filtered_warnings.empty?
+          quit Brakeman::Warnings_Found_Exit_Code
+        end
+
+        if options[:exit_on_error] and tracker.errors.any?
+          quit Brakeman::Errors_Found_Exit_Code
+        end
+      end
+
+      # Actually run Brakeman.
+      #
+      # Returns a Tracker object.
+      def run_brakeman options
+        Brakeman.run options.merge(:print_report => true, :quiet => options[:quiet])
+      end
+
+      # Run either a comparison or regular report based on options provided.
+      def run_report options
+        begin
+          if options[:previous_results_json]
+            compare_results options
+          else
+            regular_report options
+          end
+        rescue Brakeman::NoApplication => e
+          quit Brakeman::No_App_Found_Exit_Code, e.message
+        rescue Brakeman::MissingChecksError => e
+          quit Brakeman::Missing_Checks_Exit_Code, e.message
+        end
+      end
+
+      # Sets interrupt handler to gracefully handle Ctrl+C
+      def set_interrupt_handler options
+        trap("INT") do
+          warn "\nInterrupted - exiting."
+
+          if options[:debug]
+            warn caller
+          end
+
+          exit!
+        end
+      end
+
+      # Modifies options, including setting the app_path
+      # if none is given in the options hash.
+      def set_options options, default_app_path = "."
+        unless options[:app_path]
+          options[:app_path] = default_app_path
+        end
+
+        if options[:quiet].nil?
+          options[:quiet] = :command_line
+        end
+
+        options
+      end
+    end
+  end
+end

data/lib/brakeman/options.rb

@@ -20,7 +20,23 @@ module Brakeman::Options
     def get_options args, destructive = false
       options = {}
 
-      parser = OptionParser.new do |opts|
+      parser = create_option_parser options
+
+      if destructive
+        parser.parse! args
+      else
+        parser.parse args
+      end
+
+      if options[:previous_results_json] and options[:output_files]
+        options[:comparison_output_file] = options[:output_files].shift
+      end
+
+      return options, parser
+    end
+
+    def create_option_parser options
+      OptionParser.new do |opts|
         opts.banner = "Usage: brakeman [options] rails/root/path"
 
         opts.on "-n", "--no-threads", "Run checks sequentially" do
@@ -306,18 +322,6 @@ module Brakeman::Options
           options[:show_help] = true
         end
       end
-
-      if destructive
-        parser.parse! args
-      else
-        parser.parse args
-      end
-
-      if options[:previous_results_json] and options[:output_files]
-        options[:comparison_output_file] = options[:output_files].shift
-      end
-
-      return options, parser
     end
   end
 end

data/lib/brakeman/processors/alias_processor.rb

@@ -682,7 +682,7 @@ class Brakeman::AliasProcessor < Brakeman::SexpProcessor
             env.current[var] = condition.target[1]
             exp[branch_index] = process_if_branch branch
             env.current[var] = previous_value
-          elsif i == 1 and array_include_all_literals? condition and node_type? branch, :return
+          elsif i == 1 and array_include_all_literals? condition and early_return? branch
             var = condition.first_arg
             env.current[var] = condition.target[1]
             exp[branch_index] = process_if_branch branch
@@ -704,6 +704,16 @@ class Brakeman::AliasProcessor < Brakeman::SexpProcessor
     exp
   end
 
+  def early_return? exp
+    return true if node_type? exp, :return
+
+    if node_type? exp, :block, :rlist
+      node_type? exp.last, :return
+    else
+      false
+    end
+  end
+
   def simple_when? exp
     node_type? exp[1], :array and
       not node_type? exp[1][1], :splat, :array and