Commit bdc50ed7 authored by Douwe Maan's avatar Douwe Maan

Merge branch '38635-fix-gitlab-check-git-ssh-config' into 'master'

Whitelist authorized_keys.lock in the gitlab:check rake task

Closes #38635

See merge request gitlab-org/gitlab-ce!14624
parents ea4c3371 43c712f5
---
title: Whitelist authorized_keys.lock in the gitlab:check rake task
merge_request: 14624
author:
type: fixed
......@@ -5,6 +5,7 @@ module SystemCheck
# whitelisted as it may change the SSH client's behaviour dramatically.
WHITELIST = %w[
authorized_keys
authorized_keys.lock
authorized_keys2
known_hosts
].freeze
......
......@@ -16,7 +16,12 @@ describe SystemCheck::App::GitUserDefaultSSHConfigCheck do
end
it 'only whitelists safe files' do
expect(described_class::WHITELIST).to contain_exactly('authorized_keys', 'authorized_keys2', 'known_hosts')
expect(described_class::WHITELIST).to contain_exactly(
'authorized_keys',
'authorized_keys2',
'authorized_keys.lock',
'known_hosts'
)
end
describe '#skip?' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment