bizside 2.3.9 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46b9cdead64c8e2f35b91ed65a21ec4e78331522211421a6e75015a75124bcc1
-  data.tar.gz: e2fc1dd98565f9e20e362b229035f6b5a9b38a2e6c1abad95eb0c58e55493c77
+  metadata.gz: 81dbebe065d4091665ab663600a57a56e54c97b2cde5d0b18f8fc78197c4ddbe
+  data.tar.gz: f80003853d525d8c79faa245008dd8ec4ca613bf2ec02f8d58a8b5128d12e68a
 SHA512:
-  metadata.gz: 87fc2260a1eaafd7af65e708a6574a3f28fada1673103ba1ab9c0a70f70168eaeacb56bea82be997d92580dc9d2ec4e94327d838625aacf3dcfe89e24d5e8364
-  data.tar.gz: fb05cc1b9a8db6ffc9aa42a676a25424d9625aa1b9156c22197f4af52e0314a280775301b83fb3ef922e79956bc5d23fae0b30bee713d6c67632e6b50de1c7f8
+  metadata.gz: 0026f469b9d2d81d63b506c9667561cac3bd842e18bc6f327885f6ce8e3460e5eecf3ba89ba55079cab3a7eb257f84437c555ffa8044a918d3f2ea0e0c83b74d
+  data.tar.gz: 559dd6e411c386a5497542f87923d257342d89b0a4278e32db7811520df50e396a49e689c4556ace10789613d45b8629958b2bc43607de13eaaab4f8452594b5

data/lib/bizside/audit_log.rb

@@ -1,23 +1,15 @@
-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
@@ -33,7 +25,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']
@@ -90,7 +82,7 @@ module Bizside
         referrer: env['HTTP_REFERER'],
         request_method: env['REQUEST_METHOD'],
         request_uri: env['BIZSIDE_REQUEST_URI'].presence || env['REQUEST_URI'],
-        remote_address: to_client_ip(env['HTTP_X_FORWARDED_FOR']) || to_client_ip(env['HTTP_CLIENT_IP']) || env['REMOTE_ADDR'],
+        remote_address: env['REMOTE_ADDR'],
         status: status,
         started_at: start,
         finished_at: stop,
@@ -188,24 +180,5 @@ module Bizside
       exception.backtrace.join("\n")[0...truncate_length]
     end
 
-    # 信頼のおけるロードバランサーがプロキシーになっている前提で、各HTTPヘッダの最後のIPをクライアントIPとして取得する
-    def to_client_ip(header_value)
-      ips = header_value ? header_value.strip.split(/[,\s]+/) : []
-      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
 end

data/lib/bizside/version.rb

@@ -1,3 +1,3 @@
 module Bizside
-  VERSION = '2.3.9'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.3.9
+  version: 3.0.0
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -62,16 +62,22 @@ dependencies:
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: carrierwave-magic
   requirement: !ruby/object:Gem::Requirement
@@ -217,9 +223,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.36'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -227,9 +230,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.36'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -368,7 +368,7 @@ dependencies:
         version: 1.5.0
 description: Bizside is an utilities to assist building web application.
 email:
-- bizside-developers@bizside.biz
+- bizside-developers@lab.acs-jp.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -468,14 +468,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Bizside is an utilities for web application.