errplane 0.5.15 → 0.5.17

data/lib/errplane.rb

@@ -129,7 +129,7 @@ module Errplane
       e = e.continued_exception if e.respond_to?(:continued_exception)
       e = e.original_exception if e.respond_to?(:original_exception)
       opts = opts.merge(:exception => e)
-      opts[:environment_variables] = ENV.to_hash if configuration.include_environment_variables?
+      opts[:environment_variables] = ENV.to_hash
       black_box = BlackBox.new(opts)
     end
   end

data/lib/errplane/black_box.rb

@@ -37,7 +37,10 @@ module Errplane
         :reporter => reporter,
         :custom_data => @custom_data
       }
-      payload[:environment_variables] = @environment_variables
+
+      payload[:environment_variables] = @environment_variables.reject do |env|
+        Errplane.configuration.environment_variable_filters.any? { |filter| env =~ filter }
+      end
 
       Errplane.configuration.add_custom_exception_data(self)
 

data/lib/errplane/configuration.rb

@@ -19,7 +19,7 @@ module Errplane
     attr_accessor :backtrace_filters
     attr_accessor :aggregated_exception_classes
     attr_accessor :environment_variables
-    attr_writer   :include_environment_variables
+    attr_accessor :environment_variable_filters
 
     attr_accessor :instrumentation_enabled
     attr_accessor :debug
@@ -37,7 +37,10 @@ module Errplane
                                 ActionController::RoutingError},
       :ignored_environments => %w{test cucumber selenium},
       :ignored_user_agents => %w{GoogleBot},
-      :include_environment_variables => false,
+      :environment_variable_filters => [
+        /password/i,
+        /key/i
+      ],
       :backtrace_filters => [
         lambda { |line| line.gsub(/^\.\//, "") },
         lambda { |line|
@@ -60,7 +63,7 @@ module Errplane
       @ignored_environments = DEFAULTS[:ignored_environments].dup
       @ignored_user_agents = DEFAULTS[:ignored_user_agents].dup
       @backtrace_filters = DEFAULTS[:backtrace_filters].dup
-      @include_environment_variables = DEFAULTS[:include_environment_variables]
+      @environment_variable_filters = DEFAULTS[:environment_variable_filters]
       @aggregated_exception_classes = []
       @debug = false
       @rescue_global_exceptions = false
@@ -75,10 +78,6 @@ module Errplane
       !!@debug
     end
 
-    def include_environment_variables?
-      @include_environment_variables
-    end
-
     def instrumentation_enabled?
       !!@instrumentation_enabled
     end

data/lib/errplane/max_queue.rb

@@ -11,7 +11,7 @@ module Errplane
     end
 
     def push(obj)
-      super if @que.length < @max
+      super if length < @max
     end
   end
 end

data/lib/errplane/version.rb

@@ -1,3 +1,3 @@
 module Errplane
-  VERSION = "0.5.15"
+  VERSION = "0.5.17"
 end

data/spec/unit/black_box_spec.rb

@@ -46,5 +46,24 @@ describe Errplane::BlackBox do
       json["hash"].should == "some_hash"
       json["custom_data"]["extra_info"].should == "blah"
     end
+
+    describe "environment variables" do
+      it "should be filtered based on the contents of environment_variable_filters" do
+        Errplane.configure do |config|
+          config.environment_variable_filters = [/password/i]
+        end
+
+        black_box = Errplane::BlackBox.new(
+          :exception => @exception,
+          :environment_variables => {
+            "IMPORTANT_PASSWORD" => "sesame",
+            "EDITOR" => "vim"
+        })
+
+        json = JSON.parse(black_box.to_json)
+        json["environment_variables"].size.should == 1
+        json["environment_variables"].should == {"EDITOR" => "vim"}
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errplane
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.5.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70277963708200 !ruby/object:Gem::Requirement
+  requirement: &70309651133360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277963708200
+  version_requirements: *70309651133360
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70277963707600 !ruby/object:Gem::Requirement
+  requirement: &70309651132840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70277963707600
+  version_requirements: *70309651132840
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70277963707060 !ruby/object:Gem::Requirement
+  requirement: &70309651132320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70277963707060
+  version_requirements: *70309651132320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70277963706540 !ruby/object:Gem::Requirement
+  requirement: &70309651131820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70277963706540
+  version_requirements: *70309651131820
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70277963706040 !ruby/object:Gem::Requirement
+  requirement: &70309651131260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277963706040
+  version_requirements: *70309651131260
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70277963705540 !ruby/object:Gem::Requirement
+  requirement: &70309651130740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277963705540
+  version_requirements: *70309651130740
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70277963705000 !ruby/object:Gem::Requirement
+  requirement: &70309651130260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277963705000
+  version_requirements: *70309651130260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70277963704420 !ruby/object:Gem::Requirement
+  requirement: &70309651129740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277963704420
+  version_requirements: *70309651129740
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70277963699340 !ruby/object:Gem::Requirement
+  requirement: &70309651129220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277963699340
+  version_requirements: *70309651129220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70277963698520 !ruby/object:Gem::Requirement
+  requirement: &70309651128660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277963698520
+  version_requirements: *70309651128660
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70277963697680 !ruby/object:Gem::Requirement
+  requirement: &70309651033340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277963697680
+  version_requirements: *70309651033340
 description: This gem provides implements instrumentation with Errplane for Rails
   3.x applications.
 email: