veracode 1.0.0.alpha19 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1ea5fea7f60db50f74f9ff774a1a548d9aea957bfb78ba4daab6a2d8d3d53c2
-  data.tar.gz: 70ff0d73076ec7e4f652627d1edc8fdf211659bca3eda9af062d327a85c606fc
+  metadata.gz: 5034f66e32e4f8c4ca8f8402491e02a000fec97485eb7325687b6a4a5e7b9a88
+  data.tar.gz: e5c71b7a1a8ac70356ad77e8c9d88897596d8744abd86c22269c1b177dc6b50b
 SHA512:
-  metadata.gz: fcad070be483f3316862afca54b4e4e2b91cd09a8c6979c048e483c1f5fb629d8bc4b7dc8c12499b2cedcfa05f2faade67cb17fe8d3a63a8345daa71c403e234
-  data.tar.gz: a331deeba1ca33939dd9f78a6d8554b5049b67566b90cab4af6ac7c9a85633bf1680c137d6628916f9357d819e04b5bf48a48a4f1f525d55f31c2dc48c17c773
+  metadata.gz: a77258daf063823f0f3e03c6d10a1bdc3f157432ef2fcf91e045d498f255cea69f35f63df725195d4ac50966530f3376f7710b86e7fb5ec6ed74d1ef1af07c65
+  data.tar.gz: 7633d5c870d6bd8ed6a015ba4b506d2e8b44ab45761044d103d58c10bc1802a530e83dfea1dd81d96d9b75aa3ddfedddb8b124c6d5af8d3d9a88d385ae58288e

data/bin/veracode

@@ -25,7 +25,7 @@ $options =  {
               :include_inherited => false,
               :environment => false,
               :verbose => false,
-              :jruby => false,
+              :skipenvironment => false,
               :skipactiverecord => false,
               :skipactionview => false,
               :skipsprockets => false,
@@ -42,8 +42,8 @@ case subcommand
         $options[:verbose] = true
       end
 
-      opts.on("-j", "--jruby", "Force JRuby mode") do
-        $options[:jruby] = true
+      opts.on("-E", "--skip-environment", "Skip environment") do
+        $options[:skipenvironment] = true
       end
 
       opts.on("-O", "--skip-active-record", "Skip ActiveRecord") do
@@ -70,6 +70,17 @@ case subcommand
         $options[:snapshot] = true
       end
 
+      # only print the options that match the documentation in the help center
+      opts.on("-h", "--help", "Print help") do
+        msg = <<-HELPMSG.strip
+Usage: veracode prepare [options]
+    -v, --verbose                    Run verbosely
+    -D, --debug                      Enable debug output
+        HELPMSG
+        puts msg
+        exit
+      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]
@@ -400,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
@@ -601,7 +603,22 @@ module Veracode
       safe_name(Veracode::ActiveRecord::Model),
       safe_name(Veracode::ActiveRecord::Schema)
     ]
-    objects = objects.reject { |o| veracode_artifacts.include?(safe_name(o)) }
+    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" : "")
@@ -610,10 +627,12 @@ 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) ? object_contents(o, with_disasm) : "") + 
                    ( o.is_a?(Module) ? module_contents(o, with_disasm) : "") + 
@@ -622,6 +641,37 @@ module Veracode
     end
   end
 
+  def self.archive_rails6_templates
+    puts "archiving views" if $options[:verbose]
+    begin
+      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"
+    rescue Exception => e
+      log_error "Error archiving Rails 6 views: #{e.message}"
+    end
+  end
+
 
   def self.compile_templates
 
@@ -684,9 +734,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
@@ -729,7 +781,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)
@@ -742,7 +796,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
 
@@ -785,7 +839,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)
@@ -798,7 +854,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
 
@@ -816,6 +872,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
@@ -855,9 +914,6 @@ def self.require_rails(gemdir)
   end
 end
 
-
-
-
 ################################################################################
 # Subcommands
   def self.prepare
@@ -909,11 +965,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
     #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
@@ -922,7 +979,7 @@ end
       # require 'rails/commands'
 
     ## Imitate rails/commands when console
-    if Gem::Version.new(Rails.version) >= Gem::Version.new("5.1.0")
+    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'
@@ -936,7 +993,11 @@ end
 
     glob_require "config/application.rb"
 
-    Rails.application.require_environment! unless $options[:jruby]
+    begin
+      Rails.application.require_environment! unless $options[:skipenvironment]
+    rescue Exception => e
+      log_error "Unable to require environment: #{e.message}"
+    end
     # Following line will actually kick off IRB
     # Rails::Console.start(Rails.application)
     
@@ -976,13 +1037,26 @@ end
         puts "new successful requires? #{any_new.to_s}" if $options[:verbose]
       end
 
-      compile_templates
-
-      self.update
-      self.stats if $options[:verbose]
+      begin
+        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
 
-      # Ensure compiled templates are fully disassembled in archive
-      @baseline_modules.delete(ActionView::CompiledTemplates)
+        # Ensure compiled templates are fully disassembled in archive
+        @baseline_modules.delete(ActionView::CompiledTemplates) unless @rails6
+      rescue Exception => e
+        puts "Unable to compile templates: #{e.message}" if $options[:verbose]
+        log_error "Unable to compile templates: #{e.message}"
+      end
 
       if $options[:environment]
         puts "Processing and disassembling environment"
@@ -997,6 +1071,9 @@ end
         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
 
       end
@@ -1006,6 +1083,7 @@ end
         log_error e.message
         log_error e.backtrace.join("\n")
       else
+        puts "Failed to prepare veracode archive. Please see #{@archive_dirname + '/' + @errorlog_filename}."
         raise
       end
     end

data/lib/veracode/version.rb

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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: veracode
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha19
+  version: 1.1.1
 platform: ruby
 authors:
 - Veracode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 description: Prepares your Ruby on Rails app for submission to Veracode.
@@ -50,12 +50,11 @@ 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
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Command line tool for preparing your Ruby on Rails app for submission to