diff options
author | James Lopez <james@jameslopez.es> | 2018-12-05 09:52:56 +0100 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2018-12-18 09:35:08 +0100 |
commit | 2652a248e40bfa7f74dca8b3241d374c2d21e8ad (patch) | |
tree | 4c83bf7f6bec5d2b34b1db705e8a1b39df835163 /lib | |
parent | ca019bf3b85e2e2557a21827038b7340844b74ec (diff) | |
download | gitlab-ce-2652a248e40bfa7f74dca8b3241d374c2d21e8ad.tar.gz |
Fix persistent symlink in project import
- Fix permissions after untar is done
- Refactor command line util
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/import_export/command_line_util.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab/import_export/command_line_util.rb b/lib/gitlab/import_export/command_line_util.rb index 3adc44f8044..cd862d65f78 100644 --- a/lib/gitlab/import_export/command_line_util.rb +++ b/lib/gitlab/import_export/command_line_util.rb @@ -1,7 +1,8 @@ module Gitlab module ImportExport module CommandLineUtil - DEFAULT_MODE = 0700 + UNTAR_MASK = 'u+rwX,go+rX,go-w' + DEFAULT_DIR_MODE = 0700 def tar_czf(archive:, dir:) tar_with_options(archive: archive, dir: dir, options: 'czf') @@ -12,8 +13,8 @@ module Gitlab end def mkdir_p(path) - FileUtils.mkdir_p(path, mode: DEFAULT_MODE) - FileUtils.chmod(DEFAULT_MODE, path) + FileUtils.mkdir_p(path, mode: DEFAULT_DIR_MODE) + FileUtils.chmod(DEFAULT_DIR_MODE, path) end private @@ -39,6 +40,7 @@ module Gitlab def untar_with_options(archive:, dir:, options:) execute(%W(tar -#{options} #{archive} -C #{dir})) + execute(%W(chmod -R #{UNTAR_MASK} #{dir})) end def execute(cmd) |