brakeman 3.3.1 → 3.3.2

data/bundle/ruby/2.3.0/gems/{terminal-table-1.5.2 → terminal-table-1.6.0}/lib/terminal-table/table.rb

@@ -1,13 +1,12 @@
-
 module Terminal
   class Table
-    
+
     attr_reader :title
     attr_reader :headings
-    
+
     ##
     # Generates a ASCII table with the given _options_.
-  
+
     def initialize options = {}, &block
       @column_widths = []
       self.style = options.fetch :style, {}
@@ -16,10 +15,10 @@ module Terminal
       self.title = options.fetch :title, nil
       yield_or_eval(&block) if block
     end
-    
+
     ##
     # Align column _n_ to the given _alignment_ of :center, :left, or :right.
-    
+
     def align_column n, alignment
       r = rows
       column(n).each_with_index do |col, i|
@@ -27,10 +26,10 @@ module Terminal
         cell.alignment = alignment unless cell.alignment?
       end
     end
-    
+
     ##
-    # Add a row. 
-    
+    # Add a row.
+
     def add_row array
       row = array == :separator ? Separator.new(self) : Row.new(self, array)
       @rows << row
@@ -44,58 +43,58 @@ module Terminal
     def add_separator
       self << :separator
     end
-    
+
     def cell_spacing
       cell_padding + style.border_y.length
     end
-    
+
     def cell_padding
       style.padding_left + style.padding_right
     end
-    
+
     ##
     # Return column _n_.
-    
+
     def column n, method = :value, array = rows
-      array.map { |row| 
+      array.map { |row|
         cell = row[n]
         cell && method ? cell.__send__(method) : cell
-      }.compact 
+      }.compact
     end
-    
+
     ##
     # Return _n_ column including headings.
-    
+
     def column_with_headings n, method = :value
       column n, method, headings_with_rows
     end
-    
+
     ##
     # Return columns.
-    
+
     def columns
-      (0...number_of_columns).map { |n| column n } 
+      (0...number_of_columns).map { |n| column n }
     end
-    
+
     ##
     # Return length of column _n_.
-    
+
     def column_width n
       width = @column_widths[n] || 0
       width + additional_column_widths[n].to_i
     end
     alias length_of_column column_width # for legacy support
-    
+
     ##
     # Return total number of columns available.
-     
+
     def number_of_columns
       headings_with_rows.map { |r| r.cells.size }.max
     end
 
     ##
     # Set the headings
-    
+
     def headings= arrays
       arrays = [arrays] unless arrays.first.is_a?(Array)
       @headings = arrays.map do |array|
@@ -107,7 +106,7 @@ module Terminal
 
     ##
     # Render the table.
-  
+
     def render
       separator = Separator.new(self)
       buffer = [separator]
@@ -121,19 +120,23 @@ module Terminal
           buffer << separator
         end
       end
-      buffer += @rows
-      buffer << separator
-      buffer.map { |r| r.render }.join("\n")
+      if style.all_separators
+        buffer += @rows.product([separator]).flatten
+      else
+        buffer += @rows
+        buffer << separator
+      end
+      buffer.map { |r| style.margin_left + r.render }.join("\n")
     end
     alias :to_s :render
-    
+
     ##
     # Return rows without separator rows.
 
     def rows
       @rows.reject { |row| row.is_a? Separator }
     end
-    
+
     def rows= array
       @rows = []
       array.each { |arr| self << arr }
@@ -142,16 +145,16 @@ module Terminal
     def style=(options)
       style.apply options
     end
-    
+
     def style
       @style ||= Style.new
     end
-    
+
     def title=(title)
       @title = title
       recalc_column_widths Row.new(self, [title_cell_options])
     end
-    
+
     ##
     # Check if _other_ is equal to self. _other_ is considered equal
     # if it contains the same headings and rows.
@@ -163,11 +166,11 @@ module Terminal
     end
 
     private
-    
+
     def columns_width
       @column_widths.inject(0) { |s, i| s + i + cell_spacing } + style.border_y.length
     end
-    
+
     def additional_column_widths
       return [] if style.width.nil?
       spacing = style.width - columns_width
@@ -181,7 +184,7 @@ module Terminal
         arr
       end
     end
-    
+
     def recalc_column_widths row
       return if row.is_a? Separator
       i = 0
@@ -202,14 +205,14 @@ module Terminal
         end
       end
     end
-    
+
     ##
     # Return headings combined with rows.
-    
+
     def headings_with_rows
       @headings + rows
     end
-    
+
     def yield_or_eval &block
       return unless block
       if block.arity > 0

data/bundle/ruby/2.3.0/gems/{terminal-table-1.5.2 → terminal-table-1.6.0}/lib/terminal-table/table_helper.rb

@@ -1,9 +1,9 @@
-module Terminal
-  class Table
-    module TableHelper
-      def table headings = [], *rows, &block
-        Terminal::Table.new :headings => headings.to_a, :rows => rows, &block
-      end
-    end
-  end
-end
+module Terminal
+  class Table
+    module TableHelper
+      def table headings = [], *rows, &block
+        Terminal::Table.new :headings => headings.to_a, :rows => rows, &block
+      end
+    end
+  end
+end

data/bundle/ruby/2.3.0/gems/{terminal-table-1.5.2 → terminal-table-1.6.0}/lib/terminal-table/version.rb

@@ -1,5 +1,5 @@
 module Terminal
   class Table
-    VERSION = '1.5.2'
+    VERSION = '1.6.0'
   end
 end

data/lib/brakeman/checks/check_secrets.rb

