veracode 1.0.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76b474d0295eea0d4627632242cae9e9af1e897af7ac846776b035cb58a0c89b
-  data.tar.gz: 65b8f267cbbba773839d7b6980f6de4c85dfdd2e559d793bcb63edc0c8140a99
+  metadata.gz: '08bcc098eb5e5c8b64c1cdfddfaa7dab701d190b2a0740e825a1c986b91ac737'
+  data.tar.gz: '08122a15ccd6189ca40dd823d6db2b38a9aba95ec556d8dddd14c4fda6d98fd3'
 SHA512:
-  metadata.gz: a29acbc7213e4f7dd56cbbdeb8fb15bdeb35162955b4ad2fa6c3aaabc557cc7ed2523f562e5c97731fe7ebc44224c772342bcf939001ec3a3ef83a0b3a51ddd9
-  data.tar.gz: 86d3da0ae6a302e1df67008f40203b0d2f1fc8c003c7ac109e808f78a8b17ef1df01f8bb2e9aeebafd4df1628822a09bb33fc077f203278ce39f6619135bddf8
+  metadata.gz: a71ea85866f288b9861c99c30d5786014f72ed5691c4353d5ed7f448154df38f1be7e5f399d33a18a8f4192baa7618a465eb34228f856caa8a8ba61b67023a82
+  data.tar.gz: 563b9b4090074f5042fcdc3efb0a9a713c2eac8cebf80a531d78c8917478530ead6bf790e1f0a62ebac3c3fc15a1a5548eee4bd3346573dddc22025dc15e2ef4

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/version.rb

@@ -1,4 +1,4 @@
 module Veracode
-  VERSION = '1.0.2'
+  VERSION = '1.1.3'
   ARCHIVE_VERSION = '2020-06-29'
 end

data/lib/veracode.rb

@@ -184,6 +184,7 @@ module Veracode
           }
         }
       else
+        Zip.write_zip64_support = true
         Zip::File.open(@archive_filename, Zip::File::CREATE) { |zf|
           @manifest.each { |file|
 
@@ -297,11 +298,13 @@ module Veracode
       when o.is_a?(Module)
         begin
           ( o.name.nil? ? o.to_s : o.name.to_s )
-        rescue
+        rescue Exception => e
           begin
+            log_error "Exception rescued trying to call .name on object. Object: #{o.inspect}. Exception: #{e.inspect}"
             ( o.nil? ? "nil" : o.to_s )
-          rescue
-              ( o == nil ? "nil" : o.to_s ) # in case of monkey patched nil?
+          rescue Exception => e
+            log_error "Exception rescued trying to call .nil on object. Object: #{o.inspect}. Exception: #{e.inspect}"
+            ( o == nil ? "nil" : o.to_s ) # in case of monkey patched nil?
           end
         end
       when o.is_a?(Method), o.is_a?(UnboundMethod)
@@ -309,7 +312,8 @@ module Veracode
       else
         o.to_s
       end
-    rescue
+    rescue Exception => e
+      log_error "Exception rescued trying to get safe_name on object. Dropping from archive. Exception: #{e.inspect}"
       "Veracode" #should result in this being dropped from the archive since we can't get a safe name for it
     end
   end
@@ -643,29 +647,33 @@ module Veracode
 
   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}"
+    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
-    # 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
 
 
@@ -989,7 +997,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)
     
@@ -1075,6 +1087,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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: veracode
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Veracode
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2022-01-11 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.
@@ -39,7 +39,7 @@ files:
 homepage: http://veracode.com/
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -54,8 +54,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Command line tool for preparing your Ruby on Rails app for submission to
   Veracode