lib/rdoc/rdoc.rb: Allow only RDoc::Options in .rdoc_options

Follow-up of d8fd92f. Instead of using unsafe_load blindly, RDoc::Options is only supposed to be allowed.
ruby · May 17, 2021 · ffdf023 · ffdf023
1 parent d8fd92f
commit ffdf023
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
@@ -162,11 +162,12 @@ def load_options
     RDoc.load_yaml
 
     begin
-      options = YAML.unsafe_load_file '.rdoc_options'
+      options = YAML.load_file '.rdoc_options', permitted_classes: [RDoc::Options, Symbol]
     rescue Psych::SyntaxError
+      raise RDoc::Error, "#{options_file} is not a valid rdoc options file"
     end
 
-    return RDoc::Options.new if options == false # Allow empty file.
+    return RDoc::Options.new unless options # Allow empty file.
 
     raise RDoc::Error, "#{options_file} is not a valid rdoc options file" unless
       RDoc::Options === options or Hash === options

diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb
@@ -145,7 +145,7 @@ def test_init_with_encoding
 
     @options.encoding = Encoding::IBM437
 
-    options = YAML.unsafe_load YAML.dump @options
+    options = YAML.load(YAML.dump(@options), permitted_classes: [RDoc::Options, Symbol])
 
     assert_equal Encoding::IBM437, options.encoding
   end
@@ -161,7 +161,7 @@ def test_init_with_trim_paths
 - /etc
     YAML
 
-    options = YAML.unsafe_load yaml
+    options = YAML.load(yaml, permitted_classes: [RDoc::Options, Symbol])
 
     assert_empty options.rdoc_include
     assert_empty options.static_path
@@ -749,7 +749,7 @@ def test_write_options
 
       assert File.exist? '.rdoc_options'
 
-      assert_equal @options, YAML.unsafe_load(File.read('.rdoc_options'))
+      assert_equal @options, YAML.load(File.read('.rdoc_options'), permitted_classes: [RDoc::Options, Symbol])
     end
   end