sentry-sanitizer 0.1.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce13accdd4d90cccb1820625ef2d167a765e077b3837cf2d8341d2e945c3f735
-  data.tar.gz: 948e32dee0448aa61a1897328806fcacd1ac392179b502fb7ab09a0cf78cb21d
+  metadata.gz: 001d2ffb5bebe39d7f349f992f426cb53a08422b59b0a9d916477c0800d35d75
+  data.tar.gz: 48841d0763734c89c155737b07f1f774b3405aeb121ca2773b9f7dd384b1d9d8
 SHA512:
-  metadata.gz: e4863aeb41c575268039a9eda51a04aa78057fb41e3238ed1ba075be7020e395b9f526551fc0684cb39838101067c89441cd0d5a6eb5ef0ca3dfed3ed24320a0
-  data.tar.gz: cb5ec02b1a3604da2c636226ced1db9bd590ecd767f7bf083582911a211a22f79fc2ae3c55a27e5d944cdcc86b65861eb94bc6c1c2ef1730905ef9ca4a01be3e
+  metadata.gz: 9bfb1c9f69345cfaee791e3802e2bc52845244d06b58b4b64b6b43529608cbe60dfc42fb51ad8ca6a1cdb888e6ed091ff4d13602035450a1fcb338f3f02fa973
+  data.tar.gz: 8d3a339ee6a5fc3da5eda0a35012c2bf00f8f6cc8e304fcdadac5f17eecd7bf742cdee4ab9540077564362c1b861b46bd7ddc623e374522789612b935f2d94ec

