blouson 1.1.1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a088372f568649175af63be6d52577a3847dd532664ea5a2370ccdf40a4f3db
-  data.tar.gz: c13bc3482ec0a909d85cddb8b4a404ce6f072360b1f5d91fd49e959d70ba1785
+  metadata.gz: a561df78a14ba07951254ce32982357a83a32eab60691ba688fe95a4049e1d77
+  data.tar.gz: 53d9f65de40ed900cf5e3fbb4ac2525c74eb563695a1320dd5ae3b0d53b50b73
 SHA512:
-  metadata.gz: 6213fbb353b32e31154ea5e986103ec1b6568e82c1cea386062259f4ed99fb2a4a734d4d3c7fec7d2aa184ba65dd671030861125108e47830f6685a3369510e2
-  data.tar.gz: 6fa70f5b597dca1c95929c51c08c5ef4284ee3fe0daf15d7a44a17f9f4c2abf3e9ce2c5b933cc8b750e25b795804ec3a690cbc74841e2d4f82ef252b93229c91
+  metadata.gz: aec465e833f9b260e8d2180ae9147accf15220d3431cf4975a50d73075c56975288d83c0b1245396a281ac492546b3aa36d2f43410ce016f9e770436e0d459aa
+  data.tar.gz: 2ff71f692ae850d89b3a702480bbb4c13ce226c77984bd1092835a0b1cf55e4335e2d03d7f68857056909d2589a84e895c389a31eccd041437a46aaef640f2b6

data/.github/workflows/ci.yml

@@ -0,0 +1,64 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+        gemfile:
+          - rails_5.0
+          - rails_5.1
+          - rails_5.2
+          - rails_6.0
+          - rails_6.1
+          - rails_7.0
+        exclude:
+          # Ruby >= 3.0 is supported since Rails 6.0
+          - ruby: '3.0'
+            gemfile: rails_5.0
+          - ruby: '3.0'
+            gemfile: rails_5.1
+          - ruby: '3.0'
+            gemfile: rails_5.2
+          - ruby: '3.1'
+            gemfile: rails_5.0
+          - ruby: '3.1'
+            gemfile: rails_5.1
+          - ruby: '3.1'
+            gemfile: rails_5.2
+          # Rails 7.0 supports Ruby >= 2.7 only
+          - ruby: '2.6'
+            gemfile: rails_7.0
+    name: Run test with Ruby ${{ matrix.ruby }} and Gemfile ${{ matrix.gemfile }}
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: '1'
+          MYSQL_DATABASE: blouson
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd "mysqladmin ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake spec

data/Appraisals

@@ -1,7 +1,3 @@
-appraise 'rails-4.2' do
-  gem 'rails', '~> 4.2.0'
-end
-
 appraise 'rails-5.0' do
   gem 'rails', '~> 5.0.0'
 end
@@ -14,4 +10,16 @@ appraise 'rails-5.2' do
   gem 'rails', '~> 5.2.0'
 end
 
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0.0'
+end
+
+appraise 'rails-6.1' do
+  gem 'rails', '~> 6.1.0'
+end
+
+appraise 'rails-7.0' do
+  gem 'rails', '~> 7.0.0'
+end
+
 # vim: set ft=ruby:

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 1.1.4 (2022-05-02)
+- Fix ArgumentError on activerecord 7.0
+
+# 1.1.3 (2020-12-11)
+- Fix cookies not being filtered when used with Raven::Rack
+
+# 1.1.2 (2019-10-24)
+- Support Rails 6.0
+
 # 1.1.1 (2019-09-27)
 - Change to use ActiveSupport::LoggerSilence for thread safety #10
 

data/README.md

