Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
eda8156e
Commit
eda8156e
authored
Jul 11, 2018
by
Stan Hu
Committed by
Alessio Caiazza
Jul 17, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix symlink vulnerability in project import
Closes
https://gitlab.com/gitlab-org/gitlab-ce/issues/49133
parent
7f0431dd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
changelogs/unreleased/sh-fix-issue-49133.yml
changelogs/unreleased/sh-fix-issue-49133.yml
+5
-0
lib/gitlab/import_export/file_importer.rb
lib/gitlab/import_export/file_importer.rb
+2
-1
spec/lib/gitlab/import_export/file_importer_spec.rb
spec/lib/gitlab/import_export/file_importer_spec.rb
+7
-0
No files found.
changelogs/unreleased/sh-fix-issue-49133.yml
0 → 100644
View file @
eda8156e
---
title
:
Fix symlink vulnerability in project import
merge_request
:
author
:
type
:
security
lib/gitlab/import_export/file_importer.rb
View file @
eda8156e
...
@@ -4,6 +4,7 @@ module Gitlab
...
@@ -4,6 +4,7 @@ module Gitlab
include
Gitlab
::
ImportExport
::
CommandLineUtil
include
Gitlab
::
ImportExport
::
CommandLineUtil
MAX_RETRIES
=
8
MAX_RETRIES
=
8
WHITELISTED_FILENAMES
=
%w(. ..)
.
freeze
def
self
.
import
(
*
args
)
def
self
.
import
(
*
args
)
new
(
*
args
).
import
new
(
*
args
).
import
...
@@ -59,7 +60,7 @@ module Gitlab
...
@@ -59,7 +60,7 @@ module Gitlab
end
end
def
extracted_files
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
|
WHITELISTED_FILENAMES
.
include?
(
File
.
basename
(
f
))
}
end
end
end
end
end
end
...
...
spec/lib/gitlab/import_export/file_importer_spec.rb
View file @
eda8156e
...
@@ -7,6 +7,7 @@ describe Gitlab::ImportExport::FileImporter do
...
@@ -7,6 +7,7 @@ describe Gitlab::ImportExport::FileImporter do
let
(
:symlink_file
)
{
"
#{
shared
.
export_path
}
/invalid.json"
}
let
(
:symlink_file
)
{
"
#{
shared
.
export_path
}
/invalid.json"
}
let
(
:hidden_symlink_file
)
{
"
#{
shared
.
export_path
}
/.hidden"
}
let
(
:hidden_symlink_file
)
{
"
#{
shared
.
export_path
}
/.hidden"
}
let
(
:subfolder_symlink_file
)
{
"
#{
shared
.
export_path
}
/subfolder/invalid.json"
}
let
(
:subfolder_symlink_file
)
{
"
#{
shared
.
export_path
}
/subfolder/invalid.json"
}
let
(
:evil_symlink_file
)
{
"
#{
shared
.
export_path
}
/.
\n
evil"
}
before
do
before
do
stub_const
(
'Gitlab::ImportExport::FileImporter::MAX_RETRIES'
,
0
)
stub_const
(
'Gitlab::ImportExport::FileImporter::MAX_RETRIES'
,
0
)
...
@@ -34,6 +35,10 @@ describe Gitlab::ImportExport::FileImporter do
...
@@ -34,6 +35,10 @@ describe Gitlab::ImportExport::FileImporter do
expect
(
File
.
exist?
(
hidden_symlink_file
)).
to
be
false
expect
(
File
.
exist?
(
hidden_symlink_file
)).
to
be
false
end
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
it
'removes symlinks in subfolders'
do
expect
(
File
.
exist?
(
subfolder_symlink_file
)).
to
be
false
expect
(
File
.
exist?
(
subfolder_symlink_file
)).
to
be
false
end
end
...
@@ -75,5 +80,7 @@ describe Gitlab::ImportExport::FileImporter do
...
@@ -75,5 +80,7 @@ describe Gitlab::ImportExport::FileImporter do
FileUtils
.
touch
(
valid_file
)
FileUtils
.
touch
(
valid_file
)
FileUtils
.
ln_s
(
valid_file
,
symlink_file
)
FileUtils
.
ln_s
(
valid_file
,
symlink_file
)
FileUtils
.
ln_s
(
valid_file
,
subfolder_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
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment