veracode 1.0.0.alpha17 → 1.0.0.alpha18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5cb7c4ca35c0ba950a80cd3128abe49464b68357d59528a09af7e17998bf2d9
-  data.tar.gz: fea0072496133717cc1f109cfe987eee7ee6099443c6032efd594c823338353f
+  metadata.gz: e42ef047b5e2b3f33eba714c33d5c13aa393679e704633ac93df478b6697c811
+  data.tar.gz: 5adf88dcca009894d9f1631061750d108e9ec3ab77de5ac6083c95aeda5db4e6
 SHA512:
-  metadata.gz: 955ceacaea17f867fbbacbeb50607cdf71c4392474e71d73c5a3ba2c585139fef63ea6b73cc1fd6713a078e76c2855465f65a9a567d066a654989a3fdac9caf7
-  data.tar.gz: 0700d727fe2b5a19ebec8ba118e6d4438473e3234ffbd3fa26520f7cce054fd9fd5cd5c20d1d09e550bbcb417708cccf1019ad24a784f3e6b59a8fbea30de1a9
+  metadata.gz: afcf1ebbc31dfb94ade508fdf858f6815a088d66d40982f82e2f7c439929b3eb2c803b5d238cea1825f7ed5f60cb0d483caa4d85032542d60e91be970c9d2db2
+  data.tar.gz: 8dd0fa92c21625c40df171a9ee8d4f5a8dc4f37f53f8a1dd223f5fbd8e5aefc1d0279915ff368d24b228eef690b0cafb5407a85c1cbb743e17e5127b34830c15

data/lib/veracode.rb

@@ -298,7 +298,8 @@ module Veracode
         begin
           ( o.nil? ? "nil" : o.to_s )
         rescue
-          "nil"
+          log_error "Error testing #{o} with nil?. Probable monkey patching. #{e.message}"
+          ( o == nil ? "nil" : o.to_s ) # in case of monkey patched nil?
         end
       end
     when o.is_a?(Method), o.is_a?(UnboundMethod)
@@ -540,7 +541,14 @@ module Veracode
   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]
 
@@ -584,12 +592,13 @@ 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)
+    ]
+    objects = objects.reject { |o| veracode_artifacts.include?(safe_name(o)) }
 
     if $options[:verbose]
       puts "Archiving #{objects.count.to_s} objects" + (with_disasm ? " with disassembly" : "")
@@ -598,12 +607,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]
+      puts "archiving #{o.class.to_s.downcase} #{quote(safe_name(o))}" 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(safe_name(o))}\n" + 
                    ( o.is_a?(Class)  ? class_header(o)  : "") + # superclass
                    ( 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"
@@ -983,7 +992,8 @@ end
         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)
+        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)
         archive_schema
 
       end

data/lib/veracode/version.rb

@@ -1,4 +1,4 @@
 module Veracode
-  VERSION = '1.0.0.alpha17'
+  VERSION = '1.0.0.alpha18'
   ARCHIVE_VERSION = '2012-07-04'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: veracode
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha17
+  version: 1.0.0.alpha18
 platform: ruby
 authors:
 - Veracode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip