rservicebus2 0.2.21 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 577432efc03536a99119146208b8fd418bd7641fc467f59f38564f4fdb477ca0
-  data.tar.gz: 85ade6550d036a70c0346f6d15bbc5d5376f49724b94bac7f48397e4ecd02bba
+  metadata.gz: bdf786cee730fd3a1cb0ecb384d566ead93171cfa566b2b23bff09ab4dc75116
+  data.tar.gz: 4f8d812c2cf83ce2c1c561038d6d7b545afdb4e8ba5db414554fda52e19eb3d0
 SHA512:
-  metadata.gz: df0fb5b6725e33976c7347765dceb6366c6b9c38bc8c215dee36ee984507e83ce1357861033a4389c38173ac02700df005314050bf3da740c5a6efc45c75a412
-  data.tar.gz: 80d4d9d00f7faa47c7b17b19ffe4a6e841b06b96952f52d3be3fe3df573780713685fbeff17dd5ceef6cb0d20fd9d34f01fea0c2545da20150683a8e0e4f3f89
+  metadata.gz: 3787ed00c7dd8947ae2e1b000f3953afb34ceb8ffce6925f9c97a3d7ce67cf8d10e2e0d7989da8b7abee110a608066a8e1f95acb752665376beb811a0636d519
+  data.tar.gz: c8f21f22ea7132ecdf43d6a14c681f68071def8e611ab91e1388fa2dbeaf38ad02c2e89ce9ded75551e444ade20eea54d0493f9252fee2dca2e5cab2fd6c3891

data/lib/rservicebus2.rb

@@ -23,6 +23,7 @@ require 'rservicebus2/config'
 require 'rservicebus2/endpointmapping'
 require 'rservicebus2/statistic_manager'
 require 'rservicebus2/audit'
+require 'rservicebus2/yaml_safe_loader'
 
 require 'rservicebus2/message'
 require 'rservicebus2/message/subscription'

data/lib/rservicebus2/handler_loader.rb

@@ -140,10 +140,8 @@ module RServiceBus2
         next if file_path.end_with?('.')
 
         msg_name = get_msg_name(file_path)
-        RServiceBus2.add_to_permitted_classes(
-          msg_name.gsub(/(?<=_|^)(\w)/) { Regexp.last_match(1).upcase }.gsub(/(?:_)(\w)/, '\1')
-        )
-
+        YamlSafeLoader.instance.add_permitted_class(msg_name
+                       .gsub(/(?<=_|^)(\w)/) { Regexp.last_match(1).upcase }.gsub(/(?:_)(\w)/, '\1'))
         if File.directory?(file_path)
           load_handlers_from_second_level_path(msg_name, file_path)
           next

data/lib/rservicebus2/helper_functions.rb

@@ -4,22 +4,9 @@ require 'csv'
 
 # Helper functions
 module RServiceBus2
-  DEFAULT_PERMITTED_CLASSES = 'RServiceBus2::Message,Time,UUIDTools::UUID,URI::Generic,URI::RFC3986_Parser,Symbol,Regexp'
-
-  def self.permitted_classes
-    permitted_classes_string = get_value('PERMITTED_CLASSES', DEFAULT_PERMITTED_CLASSES)
-    CSV.parse(permitted_classes_string)[0]
-  end
-
-  def self.add_to_permitted_classes(string)
-    ENV['PERMITTED_CLASSES'] = permitted_classes
-                               .push(string)
-                               .uniq
-                               .to_csv
-  end
-
   def self.safe_load(body)
-    YAML.safe_load(body, permitted_classes: permitted_classes)
+    # YAML.safe_load(body, permitted_classes: Module.constants)
+    YamlSafeLoader.instance.load(body)
   end
 
   def self.convert_dto_to_hash(obj)

data/lib/rservicebus2/monitor/dir.rb

@@ -146,7 +146,8 @@ module RServiceBus2
         process_path(file_path)
 
         file_processed += 1
-        RServiceBus2.log "Processed #{file_processed} of #{file_list.length}.\nAllow system tick #{self.class.name}"
+        RServiceBus2.log "Processed #{file_processed} of #{file_list.length}."
+        RServiceBus2.log "Allow system tick #{self.class.name}"
 
         break if file_processed >= max_files_processed
       end

data/lib/rservicebus2/yaml_safe_loader.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'csv'
+require 'singleton'
+
+# YamlSafeLoader
+class YamlSafeLoader
+  include Singleton
+
+  DEFAULT_PERMITTED_CLASSES = 'RServiceBus2::Message,Time,UUIDTools::UUID,YamlSafeLoader,' \
+                              'URI::Generic,URI::RFC3986_Parser,Symbol,Regexp'
+
+  def init
+    return unless @permitted_classes.nil?
+
+    string = "#{RServiceBus2.get_value('PERMITTED_CLASSES_BASE', DEFAULT_PERMITTED_CLASSES)}," \
+             "#{RServiceBus2.get_value('PERMITTED_CLASSES', '')}"
+    @permitted_classes = CSV.parse(string)[0].reject { |c| c.to_s.rstrip.empty? }
+  end
+
+  def add_permitted_class(string)
+    init
+
+    @permitted_classes << string
+    @permitted_classes.uniq!
+  end
+
+  def load(body)
+    init
+
+    YAML.safe_load(body, permitted_classes: @permitted_classes)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus2
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.22
 platform: ruby
 authors:
 - Guy Irvine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
@@ -165,6 +165,7 @@ files:
 - lib/rservicebus2/test/bus.rb
 - lib/rservicebus2/transporter.rb
 - lib/rservicebus2/usermessage/withpayload.rb
+- lib/rservicebus2/yaml_safe_loader.rb
 homepage: http://rubygems.org/gems/rservicebus2
 licenses:
 - LGPL-3.0