bizside 2.3.8 → 2.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31a2944a9db2b20cadfe18a6367f9cbcd5c04f5dcf6259e1fd6f5639ac056915
-  data.tar.gz: 70dcd0e7746a040d1a60494406b4bedbdfb1b51bccbdcd86d3d54f0bee4844e2
+  metadata.gz: 68f86e96f8a12ef1c7f2f3621bd5f3f5bfbd91793c22f69cef1931bec3afaaa1
+  data.tar.gz: 9b57e4ee3d7149f04d9bfd6c75b1bbf4ff0c5a70340ddfbecdf717c31d134c50
 SHA512:
-  metadata.gz: a06ec66efb74b3c4ed9d34293e4db7b019df45737314135eea676da367f9a7d264bed92bcacd3be13f7835549303fac04b63ab0bdc37ef7a21daf9987ac392f7
-  data.tar.gz: cafbf3686937f4b507d57699783d66afe98cd2ad28d9e93711f7ee2009cb3cda2a9a8cd2f1a7ba94892ef870d4343ca56572553c59d5694f89d5e557d45b005a
+  metadata.gz: 4401fe930807b9a5bdc446d2caf1757d52b3424ec70feaf7a460f31790581fe817583013af85f0449a01d8ee5c7aaaf32073885a113322ea25cad48eb5a1138c
+  data.tar.gz: dcf8446560af38e5436d67852dbfe45c19d48c6f77350bb2b0bafc2ad58a522a3d9fe084cfa94410c4f0dab7c9d3029cc9b76230d37e8d7db2f2686bbf238e21

data/lib/bizside/audit_log.rb

@@ -1,15 +1,23 @@
+require 'ipaddr'
 require_relative 'audit/logger'
 
 module Bizside
   class AuditLog
 
     @@ignore_paths = []
+    @@trusted_proxy_cidrs = []
+    @@trusted_proxy_cidr_objects = {}
     @@truncate_length = 8192
 
     def self.ignore_paths
       @@ignore_paths
     end
 
+    # 192.168.0.0/24 といったCIDR表記の文字列を複数指定可能
+    def self.trusted_proxy_cidrs
+      @@trusted_proxy_cidrs
+    end
+
     def self.truncate_length
       @@truncate_length
     end
@@ -25,7 +33,7 @@ module Bizside
     def call(env)
       start = Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z')
       status, headers, response = @app.call(env)
-      stop = Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z')      
+      stop = Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z')
       exception = env[Bizside::ShowExceptions::BIZSIDE_EXCEPTION_ENV_KEY]
 
       if env['BIZSIDE_SUPPRESS_AUDIT']
@@ -180,10 +188,23 @@ module Bizside
       exception.backtrace.join("\n")[0...truncate_length]
     end
 
-    # 信頼のおけるロードバランサーがプロキシーになっている前提で、各HTTPヘッダの先頭のIPをクライアントIPとして取得する
+    # 信頼のおけるロードバランサーがプロキシーになっている前提で、各HTTPヘッダの最後のIPをクライアントIPとして取得する
     def to_client_ip(header_value)
       ips = header_value ? header_value.strip.split(/[,\s]+/) : []
-      ips.first
+      ips.reverse.each do |ip|
+        return ip unless proxy?(ip)
+      end
+
+      nil
+    end
+
+    def proxy?(ip)
+      @@trusted_proxy_cidrs.each do |cidr|
+        cidr_obj = @@trusted_proxy_cidr_objects[cidr] ||= IPAddr.new(cidr)
+        return true if cidr_obj.include?(ip)
+      end
+
+      false
     end
 
   end

data/lib/bizside/coverage/launch.rb

@@ -1,33 +1,35 @@
 module Bizside
-  class CoverageLaunch
+  module Coverage
+    class Launch
 
-    def self.load
-      if ENV["COVERAGE"].to_s.downcase == 'true' and ENV['ACCEPTANCE_TEST'].to_s.downcase == 'true'
-        setup()
+      def self.load
+        if ENV["COVERAGE"].to_s.downcase == 'true' and ENV['ACCEPTANCE_TEST'].to_s.downcase == 'true'
+          setup()
 
-        SimpleCov.start 'rails' do
-          SimpleCov.command_name(ENV['COMMAND_NAME']) if ENV['COMMAND_NAME']
-          SimpleCov.merge_timeout(7200)
+          SimpleCov.start 'rails' do
+            SimpleCov.command_name(ENV['COMMAND_NAME']) if ENV['COMMAND_NAME']
+            SimpleCov.merge_timeout(7200)
+          end
         end
       end
-    end
 
-    def self.load_from_test_helper
-      if ENV["COVERAGE"] == 'true'
-        setup()
-        SimpleCov.start 'rails'
+      def self.load_from_test_helper
+        if ENV["COVERAGE"] == 'true'
+          setup()
+          SimpleCov.start 'rails'
+        end
       end
-    end
 
-    def self.setup
-      require 'simplecov'
-      require 'simplecov-rcov'
-      require_relative 'rcov_formatter'
-      SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-        SimpleCov::Formatter::HTMLFormatter,
-        Coverage::RcovFormatter
-      ])
+      def self.setup
+        require 'simplecov'
+        require 'simplecov-rcov'
+        require_relative 'rcov_formatter'
+        SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
+          SimpleCov::Formatter::HTMLFormatter,
+          Bizside::Coverage::RcovFormatter
+        ])
+      end
+      private_class_method :setup
     end
-    private_class_method :setup
   end
 end

data/lib/bizside/coverage/rcov_formatter.rb

@@ -1,12 +1,14 @@
-module Coverage
-  class RcovFormatter < SimpleCov::Formatter::RcovFormatter
+module Bizside
+  module Coverage
+    class RcovFormatter < SimpleCov::Formatter::RcovFormatter
 
-    private
+      private
 
-    def write_file(template, output_filename, binding)
-      rcov_result = template.result( binding ).force_encoding('UTF-8')
-      File.open( output_filename, "w" ) do |file_result|
-        file_result.write rcov_result
+      def write_file(template, output_filename, binding)
+        rcov_result = template.result( binding ).force_encoding('UTF-8')
+        File.open( output_filename, "w" ) do |file_result|
+          file_result.write rcov_result
+        end
       end
     end
   end

data/lib/bizside/itamae_conf.rb

@@ -121,7 +121,7 @@ module Bizside
   # config/itamae.yml::                         設定ファイル-2(*2)
   # /etc/bizside/hanaita.yml::                  設定ファイル-3
   #
-  # (*1) RAISL_ENV に該当する部分のみ 'db' エントリの下に読み込みます。
+  # (*1) RAILS_ENV に該当する部分のみ 'db' エントリの下に読み込みます。
   # (*2) 指定された ROLE のみ読み込みます。
   class ItamaeConf < ItamaeConfSub
     class OverWriteError < StandardError; end

data/lib/bizside/railtie.rb

@@ -1,5 +1,5 @@
 require_relative 'coverage/launch'
-Bizside::CoverageLaunch.load()
+Bizside::Coverage::Launch.load()
 
 module Bizside
   class Railtie < ::Rails::Railtie

data/lib/bizside/resque.rb

@@ -159,3 +159,39 @@ end
 Resque::Failure::Multiple.configure do |multi|
   multi.classes = [Resque::Failure::Redis, Resque::Failure::LogOutput, Resque::Failure::JobAuditLog]
 end
+
+# resque-scheduler
+if defined? Resque::Scheduler
+  module Bizside
+    module ResqueScheduler
+      class FailureHandler
+        def self.on_enqueue_failure(payload, exception)
+          ::Resque::Scheduler::FailureHandler.on_enqueue_failure(payload, exception)
+
+          return if Bizside.rails_env&.test?
+
+          ::Bizside.logger.error [
+            "[FATAL] Resque::Scheduler",
+            "#{payload}",
+            "#{exception.class} #{exception.to_s}",
+            "#{Array(exception.backtrace).join("\n")}"
+          ].join("\n")
+
+          @hostname ||= (`hostname`.chomp rescue '(unknown)')
+          info = {
+            time: Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z'),
+            add_on_name: Bizside.config.add_on_name,
+            server_address: @hostname,
+            class: payload['class'],
+            args: payload['args'].to_s,
+            exception: exception.class,
+            exception_message:  exception.to_s,
+            exception_backtrace: Array(exception.backtrace)[0..10].join("\n") # Get only the top 10 because there are many traces.
+          }
+          ::Bizside::Audit::JobLogger.logger.record(info)
+        end
+      end
+    end
+  end
+  Resque::Scheduler.failure_handler = Bizside::ResqueScheduler::FailureHandler
+end

data/lib/bizside/test_help.rb

@@ -1,7 +1,7 @@
 require 'minitest/reporters'
 
 require_relative 'coverage/launch'
-Bizside::CoverageLaunch.load_from_test_helper()
+Bizside::Coverage::Launch.load_from_test_helper()
 
 case ENV['CI'].to_s.downcase
 when 'jenkins'

data/lib/bizside/version.rb

@@ -1,3 +1,3 @@
 module Bizside
-  VERSION = '2.3.8'
+  VERSION = '2.3.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.3.8
+  version: 2.3.10
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-16 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -368,7 +368,7 @@ dependencies:
         version: 1.5.0
 description: Bizside is an utilities to assist building web application.
 email:
-- bizside-developers@lab.acs-jp.com
+- bizside-developers@bizside.biz
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Bizside is an utilities for web application.