immunio 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4a20073cf6c0c115c95a2afc1e6a8881ed83d8b
-  data.tar.gz: 903ba865e4b4cdfd39df4efe4425250d6bcb2234
+  metadata.gz: 88d0c7506de87c39b6c0c7dc765cb55da4948b64
+  data.tar.gz: d38d7b83f8652eae78201c954215bf715fed31df
 SHA512:
-  metadata.gz: e6d484d4001d19d66df60d17cf67003d92e812423274f4c995723bd8a82e8be0c1e9d7dcec22ad3e335bcd809a03d35e4f25395f8d255c2266d64a4fb5a5e102
-  data.tar.gz: eb0808e3109763538ebe88867117e377779dbb019a87747306ffa0db2f89d71fb0f063eb434b11470611217c077e56587f430ee3a1b25837916fa02f1647b2ce
+  metadata.gz: 98a9fddf1a26d59bd4491350613a2e016f9b4cc0697b038f96144793f33e9d01e88cafd1cf4d8ed92874e651d7af730eab7b87e73b814488cc0c17281ddae9e0
+  data.tar.gz: 75a136f01c2ffe9bec4fda596502df66adbd2e858e25b7f8c04d5dda6653e57a2162f43601bc5e5bbe0c92d78904823443ecb9d7265a2ee9abcda74379894dc2

data/lib/immunio/agent.rb

@@ -70,6 +70,8 @@ module Immunio
     # purposes.
     config_accessor :vm_data
 
+    attr_reader :plugins
+
     def initialize
       Immunio.logger.info { "Initializing agent version #{VERSION} for process #{Process.pid}" }
 
@@ -102,6 +104,8 @@ module Immunio
       # Be sure all config attributes have a type before this call:
       load_config
 
+      setup_plugin_registry
+
       Immunio::switch_to_real_logger(config.log_file, config.log_level)
 
       if !config.agent_enabled then
@@ -231,6 +235,75 @@ module Immunio
     def environment=(environment)
       @processor.environment = environment
     end
+
+    def register_plugin(name, version = nil)
+      @plugins[name] = {} unless @plugins.has_key?(name)
+      @plugins[name]['status'] = 'loaded'
+      @plugins[name]['version'] = version if version
+
+      Immunio.logger.info do
+        "Registering plugin '#{name}' => '#{@plugins[name]}'"
+      end
+    end
+
+    RECOGNIZED_PLUGINS = [
+      ## action_dispatch
+      'ActionDispatch::Cookies::SignedCookieJar',
+      'ActionDispatch::Cookies::UpgradeLegacySignedCookieJar',
+      'ActionDispatch::Cookies::EncryptedCookieJar',
+      'ActionDispatch::Cookies::UpgradeLegacyEncryptedCookieJar',
+
+      ## action_view
+      'ActionView::Template::Handlers::Erubis',
+      'Haml::Compiler',
+      'Hash',
+      'ActionView::TemplateRenderer',
+      'ActionView::Template',
+      'ActionController::Caching::Fragments',
+
+      ## active_record
+      'ActiveRecord',
+      'ActiveRecord::ConnectionAdapters::Mysql2Adapter',
+      'ActiveRecord::ConnectionAdapters::MysqlAdapter',
+      'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter',
+      'ActiveRecord::ConnectionAdapters::SQLite3Adapter',
+      'ActiveRecord::ConnectionAdapters::SQLiteAdapter',
+      'ActiveRecord::Sanitization',
+      'Arel::Visitors::ToSql',
+      'ActiveRecord::ConnectionAdapters::AbstractAdapter',
+
+      ## active_record_relation
+      'ActiveRecord::Relation',
+      'ActiveRecord::SpawnMethods',
+      'ActiveRecord::Querying',
+      'ActiveRecord::StatementCache',
+      'ActiveRecord::Associations::HasManyThroughAssociation',
+
+      'Authlogic',
+      'ActionController (CSRF)',
+      'Devise',
+      'Kernel (Eval)',
+      'Immunio::HTTPFinisher',
+      'Immunio::HTTPTracker',
+
+      ## io
+      'IO',
+      'File',
+      'Kernel (Module)',
+
+      'ActionController (Redirect)',
+      'Warden'
+    ].freeze
+
+    private
+
+    def setup_plugin_registry
+      @plugins = {}
+
+      RECOGNIZED_PLUGINS.each do |name|
+        @plugins[name] = { 'status' => 'pending' }
+      end
+    end
   end
 
   AGENT_INIT_MUTEX = Mutex.new