@@ -1,6 +1,6 @@
 # Blouson
 [![Gem Version](https://badge.fury.io/rb/blouson.svg)](https://badge.fury.io/rb/blouson)
-[![Build Status](https://travis-ci.org/cookpad/blouson.svg?branch=master)](https://travis-ci.org/cookpad/blouson)
+[![Build Status](https://github.com/cookpad/blouson/actions/workflows/ci.yml/badge.svg)](https://github.com/cookpad/blouson/actions/workflows/ci.yml)
 
 Blouson is a filter tool for Rails to conceal sensitive data from various logs.
 
@@ -76,7 +76,7 @@ secure_headers = %w(secret_token)
 
 Raven.configure do |config|
   ...
-  config.processors = [Blouson::RavenParameterFilterProcessor.create(filter_pattern, secure_headers)]
+  config.processors << Blouson::RavenParameterFilterProcessor.create(filter_pattern, secure_headers)
   ...
 end
 ```

data/gemfiles/{rails_4.2.gemfile → rails_6.0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0"
+gem "rails", "~> 6.0.0"
 
 gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0.0"
+
+gemspec path: "../"

data/lib/blouson/raven_parameter_filter_processor.rb

@@ -14,7 +14,13 @@ module Blouson
         end
 
         def initialize(client = nil)
-          @parameter_filter = ActionDispatch::Http::ParameterFilter.new(self.class.filters)
+          # ActionDispatch::Http::ParameterFilter is deprecated and will be removed from Rails 6.1.
+          parameter_filter_klass = if defined?(ActiveSupport::ParameterFilter)
+              ActiveSupport::ParameterFilter
+            else
+              ActionDispatch::Http::ParameterFilter
+            end
+          @parameter_filter = parameter_filter_klass.new(self.class.filters)
         end
 
         def process(value)
@@ -65,6 +71,10 @@ module Blouson
         end
 
         def process_cookie(value)
+          if (cookies = value.dig(:request, :cookies))
+            value[:request][:cookies] = @parameter_filter.filter(cookies)
+          end
+
           if value[:request] && value[:request][:headers] && value[:request][:headers]['Cookie']
             cookies  = Hash[value[:request][:headers]['Cookie'].split('; ').map { |pair| pair.split('=', 2) }]
             filtered = @parameter_filter.filter(cookies)

data/lib/blouson/sensitive_query_filter.rb

@@ -15,9 +15,10 @@ module Blouson
     end
 
     module StatementInvalidErrorFilter
-      def initialize(message = nil, original_exception = nil)
-        if SensitiveQueryFilter.contain_sensitive_query?(message)
-          message = SensitiveQueryFilter.filter_sensitive_words(message)
+      def initialize(message = nil, original_exception = nil, sql: nil, binds: nil)
+        if SensitiveQueryFilter.contain_sensitive_query?(message) || (SensitiveQueryFilter.contain_sensitive_query?(sql))
+          message = SensitiveQueryFilter.filter_sensitive_words(message) if message
+          sql = SensitiveQueryFilter.filter_sensitive_words(sql) if sql
           if defined?(Mysql2::Error)
             if original_exception.is_a?(Mysql2::Error)
               original_exception.extend(Mysql2Filter)
@@ -30,6 +31,11 @@ module Blouson
         if original_exception
           # Rails < 5.0
           super(message, original_exception)
+        elsif sql
+          # Rails >= 6.0
+          #
+          # - https://github.com/rails/rails/pull/34468
+          super(message, sql: sql, binds: binds)
         else
           # Rails >= 5.0
           #

data/lib/blouson/sensitive_table_query_log_silencer.rb

@@ -1,13 +1,13 @@
 module Blouson
   class SensitiveTableQueryLogSilencer < Arproxy::Base
-    def execute(sql, name=nil)
+    def execute(sql, name=nil, **kwargs)
       if Rails.logger.level != Logger::DEBUG || !(Blouson::SENSITIVE_TABLE_REGEXP === sql)
-        return super(sql, name)
+        return super(sql, name, **kwargs)
       end
 
       ActiveRecord::Base.logger.silence(Logger::INFO) do
         Rails.logger.info "  [Blouson::SensitiveTableQueryLogSilencer] SQL Log is skipped for sensitive table"
-        super(sql, name)
+        super(sql, name, **kwargs)
       end
     end
   end

data/lib/blouson/version.rb

@@ -1,3 +1,3 @@
 module Blouson
-  VERSION = "1.1.1"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blouson
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.4
 platform: ruby
 authors:
 - Cookpad Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,9 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -155,10 +155,12 @@ files:
 - bin/console
 - bin/setup
 - blouson.gemspec
-- gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/blouson.rb
 - lib/blouson/engine.rb
 - lib/blouson/raven_parameter_filter_processor.rb
@@ -172,7 +174,7 @@ homepage: https://github.com/cookpad/blouson
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -187,8 +189,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.8
+signing_key:
 specification_version: 4
 summary: Filter tools to mask sensitive data in various logs
 test_files: []

data/.travis.yml

@@ -1,17 +0,0 @@
-sudo: false
-language: ruby
-services:
-  - mysql
-gemfile:
-  - gemfiles/rails_4.2.gemfile
-  - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_5.1.gemfile
-  - gemfiles/rails_5.2.gemfile
-rvm:
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-before_install:
-  - "[[ $BUNDLE_GEMFILE =~ rails_4\\.2 ]] && gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true"
-  - "[[ $BUNDLE_GEMFILE =~ rails_4\\.2 ]] && gem install bundler -v '< 2' || true"