Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relax restricted classes #605

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/psych.rb
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,10 @@ def self.safe_load yaml, permitted_classes: [], permitted_symbols: [], aliases:
# Psych.load("---\n foo: bar", symbolize_names: true) # => {:foo=>"bar"}
#
# Raises a TypeError when `yaml` parameter is NilClass. This method is
# similar to `safe_load` except that `Symbol` objects are allowed by default.
# similar to `safe_load` except that `Symbol`, Date, DateTime and Time objects
# are allowed by default.
#
def self.load yaml, permitted_classes: [Symbol], permitted_symbols: [], aliases: false, filename: nil, fallback: nil, symbolize_names: false, freeze: false, strict_integer: false
def self.load yaml, permitted_classes: [Symbol, Date, DateTime, Time], permitted_symbols: [], aliases: false, filename: nil, fallback: nil, symbolize_names: false, freeze: false, strict_integer: false
safe_load yaml, permitted_classes: permitted_classes,
permitted_symbols: permitted_symbols,
aliases: aliases,
Expand Down
1 change: 1 addition & 0 deletions lib/psych/class_loader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class ClassLoader # :nodoc:
REGEXP = 'Regexp'
STRUCT = 'Struct'
SYMBOL = 'Symbol'
TIME = 'Time'

def initialize
@cache = CACHE.dup
Expand Down
2 changes: 2 additions & 0 deletions test/psych/test_object_references.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ def assert_reference_trip obj
assert_match(/\*-?\d+/, yml)
begin
data = Psych.load yml
rescue Psych::AliasesNotEnabled
data = Psych.load yml, aliases: true
rescue Psych::DisallowedClass
data = Psych.unsafe_load yml
end
Expand Down