veracode 1.0.0.alpha15 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ad985e497f862247d92d07c550cf5e71f30e91d4a4a599937ae3af3c2a56bb0
-  data.tar.gz: fbe71f39a1628e58765bba17d847812d6f3250b27f4937f4bc1b492be6ecd64b
+  metadata.gz: 32f374241e790d16dcc804e4dd3dbbb754417e0b99afa9a3c2ab9fe80ef6466d
+  data.tar.gz: a10a06a8bb5b5d573808c3f2855e3b7ba9eecf2535f975f13966e755771b9dc0
 SHA512:
-  metadata.gz: 377bdd9c7c20e5811aa04b42bed81d94ce8e97a8f33e832cee012b10dac39aadba0b239a757b8b5d03f2ce46b2efb420871ff949f7273e83a9cc6916faa68333
-  data.tar.gz: c42fd23e7d02f02d0e3565866aef8e21f0dc0271172f7ad95c35f9754f6897b6ad89666a44f89a6be405b95d16f0a9e95ba681027bdb0f82eda88b83657d012e
+  metadata.gz: 66f1e39a03ef77a76bc33febbbe7e7778f3d653f2d76f5eba02c0e93a26e0eacf2e3fecfd14a3281281c6ebcf27330d219ffded199ad56db7c5791658bcb66ff
+  data.tar.gz: b9498b2e70b3b3c3b509937d5001067c9fe710388e7b86ab1a98c607810c41862f932b91d4112530473e412653bd861b687561af8339c662622f69e50efb4017

data/bin/veracode

@@ -23,8 +23,13 @@ require 'veracode/version'
 $options =  {
               :archive_source => true,
               :include_inherited => false,
-              :jruby => false,
               :environment => false,
+              :verbose => false,
+              :jruby => false,
+              :skipactiverecord => false,
+              :skipactionview => false,
+              :skipsprockets => false,
+              :snapshot => false
             }
 
 subcommand = ARGV.shift
@@ -61,6 +66,10 @@ case subcommand
         $DEBUG = true
       end
 
+      opts.on("--debug-snapshot", "Generate a snapshot of the prepare state for Veracode debugging.") do 
+        $options[:snapshot] = true
+      end
+
     end.parse!
 
     Veracode.prepare

data/lib/veracode.rb

@@ -36,6 +36,7 @@ module Veracode
   @archive_filename = nil
   @archive_dirname = nil
 
+  @expanded_app_dir = Dir.getwd
 
   def self.init
     if Gem::Dependency.new('', '~> 2.2.0').match?('', RUBY_VERSION)
@@ -120,10 +121,11 @@ module Veracode
 
     @manifest += Dir.glob("*").keep_if {|f| File.file?(f)}
 
