Update upstream source from tag 'upstream/10.7.7+dfsg'
Update to upstream version '10.7.7+dfsg'
with Debian dir 69050722be
This commit is contained in:
commit
317c39634c
4 changed files with 17 additions and 2 deletions
|
@ -2,6 +2,13 @@
|
|||
documentation](doc/development/changelog.md) for instructions on adding your own
|
||||
entry.
|
||||
|
||||
## 10.7.7 (2018-07-17)
|
||||
|
||||
### Security (1 change)
|
||||
|
||||
- Fix symlink vulnerability in project import.
|
||||
|
||||
|
||||
## 10.7.6 (2018-06-21)
|
||||
|
||||
### Security (6 changes)
|
||||
|
|
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
10.7.6
|
||||
10.7.7
|
||||
|
|
|
@ -4,6 +4,7 @@ module Gitlab
|
|||
include Gitlab::ImportExport::CommandLineUtil
|
||||
|
||||
MAX_RETRIES = 8
|
||||
IGNORED_FILENAMES = %w(. ..).freeze
|
||||
|
||||
def self.import(*args)
|
||||
new(*args).import
|
||||
|
@ -59,7 +60,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def extracted_files
|
||||
Dir.glob("#{@shared.export_path}/**/*", File::FNM_DOTMATCH).reject { |f| f =~ %r{.*/\.{1,2}$} }
|
||||
Dir.glob("#{@shared.export_path}/**/*", File::FNM_DOTMATCH).reject { |f| IGNORED_FILENAMES.include?(File.basename(f)) }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -7,6 +7,7 @@ describe Gitlab::ImportExport::FileImporter do
|
|||
let(:symlink_file) { "#{shared.export_path}/invalid.json" }
|
||||
let(:hidden_symlink_file) { "#{shared.export_path}/.hidden" }
|
||||
let(:subfolder_symlink_file) { "#{shared.export_path}/subfolder/invalid.json" }
|
||||
let(:evil_symlink_file) { "#{shared.export_path}/.\nevil" }
|
||||
|
||||
before do
|
||||
stub_const('Gitlab::ImportExport::FileImporter::MAX_RETRIES', 0)
|
||||
|
@ -34,6 +35,10 @@ describe Gitlab::ImportExport::FileImporter do
|
|||
expect(File.exist?(hidden_symlink_file)).to be false
|
||||
end
|
||||
|
||||
it 'removes evil symlinks in root folder' do
|
||||
expect(File.exist?(evil_symlink_file)).to be false
|
||||
end
|
||||
|
||||
it 'removes symlinks in subfolders' do
|
||||
expect(File.exist?(subfolder_symlink_file)).to be false
|
||||
end
|
||||
|
@ -75,5 +80,7 @@ describe Gitlab::ImportExport::FileImporter do
|
|||
FileUtils.touch(valid_file)
|
||||
FileUtils.ln_s(valid_file, symlink_file)
|
||||
FileUtils.ln_s(valid_file, subfolder_symlink_file)
|
||||
FileUtils.ln_s(valid_file, hidden_symlink_file)
|
||||
FileUtils.ln_s(valid_file, evil_symlink_file)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue