stratagem 0.2.0 → 0.2.2

data/LICENSE

@@ -0,0 +1,29 @@
+Copyright (c) 2010-2011 StrataGem, Inc.  All rights reserved.
+
+Certain inventions disclosed in this file may be claimed within
+patents owned or patent applications filed by StrataGem, Inc. or third
+parties.
+
+Subject to the terms of this notice, StrataGem grants you a
+nonexclusive, nontransferable license, without the right to
+sublicense, to (a) install and execute one copy of these files on any
+number of workstations owned or controlled by you and (b) distribute
+verbatim copies of these files to third parties.  As a condition to the
+foregoing grant, you must provide this notice along with each copy you
+distribute and you must not remove, alter, or obscure this notice. All
+other use, reproduction, modification, distribution, or other
+exploitation of these files is strictly prohibited, except as may be set
+forth in a separate written license agreement between you and Stratagem.  
+The terms of any such license agreement will control over this
+notice.  The license stated above will be automatically terminated and
+revoked if you exceed its scope or violate any of the terms of this
+notice.
+
+Unless otherwise expressly agreed by StrataGem in a separate written
+license agreement, these files are provided AS IS, WITHOUT WARRANTY OF
+ANY KIND, including without any implied warranties of MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE, or NON-INFRINGEMENT.  As a
+condition to your use of these files, you are solely responsible for
+such use. StrataGem will have no liability to you for direct,
+indirect, consequential, incidental, special, or punitive damages or
+for lost profits or data.

data/Manifest

@@ -1,3 +1,4 @@
+LICENSE
 Manifest
 Rakefile
 bin/stratagem
@@ -38,44 +39,45 @@ lib/stratagem/extensions/object.rb
 lib/stratagem/extensions/red_parse.rb
 lib/stratagem/extensions/string.rb
 lib/stratagem/extensions/trace_compression.rb
