blouson 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b25599e819a53e78883ffd4e743eb30202e9e2fb3f8c7b040d89b538fae446f
-  data.tar.gz: 36685c9343cc6db285668bb8bfdd2d7d8ec29c15c621de8005551f6907ca0250
+  metadata.gz: 840e5b805a31017d60d1652c29a478e2b356b7b37a573bb74f345e9dcde7c2ac
+  data.tar.gz: c7dd1bfac7e80734459faa5429d17eef64d73c04a034f18bfdb5126530b155da
 SHA512:
-  metadata.gz: ade492f5a1994bfed0f02412d98c0e996baa827bcc65ac4256bda7f851e6814d6f9c017e13da5013d7e0c9821e83859f3870ad82d5f7c2d4ac59d0aac024d01f
-  data.tar.gz: 3e995584ca65d2498bdcff2d4c6c5bc8cd3d06beadc22569e808408af634577e4d94bd70c18f0613b458e1b6b1466e7807a18bc52aacbce573389a5e4372fe52
+  metadata.gz: a42792b547527c0a2406a9d2bc206ef8860df465e879685f56202170559e2ebfc39da76837d7abf53a08e13bdbaa74a3def88bdd3f57e6daaab78f4d3d23a3ab
+  data.tar.gz: 231df2e6c0798617606195afaf2812c09e6de32ee9109e93ee0aca9e4e35c7e14be08b8a288238104ce525f22621a9897fb4f7c1d084aba804ab2cc0daf8def7

data/.github/workflows/ci.yml

@@ -11,38 +11,20 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '2.6'
           - '2.7'
           - '3.0'
           - '3.1'
+          - '3.2'
+          - '3.3'
         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
+          - rails_7.1
     name: Run test with Ruby ${{ matrix.ruby }} and Gemfile ${{ matrix.gemfile }}
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8.4
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: '1'
           MYSQL_DATABASE: blouson
