Use ::Utils.load_spec_yaml_file to fix unified spec test loading

johnnyshields · comandeo-mongo · p · commit 349e5cafecd2 · 2022-03-24T16:18:13.000-04:00
Cherry-picked from 62e9725: RUBY-2859 Add GH Actions setup for ruby 3.1 (#2398) Co-authored-by: shields <shields@tablecheck.com> Co-authored-by: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
diff --git a/spec/runners/auth.rb b/spec/runners/auth.rb
@@ -48,7 +48,7 @@ class Spec
       attr_reader :tests
 
       def initialize(test_path)
-        @spec = YAML.load(File.read(test_path))
+        @spec = ::Utils.load_spec_yaml_file(test_path)
         @description = File.basename(test_path)
       end
 
diff --git a/spec/runners/change_streams/spec.rb b/spec/runners/change_streams/spec.rb
@@ -32,7 +32,7 @@ class Spec
       #
       # @since 2.6.0
       def initialize(test_path)
-        @spec = YAML.load(File.read(test_path))
+        @spec = ::Utils.load_spec_yaml_file(test_path)
         @description = File.basename(test_path)
         @spec_tests = @spec['tests']
         @collection_name = @spec['collection_name']
diff --git a/spec/runners/cmap.rb b/spec/runners/cmap.rb
@@ -40,7 +40,7 @@ class Spec
       #
       # @param [ String ] test_path The path to the file.
       def initialize(test_path)
-        @test = YAML.load(File.read(test_path))
+        @test = ::Utils.load_spec_yaml_file(test_path)
 
         @description = @test['description']
         @pool_options = ::Utils.snakeize_hash(process_options(@test['poolOptions']))
diff --git a/spec/runners/command_monitoring.rb b/spec/runners/command_monitoring.rb
@@ -204,7 +204,7 @@ class Spec
       #
       # @since 2.1.0
       def initialize(test_path)
-        @spec = YAML.load(File.read(test_path))
+        @spec = ::Utils.load_spec_yaml_file(test_path)
         @data = @spec['data']
         @tests = @spec['tests']
       end
diff --git a/spec/runners/connection_string.rb b/spec/runners/connection_string.rb
@@ -100,7 +100,7 @@ class Spec
       #
       # @since 2.0.0
       def initialize(test_path)
-        @spec = YAML.load(File.read(test_path))
+        @spec = ::Utils.load_spec_yaml_file(test_path)
         @description = File.basename(test_path)
       end
 
diff --git a/spec/runners/crud/spec.rb b/spec/runners/crud/spec.rb
@@ -12,9 +12,7 @@ class Spec
       #
       # @since 2.0.0
       def initialize(test_path)
-        contents = File.read(test_path)
-
-        @spec = YAML.load(contents)
+        @spec = ::Utils.load_spec_yaml_file(test_path)
         @description = File.basename(test_path)
         @data = BSON::ExtJSON.parse_obj(@spec['data'])
         @tests = @spec['tests']
diff --git a/spec/runners/gridfs.rb b/spec/runners/gridfs.rb
@@ -100,7 +100,7 @@ class Spec
       #
       # @since 2.1.0
       def initialize(test_path)
-        @spec = YAML.load(File.read(test_path))
+        @spec = ::Utils.load_spec_yaml_file(test_path)
         @description = File.basename(test_path)
         @data = @spec['data']
       end
diff --git a/spec/runners/read_write_concern_document.rb b/spec/runners/read_write_concern_document.rb
@@ -13,7 +13,7 @@ class Spec
     #
     # @since 2.0.0
     def initialize(test_path)
-      @spec = YAML.load(File.read(test_path))
+      @spec = ::Utils.load_spec_yaml_file(test_path)
       @description = File.basename(test_path)
     end
 
diff --git a/spec/runners/sdam.rb b/spec/runners/sdam.rb
@@ -77,7 +77,7 @@ class Spec
       #
       # @since 2.0.0
       def initialize(test_path)
-        @test = YAML.load(File.read(test_path))
+        @test = ::Utils.load_spec_yaml_file(test_path)
         @description = @test['description']
         @uri_string = @test['uri']
         @uri = URI.new(uri_string)
diff --git a/spec/runners/server_selection.rb b/spec/runners/server_selection.rb
@@ -64,7 +64,7 @@ class Spec
         #
         # @since 2.0.0
         def initialize(test_path)
-          @test = YAML.load(File.read(test_path))
+          @test = ::Utils.load_spec_yaml_file(test_path)
           @description = "#{@test['topology_description']['type']}: #{File.basename(test_path)}"
           @heartbeat_frequency = @test['heartbeatFrequencyMS'] / 1000 if @test['heartbeatFrequencyMS']
           @read_preference = @test['read_preference']
diff --git a/spec/runners/server_selection_rtt.rb b/spec/runners/server_selection_rtt.rb
@@ -28,7 +28,7 @@ class Spec
         #
         # @since 2.0.0
         def initialize(test_path)
-          @test = YAML.load(File.read(test_path))
+          @test = ::Utils.load_spec_yaml_file(test_path)
           @description = "#{File.basename(test_path)}: avg_rtt_ms: #{@test['avg_rtt_ms']}, new_rtt_ms: #{@test['new_rtt_ms']}," +
                            " new_avg_rtt: #{@test['new_avg_rtt']}"
           @average_rtt = @test['avg_rtt_ms'] == 'NULL' ? nil : @test['avg_rtt_ms'].to_f / 1000
diff --git a/spec/runners/unified/test_group.rb b/spec/runners/unified/test_group.rb
@@ -6,7 +6,7 @@ module Unified
   class TestGroup
     def initialize(path, **opts)
       if String === path
-        data = YAML.load(File.read(path))
+        data = ::Utils.load_spec_yaml_file(path)
       else
         data = path
       end
diff --git a/spec/spec_tests/seed_list_discovery_spec.rb b/spec/spec_tests/seed_list_discovery_spec.rb
@@ -15,7 +15,7 @@
 
   SEED_LIST_DISCOVERY_TESTS.each do |test_path|
 
-    spec = YAML.load(File.read(test_path))
+    spec = ::Utils.load_spec_yaml_file(test_path)
 
     test = Mongo::ConnectionString::Test.new(spec)
 
diff --git a/spec/support/utils.rb b/spec/support/utils.rb
@@ -595,4 +595,35 @@ def match_with_type?(expected, actual)
       end
     end
   end
+
+  module_function def load_spec_yaml_file(path)
+    permitted_classes = [
+                          BigDecimal,
+                          Date,
+                          Time,
+                          Range,
+                          Regexp,
+                          Symbol,
+                          BSON::Binary,
+                          BSON::Code,
+                          BSON::CodeWithScope,
+                          BSON::DbPointer,
+                          BSON::Decimal128,
+                          BSON::Int32,
+                          BSON::Int64,
+                          BSON::MaxKey,
+                          BSON::MinKey,
+                          BSON::ObjectId,
+                          BSON::Regexp::Raw,
+                          BSON::Symbol::Raw,
+                          BSON::Timestamp,
+                          BSON::Undefined,
+                        ]
+    if RUBY_VERSION.start_with?("2.5")
+      YAML.safe_load(File.read(path), permitted_classes, [], true)
+    else
+      # Here we have Ruby 2.6+ that supports the new syntax of `safe_load``.
+      YAML.safe_load(File.read(path), permitted_classes: permitted_classes, aliases: true)
+    end
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class Spec`
`32`	`32`	`#`
`33`	`33`	`# @since 2.6.0`
`34`	`34`	`def initialize(test_path)`
`35`		`- @spec = YAML.load(File.read(test_path))`
	`35`	`+ @spec = ::Utils.load_spec_yaml_file(test_path)`
`36`	`36`	`@description = File.basename(test_path)`
`37`	`37`	`@spec_tests = @spec['tests']`
`38`	`38`	`@collection_name = @spec['collection_name']`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class Spec`
`40`	`40`	`#`
`41`	`41`	`# @param [ String ] test_path The path to the file.`
`42`	`42`	`def initialize(test_path)`
`43`		`- @test = YAML.load(File.read(test_path))`
	`43`	`+ @test = ::Utils.load_spec_yaml_file(test_path)`
`44`	`44`
`45`	`45`	`@description = @test['description']`
`46`	`46`	`@pool_options = ::Utils.snakeize_hash(process_options(@test['poolOptions']))`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ class Spec`
`204`	`204`	`#`
`205`	`205`	`# @since 2.1.0`
`206`	`206`	`def initialize(test_path)`
`207`		`- @spec = YAML.load(File.read(test_path))`
	`207`	`+ @spec = ::Utils.load_spec_yaml_file(test_path)`
`208`	`208`	`@data = @spec['data']`
`209`	`209`	`@tests = @spec['tests']`
`210`	`210`	`end`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class Spec`
`100`	`100`	`#`
`101`	`101`	`# @since 2.0.0`
`102`	`102`	`def initialize(test_path)`
`103`		`- @spec = YAML.load(File.read(test_path))`
	`103`	`+ @spec = ::Utils.load_spec_yaml_file(test_path)`
`104`	`104`	`@description = File.basename(test_path)`
`105`	`105`	`end`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class Spec`
`13`	`13`	`#`
`14`	`14`	`# @since 2.0.0`
`15`	`15`	`def initialize(test_path)`
`16`		`- @spec = YAML.load(File.read(test_path))`
	`16`	`+ @spec = ::Utils.load_spec_yaml_file(test_path)`
`17`	`17`	`@description = File.basename(test_path)`
`18`	`18`	`end`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ class Spec`
`77`	`77`	`#`
`78`	`78`	`# @since 2.0.0`
`79`	`79`	`def initialize(test_path)`
`80`		`- @test = YAML.load(File.read(test_path))`
	`80`	`+ @test = ::Utils.load_spec_yaml_file(test_path)`
`81`	`81`	`@description = @test['description']`
`82`	`82`	`@uri_string = @test['uri']`
`83`	`83`	`@uri = URI.new(uri_string)`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ class Spec`
`64`	`64`	`#`
`65`	`65`	`# @since 2.0.0`
`66`	`66`	`def initialize(test_path)`
`67`		`- @test = YAML.load(File.read(test_path))`
	`67`	`+ @test = ::Utils.load_spec_yaml_file(test_path)`
`68`	`68`	`@description = "#{@test['topology_description']['type']}: #{File.basename(test_path)}"`
`69`	`69`	`@heartbeat_frequency = @test['heartbeatFrequencyMS'] / 1000 if @test['heartbeatFrequencyMS']`
`70`	`70`	`@read_preference = @test['read_preference']`