rservicebus2 0.2.20 → 0.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f586d7a257549f1a8bbac85940e7740bc6927928b75e3254254cf1a945aefa38
-  data.tar.gz: 3e2352c5ddebf9cb4583a67106e4286a54f0b75f67c0fa1f485b56bd70c1dd94
+  metadata.gz: ae906c0d751849d9f4843a7b8ca164398597fd9f7fd88a6673b7d4851e2f1672
+  data.tar.gz: e0b563cf71559ff0565af68132bb31035e292098cf9f2716b086b6293daa8481
 SHA512:
-  metadata.gz: efbdcb52173f9caff80c659e2aae973deeaef5d9cc5adf31d9d251f8c88ef6cf1b212514ed07a88ab36efb7e5e84b83d1938710e5b50ae50049b0b04907df325
-  data.tar.gz: 5aeed54b1b619ba5f6b6a2c9221e868770575f88c18f3426ff23ee46abfc7ff62424c5a3a1609e5487bb36e0b0f1b5edfa09ac8cf920b64a4d5a385f3c26434f
+  metadata.gz: 69c1d0ff2b0c93f087dd5a9daf57040f132e0d3e513ef591b608c35f7ef350daa7ac0e5640d72e254f5358e12cb09d23c517cc8c61018d53eb2b9beee5c82f45
+  data.tar.gz: e26625aa44347b9f604fa6f64f9344cca6509fe952240439092c96252c458d910ac620331554aa93914aaf51d3feb895912e53eb1c3ad2014dc3e7eca8bab33e

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'
-
-  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)
@@ -52,6 +39,8 @@ module RServiceBus2
   end
 
   def self.create_anonymous_class(name_for_class)
+    Module.const_get(name_for_class)
+  rescue NameError
     new_anonymous_class = Class.new(Object)
     Object.const_set(name_for_class, new_anonymous_class)
     Object.const_get(name_for_class).new

data/lib/rservicebus2/host.rb

@@ -99,6 +99,7 @@ module RServiceBus2
 
     def initialize
       RServiceBus2.rlog "Current directory: #{Dir.pwd}"
+      YamlSafeLoader.instance
       @config = ConfigFromEnv.new
                              .load_host_section
                              .load_contracts

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,27 @@
+# frozen_string_literal: true
+
+require 'csv'
+require 'singleton'
+
+# YamlSafeLoader
+class YamlSafeLoader
+  include Singleton
+
+  DEFAULT_PERMITTED_CLASSES = 'RServiceBus2::Message,RServiceBus2::ErrorMessage,Time,UUIDTools::UUID,YamlSafeLoader,' \
+                              'URI::Generic,URI::RFC3986_Parser,Symbol,Regexp'
+
+  def initialize
+    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)
+    @permitted_classes << string
+    @permitted_classes.uniq!
+  end
+
+  def load(body)
+    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.20
+  version: 0.2.25
 platform: ruby
 authors:
 - Guy Irvine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2021-06-04 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