veracode 1.0.0.alpha4 → 1.0.0.alpha5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d91e291f1416313582f7940e2ea550556669a4dc
+  data.tar.gz: c2c9d0fe5c9671bbcedb2056f341ce3c267e4c13
+SHA512:
+  metadata.gz: 4d6676d8f9202fa910494d4b9a25883363ff648af5640ff0205ee4b4bb531a94d776195c79d36ae05740676c5a1a0df048257904fe772da460b2657b01733810
+  data.tar.gz: 408f07407d266ed5b6f859c9d46b4a01944a3aa6797934ed4b42b7c25c9cff6f7c09103057d4f3b0bad3c03fa7d58d1210da1ce210ac535fbd9baa932fedc576

data/bin/veracode

@@ -16,10 +16,12 @@ require 'veracode'
 require 'veracode/version'
 
 $options =  {
+              :phase1 => false, 
+              :phase2 => false, 
+              :phase3 => true,
               :archive_source => true,
               :include_inherited => false,
               :jruby => false,
-              :environment => false,
             }
 
 subcommand = ARGV.shift
@@ -32,13 +34,22 @@ case subcommand
         $options[:verbose] = true
       end
 
+      opts.on("-a", "--all", "Archive objects at all stages") do
+        $options[:phase1] = true
+        $options[:phase2] = true
+      end
+
+      opts.on("-f", "--file", "Disassemble .rb files") do
+        $options[:disasm] = true
+      end
+
       opts.on("-j", "--jruby", "Force JRuby mode") do
         $options[:jruby] = true
       end
 
-      # opts.on("--[no-]source", "[Don't] Include source code in archive") do |s|
-      #   $options[:archive_source] = s
-      # end
+      opts.on("--[no-]source", "[Don't] Include source code in archive") do |s|
+        $options[:archive_source] = s
+      end
 
       opts.on("-D", "--debug", "Enable debug output") do
         $DEBUG = true
@@ -62,23 +73,6 @@ case subcommand
                     "       #{opts.program_name} help"
     end.parse!
 
-  when "environment", "env"
-    $options[:environment] = true
-
-    OptionParser.new do |opts|
-      opts.banner = "Usage: veracode environment [options]"
-
-      opts.on("-v", "--verbose", "Run verbosely") do
-        $options[:verbose] = true
-      end
-
-      opts.on("-D", "--debug", "Enable debug output") do
-        $DEBUG = true
-      end
-
-    end.parse!
-    Veracode.prepare
-
   else
     $stderr.puts "#{subcommand.dump} is not a valid subcommand"
 

data/lib/veracode.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 require 'set'
 require 'zlib'
-require 'zip/zip'
+require 'zip'
 require 'veracode/version'
 require 'veracode/schema'
 require 'veracode/gems'
@@ -36,7 +36,6 @@ module Veracode
   @archive_filename = nil
   @archive_dirname = nil
 
-
   def self.init
     @run_id = Time.now.strftime("%Y%m%d%H%M%S")
     @archive_dirname = File.join("tmp","veracode-#{@run_id}")
@@ -160,7 +159,7 @@ module Veracode
     @errorlog.flush
 
     begin