@@ -56,7 +38,7 @@ jobs:
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/gemfiles/*.gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/Appraisals

@@ -1,15 +1,3 @@
-appraise 'rails-5.0' do
-  gem 'rails', '~> 5.0.0'
-end
-
-appraise 'rails-5.1' do
-  gem 'rails', '~> 5.1.0'
-end
-
-appraise 'rails-5.2' do
-  gem 'rails', '~> 5.2.0'
-end
-
 appraise 'rails-6.0' do
   gem 'rails', '~> 6.0.0'
 end
@@ -22,4 +10,8 @@ appraise 'rails-7.0' do
   gem 'rails', '~> 7.0.0'
 end
 
+appraise 'rails-7.1' do
+  gem 'rails', '~> 7.1.0'
+end
+
 # vim: set ft=ruby:

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 3.0.0 (2024-09-18)
+- [Breaking change] Drop support for Ruby 2.6
+- [Breaking change] Drop support for Rails 5.0, 5.1, and 5.2
+- Support Ruby 3.2 and 3.3
+- Support Rails 7.1
+- [Breaking change] blouson/sensitive_params_silener is renamed to blouson/sensitive_params_silencer
+- Use `Rails.logger.debug?` for loggers other than the default Logger class
+- Run tests with MySQL 8.4 instead of 5.7
+- Ignore lockfiles for Appraisal for the development
+
 # 2.0.0 (2022-05-23)
 - Support parameter filter for `sentry-ruby` gem
 - [Breaking change] Drop dependency of `sentry-raven` gem

data/blouson.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rails', '>= 4.0.0'
+  spec.add_dependency 'rails', '>= 6.0.0'
 
   spec.add_development_dependency 'arproxy'
   spec.add_development_dependency 'mysql2'

data/gemfiles/{rails_5.0.gemfile → rails_7.1.gemfile}

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

data/lib/blouson/engine.rb

@@ -6,7 +6,7 @@ module Blouson
 
     # We have to prevent logging sensitive data in SQL if production mode and logger level is debug
     initializer 'blouson.load_helpers' do |app|
-      if !Rails.env.development? && Rails.logger.level == Logger::DEBUG
+      if !Rails.env.development? && Rails.logger.debug?
         ActiveSupport.on_load(:action_controller) do
           around_action Blouson::SensitiveParamsSilencer
         end
@@ -19,6 +19,11 @@ module Blouson
           ActiveRecord::StatementInvalid.class_eval do
             prepend Blouson::SensitiveQueryFilter::StatementInvalidErrorFilter
           end
+          if Rails::VERSION::MAJOR >= 7 && Rails::VERSION::MINOR >= 1 && defined?(Mysql2::Error)
+            ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
+              prepend Blouson::SensitiveQueryFilter::AbstractAdapterFilter
+            end
+          end
         end
       end
     end

data/lib/blouson/sensitive_query_filter.rb

@@ -15,33 +15,43 @@ module Blouson
     end
 
     module StatementInvalidErrorFilter
-      def initialize(message = nil, original_exception = nil, sql: nil, binds: nil)
-        if SensitiveQueryFilter.contain_sensitive_query?(message) || (SensitiveQueryFilter.contain_sensitive_query?(sql))
+      def initialize(message = nil, sql: nil, binds: nil, connection_pool: 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)
-            elsif $!.is_a?(Mysql2::Error)
+            if $!.is_a?(Mysql2::Error)
               $!.extend(Mysql2Filter)
             end
           end
         end
 
-        if original_exception
-          # Rails < 5.0
-          super(message, original_exception)
-        elsif sql
+        if connection_pool
+          # Rails >= 7.1
+          #
+          # - https://github.com/rails/rails/pull/48295
+          super(message, sql: sql, binds: binds, connection_pool: connection_pool)
+        else
           # Rails >= 6.0
           #
           # - https://github.com/rails/rails/pull/34468
           super(message, sql: sql, binds: binds)
+        end
+      end
+
+      def set_query(sql, binds)
+        if SensitiveQueryFilter.contain_sensitive_query?(sql)
+          super(SensitiveQueryFilter.filter_sensitive_words(sql), binds)
         else
-          # Rails >= 5.0
-          #
-          # - https://github.com/rails/rails/pull/18774
-          # - https://github.com/rails/rails/pull/27503
-          super(message)
+          super(sql, binds)
+        end
+      end
+
+      def to_s
+        if SensitiveQueryFilter.contain_sensitive_query?(sql)
+          SensitiveQueryFilter.filter_sensitive_words(super)
+        else
+          super
         end
       end
     end
@@ -51,5 +61,20 @@ module Blouson
         SensitiveQueryFilter.filter_sensitive_words(super)
       end
     end
+
+    module AbstractAdapterFilter
+      def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil, async: false, &block)
+        super(sql, name, binds, type_casted_binds, statement_name, async: false, &block)
+      rescue ActiveRecord::RecordNotUnique, Mysql2::Error => ex
+        if ex.cause.is_a?(Mysql2::Error)
+          ex.cause.extend(Mysql2Filter)
+        elsif $!.is_a?(Mysql2::Error)
+          $!.extend(Mysql2Filter)
+        end
+        raise ex
+      end
+
+      private :log
+    end
   end
 end

data/lib/blouson/sensitive_table_query_log_silencer.rb

@@ -1,7 +1,7 @@
 module Blouson
   class SensitiveTableQueryLogSilencer < Arproxy::Base
     def execute(sql, name=nil, **kwargs)
-      if Rails.logger.level != Logger::DEBUG || !(Blouson::SENSITIVE_TABLE_REGEXP === sql)
+      if !Rails.logger.debug? || !(Blouson::SENSITIVE_TABLE_REGEXP === sql)
         return super(sql, name, **kwargs)
       end
 

data/lib/blouson/version.rb

@@ -1,3 +1,3 @@
 module Blouson
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

data/lib/blouson.rb

@@ -1,6 +1,6 @@
 require "blouson/version"
 
-require 'blouson/sensitive_params_silener'
+require 'blouson/sensitive_params_silencer'
 require 'blouson/sensitive_query_filter'
 require 'blouson/sensitive_mail_log_filter'
 require 'blouson/engine'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blouson
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Cookpad Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-23 00:00:00.000000000 Z
+date: 2024-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: arproxy
   requirement: !ruby/object:Gem::Requirement
@@ -169,17 +169,15 @@ files:
 - bin/console
 - bin/setup
 - blouson.gemspec
-- 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
+- gemfiles/rails_7.1.gemfile
 - lib/blouson.rb
 - lib/blouson/engine.rb
 - lib/blouson/raven_parameter_filter_processor.rb
 - lib/blouson/sensitive_mail_log_filter.rb
-- lib/blouson/sensitive_params_silener.rb
+- lib/blouson/sensitive_params_silencer.rb
 - lib/blouson/sensitive_query_filter.rb
 - lib/blouson/sensitive_table_query_log_silencer.rb
 - lib/blouson/sentry_parameter_filter.rb
@@ -204,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Filter tools to mask sensitive data in various logs

data/gemfiles/rails_5.1.gemfile

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

data/gemfiles/rails_5.2.gemfile

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