-lib/stratagem/framework_extensions.rb
-lib/stratagem/framework_extensions/method_invocation.rb
-lib/stratagem/framework_extensions/models.rb
-lib/stratagem/framework_extensions/models/adapters/active_record/detect.rb
-lib/stratagem/framework_extensions/models/adapters/active_record/extensions.rb
-lib/stratagem/framework_extensions/models/adapters/active_record/metadata.rb
-lib/stratagem/framework_extensions/models/adapters/active_record/tracing.rb
-lib/stratagem/framework_extensions/models/adapters/authlogic/detect.rb
-lib/stratagem/framework_extensions/models/adapters/authlogic/extensions.rb
-lib/stratagem/framework_extensions/models/adapters/authlogic/metadata.rb
-lib/stratagem/framework_extensions/models/adapters/authlogic/tracing.rb
-lib/stratagem/framework_extensions/models/adapters/common/detect.rb
-lib/stratagem/framework_extensions/models/adapters/common/extensions.rb
-lib/stratagem/framework_extensions/models/adapters/common/metadata.rb
-lib/stratagem/framework_extensions/models/adapters/common/tracing.rb
-lib/stratagem/framework_extensions/models/adapters/devise/detect.rb
-lib/stratagem/framework_extensions/models/adapters/devise/extensions.rb
-lib/stratagem/framework_extensions/models/adapters/devise/metadata.rb
-lib/stratagem/framework_extensions/models/adapters/devise/tracing.rb
-lib/stratagem/framework_extensions/models/adapters/friendly_id/detect.rb
-lib/stratagem/framework_extensions/models/adapters/friendly_id/extensions.rb
-lib/stratagem/framework_extensions/models/adapters/friendly_id/metadata.rb
-lib/stratagem/framework_extensions/models/adapters/friendly_id/tracing.rb
-lib/stratagem/framework_extensions/models/adapters/restful_authentication/detect.rb
-lib/stratagem/framework_extensions/models/adapters/restful_authentication/extensions.rb
-lib/stratagem/framework_extensions/models/adapters/restful_authentication/metadata.rb
-lib/stratagem/framework_extensions/models/adapters/restful_authentication/tracing.rb
-lib/stratagem/framework_extensions/models/adapters/util/authentication_metadata.rb
-lib/stratagem/framework_extensions/models/annotations.rb
-lib/stratagem/framework_extensions/models/detect.rb
-lib/stratagem/framework_extensions/models/metadata.rb
-lib/stratagem/framework_extensions/models/mocking.rb
-lib/stratagem/framework_extensions/models/tracing.rb
-lib/stratagem/framework_extensions/rails.rb
-lib/stratagem/framework_extensions/rails2/action_controller.rb
-lib/stratagem/framework_extensions/rails2/action_mailer.rb
-lib/stratagem/framework_extensions/rails3/parameters.rb
-lib/stratagem/framework_extensions/request_forgery_protection.rb
+lib/stratagem/instrumentation.rb
+lib/stratagem/instrumentation/method_invocation.rb
+lib/stratagem/instrumentation/models.rb
+lib/stratagem/instrumentation/models/annotations.rb
+lib/stratagem/instrumentation/models/association.rb
+lib/stratagem/instrumentation/models/authentication.rb
+lib/stratagem/instrumentation/models/authentication/authlogic/detect.rb
+lib/stratagem/instrumentation/models/authentication/authlogic/instrumentation.rb
+lib/stratagem/instrumentation/models/authentication/authlogic/metadata.rb
+lib/stratagem/instrumentation/models/authentication/devise/detect.rb
+lib/stratagem/instrumentation/models/authentication/devise/instrumentation.rb
+lib/stratagem/instrumentation/models/authentication/devise/metadata.rb
+lib/stratagem/instrumentation/models/authentication/metadata.rb
+lib/stratagem/instrumentation/models/authentication/restful_authentication/detect.rb
+lib/stratagem/instrumentation/models/authentication/restful_authentication/instrumentation.rb
+lib/stratagem/instrumentation/models/authentication/restful_authentication/metadata.rb
+lib/stratagem/instrumentation/models/detect.rb
+lib/stratagem/instrumentation/models/metadata.rb
+lib/stratagem/instrumentation/models/mocking.rb
+lib/stratagem/instrumentation/models/persistence.rb
+lib/stratagem/instrumentation/models/persistence/active_record/detect.rb
+lib/stratagem/instrumentation/models/persistence/active_record/extensions.rb
+lib/stratagem/instrumentation/models/persistence/active_record/metadata.rb
+lib/stratagem/instrumentation/models/persistence/active_record/tracing.rb
+lib/stratagem/instrumentation/models/persistence/common/detect.rb
+lib/stratagem/instrumentation/models/persistence/common/extensions.rb
+lib/stratagem/instrumentation/models/persistence/common/metadata.rb
+lib/stratagem/instrumentation/models/persistence/common/tracing.rb
+lib/stratagem/instrumentation/models/support_libraries.rb
+lib/stratagem/instrumentation/models/support_libraries/friendly_id/detect.rb
+lib/stratagem/instrumentation/models/support_libraries/friendly_id/metadata.rb
+lib/stratagem/instrumentation/models/support_libraries/state_machine/detect.rb
+lib/stratagem/instrumentation/models/support_libraries/state_machine/metadata.rb
+lib/stratagem/instrumentation/models/tracing.rb
+lib/stratagem/instrumentation/rails.rb
+lib/stratagem/instrumentation/rails2/action_controller.rb
+lib/stratagem/instrumentation/rails2/action_mailer.rb
+lib/stratagem/instrumentation/rails3/parameters.rb
+lib/stratagem/instrumentation/request_forgery_protection.rb
 lib/stratagem/interface/browser.rb
 lib/stratagem/interface/public/images/backgrounds/content.png
 lib/stratagem/interface/public/images/backgrounds/shadow.png

data/Rakefile

@@ -2,9 +2,9 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('stratagem', '0.2.0') do |p|
-  p.description    = "Intuitive security analysis of your Rails applications"
-  p.url            = "http://github.com/stratagem/stratagem"
+Echoe.new('stratagem', '0.2.2') do |p|
+  p.description    = "Intuitive security analysis for your Rails applications"
+  p.url            = "http://www.stratagemapp.com"
   p.author         = "Charles Grimes"
   p.email          = "cj@stratagemapp.com"
   p.executable_pattern = ['bin/*']

data/lib/stratagem.rb

@@ -9,14 +9,14 @@ end
 
 module Stratagem
   class << self
-    def init
+    def load_dependencies
       require 'haml'
       require 'launchy'
       require 'redparse'
       require 'stratagem/blocker'
       require 'stratagem/logger'
       require 'stratagem/extensions'
-      require 'stratagem/framework_extensions'
+      require 'stratagem/instrumentation'
 
       require 'stratagem/model'
       require 'stratagem/auto_mock'
@@ -32,12 +32,29 @@ module Stratagem
       require 'stratagem/snapshot'
 
       require 'stratagem/commands'
-
+    end
+    
+    def init
+      load_dependencies
+      
       @@blocker = Blocker.new
       @@running = false
       @@session_id = Time.now.to_f.to_s # the interface uses this to determine which instance of the client it's talking to
     end
     
+    def ssl?
+      false
+    end
+
+    def domain
+      'stratagemapp.local'
+    end
+
+    def mocking?
+      true
+    end
+
+    
     def rails_version
       @@rails_version ||= begin
         rails_version = Rails.version.split('.').map {|v| v.size > 1 ? 9 : v.to_i }