-      Zip::ZipFile.open(@archive_filename, Zip::ZipFile::CREATE) { |zf|
+      Zip::File.open(@archive_filename, Zip::File::CREATE) { |zf|
         @manifest.each {|file|
 
           if file.start_with?(@archive_dirname)
@@ -234,24 +233,20 @@ module Veracode
 
   def self.glob_require(files)
     any_new = false
-    total, count = 0, 0
     Dir.glob(files) do |f|
       print "Requiring #{f.to_s} " if $options[:verbose]
       
       begin
-        required = require File.expand_path(f)
+        any_new |= cond_require File.expand_path(f)
       rescue Exception => e
         puts "(failed: #{e.message})" if $options[:verbose]
         log_error "Unable to require #{File.expand_path(f).to_s.dump} (#{e.message})"
       else
-        puts "(OK: #{(required ? "required" : "already required")})" if $options[:verbose]
+        puts "(OK)" if $options[:verbose]
       end
-      any_new |= required
-      total += 1
-      count += 1 if required
+
     end
-    puts "#{count}/#{total} files were required" if $options[:verbose]
-    any_new
+    return any_new
   end
 
   def self.safe_name(o)
@@ -259,11 +254,7 @@ module Veracode
     when o == ActiveSupport::TimeWithZone
       "ActiveSupport::TimeWithZone"
     when o.is_a?(Module)
-      begin
-        ( o.name.nil? ? o.to_s : o.name.to_s )
-      rescue
-        o.to_s
-      end
+      ( o.name.nil? ? o.to_s : o.name )
     when o.is_a?(Method), o.is_a?(UnboundMethod)
       o.name.to_s
     else
@@ -328,13 +319,7 @@ module Veracode
   def self.prepare_archive
     @disasmlog = Zlib::GzipWriter.new(File.open(@disasmlog_filename, "wb"), nil, nil)
     @disasmlog.puts "#{RUBY_ENGINE}-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
-    if $options[:environment]
-      @disasmlog.puts "# EnvironmentDef %s-%s_rails-%s" % [RUBY_ENGINE, RUBY_VERSION, Rails.version]
-    else
-      @disasmlog.puts "# Environment %s-%s_rails-%s" % [RUBY_ENGINE, RUBY_VERSION, Rails.version]
-    end
-    @disasmlog.puts "# Ruby #{RUBY_ENGINE}-#{RUBY_VERSION}"
-    @disasmlog.puts "# Rails #{Rails.version}"
+    @disasmlog.puts "# " + `rails --version`.chomp
     @disasmlog.puts
   end
 
@@ -411,7 +396,7 @@ module Veracode
         m.included_modules.map {|m| "include #{m.inspect.dump}\n" }.join : 
         ""
     ) + 
-    ( m.respond_to?(:singleton_class) && m.singleton_class.included_modules.count > 0 ? 
+    ( m.singleton_class.included_modules.count > 0 ? 
         m.singleton_class.included_modules.map {|m| "extend #{m.inspect.dump}\n" }.join : 
         ""
     )
@@ -447,20 +432,17 @@ module Veracode
       end
     end
 
-    begin
-      if m == Kernel
-        m.global_variables.each do |v_symbol|
-          begin
-            v = eval(v_symbol.to_s)
-            formatted_contents += format_variable(v_symbol, v, "global")
-          rescue Exception => e
-            log_error "Error archiving global variable #{v_symbol.to_s.dump}: #{e.message}"
-            formatted_contents += format_variable(v_symbol, :veracode_nil, "global")
-          end
-        end        
+    if m.respond_to?(:global_variables)
+      m.global_variables.each do |v_symbol|
+        begin
+          v = eval(v_symbol.to_s)
+          formatted_contents += format_variable(v_symbol, v, "global")
+        rescue Exception => e
+          log_error "Error archiving global variable #{v_symbol.to_s.dump}: #{e.message}"
+          formatted_contents += format_variable(v_symbol, :veracode_nil, "global")
+        end
+        
       end
-    rescue Exception => e
-      # m.respond_to?(:global_variables) was throwing exceptions
     end
 
     %w[ public protected private ].each {|p|
@@ -724,7 +706,7 @@ module Veracode
 
   end
 
-  def self.require_libs(lib_paths)
+    def self.require_libs(lib_paths)
     for lib_path in lib_paths
       dirsToProcess = [Pathname(lib_path)]
       until dirsToProcess.count == 0 || !Dir.exists?(dirsToProcess[0])
@@ -732,52 +714,50 @@ module Veracode
         for child in currentDir.children
           if child.directory?
             dirsToProcess[dirsToProcess.count] = child
-            base = child.to_s.partition("#{lib_path}/")[2]
+	    base = child.to_s.partition("#{lib_path}/")[2]
             lib = ""
             for part in base.split('/').reverse
               lib = "#{part}/#{lib}"
               lib = lib[0..lib.length-2] if lib[lib.length-1] == '/'
-            begin
-              if cond_require lib
-                puts "requiring #{lib}" if $options[:verbose]
+              begin
+                if cond_require lib
+                  puts "requiring #{lib}" if $options[:verbose]
+		end
+              rescue Exception => e
               end
-            rescue Exception => e
-            end
+	    end
           end
         end
       end
     end
   end
-end
-
-def self.require_rails(gemdir)
-  dirsToProcess = [Pathname(gemdir)]
-  until dirsToProcess.count == 0
-    currentDir = dirsToProcess.delete_at(0)
-    for child in currentDir.children
-      if child.directory?
-        dirsToProcess[dirsToProcess.count] = child
-      end
-      base = child.to_s.partition("#{gemdir}/")[2]
-      if base.index("action_controller") != nil || base.index("action_view") != nil || base.index("active_record") != nil
-        lib = ""
-        for part in base.split('/').reverse
-          lib = "#{part}/#{lib}"
-          lib = lib[0..lib.length-2] if lib[lib.length-1] == '/'
-          lib.chomp!(File.extname(lib))
-          begin
-            if cond_require lib
-              puts "requiring #{lib}" if $options[:verbose]
-            end
-          rescue Exception => e
-          end
+  
+  def self.require_rails(gemdir)
+    dirsToProcess = [Pathname(gemdir)]
+    until dirsToProcess.count == 0
+      currentDir = dirsToProcess.delete_at(0)
+      for child in currentDir.children
+        if child.directory?
+          dirsToProcess[dirsToProcess.count] = child
+        end
+        base = child.to_s.partition("#{gemdir}/")[2]
+        if base.index("action_controller") != nil || base.index("action_view") != nil || base.index("active_record") != nil
+	  lib = ""
+  	  for part in base.split('/').reverse
+  	    lib = "#{part}/#{lib}"
+	    lib = lib[0..lib.length-2] if lib[lib.length-1] == '/'
+	    lib.chomp!(File.extname(lib))
+	    begin
+	      if cond_require lib
+	        puts "requiring #{lib}" if $options[:verbose]
+	      end
+	    rescue Exception => e
+	    end
+	  end
         end
       end
     end
   end
-end
-
-
 
 
 ################################################################################
@@ -794,6 +774,16 @@ end
       puts
     end
 
+    if $options[:disasm]
+      rbfiles = File.join("**", "*.rb")
+      Dir[rbfiles].each do |f|
+        puts RubyVM::InstructionSequence.compile_file(f).disasm
+        puts
+      end
+      exit
+    end
+
+    prepare_archive
 
     ################################################################
     ## phase 1 - Create baseline
@@ -802,6 +792,10 @@ end
     puts "Phase 1 - Initial State" if $options[:verbose]
     self.stats if $options[:verbose]
     
+    if $options[:phase1]
+      puts "Processing and disassembling Ruby standard classes and modules"
+      archive(@modules)
+    end
     ## /phase 1 - Create baseline
     ################################################################
 
@@ -812,54 +806,59 @@ end
 
     puts "Phase 2 - Load Rails" if $options[:verbose]
     begin
-      require "rails/all"
+      cond_require "rails"
+      cond_require 'action_controller'
+      cond_require 'action_view'
+      cond_require 'active_record'
     rescue Exception => e
       puts "Unable to require rails: #{e.message}"
       log_error "Unable to require rails: #{e.message}"
       exit
     else
-      puts "Required rails" if $options[:verbose]
-    end
-
-    ## 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"
-    #require 'rails/commands'
-      # this will trigger the console to be launched
-      # ARGV.clear
-      # ARGV << 'console'
-      # ARGV << '--sandbox'
-      # require 'rails/commands'
-
-    ## Imitate rails/commands when console
-    cond_require 'rails/commands/console.rb'
-    # require APP_PATH # => config/application.rb
-
-    glob_require "config/application.rb"
-
-    Rails.application.require_environment! unless $options[:jruby]
-    # Following line will actually kick off IRB
-    # Rails::Console.start(Rails.application)
-    
-    # Imitate Rails::Console.initialize_console
-    # require "pp"
-    cond_require "rails/console/app.rb"
-    cond_require "rails/console/helpers.rb"
-
-    if $options[:environment]
       @stdlib = $:
       @gemdir = Gem.dir
 
+      ## 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"
+      #require 'rails/commands'
+        # this will trigger the console to be launched
+        # ARGV.clear
+        # ARGV << 'console'
+        # ARGV << '--sandbox'
+        # require 'rails/commands'
+
+      ## Imitate rails/commands when console
+      glob_require 'rails/commands/console'
+      # require APP_PATH # => config/application.rb
+
+      glob_require "config/application.rb"
+
+      Rails.application.require_environment! unless $options[:jruby]
+      begin
+        cond_require 'sass'
+        cond_require 'sass/rails/importer'
+        cond_require 'multi_json/adapters/json_gem'
+      rescue Exception => e
+      end
+    
       require_libs(@stdlib)
       require_rails(@gemdir)
+      puts "Required rails" if $options[:verbose]
     end
 
-    self.rebaseline
+    self.update
 
     self.stats if $options[:verbose]
 
+    if $options[:phase2]
+      puts "Processing and disassembling Rails classes and modules"
+      archive(@modules)
+    end
+    
+    self.rebaseline
     ## /phase 2 - Require rails
     ################################################################
     
@@ -869,14 +868,19 @@ end
     # phase 3 - require app
 
     puts "Phase 3 - Imitate Rails" if $options[:verbose]
+    # Following line will actually kick off IRB
+    # Rails::Console.start(Rails.application)
+    
+    # Imitate Rails::Console.initialize_console
+    # require "pp"
+    glob_require "rails/console/app"
+    glob_require "rails/console/helpers"
 
-    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
+    glob_require "lib/**/*.rb"
+    glob_require "app/models/**/*.rb"
+    glob_require "app/helpers/**/*.rb"
+    glob_require "app/controllers/application_controller.rb"
+    glob_require "app/controllers/**/*.rb"
 
     compile_templates
 
@@ -886,21 +890,14 @@ end
     # 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"
+    if $options[:phase3]
       puts "Processing and disassembling #{APP_NAME} classes and modules"
+      archive(@baseline_modules, false)
       archive(@modules - @baseline_modules, true)
-      archive_schema
     end
 
+    archive_schema
+
     ## /phase 3 - require app
     ################################################################
 

data/lib/veracode/version.rb

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

metadata

@@ -1,27 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: veracode
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha4
-  prerelease: 6
+  version: 1.0.0.alpha5
 platform: ruby
 authors:
 - Veracode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70110652152040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70110652152040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Prepares your Ruby on Rails app for submission to Veracode.
 email: devcontact@veracode.com
 executables:
@@ -36,27 +38,29 @@ files:
 - lib/veracode/version.rb
 homepage: http://veracode.com/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ~>
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3.0
+  - - <
+    - !ruby/object:Gem::Version
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Command line tool for preparing your Ruby on Rails app for submission to
   Veracode
 test_files: []