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
Fix CVE-2018-1000544 and disable symlinks to avoid other security issues #376
Merged
Merged
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
6e0d231
Fix CVE-2018-1000544 absolute path traversal
bdewater 8e78311
Fix CVE-2018-1000544 symlink path traversal
bdewater cf71583
Move jruby to allow failures matrix till crc uint 32 issues are resolved
vipulnsward 0586329
Trigger CI again
bdewater 9c468f3
Add jwilk's path traversal tests
jdleesmiller ffebfa3
Consolidate path traversal tests
jdleesmiller 3dd165b
Disable symlinks and check for path traversal
jdleesmiller 8a1de58
Expand from root rather than current working directory
jdleesmiller ffb374c
Bump version to 2.0.0
jdleesmiller cf35774
Bump version to 1.3.0
jdleesmiller fd81bd5
Bump version to 1.2.2
jdleesmiller File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
module Zip | ||
VERSION = '1.2.1' | ||
VERSION = '2.0.0' | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# Based on 'relative2' in https://github.com/jwilk/path-traversal-samples, | ||
# but create the local `tmp` folder before adding the symlink. Otherwise | ||
# we may bail out before we get to trying to create the file. | ||
all: relative1.zip | ||
relative1.zip: | ||
rm -f $(@) | ||
mkdir -p -m 755 tmp/tmp | ||
umask 022 && echo moo > moo | ||
cd tmp && zip -X ../$(@) tmp tmp/../../moo | ||
rm -rf tmp moo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# Path Traversal Samples | ||
|
||
Copied from https://github.com/jwilk/path-traversal-samples on 2018-08-26. | ||
|
||
License: MIT |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# Path Traversal Samples | ||
|
||
Copied from https://github.com/tuzovakaoff/zip_path_traversal on 2018-08-25. |
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,134 @@ | ||
class PathTraversalTest < MiniTest::Test | ||
TEST_FILE_ROOT = File.absolute_path('test/data/path_traversal') | ||
|
||
def setup | ||
# With apologies to anyone using these files... but they are the files in | ||
# the sample zips, so we don't have much choice here. | ||
FileUtils.rm_f '/tmp/moo' | ||
FileUtils.rm_f '/tmp/file.txt' | ||
end | ||
|
||
def extract_path_traversal_zip(name) | ||
Zip::File.open(File.join(TEST_FILE_ROOT, name)) do |zip_file| | ||
zip_file.each do |entry| | ||
entry.extract | ||
end | ||
end | ||
end | ||
|
||
def in_tmpdir | ||
Dir.mktmpdir do |tmp| | ||
test_path = File.join(tmp, 'test') | ||
Dir.mkdir test_path | ||
Dir.chdir test_path do | ||
yield test_path | ||
end | ||
end | ||
end | ||
|
||
def test_leading_slash | ||
in_tmpdir do | ||
extract_path_traversal_zip 'jwilk/absolute1.zip' | ||
refute File.exist?('/tmp/moo') | ||
end | ||
end | ||
|
||
def test_multiple_leading_slashes | ||
in_tmpdir do | ||
extract_path_traversal_zip 'jwilk/absolute2.zip' | ||
refute File.exist?('/tmp/moo') | ||
end | ||
end | ||
|
||
def test_leading_dot_dot | ||
in_tmpdir do | ||
extract_path_traversal_zip 'jwilk/relative0.zip' | ||
refute File.exist?('../moo') | ||
end | ||
end | ||
|
||
def test_non_leading_dot_dot_with_existing_folder | ||
in_tmpdir do | ||
extract_path_traversal_zip 'relative1.zip' | ||
assert Dir.exist?('tmp') | ||
refute File.exist?('../moo') | ||
end | ||
end | ||
|
||
def test_non_leading_dot_dot_without_existing_folder | ||
in_tmpdir do | ||
extract_path_traversal_zip 'jwilk/relative2.zip' | ||
refute File.exist?('../moo') | ||
end | ||
end | ||
|
||
def test_file_symlink | ||
in_tmpdir do | ||
extract_path_traversal_zip 'jwilk/symlink.zip' | ||
assert File.exist?('moo') | ||
refute File.exist?('/tmp/moo') | ||
end | ||
end | ||
|
||
def test_directory_symlink | ||
in_tmpdir do | ||
# Can't create tmp/moo, because the tmp symlink is skipped. | ||
assert_raises Errno::ENOENT do | ||
extract_path_traversal_zip 'jwilk/dirsymlink.zip' | ||
end | ||
refute File.exist?('/tmp/moo') | ||
end | ||
end | ||
|
||
def test_two_directory_symlinks_a | ||
in_tmpdir do | ||
# Can't create par/moo because the symlinks are skipped. | ||
assert_raises Errno::ENOENT do | ||
extract_path_traversal_zip 'jwilk/dirsymlink2a.zip' | ||
end | ||
refute File.exist?('cur') | ||
refute File.exist?('par') | ||
refute File.exist?('par/moo') | ||
end | ||
end | ||
|
||
def test_two_directory_symlinks_b | ||
in_tmpdir do | ||
# Can't create par/moo, because the symlinks are skipped. | ||
assert_raises Errno::ENOENT do | ||
extract_path_traversal_zip 'jwilk/dirsymlink2b.zip' | ||
end | ||
refute File.exist?('cur') | ||
refute File.exist?('../moo') | ||
end | ||
end | ||
|
||
def test_entry_name_with_absolute_path_does_not_extract | ||
in_tmpdir do | ||
extract_path_traversal_zip 'tuzovakaoff/absolutepath.zip' | ||
refute File.exist?('/tmp/file.txt') | ||
end | ||
end | ||
|
||
def test_entry_name_with_absolute_path_extract_when_given_different_path | ||
in_tmpdir do |test_path| | ||
zip_path = File.join(TEST_FILE_ROOT, 'tuzovakaoff/absolutepath.zip') | ||
Zip::File.open(zip_path) do |zip_file| | ||
zip_file.each do |entry| | ||
entry.extract(File.join(test_path, entry.name)) | ||
end | ||
end | ||
refute File.exist?('/tmp/file.txt') | ||
end | ||
end | ||
|
||
def test_entry_name_with_relative_symlink | ||
in_tmpdir do | ||
# Doesn't create the symlink path, so can't create path/file.txt. | ||
assert_raises Errno::ENOENT do | ||
extract_path_traversal_zip 'tuzovakaoff/symlink.zip' | ||
end | ||
refute File.exist?('/tmp/file.txt') | ||
end | ||
end | ||
end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jdleesmiller can you please revert this? Or at least release a patch version of 1.2 as well?
The thing is all the libraries we have in
Gemfile.lock
either explicitly declare< 2.0.0
or~> 1.2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm. That is a good point about version constraints.
My rationale was that dropping support for symlinks completely is a breaking change, and I'd be unhappy if semver minor or patch release broke my app.
If you have
~> 1.2
, I guess 1.3.0 should do it. It's not very semantic, but it does seem like the pragmatic solution. Happy to try it out.