@@ -63,9 +80,7 @@ module Stratagem
       Stratagem::Logger.instance
     end
 
-    def domain
-      ENV['STRATAGEM_HOST'] || 'stratagemapp.com'
-    end
+    
 
     def wait_for_completion
       @@blocker.wait
@@ -91,7 +106,7 @@ module Stratagem
             # # Print a flat profile to text
             # printer = RubyProf::FlatPrinter.new(result)
             # printer.print(STDOUT, 0)
-          rescue
+          rescue Exception
             puts $!.message
             puts $!.backtrace
           ensure

data/lib/stratagem/authentication.rb

@@ -28,7 +28,8 @@ module Stratagem
 
     def base_url
       subdomain = credentials ? credentials[:account] : 'www' 
-      "https://#{subdomain}.stratagemapp.com"
+      protocol = Stratagem.ssl? ? 'https' : 'http'
+      "#{protocol}://#{subdomain}.#{Stratagem.domain}"
     end
 
     def project_url

data/lib/stratagem/auto_mock/aquifer.rb

@@ -14,27 +14,41 @@ module Stratagem::AutoMock
     end
 
     def clear
-      objects = self.repo.values.inject([]) {|memo,obj| memo += obj.compact }
-      i = 0
-      while (objects.size > 0 && ((i+=1) < objects.size))
-        objects = objects.select do |instance|
-          # puts "deleting #{instance.class.name}"
-          begin
-            instance.destroy
-          rescue
+      if (Stratagem.mocking?)
+        objects = self.repo.values.inject([]) {|memo,obj| memo += obj.compact }
+        i = 0
+        while (objects.size > 0 && ((i+=1) < objects.size))
+          objects = objects.select do |instance|
+            next if (pre_existing_object_ids[instance.class] || []).include?(instance.id)
+            puts "deleting #{instance.class.name} - #{instance.id}"
             begin
-              instance.delete
+              instance.destroy
             rescue
-              puts "Unable to delete object: #{instance.class.name} - #{$!.message}"
-              puts $!.backtrace
+              begin
+                instance.delete
+              rescue
+                puts "Unable to delete object: #{instance.class.name} - #{$!.message}"
+                puts $!.backtrace
+              end
             end
+            !instance.frozen?
           end
-          !instance.frozen?
         end
       end
       self.repo.clear
     end
 
+    # def export
+    #   h = {}
+    #   repo.each {|model_klass,instances|
+    #     h[model_klass.name] = instances.map {|instance|
+    #       instance.stratagem.
+    #       :database_attributes => instance.
+    #     }
+    #     
+    #   }
+    # end
+    # 
     def destroy
       clear
     end
@@ -52,23 +66,82 @@ module Stratagem::AutoMock
       instance
     end
 
+    def pre_existing_object_ids
+      @pre_existing_object_ids ||= {}
+    end
+    
+    def load_existing_object_ids(klass)
+      if (Stratagem.mocking?)
+        # handle polymorphic objects (class may actually be a subclass of the klass parameter)
+        klass.existing_instance_ids.each do |existing_id|
+          begin
+            instance = klass.find(existing_id)
+            (pre_existing_object_ids[instance.class] ||= []) << existing_id
+          rescue
+            puts "ERROR: instance id #{existing_id} of #{klass.name} could not be loaded"
+          end
+        end
+      else
+        pre_existing_object_ids[klass] = []
+      end
+    end
+
+    def load_instance_ids(meta_model)
+      if (meta_model.stratagem?)
+        meta_model.klass.existing_instance_ids
+      else
+        []
+      end
+    end
+
+
     def fill(model_count=nil)
       Stratagem.logger.phase "mocking_models"
+
+      # load the ids of existing models for each class
+      application.models.each do |meta_model|
+        next unless meta_model.stratagem?
+        load_existing_object_ids(meta_model.klass)
+      end
+
+      # mock instances of all models
+      if (Stratagem.mocking?)
+        application.models.each do |meta_model|
+          mock_model(meta_model.klass, model_count) if (meta_model.stratagem?)
+        end
+      end
+
+      # determine the new ids for each model
       application.models.each do |meta_model|
-        models = mock_model(meta_model.klass, model_count) if (meta_model.stratagem?)
+        next unless meta_model.klass
+        next unless meta_model.stratagem?
+        
+        known_mocked_instances = mocked(meta_model.klass)
+        new_ids = load_instance_ids(meta_model) - (pre_existing_object_ids[meta_model.klass] || [])
+        repo[meta_model.klass.name] = new_ids.map {|id|
+          begin
+            known_mocked_instances.find {|i| i.id == id } || meta_model.klass.find(id)
+          rescue
+            puts "ERROR: #{$!.message}"
+            nil
+          end
+        }.compact
+        
       end
