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.

Sign up for GitHub

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

Nokogiri.parse accepts Pathname object as argument, but only work with small files then. #1821

Closed
wants to merge 4 commits into from
Closed

Nokogiri.parse accepts Pathname object as argument, but only work with small files then. #1821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf48ff9
Add failing test for parsing from pathname class object, which respon…
phokz Nov 28, 2018
db73963
Update tests to cover both codepaths where string_or_io.respond_to?(:…
phokz Nov 28, 2018
41f5f19
Check of object class, read at once to string if it is a Pathname.
phokz Nov 28, 2018
d90bf40
Pathname.read DoS example.
phokz Nov 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/nokogiri/html/document.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ def parse string_or_io, url = nil, encoding = nil, options = XML::ParseOptions::
end
end

string_or_io = string_or_io.read if string_or_io.class.to_s == 'Pathname'

if string_or_io.respond_to?(:read)
url ||= string_or_io.respond_to?(:path) ? string_or_io.path : nil
unless encoding
Expand Down
2 changes: 2 additions & 0 deletions lib/nokogiri/xml/document.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ def self.parse string_or_io, url = nil, encoding = nil, options = ParseOptions::
end
end

string_or_io = string_or_io.read if string_or_io.class.to_s == 'Pathname'

doc = if string_or_io.respond_to?(:read)
url ||= string_or_io.respond_to?(:path) ? string_or_io.path : nil
read_io(string_or_io, url, encoding, options.to_i)
Expand Down
8 changes: 8 additions & 0 deletions pathname_dos.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env ruby

require 'nokogiri'
require 'pathname'
f = 'pathname_dos.xml'
pathname = Pathname.new(f)
doc = Nokogiri.parse(pathname)
puts doc.to_s
133 changes: 133 additions & 0 deletions pathname_dos.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
<?xml version="1.0" encoding="UTF-8"?>
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
<element name="John Doe" />
19 changes: 19 additions & 0 deletions test/test_nokogiri.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require "helper"
require 'pathname'

class TestNokogiri < Nokogiri::TestCase
def test_versions
Expand Down Expand Up @@ -47,6 +48,24 @@ def test_atom_is_xml?
assert !doc.html?
end

def test_parsing_xml_pathname_argument?
pathname = Pathname.new(XML_ATOM_FILE)
doc = Nokogiri::XML.parse(pathname)
assert_equal 20,doc.css('author').size
end

def test_parsing_html_pathname_argument?
pathname = Pathname.new(XML_ATOM_FILE)
doc = Nokogiri::HTML.parse(pathname)
assert_equal 20,doc.css('author').size
end

def test_parsing_pathname_argument?
pathname = Pathname.new(XML_ATOM_FILE)
doc = Nokogiri.parse(pathname)
assert_equal 20,doc.css('author').size
end

def test_html?
doc = Nokogiri.parse(File.read(HTML_FILE))
assert !doc.xml?
Expand Down