sjs/http-cookie
1
0
Fork 0
mirror of https://github.com/samsonjs/http-cookie.git synced 2026-04-27 14:57:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use safe_load when using Psych >=3.1

Browse source
This commit is contained in:
Akinori MUSHA 2021-06-07 12:47:01 +09:00
parent 9eb68dcce5
commit 7a1bf4fbb3
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/http/cookie_jar/yaml_saver.rb
View file

@ -21,7 +21,7 @@ class HTTP::CookieJar::YAMLSaver < HTTP::CookieJar::AbstractSaver
def load(io, jar) def load(io, jar)
begin begin
data = YAML.load(io) data = load_yaml(io)
rescue ArgumentError => e rescue ArgumentError => e
case e.message case e.message
when %r{\Aundefined class/module Mechanize::} when %r{\Aundefined class/module Mechanize::}
@ -31,7 +31,7 @@ class HTTP::CookieJar::YAMLSaver < HTTP::CookieJar::AbstractSaver
yaml = io.read yaml = io.read
# a gross hack # a gross hack
yaml.gsub!(%r{^( [^ ].*:) !ruby/object:Mechanize::Cookie$}, "\\1") yaml.gsub!(%r{^( [^ ].*:) !ruby/object:Mechanize::Cookie$}, "\\1")
data = YAML.load(yaml) data = load_yaml(yaml)
rescue Errno::ESPIPE rescue Errno::ESPIPE
@logger.warn "could not rewind the stream for conversion" if @logger @logger.warn "could not rewind the stream for conversion" if @logger
rescue ArgumentError rescue ArgumentError
@ -73,4 +73,14 @@ class HTTP::CookieJar::YAMLSaver < HTTP::CookieJar::AbstractSaver
def default_options def default_options
{} {}
end end
if YAML.name == 'Psych' && Psych::VERSION >= '3.1'
def load_yaml(yaml)
YAML.safe_load(yaml, :permitted_classes => %w[Time HTTP::Cookie Mechanize::Cookie DomainName])
end
else
def load_yaml(yaml)
YAML.load(yaml)
end
end
end end