-      # puts "aquifer full"
+
       print
       self
     end
 
     def print
+      puts "Mocked models:"
       application.models.each do |meta_model|
         puts "#{meta_model.klass.name}"
         (repo[meta_model.klass.name] || []).each do |instance|
-          puts "\t#{instance.class} - #{instance}"
+          puts "\t#{instance.class} - #{instance.id}"
         end
       end
+      puts "end of aquifer"
     end
 
     def mock_model(klass, count=nil)

data/lib/stratagem/auto_mock/factory.rb

@@ -18,7 +18,15 @@ module Stratagem::AutoMock
       object.stratagem.mock_attributes
     end
 
+    # Note:
+    # If a class is passed in that has descendants, a leaf descendant will be chosen at random
     def mock(model,mock_chain=[], belongs_to=nil)
+      while (model.stratagem.subclasses?)
+        prior_model = model
+        model = model.sg_subclasses[rand model.sg_subclasses.size]
+        puts "mapped base class #{prior_model.name} -> #{model.name} "
+      end
+      
       return if mock_chain.select {|m| m == model }.size > 1
       mock_chain << model
 
@@ -39,11 +47,12 @@ module Stratagem::AutoMock
             break
           end
         end
-      rescue
-        puts $!.class.name
-        puts $!.message
-        puts $!.backtrace
-        e = MockError.new("Unexpected error mocking model #{model.name}")
+      rescue Exception, ActiveRecord::ActiveRecordError
+        # puts $!.class.name
+        # puts $!.message
+        # puts $!.backtrace
+        e = MockError.new("Unexpected error mocking model #{model.name} - #{$!.message}")
+        puts e.message
         e.target = $!
         # raise e
       end
@@ -60,7 +69,7 @@ module Stratagem::AutoMock
     def mocked(model=nil)
       @mocked ||= {}
       if (model)
-        @mocked[model.name] ||= []
+        @mocked[model.name] ||= model.all
       else
         @mocked
       end
@@ -109,26 +118,6 @@ module Stratagem::AutoMock
         end
       end
 
-      # has_many relations
-      # object.stratagem.relation_names(:has_many).each do |attr_name|
-      #   relation = object.stratagem.relation(attr_name)
-      #   # select the instances that don't have an existing belongs_to for this relation type
-      #   instances = mocked(relation.klass).select {|i| 
-      #     br = i.stratagem.relations.find {|r| r.klass == i.class }
-      #     if (br && !i.send(br.name).nil?)
-      #       false
-      #     else
-      #       true
-      #     end
-      #   }
-      #   if (instances.size > 2)
-      #     collection = object.send(attr_name.to_s)
-      #     collection << instances[rand instances.size]
-      #   else
-      #     mock(relation.klass, mock_chain, object)
-      #   end
-      # end
-
       (object.stratagem.invalid_columns(object)).size == 0
     end
 
@@ -163,11 +152,10 @@ module Stratagem::AutoMock
         puts "Error mocking #{klass.name}"
         valid = false
       rescue
-        puts object.stratagem.mock_attributes.inspect
-        puts "Error mocking #{object.class.name} - #{$!.message}"
+        puts "Error mocking #{object.class.name} - #{$!.message} - #{object.stratagem.mock_attributes.inspect}"
         error_column = object.stratagem.column_from_error($!)
-        puts "\terror column: #{error_column}"
         if error_column && !object.stratagem.foreign_keys.include?(error_column)
+          puts "\terror column: #{error_column}"
           if retries < 100
             puts "\tretrying to correct field #{error_column} that was missing validation"
             set_attribute_value(object, error_column, [])
@@ -179,7 +167,8 @@ module Stratagem::AutoMock
         else
           valid = false
         end
-        puts $!.backtrace unless valid
+        puts "\tERROR: could not correct errors in model" unless valid
+        # puts $!.backtrace unless valid
       end
       
       # puts "\t#{object.stratagem.mock_attributes.inspect}" if (valid)

data/lib/stratagem/auto_mock/value_generator.rb

@@ -57,7 +57,9 @@ module Stratagem::AutoMock
 
     def generate_string(attribute_name)
       attribute_name = attribute_name.to_s
-      if (attribute_name.stratagem_contains_token?('email') || attribute_name.stratagem_contains_token?('e-mail'))
+      if (attribute_name.stratagem_contains_token?('_type'))
+        nil
+      elsif (attribute_name.stratagem_contains_token?('email') || attribute_name.stratagem_contains_token?('e-mail'))
         (random_noise(4,false) || '') + @user[:email]
       elsif (attribute_name.stratagem_contains_token?('login') || attribute_name.stratagem_contains_token?('username') || attribute_name.stratagem_contains_token?('user_name'))
         @user[:login] + (random_noise(4, false) || '')