-#     {app config db doc lib log public script test tmp vendor}
-    %w{app config        lib log public script          vendor}.each {|dirname|
+    #{app config db doc lib log public script test tmp vendor}
+    %w{app config lib log public script}.each {|dirname|
       @manifest += Dir[File.join(dirname, "**", "*")].keep_if {|f| File.file?(f)}
     }
+    @manifest += Dir[File.join("vendor", "**", "*.rb")]
     @manifest += Dir[File.join("db", "**", "*.rb")]
 
     if $options[:archive_source]
@@ -202,7 +204,11 @@ module Veracode
       exit
     end
 
-    puts "Please upload #{@archive_filename}"
+    if $options[:snapshot]
+      puts "Please provide #{@archive_filename} to veracode for further investigation."
+    else
+      puts "Please upload #{@archive_filename}"
+    end
   end
 
   def self.cleanup
@@ -284,23 +290,27 @@ module Veracode
   end
 
   def self.safe_name(o)
-    case 
-    when o == ActiveSupport::TimeWithZone
-      "ActiveSupport::TimeWithZone"
-    when o.is_a?(Module)
-      begin
-        ( o.name.nil? ? o.to_s : o.name.to_s )
-      rescue
+    begin
+      case 
+      when o == ActiveSupport::TimeWithZone
+        "ActiveSupport::TimeWithZone"
+      when o.is_a?(Module)
         begin
-          ( o.nil? ? "nil" : o.to_s )
+          ( o.name.nil? ? o.to_s : o.name.to_s )
         rescue
-          "nil"
+          begin
+            ( o.nil? ? "nil" : o.to_s )
+          rescue
+              ( o == nil ? "nil" : o.to_s ) # in case of monkey patched nil?
+          end
         end
+      when o.is_a?(Method), o.is_a?(UnboundMethod)
+        o.name.to_s
+      else
+        o.to_s
       end
-    when o.is_a?(Method), o.is_a?(UnboundMethod)
-      o.name.to_s
-    else
-      o.to_s
+    rescue
+      "Veracode" #should result in this being dropped from the archive since we can't get a safe name for it
     end
   end
   
@@ -392,8 +402,8 @@ module Veracode
 
     if with_disasm
       insns = RubyVM::InstructionSequence.disassemble(m)
-      formatted += ( (insns.nil? || insns.empty?) ? 
-                     "== disasm\n== end disasm\n" : 
+      formatted += ( (insns.nil? || insns.empty? || insns[/.*#{@expanded_app_dir}.*/].nil?) ? 
+                     "\n" :
                      "#{insns}== end disasm\n" 
                    )
     end
@@ -419,20 +429,25 @@ module Veracode
   ##############################################################################
   # Archiving Headers
   def self.class_header(c)
-    return "" unless c.is_a? Class
+    begin
+      return "" unless c.is_a? Class
+
+      puts "  class header" if $options[:verbose]
 
-    puts "  class header" if $options[:verbose]
+      case
+      when c.superclass.nil? # this should only happen for BasicObject
+        return ""
+      when c.superclass.name.nil? # in case the parent is anonymous
+        name = c.superclass.to_s.dump
+      else
+        name = c.superclass.name.dump
+      end
 
-    case
-    when c.superclass.nil? # this should only happen for BasicObject
+      "superclass #{name}\n"
+    rescue Exception => e
+      log_error e.message
       return ""
-    when c.superclass.name.nil? # in case the parent is anonymous
-      name = c.superclass.to_s.dump
-    else
-      name = c.superclass.name.dump
     end
-
-    "superclass #{name}\n"
   end
 
   def self.module_header(m)
@@ -509,25 +524,36 @@ module Veracode
       # m.respond_to?(:global_variables) was throwing exceptions
     end
 
-    %w[ public protected private ].each {|p|
-      get_methods = (p + "_instance_methods").to_sym
-      if m.respond_to?(get_methods) && m.__send__(get_methods, $options[:include_inherited]).count > 0
-        m.__send__(get_methods, $options[:include_inherited]).each do |m_symbol|
-          begin
-            method = m.instance_method(m_symbol)
-            formatted_contents += format_method(method, "#{p.to_s}_instance", with_disasm)
-          rescue Exception => e
-            log_error "Error archiving #{p.to_s} instance method #{m_symbol.to_s.dump}: #{e.message}"
+    begin
+      %w[ public protected private ].each {|p|
+        get_methods = (p + "_instance_methods").to_sym
+        if m.respond_to?(get_methods) && m.__send__(get_methods, $options[:include_inherited]).count > 0
+          m.__send__(get_methods, $options[:include_inherited]).each do |m_symbol|
+            begin
+              method = m.instance_method(m_symbol)
+              formatted_contents += format_method(method, "#{p.to_s}_instance", with_disasm)
+            rescue Exception => e
+              log_error "Error archiving #{p.to_s} instance method #{m_symbol.to_s.dump}: #{e.message}"
+            end
           end
         end
-      end
-    }
+      }
+    rescue Exception => e
+      # m.respond_to?(get_methods)
+    end
 
     formatted_contents
   end
 
   def self.object_contents(o, with_disasm=true)
-    return "" unless !o.nil? && o.is_a?(Object)
+    begin
+      return "" unless !o.nil?
+    rescue Exception => e
+      log_error "Error testing #{o} with nil?. Probable monkey patching. #{e.message}"
+      return "" if o == nil
+    end
+
+    return "" unless o.is_a?(Object)
 
     puts "  object contents" if $options[:verbose]
 
@@ -571,12 +597,28 @@ module Veracode
   ##############################################################################
   # Archiving Objects
   def self.archive(objects, with_disasm=true)
-    objects = objects - [
-                            Veracode, 
-                            Veracode::ActiveRecord, 
-                            Veracode::ActiveRecord::Model, 
-                            Veracode::ActiveRecord::Schema,
-                           ]
+    veracode_artifacts = Set[
+      safe_name(Veracode),
+      safe_name(Veracode::ActiveRecord),
+      safe_name(Veracode::ActiveRecord::Model),
+      safe_name(Veracode::ActiveRecord::Schema)
+    ]
+    rails_filters = [
+      "ActionCable::",
+      "ActionController::",
+      "ActionDispatch::",
+      "ActionMailer::",
+      "ActiveJob::",
+      "ActiveSupport::",
+      "ActiveStorage::",
+      "ActionView::(?!CompiledTemplates)", #Allows Compiled templates with the not group
+      "ActiveRecord::",
+    ]
+    objects = objects.reject do |o|
+      sn = safe_name(o).dup
+      while with_disasm && !sn.slice!(/^#<(Class|Module):/).nil? do sn = sn[0..-2] end #strip #<Class: and #<Module: prefix, strip corresponding > suffix
+      veracode_artifacts.include?(sn) || (with_disasm && sn[/^(#{rails_filters.join('|')}).*/])
+    end
 
     if $options[:verbose]
       puts "Archiving #{objects.count.to_s} objects" + (with_disasm ? " with disassembly" : "")
@@ -585,18 +627,47 @@ module Veracode
 
     objects.sort_by {|o| safe_name(o) }.each do |o|
 
-    puts "archiving #{o.class.to_s.downcase} #{quote(safe_name(o))}" if $options[:verbose]
+      sn = safe_name(o)
+      puts "archiving #{o.class.to_s.downcase} #{quote(sn)}" if $options[:verbose]
 
-    add_to_archive "#{o.class.to_s.downcase} #{quote(safe_name(o))}\n" + 
+      add_to_archive "#{o.class.to_s.downcase} #{quote(sn)}\n" + 
                    ( o.is_a?(Class)  ? class_header(o)  : "") + # superclass
+                   ( @rails6 && sn == "ActionView::Base" ? "include \"ActionView::CompiledTemplates\"\n" : "") + #hack for rails 6 compiled template output
                    ( o.is_a?(Module) ? module_header(o) : "") + # included modules
-                   ( (o.is_a?(Object) && !o.nil?) ? object_contents(o, with_disasm) : "") + 
+                   ( o.is_a?(Object) ? object_contents(o, with_disasm) : "") + 
                    ( o.is_a?(Module) ? module_contents(o, with_disasm) : "") + 
                    "end#{o.class.to_s.downcase}\n" + 
                    "\n"
     end
   end
 
+  def self.archive_rails6_templates
+    puts "archiving views" if $options[:verbose]
+    o = @view.compiled_method_container
+    compiled_views = o.instance_methods - @view_methods
+    formatted_contents = ""
+    for m_symbol in compiled_views
+      begin
+        m = o.instance_method(m_symbol)
+        formatted_contents += format_method(m, "public_instance", true)
+      rescue Exception => e
+        log_error "Error archiving singleton method #{m_symbol.to_s.dump}: #{e.message}"
+      end
+    end
+    # fake the module outpput to match what SAF expects from Rails <= 5
+    add_to_archive "module \"ActionView::CompiledTemplates\"\n" + 
+                   "extend \"ActiveSupport::Dependencies::ModuleConstMissing\"\n" +
+                   "extend \"Module::Concerning\"\n" +
+                   "extend \"ActiveSupport::ToJsonWithActiveSupportEncoder\"\n" +
+                   "extend \"PP::ObjectMixin\"\n" +
+                   "extend \"ActiveSupport::Dependencies::Loadable\"\n" +
+                   "extend \"JSON::Ext::Generator::GeneratorMethods::Object\"\n" +
+                   "extend \"ActiveSupport::Tryable\"\n" +
+                   "extend \"Kernel\"\n" +
+                   formatted_contents +
+                   "endmodule\n"
+  end
+
 
   def self.compile_templates
 
@@ -642,7 +713,11 @@ module Veracode
 
     assigns = {}
     view = ActionView::Base.new(view_paths, assigns)
-    controller_view = ApplicationController.new.view_context
+    begin
+        
+    rescue Exception => e
+      log_error "Unable to get controller view context (#{e.message})"
+    end
 
     templates.each { |template|
       puts "Compiling template #{template}" if $options[:verbose]
@@ -655,9 +730,11 @@ module Veracode
       end
     }
 
-    puts "Compiled #{ActionView::CompiledTemplates.instance_methods.count.to_s} templates" if $options[:verbose]
-    log_error "Compiled #{ActionView::CompiledTemplates.instance_methods.count.to_s} templates"
-    log_error "Not all templates were compiled" if ActionView::CompiledTemplates.instance_methods.count < templates.count
+    unless @rails6
+      puts "Compiled #{ActionView::CompiledTemplates.instance_methods.count.to_s} templates" if $options[:verbose]
+      log_error "Compiled #{ActionView::CompiledTemplates.instance_methods.count.to_s} templates"
+      log_error "Not all templates were compiled" if ActionView::CompiledTemplates.instance_methods.count < templates.count
+    end
   end
 
   def self.compile_erb_templates
@@ -700,7 +777,9 @@ module Veracode
         )
 
         case t.method(:compile).arity
-        when 2  # Rails 3.1.0+
+        when 1 # Rails 6
+          t.send(:compile, @view)
+        when 2 # Rails 3.1.0+
           t.send(:compile, ActionView::Base.new, ActionView::CompiledTemplates)
         when 3
           t.send(:compile, {}, ActionView::Base.new, ActionView::CompiledTemplates)
@@ -713,7 +792,7 @@ module Veracode
 
     }
 
-    puts "Compiled templates: " + ActionView::CompiledTemplates.instance_methods.count.to_s if $options[:verbose]
+    puts "Compiled templates: " + ActionView::CompiledTemplates.instance_methods.count.to_s if $options[:verbose] && !@rails6
 
   end
 
@@ -756,7 +835,9 @@ module Veracode
         )
 
         case t.method(:compile).arity
-        when 2  # Rails 3.1.0+
+        when 1 # Rails 6
+          t.send(:compile, @view) 
+        when 2 # Rails 3.1.0+
           t.send(:compile, ActionView::Base.new, ActionView::CompiledTemplates)
         when 3
           t.send(:compile, {}, ActionView::Base.new, ActionView::CompiledTemplates)
@@ -769,7 +850,7 @@ module Veracode
 
     }
 
-    puts "Compiled templates: " + ActionView::CompiledTemplates.instance_methods.count.to_s if $options[:verbose]
+    puts "Compiled templates: " + ActionView::CompiledTemplates.instance_methods.count.to_s if $options[:verbose] && !@rails6
 
   end
 
@@ -787,6 +868,9 @@ module Veracode
               lib = "#{part}/#{lib}"
               lib = lib[0..lib.length-2] if lib[lib.length-1] == '/'
             begin
+              if @rails6 && (lib =~ /node_modules/ || lib == 'debug')
+                next
+              end
               if cond_require lib
                 puts "requiring #{lib}" if $options[:verbose]
               end
@@ -826,9 +910,6 @@ def self.require_rails(gemdir)
   end
 end
 
-
-
-
 ################################################################################
 # Subcommands
   def self.prepare
@@ -880,11 +961,12 @@ end
       puts "Required rails" if $options[:verbose]
     end
 
+    @rails6 = Gem::Version.new(Rails.version) >= Gem::Version.new("6.0.0")
     ## Imitate script/rails
     # APP_PATH = File.expand_path('config/application')
-      # APP_PATH is already set in bin/veracode
+    # APP_PATH is already set in bin/veracode
     #require File.expand_path('../../config/boot',  __FILE__)
-      glob_require "config/boot.rb"
+    glob_require "config/boot.rb"
     #require 'rails/commands'
       # this will trigger the console to be launched
       # ARGV.clear
@@ -893,7 +975,16 @@ end
       # require 'rails/commands'
 
     ## Imitate rails/commands when console
-    cond_require 'rails/commands/console.rb'
+    if @rails6 || Gem::Version.new(Rails.version) >= Gem::Version.new("5.1.0")
+      cond_require 'rails/command.rb'
+      cond_require 'rails/command/actions.rb'
+      cond_require 'rails/command/base.rb'
+      cond_require 'rails/command/behavior.rb'
+      cond_require 'rails/command/environment_argument.rb'
+      cond_require 'rails/commands/console/console_command.rb'
+    else 
+      cond_require 'rails/commands/console.rb'
+    end
     # require APP_PATH # => config/application.rb
 
     glob_require "config/application.rb"
@@ -929,36 +1020,58 @@ end
 
     puts "Phase 3 - Imitate Rails" if $options[:verbose]
 
-    any_new = true
-    while any_new
-      any_new = false
-      any_new |= glob_require "lib/**/*.rb"
-      any_new |= glob_require "app/**/*.rb"
-      puts "new successful requires? #{any_new.to_s}" if $options[:verbose]
-    end
+    begin
+      any_new = true
+      while any_new
+        any_new = false
+        any_new |= glob_require "lib/**/*.rb"
+        any_new |= glob_require "app/**/*.rb"
+        puts "new successful requires? #{any_new.to_s}" if $options[:verbose]
+      end
 
-    compile_templates
+      if @rails6
+        self.update
+        @view = ActionView::Base.with_empty_template_cache
+        @view_methods = @view.compiled_method_container.instance_methods
+        compile_erb_templates
+        compile_haml_templates
+        self.stats if $options[:verbose]
+      else
+        compile_templates
+        self.update
+        self.stats if $options[:verbose]
+      end
 
-    self.update
-    self.stats if $options[:verbose]
+      # Ensure compiled templates are fully disassembled in archive
+      @baseline_modules.delete(ActionView::CompiledTemplates) unless @rails6
 
-    # Ensure compiled templates are fully disassembled in archive
-    @baseline_modules.delete(ActionView::CompiledTemplates)
+      if $options[:environment]
+        puts "Processing and disassembling environment"
+        archive(@modules.reject  {|o| safe_name(o) =~ /^#<(Class|Module):0x[0-9a-f]+>/i }
+                        .reject  {|o| safe_name(o) =~ /^Veracode/ }
+                        .reject  {|o| safe_name(o) =~ /^EmptyRails/ }
+                        .reject  {|o| safe_name(o) =~ /^ActionView::CompiledTemplates$/ }, false)
+      else
+        puts "Processing Ruby and Rails classes and modules"
+        archive(@baseline_modules, false)
+        add_to_archive "\n# Phase 3 - App disassembly\n"
+        puts "Processing and disassembling #{APP_NAME} classes and modules"
+        safe_baseline_modules = @baseline_modules.each_with_object(Set.new) { |o, s| s << safe_name(o) }
+        archive(@modules.reject {|o| safe_baseline_modules.include?(safe_name(o))}, true)
+        if @rails6
+          archive_rails6_templates()
+        end
+        archive_schema
 
-    if $options[:environment]
-      puts "Processing and disassembling environment"
-      archive(@modules.reject  {|o| safe_name(o) =~ /^#<(Class|Module):0x[0-9a-f]+>/i }
-                      .reject  {|o| safe_name(o) =~ /^Veracode/ }
-                      .reject  {|o| safe_name(o) =~ /^EmptyRails/ }
-                      .reject  {|o| safe_name(o) =~ /^ActionView::CompiledTemplates$/ }, false)
-    else
-      puts "Processing Ruby and Rails classes and modules"
-      archive(@baseline_modules, false)
-      add_to_archive "\n# Phase 3 - App disassembly\n"
-      puts "Processing and disassembling #{APP_NAME} classes and modules"
-      archive(@modules - @baseline_modules, true)
-      archive_schema
+      end
 
+    rescue Exception => e
+      if $options[:snapshot]
+        log_error e.message
+        log_error e.backtrace.join("\n")
+      else
+        raise
+      end
     end
 
     ## /phase 3 - require app

data/lib/veracode/version.rb

@@ -1,4 +1,4 @@
 module Veracode
-  VERSION = '1.0.0.alpha15'
-  ARCHIVE_VERSION = '2012-07-04'
+  VERSION = '1.0.0'
+  ARCHIVE_VERSION = '2020-06-29'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: veracode
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha15
+  version: 1.0.0
 platform: ruby
 authors:
 - Veracode
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 description: Prepares your Ruby on Rails app for submission to Veracode.
 email: devcontact@veracode.com
 executables:
@@ -39,7 +39,7 @@ files:
 homepage: http://veracode.com/
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -50,13 +50,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Command line tool for preparing your Ruby on Rails app for submission to
   Veracode