data/.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  rspec:
+    name: Unit tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - { ruby_version: 2.4 }
+          - { ruby_version: 2.5 }
+          - { ruby_version: 2.4 }
+          - { ruby_version: 2.7 }
+          - { ruby_version: 3.0 }
+          - { ruby_version: jruby }
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Set up Ruby ${{ matrix.ruby_version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler: 2
+          ruby-version: ${{ matrix.ruby_version }}
+
+      - name: Run specs
+        run: |
+          bundle install --jobs 4 --retry 3 --no-cache
+          bundle exec rspec
+
+      - uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+
+## Unreleased
+
+## (not released)
+- Update compatibility with sentry-rails 4.3 releases [#3](https://github.com/mrexox/sentry-sanitizer/pull/3)
+
+## 0.2.1
+- Rework header cleaning to adhere to documentation in readme and not crash without configuration [#1](https://github.com/mrexox/sentry-sanitizer/pull/1)

data/Gemfile.lock

@@ -1,20 +1,22 @@
 PATH
   remote: .
   specs:
-    sentry-sanitizer (0.1.0)
-      sentry-ruby (~> 4.2.0)
+    sentry-sanitizer (0.3.0)
+      sentry-ruby (~> 4.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.1.8)
+    codecov (0.4.3)
+      simplecov (>= 0.15, < 0.22)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.4.4)
-    faraday (1.3.0)
-      faraday-net_http (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday-net_http (1.0.1)
-    multipart-post (2.1.1)
+    docile (1.3.5)
+    faraday (2.3.0)
+      faraday-net_http (~> 2.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (2.0.3)
+    rack (2.2.3)
     rake (10.5.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -29,23 +31,30 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    ruby2_keywords (0.0.4)
-    sentry-ruby (4.2.0)
+    ruby2_keywords (0.0.5)
+    sentry-ruby (4.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       faraday (>= 1.0)
-      sentry-ruby-core (= 4.2.0)
-    sentry-ruby-core (4.2.0)
+      sentry-ruby-core (= 4.3.2)
+    sentry-ruby-core (4.3.2)
       concurrent-ruby
       faraday
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.17)
+  codecov
+  rack
   rake (~> 10.0)
   rspec (~> 3.0)
   sentry-sanitizer!
+  simplecov (~> 0.18.5)
 
 BUNDLED WITH
-   2.1.4
+   2.2.14

data/LICENSE.txt

@@ -1,21 +1,13 @@
-The MIT License (MIT)
+The BSD-3-Clause license
 
 Copyright (c) 2021 Valentine Kiselev
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -1,15 +1,27 @@
-# Sentry::Sanitizer
+![CI](https://github.com/mrexox/sentry-sanitizer/workflows/CI/badge.svg)
+[![Gem Version](https://badge.fury.io/rb/sentry-sanitizer.svg)](https://badge.fury.io/rb/sentry-sanitizer)
+[![codecov](https://codecov.io/gh/mrexox/sentry-sanitizer/branch/master/graph/badge.svg?token=QW93HCVI0W)](https://codecov.io/gh/mrexox/sentry-sanitizer)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/sentry/sanitizer`. To experiment with that code, run `bin/console` for an interactive prompt.
+# sentry-sanitizer: sanitizing extension for sentry-ruby
 
-TODO: Delete this and the text above, and describe your gem
+This gem aimed to add sanitizing support to [sentry-ruby](https://rubygems.org/gems/sentry-ruby) gem.
+
+[sentry-raven](https://rubygems.org/gems/sentry-raven) gem had this apportunity but it is no longer supported. Moving from `sentry-raven` to `sentry-ruby` can surprise you with missing this ability. But you can still use `sentry-sanitizer` (with a little change to configuration).
+
+Currently this gem provides following features
+- [x] Sanitizing POST params
+- [x] Sanitizing HTTP headers
+- [x] Sanitizing cookies
+- [x] Sanitizing extras ([see](https://docs.sentry.io/platforms/ruby/enriching-events/context/#additional-data) `Sentry.set_extras`)
 
 ## Installation
 
+:warning: Please, don't use `0.1.*` version as it was experimental and not usable at all.
+
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'sentry-sanitizer'
+gem 'sentry-sanitizer', '>= 0.2.0'
 ```
 
 And then execute:
@@ -22,7 +34,30 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Add following lines to your Sentry configuration:
+
+```ruby
+Sentry.init do |config|
+  # ... your configuration
+
+  # If using Rails
+  config.sanitize.fields = Rails.application.config.filter_parameters
+
+  # You can also pass custom array
+  config.sanitize.fields = %w[password super_secret_token]
+
+  # HTTP headers can be sanitized too (it is case insensitive)
+  config.sanitize.http_headers = %w[Authorization X-Xsrf-Token]
+
+  # You can sanitize all HTTP headers with setting `true` value
+  config.sanitize.http_headers = true
+
+  # You can sanitize all cookies with this setting
+  config.sanitize.cookies = true
+
+  # ...
+end
+```
 
 ## Development
 
@@ -32,8 +67,8 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/sentry-sanitizer.
+Bug reports and pull requests are welcome on GitHub at https://github.com/mrexox/sentry-sanitizer.
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [BSD-3-Clause License](https://opensource.org/licenses/BSD-3-Clause).

data/Rakefile

@@ -1,9 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-require "bundler/gem_helper"
-Bundler::GemHelper.install_tasks(name: "sentry-sanitizer")
-
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/lib/sentry/sanitizer/cleaner.rb

@@ -11,44 +11,74 @@ module Sentry
 
       def initialize(config)
         @fields = config.fields || []
-        @http_headers = config.http_headers || []
-        @cookies = config.cookies || false
+        @http_headers = config.http_headers || DEFAULT_SENSITIVE_HEADERS
+        @do_cookies = config.cookies || false
       end
 
       def call(event)
         if event.is_a?(Sentry::Event)
-          sanitize_request(event.request) if event.request
-          event.extra = sanitize_data(event.extra) if event.extra
+          sanitize_request(event, :object) if event.request
+          event.extra = sanitize_data(event.extra)
+        elsif event.is_a?(Hash)
+          sanitize_request(event, :stringified_hash) if event['request']
+          sanitize_request(event, :symbolized_hash) if event[:request]
+          event['extra'] = sanitize_data(event['extra']) if event['extra']
+          event[:extra] = sanitize_data(event[:extra]) if event[:extra]
         end
       end
 
-      def sanitize_request(request)
-        request.data = sanitize_data(request.data) unless fields.size.zero?
-        request.headers = sanitize_headers(request.headers) unless http_headers.size.zero?
-        request.cookies = sanitize_cookies(request.cookies) if cookies
+      def sanitize_request(event, type)
+        case type
+        when :object
+          event.request.data = sanitize_data(event.request.data)
+          event.request.headers = sanitize_headers(event.request.headers)
+          event.request.cookies = sanitize_cookies(event.request.cookies)
+        when :stringified_hash
+          event['request']['data'] = sanitize_data(event['request']['data'])
+          event['request']['headers'] = sanitize_headers(event['request']['headers'])
+          event['request']['cookies'] = sanitize_cookies(event['request']['cookies'])
+        when :symbolized_hash
+          event[:request][:data] = sanitize_data(event[:request][:data])
+          event[:request][:headers] = sanitize_headers(event[:request][:headers])
+          event[:request][:cookies] = sanitize_cookies(event[:request][:cookies])
+        end
       end
 
       def sanitize_data(hash)
-        return unless hash.is_a? Hash
+        return hash unless hash.is_a? Hash
+        return hash unless fields.size.positive?
 
         sanitize_value(hash, nil)
       end
 
       private
 
-      attr_reader :fields, :http_headers, :cookies
+      attr_reader :fields, :http_headers, :do_cookies
 
       # Sanitize specified headers
       def sanitize_headers(headers)
-        headers.keys.select { |key| key.match?(sensitive_headers) }.each do |key|
-          headers[key] = DEFAULT_MASK
-        end
+        case http_headers
+        when TrueClass
+          headers.transform_values { DEFAULT_MASK }
+        when Array
+          return headers unless http_headers.size.positive?
+          http_headers_regex = sensitive_regexp(http_headers)
 
-        headers
+          headers.keys.select { |key| key.match?(http_headers_regex) }.each do |key|
+            headers[key] = DEFAULT_MASK
+          end
+
+          headers
+        else
+          headers
+        end
       end
 
       # Sanitize all cookies
       def sanitize_cookies(cookies)
+        return cookies unless cookies.is_a? Hash
+        return cookies unless do_cookies
+
         cookies.transform_values { DEFAULT_MASK }
       end
 
@@ -91,10 +121,6 @@ module Sentry
         @sensitive_fields ||= sensitive_regexp(fields)
       end
 
-      def sensitive_headers
-        @sensitive_headers ||= sensitive_regexp(DEFAULT_SENSITIVE_HEADERS | http_headers)
-      end
-
       def sensitive_regexp(fields)
         Regexp.new(fields.map { |field| "\\b#{field}\\b" }.join('|'), 'i')
       end

data/lib/sentry/sanitizer/configuration.rb

@@ -5,9 +5,15 @@ require 'sentry/sanitizer/configuration_mixin'
 module Sentry
   # Monkey-patching Sentry::Configuration
   class Configuration
+    # Add sanitizing configuration
+    attr_reader :sanitize
+
+    # Patch before_send method so it could support more than one call
     prepend Sentry::Sanitizer::ConfigurationMixin
 
     add_post_initialization_callback do
+      @sanitize ||= Sentry::Sanitizer::Configuration.new
+
       self.before_send = ->(event, hint) do
         Sentry::Sanitizer::Cleaner.new(Sentry.configuration.sanitize).call(event)
 
@@ -23,6 +29,30 @@ module Sentry
       def configured?
         [fields, http_headers, cookies].any? { |setting| !setting.nil? }
       end
+
+      def fields=(fields)
+        unless fields.is_a? Array
+          raise ArgumentError, 'sanitize_fields must be array'
+        end
+
+        @fields = fields
+      end
+
+      def http_headers=(headers)
+        unless [Array, TrueClass, FalseClass].include?(headers.class)
+          raise ArgumentError, 'sanitize_http_headers must be array'
+        end
+
+        @http_headers = headers
+      end
+
+      def cookies=(cookies)
+        unless [TrueClass, FalseClass].include?(cookies.class)
+          raise ArgumentError, 'sanitize_cookies must be boolean'
+        end
+
+        @cookies = cookies
+      end
     end
   end
 end

data/lib/sentry/sanitizer/configuration_mixin.rb

@@ -20,34 +20,6 @@ module Sentry
           event
         }
       end
-
-      def sanitize
-        @sanitize ||= Sentry::Sanitizer::Configuration.new
-      end
-
-      def sanitize_fields=(fields)
-        unless fields.is_a? Array
-          raise ArgumentError, 'sanitize_fields must be array'
-        end
-
-        sanitize.fields = fields
-      end
-
-      def sanitize_http_headers=(headers)
-        unless headers.is_a? Array
-          raise ArgumentError, 'sanitize_http_headers must be array'
-        end
-
-        sanitize.http_headers = headers
-      end
-
-      def sanitize_cookies=(cookies)
-        unless [TrueClass, FalseClass].include?(cookies.class)
-          raise ArgumentError, 'sanitize_cookies must be boolean'
-        end
-
-        sanitize.cookies = cookies
-      end
     end
   end
 end

data/lib/sentry/sanitizer/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Sanitizer
-    VERSION = '0.1.4'
+    VERSION = '0.3.0'
   end
 end

data/sentry-sanitizer.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['mrexox@outlook.com']
 
   spec.summary       = %q{Sanitizing middleware for sentry-ruby gem}
-  spec.description   = %q{Add missing sanitizing support for sentry-ruby (previous sentry-rav)}
+  spec.description   = %q{Add missing sanitizing support for sentry-ruby (previous sentry-raven)}
   spec.homepage      = 'https://github.com/mrexox/sentry-sanitizer'
   spec.license       = 'BSD'
 
@@ -27,9 +27,14 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ['lib']
 
+  # Codecov
+  spec.add_development_dependency 'codecov'
+  spec.add_development_dependency 'simplecov', '~> 0.18.5'
+
   spec.add_development_dependency 'bundler', '>= 1.17'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rack'
 
-  spec.add_runtime_dependency 'sentry-ruby', '~> 4.2.0'
+  spec.add_runtime_dependency 'sentry-ruby', '~> 4.3.0'
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sanitizer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Valentine Kiselev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,30 +80,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sentry-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
-description: Add missing sanitizing support for sentry-ruby (previous sentry-rav)
+        version: 4.3.0
+description: Add missing sanitizing support for sentry-ruby (previous sentry-raven)
 email:
 - mrexox@outlook.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -112,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Sanitizing middleware for sentry-ruby gem