@@ -13,7 +13,7 @@ class Brakeman::CheckSecrets < Brakeman::BaseCheck
     @warned = Set.new
 
     @tracker.constants.each do |constant|
-      name = constant.name.last
+      name = constant.name_array.last
       value = constant.value
 
       if string? value and not value.value.empty? and looks_like_secret? name

data/lib/brakeman/options.rb

@@ -76,6 +76,7 @@ module Brakeman::Options
         opts.on "--faster", "Faster, but less accurate scan" do
           options[:ignore_ifs] = true
           options[:skip_libs] = true
+          options[:disable_constant_tracking] = true
         end
 
         opts.on "--ignore-model-output", "Consider model attributes XSS-safe" do

data/lib/brakeman/tracker.rb

@@ -186,11 +186,11 @@ class Brakeman::Tracker
   end
 
   def add_constant name, value, context = nil
-    @constants.add name, value, context
+    @constants.add name, value, context unless @options[:disable_constant_tracking]
   end
 
   def constant_lookup name
-    @constants.get_literal name
+    @constants.get_literal name unless @options[:disable_constant_tracking]
   end
 
   def index_call_sites

data/lib/brakeman/tracker/constants.rb

@@ -2,11 +2,11 @@ require 'brakeman/processors/output_processor'
 
 module Brakeman
   class Constant
-    attr_reader :name, :file
+    attr_reader :name, :name_array, :file, :value
 
     def initialize name, value = nil, context = nil 
       set_name name, context
-      @values = [ value ]
+      @value = value
       @context = context
 
       if @context
@@ -15,28 +15,28 @@ module Brakeman
     end
 
     def line
-      if @values.first.is_a? Sexp
-        @values.first.line
+      if @value.is_a? Sexp
+        @value.line
       end
     end
 
     def set_name name, context
-      @name = Constants.constant_as_array(name)
+      @name = name
+      @name_array = Constants.constant_as_array(name)
     end
 
     def match? name
-      @name.reverse.zip(name.reverse).reduce(true) { |m, a| a[1] ? a[0] == a[1] && m : m }
-    end
-
-    def value
-      @values.reverse.reduce do |m, v|
-        Sexp.new(:or, v, m)
-      end
-    end
-
-    def add_value exp
-      unless @values.include? exp
-        @values << exp
+      if name == @name
+        return true
+      elsif name.is_a? Sexp and name.node_type == :const and name.value == @name
+        return true
+      elsif name.is_a? Symbol and name.value == @name
+        return true
+      elsif name.class == Array
+        name == @name_array or
+          @name_array.reverse.zip(name.reverse).reduce(true) { |m, a| a[1] ? a[0] == a[1] && m : m }
+      else
+        false
       end
     end
   end
@@ -45,7 +45,11 @@ module Brakeman
     include Brakeman::Util
 
     def initialize
-      @constants = []
+      @constants = Hash.new { |h, k| h[k] = [] }
+    end
+
+    def size
+      @constants.length
     end
 
     def [] exp
@@ -60,41 +64,98 @@ module Brakeman
     end
 
     def find_constant exp
-      name = Constants.constant_as_array(exp)
-      @constants.find do |c|
-        c.match? name
+      base_name = Constants.get_constant_base_name(exp)
+
+      if @constants.key? base_name
+        @constants[base_name].find do |c|
+          if c.match? exp
+            return c
+          end
+        end
+
+        name_array = Constants.constant_as_array(exp)
+
+        # Avoid losing info about dynamic constant values
+        return unless name_array.all? { |n| constant? n or n.is_a? Symbol }
+
+        @constants[base_name].find do |c|
+          if c.match? name_array
+            return c
+          end
+        end
       end
+
+      nil
     end
 
     def add name, value, context = nil
-      if existing = self.find_constant(name)
-        existing.add_value value
-      else
-        @constants << Constant.new(name, value, context)
+      if call? value and value.method == :freeze
+        value = value.target
       end
+
+      base_name = Constants.get_constant_base_name(name)
+      @constants[base_name] << Constant.new(name, value, context)
+    end
+
+    LITERALS = [:lit, :false, :str, :true, :array, :hash]
+    def literal? exp
+      exp.is_a? Sexp and LITERALS.include? exp.node_type
     end
 
     def get_literal name
-      if x = self[name] and [:lit, :false, :str, :true, :array, :hash].include? x.node_type
+      if x = self[name] and literal? x
         x
       else
         nil
       end
     end
 
-    def each &block
-      @constants.each &block
+    def each
+      @constants.each do |name, values|
+        values.each do |constant|
+          yield constant
+        end
+      end
     end
 
     def self.constant_as_array exp
-      get_constant_name(exp).split('::')
+      res = []
+      while exp
+        if exp.is_a? Sexp
+          case exp.node_type
+          when :const
+            res << exp.value
+            exp = nil
+          when :colon3
+            res << exp.value << :""
+            exp = nil
+          when :colon2
+            res << exp.last
+            exp = exp[1]
+          else
+            res << exp
+            exp = nil
+          end
+        else
+          res << exp
+          exp = nil
+        end
+      end
+
+      res.reverse!
+      res
     end
 
-    def self.get_constant_name exp
-      if exp.is_a? Sexp
-        Brakeman::OutputProcessor.new.format(exp)
+    def self.get_constant_base_name exp
+      return exp unless exp.is_a? Sexp
+
+      case exp.node_type
+      when :const, :colon3
+        exp.value
+      when :colon2
+        exp.last
       else
-        exp.to_s
+        exp
       end
     end
   end