github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-02-04 19:55:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4710 from fenollp/safe-symlinks

Browse Source 
Merge pull request 4710
This commit is contained in:
jekyllbot
2016-04-21 17:38:00 -07:00
parent 1ac9c21956 9347e90a67
commit 1d788203df
6 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/test_collections.rb
View File

@@ -179,13 +179,13 @@ class TestCollections < JekyllUnitTest
@collection = @site.collections["methods"]
end
should "not allow symlinks" do
refute_includes @collection.filtered_entries, "um_hi.md"
should "include the symlinked file as it resolves to inside site.source" do
assert_includes @collection.filtered_entries, "um_hi.md"
refute_includes @collection.filtered_entries, "/um_hi.md"
end
should "not include the symlinked file in the list of docs" do
refute_includes @collection.docs.map(&:relative_path), "_methods/um_hi.md"
should "include the symlinked file in the list of docs as it resolves to inside site.source" do
assert_includes @collection.docs.map(&:relative_path), "_methods/um_hi.md"
end
end

16
test/test_entry_filter.rb
View File

@@ -46,11 +46,11 @@ class TestEntryFilter < JekyllUnitTest
assert_equal files, @site.reader.filter_entries(files)
end
should "filter symlink entries when safe mode enabled" do
should "keep safe symlink entries when safe mode enabled" do
site = Site.new(site_configuration('safe' => true))
allow(File).to receive(:symlink?).with('symlink.js').and_return(true)
files = %w[symlink.js]
assert_equal [], site.reader.filter_entries(files)
assert_equal files, @site.reader.filter_entries(files)
end
should "not filter symlink entries when safe mode disabled" do
@@ -59,12 +59,18 @@ class TestEntryFilter < JekyllUnitTest
assert_equal files, @site.reader.filter_entries(files)
end
should "not include symlinks in safe mode" do
should "filter symlink pointing outside site source" do
ent1 = %w[_includes/tmp]
entries = EntryFilter.new(@site).filter(ent1)
assert_equal %w[], entries
end
should "include only safe symlinks in safe mode" do
site = Site.new(site_configuration('safe' => true))
site.reader.read_directories("symlink-test")
assert_equal [], site.pages
assert_equal [], site.static_files
assert_equal %w[main.scss symlinked-file].length, site.pages.length
refute_equal [], site.static_files
end
should "include symlinks in unsafe mode" do

8
test/test_site.rb
View File

@@ -418,12 +418,12 @@ class TestSite < JekyllUnitTest
assert_equal site.site_payload['site']['data']['products'], file_content
end
should "not load symlink files in safe mode" do
should "load the symlink files in safe mode, as they resolve to inside site.source" do
site = Site.new(site_configuration('safe' => true))
site.process
assert_nil site.data['products']
assert_nil site.site_payload['site']['data']['products']
file_content = SafeYAML.load_file(File.join(source_dir, '_data', 'products.yml'))
assert_equal site.data['products'], file_content
assert_equal site.site_payload['site']['data']['products'], file_content
end
end