diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-12 09:35:48 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-12 17:40:19 +0200 |
| commit | 755325c8271ae1e35eceeffa996cfbae5ec4ead2 (patch) | |
| tree | 1d96362b188fc109a0f985cff1ba7f3ff9eafe07 | |
| parent | 8fa2c5cae5e403ea5095ea1cd091ac9298465f11 (diff) | |
| download | gitlab-ce-omnibus-gitlab-1993-check-shell-repositories-path-group-is-root.tar.gz | |
Fix the `gitlab:gitlab_shell:check` taskomnibus-gitlab-1993-check-shell-repositories-path-group-is-root
Make the `gitlab:gitlab_shell:check` task check that the repositories storage
path are owned by the `root` group
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | changelogs/unreleased/omnibus-gitlab-1993-check-shell-repositories-path-group-is-root.yml | 4 | ||||
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/changelogs/unreleased/omnibus-gitlab-1993-check-shell-repositories-path-group-is-root.yml b/changelogs/unreleased/omnibus-gitlab-1993-check-shell-repositories-path-group-is-root.yml new file mode 100644 index 00000000000..3b9284258cb --- /dev/null +++ b/changelogs/unreleased/omnibus-gitlab-1993-check-shell-repositories-path-group-is-root.yml @@ -0,0 +1,4 @@ +--- +title: "Make the `gitlab:gitlab_shell:check` task check that the repositories storage path are owned by the `root` group" +merge_request: +author: diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index a9a48f7188f..f41c73154f5 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -431,8 +431,7 @@ namespace :gitlab do def check_repo_base_user_and_group gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user - gitlab_shell_owner_group = Gitlab.config.gitlab_shell.owner_group - puts "Repo paths owned by #{gitlab_shell_ssh_user}:#{gitlab_shell_owner_group}?" + puts "Repo paths owned by #{gitlab_shell_ssh_user}:root, or #{gitlab_shell_ssh_user}:#{Gitlab.config.gitlab_shell.owner_group}?" Gitlab.config.repositories.storages.each do |name, repository_storage| repo_base_path = repository_storage['path'] @@ -443,15 +442,16 @@ namespace :gitlab do break end - uid = uid_for(gitlab_shell_ssh_user) - gid = gid_for(gitlab_shell_owner_group) - if File.stat(repo_base_path).uid == uid && File.stat(repo_base_path).gid == gid + user_id = uid_for(gitlab_shell_ssh_user) + root_group_id = gid_for('root') + group_ids = [root_group_id, gid_for(Gitlab.config.gitlab_shell.owner_group)] + if File.stat(repo_base_path).uid == user_id && group_ids.include?(File.stat(repo_base_path).gid) puts "yes".color(:green) else puts "no".color(:red) - puts " User id for #{gitlab_shell_ssh_user}: #{uid}. Groupd id for #{gitlab_shell_owner_group}: #{gid}".color(:blue) + puts " User id for #{gitlab_shell_ssh_user}: #{user_id}. Groupd id for root: #{root_group_id}".color(:blue) try_fixing_it( - "sudo chown -R #{gitlab_shell_ssh_user}:#{gitlab_shell_owner_group} #{repo_base_path}" + "sudo chown -R #{gitlab_shell_ssh_user}:root #{repo_base_path}" ) for_more_information( see_installation_guide_section "GitLab Shell" |