8000 Fix CVE-2018-1000544 and disable symlinks to avoid other security issues by jdleesmiller · Pull Request #376 · rubyzip/rubyzip · GitHub
[go: up one dir, main page]
Skip to content

Fix CVE-2018-1000544 and disable symlinks to avoid other security issues #376

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

Merged
merged 11 commits into from
Aug 31, 2018
Merged

Fix CVE-2018-1000544 and disable symlinks to avoid other security issues #376

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6e0d231
Fix CVE-2018-1000544 absolute path traversal
bdewater Jul 1, 2018
8e78311
Fix CVE-2018-1000544 symlink path traversal
bdewater Jul 1, 2018
cf71583
Move jruby to allow failures matrix till crc uint 32 issues are resolved
vipulnsward Aug 26, 2018
0586329
Trigger CI again
bdewater Aug 26, 2018
9c468f3
Add jwilk's path traversal tests
jdleesmiller Aug 26, 2018
ffebfa3
Consolidate path traversal tests
jdleesmiller Aug 26, 2018
3dd165b
Disable symlinks and check for path traversal
jdleesmiller Aug 26, 2018
8a1de58
Expand from root rather than current working directory
jdleesmiller Aug 26, 2018 8000
ffb374c
Bump version to 2.0.0
jdleesmiller Aug 27, 2018
cf35774
Bump version to 1.3.0
jdleesmiller Aug 27, 2018
fd81bd5
Bump version to 1.2.2
jdleesmiller Aug 27, 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
Prev Previous commit
Next Next commit
Consolidate path traversal tests
  • Loading branch information
@jdleesmiller
jdleesmiller committed Aug 26, 2018
commit ffebfa34189a46a766bf6630796c93d81b5ef7ed
0 ...ta/jwilk-path-traversal-samples/README.md → test/data/path_traversal/jwilk/README.md
View file
Open in desktop
File renamed without changes.
0 ...wilk-path-traversal-samples/absolute1.zip → test/data/path_traversal/jwilk/absolute1.zip
View file
Open in desktop
File renamed without changes.
0 ...wilk-path-traversal-samples/absolute2.zip → test/data/path_traversal/jwilk/absolute2.zip
View file
Open in desktop
File renamed without changes.
0 ...ilk-path-traversal-samples/dirsymlink.zip → .../data/path_traversal/jwilk/dirsymlink.zip
View file
Open in desktop
File renamed without changes.
0 ...k-path-traversal-samples/dirsymlink2a.zip → ...ata/path_traversal/jwilk/dirsymlink2a.zip
View file
Open in desktop
File renamed without changes.
0 ...k-path-traversal-samples/dirsymlink2b.zip → ...ata/path_traversal/jwilk/dirsymlink2b.zip
View file
Open in desktop
File renamed without changes.
0 ...wilk-path-traversal-samples/relative0.zip → test/data/path_traversal/jwilk/relative0.zip
View file
Open in desktop
File renamed without changes.
0 ...wilk-path-traversal-samples/relative2.zip → test/data/path_traversal/jwilk/relative2.zip
View file
Open in desktop
File renamed without changes.
0 .../jwilk-path-traversal-samples/symlink.zip → test/data/path_traversal/jwilk/symlink.zip
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions test/data/path_traversal/tuzovakaoff/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Path Traversal Samples

Copied from https://github.com/jwilk/path-traversal-samples on 2018-08-25.
0 test/data/absolutepath.zip → ...th_traversal/tuzovakaoff/absolutepath.zip
View file
Open in desktop
File renamed without changes.
0 test/data/symlink.zip → ...ta/path_traversal/tuzovakaoff/symlink.zip
View file
Open in desktop
File renamed without changes.
36 changes: 0 additions & 36 deletions test/entry_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,40 +151,4 @@ def test_store_file_without_compression

assert_match(/mimetypeapplication\/epub\+zip/, first_100_bytes)
end

def test_entry_name_with_absolute_path_does_not_extract
path = '/tmp/file.txt'
File.delete(path) if File.exist?(path)

Zip::File.open('test/data/absolutepath.zip') do |zip_file|
zip_file.each do |entry|
entry.extract
end
end

refute File.exist?(path)
end

def test_entry_name_with_absolute_path_extract_when_given_different_path
path = '/tmp/CVE-2018-1000544'
FileUtils.rm_rf(path) if Dir.exist?(path)

Zip::File.open('test/data/absolutepath.zip') do |zip_file|
zip_file.each do |entry|
entry.extract("#{path}/#{entry.name}")
end
end

assert File.exist?("#{path}/tmp/file.txt")
end

def test_entry_name_with_relative_symlink
assert_raises Errno::ENOENT do
Zip::File.open('test/data/symlink.zip') do |zip_file|
zip_file.each do |entry|
entry.extract
end
end
end
end
end
77 changes: 55 additions & 22 deletions test/path_traversal_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
class PathTraversalTest < MiniTest::Test
TEST_FILE_ROOT = File.absolute_path('test/data/jwilk-path-traversal-samples')
TEST_FILE_ROOT = File.absolute_path('test/data/path_traversal')

def setup
FileUtils.rm_f '/tmp/moo' # with apologies to anyone using this file
# 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)
Expand All @@ -17,72 +20,102 @@ def in_tmpdir
Dir.mktmpdir do |tmp|
test_path = File.join(tmp, 'test')
Dir.mkdir test_path
Dir.chdir(test_path) do
yield
Dir.chdir test_path do
yield test_path
end
end
end

def test_leading_slash
in_tmpdir do
extract_path_traversal_zip 'absolute1.zip'
assert !File.exist?('/tmp/moo')
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 'absolute2.zip'
assert !File.exist?('/tmp/moo')
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 'relative0.zip'
assert !File.exist?('../moo')
extract_path_traversal_zip 'jwilk/relative0.zip'
refute File.exist?('../moo')
end
end

def test_non_leading_dot_dot
in_tmpdir do
extract_path_traversal_zip 'relative2.zip'
assert !File.exist?('../moo')
extract_path_traversal_zip 'jwilk/relative2.zip'
refute File.exist?('../moo')
end
end

def test_file_symlink
in_tmpdir do
extract_path_traversal_zip 'symlink.zip'
extract_path_traversal_zip 'jwilk/symlink.zip'
assert File.exist?('moo')
assert !File.exist?('/tmp/moo')
refute File.exist?('/tmp/moo')
end
end

def test_directory_symlink
in_tmpdir do
extract_path_traversal_zip 'dirsymlink.zip'
assert !File.exist?('/tmp/moo')
extract_path_traversal_zip 'jwilk/dirsymlink.zip'
refute File.exist?('/tmp/moo')
end
end

def test_two_directory_symlinks_a
in_tmpdir do
# Can't create par/moo because the symlink par is skipped.
# Can't create par/moo because the symlinks are skipped.
assert_raises Errno::ENOENT do
extract_path_traversal_zip 'dirsymlink2a.zip'
extract_path_traversal_zip 'jwilk/dirsymlink2a.zip'
end
assert File.exist?('cur')
assert_equal '.', File.readlink('cur')
refute File.exist?('cur')
refute File.exist?('par')
refute File.exist?('par/moo')
end
end

def test_two_directory_symlinks_b
in_tmpdir do
extract_path_traversal_zip 'dirsymlink2b.zip'
extract_path_traversal_zip 'jwilk/dirsymlink2b.zip'
assert File.exist?('cur')
assert_equal '.', File.readlink('cur')
assert !File.exist?('../moo')
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
0