data/lib/immunio/plugins/action_dispatch.rb

@@ -32,14 +32,33 @@ end
 class ActionDispatch::Cookies
   if defined? SignedCookieJar
     SignedCookieJar.send :include, Immunio::CookieHooks
+
+    Immunio.agent.register_plugin(
+      'ActionDispatch::Cookies::SignedCookieJar',
+      ActionPack::VERSION::STRING)
   end
+
   if defined? UpgradeLegacySignedCookieJar
     UpgradeLegacySignedCookieJar.send :include, Immunio::CookieHooks
+
+    Immunio.agent.register_plugin(
+      'ActionDispatch::Cookies::UpgradeLegacySignedCookieJar',
+      ActionPack::VERSION::STRING)
   end
+
   if defined? EncryptedCookieJar
     EncryptedCookieJar.send :include, Immunio::CookieHooks
+
+    Immunio.agent.register_plugin(
+      'ActionDispatch::Cookies::EncryptedCookieJar',
+      ActionPack::VERSION::STRING)
   end
+
   if defined? UpgradeLegacyEncryptedCookieJar
     UpgradeLegacyEncryptedCookieJar.send :include, Immunio::CookieHooks
+
+    Immunio.agent.register_plugin(
+      'ActionDispatch::Cookies::UpgradeLegacyEncryptedCookieJar',
+      ActionPack::VERSION::STRING)
   end
 end

data/lib/immunio/plugins/action_view.rb

@@ -533,20 +533,49 @@ end
 
 # Add XSS hooks if enabled
 if Immunio::agent.plugin_enabled?("xss") then
+  action_view_version =
+    if ActionView.respond_to?(:version)
+      ActionView.version.to_s
+    else
+      Rails.version
+    end
+
   # Hook into template engines.
   ActionView::Template::Handlers::Erubis.send :include, Immunio::ErubisHooks
 
+  Immunio.agent.register_plugin(
+    'ActionView::Template::Handlers::Erubis',
+    action_view_version)
+
   ActiveSupport.on_load(:after_initialize) do
     # Wait after Rails initialization to patch custom template engines.
     if defined? Haml::Compiler
       Haml::Compiler.send :include, Immunio::HamlHooks
+      Immunio.agent.register_plugin('Haml::Compiler', Haml::VERSION)
     end
 
     Hash.send :include, Immunio::ActiveSupportHooks
+    Immunio.agent.register_plugin('Hash', RUBY_VERSION)
   end
 
   # Hook into rendering process of Rails.
   ActionView::TemplateRenderer.send :include, Immunio::TemplateRendererHooks
+
+  Immunio.agent.register_plugin(
+    'ActionView::TemplateRenderer',
+    action_view_version)
+
   ActionView::Template.send :include, Immunio::TemplateHooks
-  ActionController::Caching::Fragments.send :include, Immunio::FragmentCachingHooks
+
+  Immunio.agent.register_plugin(
+    'ActionView::Template',
+    action_view_version)
+
+  ActionController::Caching::Fragments.send(
+    :include,
+    Immunio::FragmentCachingHooks)
+
+  Immunio.agent.register_plugin(
+    'ActionController::Caching::Fragments',
+    action_view_version)
 end

data/lib/immunio/plugins/active_record.rb

@@ -681,28 +681,66 @@ module Immunio
   end
 end
 
+Immunio.agent.register_plugin('ActiveRecord', ActiveRecord::VERSION::STRING)
+
 # Hook into quoting methods at the highest level possible in the ancestors chain.
 # In case the quote methods were overridden in a child class.
 module ActiveRecord::ConnectionAdapters
   if defined? Mysql2Adapter
     Mysql2Adapter.send :include, Immunio::QuotingHooks
+
+    Immunio.agent.register_plugin(
+      'ActiveRecord::ConnectionAdapters::Mysql2Adapter',
+      ActiveRecord::VERSION::STRING)
   elsif defined? MysqlAdapter
     MysqlAdapter.send :include, Immunio::QuotingHooks
+
+    Immunio.agent.register_plugin(
+      'ActiveRecord::ConnectionAdapters::MysqlAdapter',
+      ActiveRecord::VERSION::STRING)
   end
+
   if defined? PostgreSQLAdapter
     PostgreSQLAdapter.send :include, Immunio::QuotingHooks
+
+    Immunio.agent.register_plugin(
+      'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter',
+      ActiveRecord::VERSION::STRING)
   end
+
   if defined? SQLite3Adapter
     SQLite3Adapter.send :include, Immunio::QuotingHooks
+
+    Immunio.agent.register_plugin(
+      'ActiveRecord::ConnectionAdapters::SQLite3Adapter',
+      ActiveRecord::VERSION::STRING)
   elsif defined? SQLiteAdapter
     SQLiteAdapter.send :include, Immunio::QuotingHooks
+
+    Immunio.agent.register_plugin(
+      'ActiveRecord::ConnectionAdapters::SQLiteAdapter',
+      ActiveRecord::VERSION::STRING)
   end
 end
 
 module ActiveRecord::Sanitization
   ClassMethods.send :include, Immunio::SanitizeHooks
+
+  Immunio.agent.register_plugin(
+    'ActiveRecord::Sanitization',
+    ActiveRecord::VERSION::STRING)
 end
 
 Arel::Visitors::ToSql.send :include, Immunio::ArelToSqlHooks
 
-ActiveRecord::ConnectionAdapters::AbstractAdapter.send :include, Immunio::QueryExecutionHooks
+Immunio.agent.register_plugin(
+  'Arel::Visitors::ToSql',
+  ActiveRecord::VERSION::STRING)
+
+ActiveRecord::ConnectionAdapters::AbstractAdapter.send(
+  :include,
+  Immunio::QueryExecutionHooks)
+
+Immunio.agent.register_plugin(
+  'ActiveRecord::ConnectionAdapters::AbstractAdapter',
+  ActiveRecord::VERSION::STRING)

data/lib/immunio/plugins/active_record_relation.rb

@@ -365,8 +365,56 @@ module Immunio
   end
 end
 
-ActiveRecord::Relation.send :include, Immunio::RelationHooks if defined? ActiveRecord::Relation
-ActiveRecord::Relation.send :include, Immunio::SpawnHooks if defined? ActiveRecord::SpawnMethods
-ActiveRecord::Relation.send :include, Immunio::QueryingHooks if defined? ActiveRecord::Querying
-ActiveRecord::StatementCache.send :include, Immunio::StatementCacheHooks if defined? ActiveRecord::StatementCache
-ActiveRecord::Associations::HasManyThroughAssociation.send :include, Immunio::HasManyThroughAssociationHooks if defined? ActiveRecord::Associations::HasManyThroughAssociation
+module ActiveRecord
+  if defined? Relation
+    Relation.send(
+      :include,
+      Immunio::RelationHooks)
+
+    Immunio.agent.register_plugin(
+      'ActiveRecord::Relation',
+      ActiveRecord::VERSION::STRING)
+
+    if defined? SpawnMethods
+      Relation.send(
+        :include,
+        Immunio::SpawnHooks)
+
+      Immunio.agent.register_plugin(
+        'ActiveRecord::SpawnMethods',
+        ActiveRecord::VERSION::STRING)
+    end
+
+    if defined? Querying
+      Relation.send(
+        :include,
+        Immunio::QueryingHooks)
+
+      Immunio.agent.register_plugin(
+        'ActiveRecord::Querying',
+        ActiveRecord::VERSION::STRING)
+    end
+  end
+
+  if defined? StatementCache
+    StatementCache.send(
+      :include,
+      Immunio::StatementCacheHooks)
+
+    Immunio.agent.register_plugin(
+      'ActiveRecord::StatementCache',
+      ActiveRecord::VERSION::STRING)
+  end
+
+  module Associations
+    if defined? HasManyThroughAssociation
+      HasManyThroughAssociation.send(
+        :include,
+        Immunio::HasManyThroughAssociationHooks)
+
+      Immunio.agent.register_plugin(
+        'ActiveRecord::Associations::HasManyThroughAssociation',
+        ActiveRecord::VERSION::STRING)
+    end
+  end
+end

data/lib/immunio/plugins/authlogic.rb

@@ -77,4 +77,8 @@ if defined? Authlogic
   end
 
   Authlogic::Session::Base.send :include, Immunio::Authlogic::SessionHooks
+
+  Immunio.agent.register_plugin(
+    'Authlogic',
+    Gem.loaded_specs['authlogic'].version.to_s)
 end

data/lib/immunio/plugins/csrf.rb

@@ -24,3 +24,7 @@ module Immunio
 end
 
 ActionController::Base.send :include, Immunio::CsrfHook
+
+Immunio.agent.register_plugin(
+  'ActionController (CSRF)',
+  ActionPack::VERSION::STRING)

data/lib/immunio/plugins/devise.rb

@@ -37,4 +37,7 @@ if defined? Devise
   end
 
   Devise::Models::Recoverable::ClassMethods.send :include, Immunio::DeviseRecoverableHooks
+
+  require 'devise/version'
+  Immunio.agent.register_plugin('Devise', Devise::VERSION)
 end

data/lib/immunio/plugins/environment_reporter.rb

@@ -76,13 +76,9 @@ module Immunio
           hostname_ip: hostname_ip,
           ips: ips
         },
-        dependencies: {}
+        plugins: Immunio.agent.plugins
       }
 
-      Gem.loaded_specs.each_pair do |name, spec|
-        info[:dependencies][name] = spec.version.to_s
-      end
-
       Immunio.agent.environment = info
     end
   end

data/lib/immunio/plugins/eval.rb

@@ -41,4 +41,5 @@ if Immunio::agent.plugin_enabled?("eval") then
   Kernel.send :include, Immunio::KernelEvalHook
   Kernel.extend Immunio::KernelEvalHook
   Immunio.logger.debug { "Eval: All hooks installed." }
+  Immunio.agent.register_plugin('Kernel (Eval)', RUBY_VERSION)
 end

data/lib/immunio/plugins/http_finisher.rb

@@ -4,6 +4,7 @@ module Immunio
   # Rack middleware running at the very end of the stack to finish HTTP requests.
   class HTTPFinisher
     def initialize(app)
+      Immunio.agent.register_plugin(self.class.name)
       @app = app
     end
 

data/lib/immunio/plugins/http_tracker.rb

@@ -5,6 +5,7 @@ module Immunio
   # Rack middleware tracking HTTP requests and responses and triggers the proper hooks.
   class HTTPTracker
     def initialize(app)
+      Immunio.agent.register_plugin(self.class.name)
       @app = app
     end
 

data/lib/immunio/plugins/io.rb

@@ -104,6 +104,8 @@ if Immunio.agent.plugin_enabled?("file_io")
   IO.extend Immunio::IOClassHooks
   File.extend Immunio::FileClassHooks
   Immunio.logger.debug { "IO: All hooks installed." }
+  Immunio.agent.register_plugin('IO', RUBY_VERSION)
+  Immunio.agent.register_plugin('File', RUBY_VERSION)
 end
 
 # Add Kernel hooks if enabled
@@ -112,4 +114,5 @@ if Immunio.agent.plugin_enabled?("shell_command")
   Kernel.send :include, Immunio::KernelModuleHooks
   Kernel.extend Immunio::KernelModuleHooks
   Immunio.logger.debug { "Shell: All hooks installed." }
+  Immunio.agent.register_plugin('Kernel (Module)', RUBY_VERSION)
 end

data/lib/immunio/plugins/redirect.rb

@@ -39,4 +39,8 @@ end
 if Immunio::agent.plugin_enabled?("redirect") then
   ActionController::Base.send :include, Immunio::RedirectHook
   Immunio.logger.debug { "Redirect: All hooks installed." }
+
+  Immunio.agent.register_plugin(
+    'ActionController (Redirect)',
+    ActionPack::VERSION::STRING)
 end

data/lib/immunio/plugins/warden.rb

@@ -66,4 +66,7 @@ if defined?(Warden::Manager)
     alias :call_without_immunio :call
     alias :call :call_with_immunio
   end
+
+  require 'warden/version'
+  Immunio.agent.register_plugin('Warden', Warden::VERSION)
 end

data/lib/immunio/version.rb

@@ -1,5 +1,5 @@
 module Immunio
   AGENT_TYPE = "agent-ruby"
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
   VM_VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: immunio
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Immunio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails