opbeat 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fe06da9948bd4b055bbbd4a2cdfd9fb65ea47df
-  data.tar.gz: 03c5ef6ef57c78a97c11008a00bf2b669840448f
+  metadata.gz: db912bc5fa2bac6f5cf53c5dd625948771535c17
+  data.tar.gz: b71746960e7ad4cf3f028fe4862ce195d170821c
 SHA512:
-  metadata.gz: 3d0c1f9114d890b1cd2ffc4d901c69b0e2670eb4b49ebb7cc636bc0007cb687db67758148bef69b7c8b2793f38522ec936663bfcb01879c73576013070ea5834
-  data.tar.gz: 6bc4bcd743a8d3bcb439d2d3f3b185967f6f90b27b40c07f98e47f023491940a16359a3422674325fe1136545981c42d226f514b776a0b6c3930083790db0168
+  metadata.gz: 98d4cc3c08c7c821cfbcb8e78378defbc8b52443dfd52270ad1220a317b82bec57ddc8c1a9e7eadc491bba14cc16cae497aae19da7ae7dbdd442f2840dbca68d
+  data.tar.gz: 595b034fb2c2e294d13da6e5f392708377af9e6331f508ea0b48b9c9074f9f834ed5119f8e25faeb38b410b28e8ef6554962d960b6da70e480126f794f35f41e

data/.travis.yml

@@ -7,7 +7,8 @@ rvm:
   - 2.0.0
   - 2.1.6
   - 2.2.3
-  - 2.3.1
+  - 2.3.3
+  - 2.4.0
 gemfile:
   - gemfiles/Gemfile.rails-3.2.x
   - gemfiles/Gemfile.rails-4.0.x
@@ -16,7 +17,7 @@ gemfile:
   - gemfiles/Gemfile.rails-5.0.x
 matrix:
   include:
-    - rvm: 2.3.1
+    - rvm: 2.3.3
       gemfile: gemfiles/Gemfile.rails-HEAD
 
   exclude:
@@ -24,6 +25,14 @@ matrix:
       gemfile: gemfiles/Gemfile.rails-5.0.x
     - rvm: 2.1.6
       gemfile: gemfiles/Gemfile.rails-5.0.x
+    - rvm: 2.4.0
+      gemfile: gemfiles/Gemfile.rails-3.2.x
+    - rvm: 2.4.0
+      gemfile: gemfiles/Gemfile.rails-4.0.x
+    - rvm: 2.4.0
+      gemfile: gemfiles/Gemfile.rails-4.1.x
+    - rvm: 2.4.0
+      gemfile: gemfiles/Gemfile.rails-4.2.x
 
 notifications:
   email: false

data/HISTORY.md

@@ -1,3 +1,7 @@
+# 3.0.11
+
+- Fix parameter filtering with symbols (#37 [@simitt](https://github.com/simitt))
+
 # 3.0.10
 
 - Fix Sinatra with `config.disable_performance` (#44 [@skogsmaskin](https://github.com/skogsmaskin))

data/README.md

@@ -121,7 +121,7 @@ To enable Opbeat for [resque](https://github.com/resque/resque), add the followi
 require "resque/failure/multiple"
 require "opbeat/integration/resque"
 
-Resque::Failure::Multiple.classes = [Resque::Failure::Opbeat]
+Resque::Failure::Multiple.classes = [Opbeat::Integration::Resque]
 Resque::Failure.backend = Resque::Failure::Multiple
 ```
 

data/gemfiles/Gemfile.rails-4.2.x

@@ -1,4 +1,5 @@
 eval_gemfile File.expand_path('../Gemfile.base', __FILE__)
 
 gem 'rails', '~> 4.2.0'
+gem 'nokogiri', '< 1.7'
 gem 'sinatra'

data/lib/opbeat/configuration.rb

@@ -69,7 +69,7 @@ module Opbeat
 
     def validate!
       %w{app_id secret_token organization_id}.each do |key|
-        raise Error.new("Configuration missing `#{key}'") unless self.send(key)
+        raise Error.new("Opbeat Configuration missing `#{key}'") unless self.send(key)
       end
 
       true

data/lib/opbeat/error_message.rb

@@ -29,6 +29,7 @@ module Opbeat
     attr_reader :config
     attr_accessor :message
     attr_reader :timestamp
+    attr_reader :filter
     attr_accessor :level
     attr_accessor :logger
     attr_accessor :culprit
@@ -61,7 +62,7 @@ module Opbeat
       end
 
       if env = opts[:rack_env]
-        error_message.http = HTTP.from_rack_env env, filter: @filter
+        error_message.http = HTTP.from_rack_env env, filter: error_message.filter
         error_message.user = User.from_rack_env config, env
       end
 

data/lib/opbeat/filter.rb

@@ -39,13 +39,7 @@ module Opbeat
     end
 
     def sanitize key, value
-      return value unless value.is_a?(String)
-
-      if should_filter?(key)
-        return MASK
-      end
-
-      value
+      should_filter?(key) ? MASK : value
     end
 
     private
@@ -53,7 +47,7 @@ module Opbeat
     def should_filter? key
       @params.any? do |param|
         case param
-        when String
+        when String, Symbol
           key.to_s == param.to_s
         when Regexp
           param.match(key)

data/lib/opbeat/version.rb

@@ -1,3 +1,3 @@
 module Opbeat
-  VERSION = "3.0.10"
+  VERSION = "3.0.11"
 end

data/spec/opbeat/configuration_spec.rb

@@ -6,6 +6,13 @@ module Opbeat
     it "has defaults" do
       conf = Configuration.new
       expect(conf.timeout).to be 100
+      expect(conf.filter_parameters).to eq [/(authorization|password|passwd|secret)/i]
+    end
+
+    it "overwrites defaults when config given" do
+      conf = Configuration.new(filter_parameters: [:secret])
+      expect(conf.timeout).to be 100
+      expect(conf.filter_parameters).to eq [:secret]
     end
 
     it "can initialize with a hash" do

data/spec/opbeat/error_message_spec.rb

@@ -56,6 +56,12 @@ module Opbeat
           expect(error.http.url).to eq 'http://example.org/'
         end
 
+        it "uses proper filter options" do
+          env = Rack::MockRequest.env_for '/nested/path?foo=bar&password=SECRET'
+          error = ErrorMessage.from_exception config, real_exception, rack_env: env
+          expect(error.http.query_string).to eq "foo=bar&password=[FILTERED]"
+        end
+
         class DummyController
           def current_user
             Struct.new(:id, :email, :username).new(1, 'john@example.com', 'leroy')

data/spec/opbeat/filter_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 
 module Opbeat
   RSpec.describe Filter do
-    let(:config) { Configuration.new filter_parameters: [/password/, 'passwd'] }
+    let(:config) do 
+      Configuration.new filter_parameters: [/password/, 'pwd', :_secret, :int_secret, 'non_existing']
+    end
 
     subject do
       Filter.new config
@@ -10,13 +12,19 @@ module Opbeat
 
     describe "#apply" do
       it "filters a string" do
-        filtered = subject.apply "password=SECRET&foo=bar"
-        expect(filtered).to eq 'password=[FILTERED]&foo=bar'
+        data = "password=SECRET&foo=bar&_secret=abc&pwd=de1&int_secret=123"
+        filtered_data = "password=[FILTERED]&foo=bar&_secret=[FILTERED]&pwd=[FILTERED]&int_secret=[FILTERED]"
+        expect(subject.apply data).to eq filtered_data
       end
 
       it "filters a hash" do
-        filtered = subject.apply({ passwd: 'SECRET' })
-        expect(filtered).to eq({ passwd: '[FILTERED]' })
+        data = { password: 'SECRET', foo: :bar, _secret: 'abc', pwd: 'de1', int_secret: 123 }
+        filtered_data = { password: '[FILTERED]', 
+                          foo: :bar, 
+                          _secret: '[FILTERED]', 
+                          pwd: '[FILTERED]', 
+                          int_secret: '[FILTERED]'}
+        expect(subject.apply data).to eq filtered_data
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opbeat
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The official Opbeat Ruby client library