bizside 2.3.6 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39b9880ea371f55ab17b2c82c67394a2f740bc612c4c9b69594db539d2e9b16f
-  data.tar.gz: b32b29653cc05e0332ff1bd51636ef2a750c8ccfbd6db608d7bc8ee6390df424
+  metadata.gz: 31a2944a9db2b20cadfe18a6367f9cbcd5c04f5dcf6259e1fd6f5639ac056915
+  data.tar.gz: 70dcd0e7746a040d1a60494406b4bedbdfb1b51bccbdcd86d3d54f0bee4844e2
 SHA512:
-  metadata.gz: 64f122cfd9ad9ff1571b961e92733ff850015f1e2211c47e503705e1823bdce4334eab643fc10205369fa6ac345ee72491a6377d143a2f3092ade1394aa4e270
-  data.tar.gz: 6940e79997639635c66738ee8d19c6015447f3e187daa5d5e059009ccc5c784634a768f619a2cb0dc18c368cd1caf1486dc7ba79734ab94ca8456170f3ad70e1
+  metadata.gz: a06ec66efb74b3c4ed9d34293e4db7b019df45737314135eea676da367f9a7d264bed92bcacd3be13f7835549303fac04b63ab0bdc37ef7a21daf9987ac392f7
+  data.tar.gz: cafbf3686937f4b507d57699783d66afe98cd2ad28d9e93711f7ee2009cb3cda2a9a8cd2f1a7ba94892ef870d4343ca56572553c59d5694f89d5e557d45b005a

data/lib/bizside/audit_log.rb

@@ -82,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: env['REMOTE_ADDR'],
+        remote_address: to_client_ip(env['HTTP_X_FORWARDED_FOR']) || to_client_ip(env['HTTP_CLIENT_IP']) || env['REMOTE_ADDR'],
         status: status,
         started_at: start,
         finished_at: stop,
@@ -180,5 +180,11 @@ 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.first
+    end
+
   end
 end

data/lib/bizside/cron_validator.rb

@@ -30,7 +30,7 @@ module Bizside
 
         def valid_#{attr}?
           valid_format?(@#{attr}) &&
-          valid_range?(MIN_#{attr.upcase}, MAX_#{attr.upcase}, @#{attr})
+          valid_range_and_step?(MIN_#{attr.upcase}, MAX_#{attr.upcase}, @#{attr})
         end
       EOS
     end
@@ -41,22 +41,40 @@ module Bizside
       value =~ /\A(\*(\/\d+)?|\d+(,\d+)*(-\d+)*(\/\d+)*)\Z/
     end
 
+    def valid_range_and_step?(min, max, value)
+      valid_range?(min, max, value) && valid_step?(min, max, value)
+    end
+
     def valid_range?(min, max, value)
-      validate_values = remove_to_ignore_value(value).split(",")
-      validate_values.reject do |v|
+      range_values = get_range_value(value).split(",")
+      range_values.reject do |v|
         if v.include?("-")
           range_v = v.split("-")
           (min..max).include?(range_v[0].to_i) &&
           (min..max).include?(range_v[1].to_i) &&
           range_v[0].to_i < range_v[1].to_i
         else
-          (min..max).include? v.to_i
+          (min..max).include?(v.to_i)
         end
       end.empty?
     end
 
-    def remove_to_ignore_value(value)
+    def valid_step?(min, max, value)
+      v = get_step_value(value)
+      return true if v.empty?
+
+      v != '*' &&
+      v.to_i != 0 &&
+      (min..max).include?(v.to_i)
+    end
+
+    def get_range_value(value)
       value.gsub(/(\/\d*|\*)/, "")
     end
+
+    def get_step_value(value)
+      return "" unless value.include?('/')
+      value.gsub(/.*\/(.*)/) { $1 }
+    end
   end
 end

data/lib/bizside/job_utils.rb

@@ -173,9 +173,11 @@ module Bizside
       if cronline.to_s.strip.empty?
         return
       elsif CronValidator.new(cronline).valid?
+        new_cron = set_cron_options(cron)
+
         config = {
           :class => job_type,
-          :cron => cron,
+          :cron => new_cron,
           :args => args,
           :persist => true
         }
@@ -404,5 +406,19 @@ module Bizside
     end
     private_class_method :do_perform_and_hooks_instantly
 
+    def self.set_cron_options(cron)
+      ret = Array(cron)
+      if ret.size > 1
+        opts = ret.second
+        opts ||= {}
+        opts = opts.with_indifferent_access
+        opts = opts.merge(blocking: true)
+      else
+        opts = { blocking: true }.with_indifferent_access
+      end
+      ret[1] = opts
+      ret
+    end
+
   end
 end

data/lib/bizside/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.8
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2024-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.22
 signing_key: 
 specification_version: 4
 summary: Bizside is an utilities for web application.