dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strip extra slashes via `Jekyll.sanitized_path` (#7182) 

Merge pull request 7182
This commit is contained in:
Ashwin Maroli 2018-09-24 22:57:44 +05:30 committed by jekyllbot
parent ce05f9cb15
commit 6eee8b7e06
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/jekyll.rb
View File

@ -176,6 +176,10 @@ module Jekyll
return clean_path if clean_path.eql?(base_directory) return clean_path if clean_path.eql?(base_directory)
# remove any remaining extra leading slashes not stripped away by calling
# `File.expand_path` above.
clean_path.squeeze!("/")
if clean_path.start_with?(base_directory.sub(%r!\z!, "/")) if clean_path.start_with?(base_directory.sub(%r!\z!, "/"))
clean_path clean_path
else else

7
test/test_path_sanitization.rb
View File

@ -31,6 +31,13 @@ class TestPathSanitization < JekyllUnitTest
Jekyll.sanitized_path(source_dir, "f./../../../../../../files/hi.txt") Jekyll.sanitized_path(source_dir, "f./../../../../../../files/hi.txt")
end end
should "strip extra slashes in questionable path" do
subdir = "/files/"
file_path = "/hi.txt"
assert_equal source_dir("files", "hi.txt"),
Jekyll.sanitized_path(source_dir, "/#{subdir}/#{file_path}")
end
if Jekyll::Utils::Platforms.really_windows? if Jekyll::Utils::Platforms.really_windows?
context "on Windows with absolute path" do context "on Windows with absolute path" do
setup do setup do