immunio 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c73cecf0da251ae6c4e8fc65c1215a84cca2a9a
-  data.tar.gz: cc1742b1789f90dce3c6a2ad8a698c7e4e4730da
+  metadata.gz: c543f9eeb50f20ef762a41876363e414540aad9e
+  data.tar.gz: 3ff0d95fb36d2fbd6c5c8b2937ec1af7ca04059f
 SHA512:
-  metadata.gz: 6ba46ef732b848a7bddce203578b91b801ad5c8571b5b49443c300b9f74bcbba3519ecffac8e0bd25476e2de40d7d8b8f16ae4a4bc45cf4aa93f3d26270c7291
-  data.tar.gz: d127335b24855d7b3cdd4725bca45b946e13d5712bc203fa972d0c79b16e719986b3d1c114bcb12df6ece8524c0af032c79f7fffd4ec46208dd03bb90d738c43
+  metadata.gz: 215336fcc2822b3ad8473742e7b5bf357e4c54aa2e044d6b0a2e85188d3f47f3a2906de2ae694bcd0e9db4db6f7f08f208fe69d118e698112bde38648e345575
+  data.tar.gz: 594d62ffac2d372f7afc745faffa35ea856767d8ca395f8045a4a35cccf6427741dea15a5d4b6a7a8a14e0371873ec9bffa7a0f1b4182d35132af44f7fffeb14

data/README.md

@@ -133,35 +133,3 @@ end
 
 - Ruby 1.9.3 and up
 - Rails 3.2 to 4.2
-
-## Building the gem
-
-To build the pure Ruby gem:
-
-```sh
-$ rake gem
-```
-
-To build with bundled pre-compiled C extensions:
-
-```sh
-$ rake native gem
-```
-
-For cross-compilation, see https://github.com/luislavena/rake-compiler#cross-compilation---the-future-is-now.
-
-## Testing
-
-To run tests (under Rails 4.2):
-
-```sh
-$ rake test
-```
-
-To run tests under Rails 3.2:
-
-```sh
-$ export RAILS_VERSION=3.2
-$ bundle update rails
-$ rake test
-```

data/lib/immunio.rb

@@ -22,6 +22,7 @@ module Immunio
     require_relative "immunio/plugins/authlogic"
     require_relative "immunio/plugins/redirect"
     require_relative "immunio/plugins/eval"
+    require_relative "immunio/plugins/metal"
 
     # Load and activate Rails engine
     require_relative "immunio/rails"

data/lib/immunio/plugins/active_record.rb

@@ -583,7 +583,9 @@ module Immunio
     # to a statement.
     def call(payload)
       Request.time "plugin", "#{Module.nesting[0]}::#{__method__}" do
-        Immunio.logger.debug { "New ActiveRecord SQL query: #{payload}" }
+        # The #{payload} in the log string is causing lots of Rails 3.2
+        # upstream test failures with Ruby 1.9.3.
+        # Immunio.logger.debug { "New ActiveRecord SQL query: #{payload}" }
 
         connection_id = payload[:connection_id]
 

data/lib/immunio/plugins/http_tracker.rb

@@ -15,7 +15,6 @@ module Immunio
         Immunio.new_request(request)
 
         Immunio.run_hook! "http_tracker", "http_request_start", meta_from_env(env)
-        Immunio.run_hook! "http_tracker", "framework_route", route_name: route_name(env)
 
         env['rack.input'] = InputWrapper.new(env['rack.input'])
 
@@ -134,25 +133,6 @@ module Immunio
       }
     end
 
-    def route_name(env)
-      # Determine the route name in controller#action format:
-      route_name = nil
-
-      if defined?(Rails.application) && Rails.application.present?
-        begin
-          request = rack_request(env)
-          path = request.env['PATH_INFO']
-          method = request.env['REQUEST_METHOD'].downcase.to_sym
-          url = Rails.application.routes.recognize_path(path, method: method)
-          route_name = "#{url[:controller]}##{url[:action]}"
-        rescue StandardError
-          route_name = nil
-        end
-      end
-
-      route_name
-    end
-
     def session_was_loaded?(session)
       session && (session.respond_to?(:loaded?) ? session.loaded? : true)
     end

data/lib/immunio/plugins/metal.rb

@@ -0,0 +1,33 @@
+module Immunio
+  module MetalHook
+    extend ActiveSupport::Concern
+
+    included do
+      if method_defined? :dispatch
+        Immunio::Utils.alias_method_chain self, :dispatch, :immunio
+      end
+    end
+
+    protected
+
+    def dispatch_with_immunio(name, request)
+      Request.time 'plugin', "#{Module.nesting[0]}::#{__method__}" do
+        route_name = "#{controller_path}##{name}"
+        Immunio.logger.debug { "MetalHook#dispatch: route_name: #{route_name}" }
+
+        Immunio.run_hook! 'metal', 'framework_route', route_name: route_name
+
+        Request.pause "plugin", "#{Module.nesting[0]}::#{__method__}" do
+          dispatch_without_immunio name, request
+        end
+      end
+    end
+  end
+end
+
+Immunio::Plugin.load(
+  'ActionController (Metal)',
+  hooks: %w(framework_route)) do |plugin|
+  ActionController::Metal.send :include, Immunio::MetalHook
+  plugin.loaded! ActionPack::VERSION::STRING
+end

data/lib/immunio/rails.rb

@@ -15,7 +15,6 @@ module Immunio
                            'http_request_body_chunk',
                            'http_response_body_chunk',
                            'exception',
-                           'framework_route',
                            'framework_session',
                          ] do |plugin|
 

data/lib/immunio/version.rb

@@ -1,5 +1,5 @@
 module Immunio
   AGENT_TYPE = "agent-ruby"
-  VERSION = "1.1.10"
+  VERSION = "1.1.11"
   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.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Immunio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,6 +153,7 @@ files:
 - lib/immunio/plugins/http_finisher.rb
 - lib/immunio/plugins/http_tracker.rb
 - lib/immunio/plugins/io.rb
+- lib/immunio/plugins/metal.rb
 - lib/immunio/plugins/redirect.rb
 - lib/immunio/plugins/warden.rb
 - lib/immunio/processor.rb
@@ -465,7 +466,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Immunio Ruby agent