immunio 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99a30833d9388d3c2cf12a21d209c81983f69958
-  data.tar.gz: be529e5b823a1f0db90a4d058ba2af2f5327d2fb
+  metadata.gz: 707599380d8fefd64b7025d8529745af7ed07df2
+  data.tar.gz: 294b3c9d179e6943f88f3d7b8a0db6d72c3fd1bc
 SHA512:
-  metadata.gz: 581d82074c288618bec64dd899fde256d601d2703d3da32f86436cc92e1e53545cd209935bcc3989f2d895171b2401f5705795149c4680972daa91a0b353b660
-  data.tar.gz: 8b226690a97a6984025d96c57d3322d5c6790fe9fde2723ba690946be942dab9349ab3595f4c25ad0984df4790bc3c177b8a8681985c4ae149c67a6d43598d55
+  metadata.gz: 0c8b6e5455a9806041a0049414561ee8e70161cd85f64ab7c0041cdd82cf70350a85ec83ab0a62a3d58c038dd530ebd36ca446afc09d290f64609d4d14d080f2
+  data.tar.gz: cff8a8c2d49cff6bdf635918fa94dca3fe4db3ed70d02fc937c914f1420050dfebe58bc12b515fe5dcd449eb8a87b098c482d914c9e2048e1d6a327aaa1d694e

data/lib/immunio/context.rb

@@ -1,6 +1,10 @@
 module Immunio
   module Context
-    RAILS_TEMPLATE_FILTER = Regexp.new("(.*(_erb|_haml))__+\\d+_\\d+(.*)")
+    RAILS_TEMPLATE_FILTER = /(.*(_erb|_haml))__+\d+_\d+(.*)/
+
+    # https://github.com/rails/rails/blob/v3.2.21/activesupport/lib/active_support/callbacks.rb#L414
+    ACTIVESUPPORT_FILTER = /(.+)_run__\d+__(.+)__\d+__callbacks(.*)/
+
     # Cache for contexts (named in tribute to our buddy Adam Back who invented proof of work)
     @@hash_cache = {}
     FILE_CHECKSUM_CACHE = Hash.new do |cache, filepath|
@@ -43,10 +47,12 @@ module Immunio
         locations.each do |frame|
 
           # Filter frame names from template rendering to remove generated random bits
-          matchdata = RAILS_TEMPLATE_FILTER.match(frame[:label])
-          if matchdata != nil then
-            frame[:label] = matchdata[1] + matchdata[3]
-          end
+          template_match = RAILS_TEMPLATE_FILTER.match(frame[:label])
+          frame[:label] = template_match[1] + template_match[3] if template_match
+
+          # Filter frame names from activesupport generated callback methods
+          callback_match = ACTIVESUPPORT_FILTER.match(frame[:label])
+          frame[:label] = callback_match[1] + callback_match[2] + callback_match[3] if callback_match
 
           # Reduce paths to be relative to root if possible, to allow
           # relocation. If there's no rails root, or the path doesn't start with
@@ -113,7 +119,7 @@ module Immunio
       end
 
       # Mix in additional context data
-      unless additional_data.nil?
+      if additional_data
         if Immunio.agent.config.log_context_data
           Immunio.logger.info {"Additional context data:\n#{additional_data}"}
         end

data/lib/immunio/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: immunio
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Immunio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -438,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Immunio Ruby agent