Skip to content

Fix permission of SSH host keys #1971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheRealFalcon merged 5 commits into from
Jan 25, 2023
Merged

Fix permission of SSH host keys #1971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9aa2e8a
change: perm for ssh host keys
Mazorius Jan 19, 2023
4f873e4
fix: use octal and correct pubkey
Mazorius Jan 20, 2023
9d4c6ec
add: username to cla signers
Mazorius Jan 20, 2023
e49852d
fix: cert is also public and should be 644
Mazorius Jan 20, 2023
8bf97a6
change back to 0o640 as discussed
Mazorius Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cloudinit/config/cc_ssh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@
CONFIG_KEY_TO_FILE.update(
{
f"{k}_private": (KEY_FILE_TPL % k, 0o600),
f"{k}_public": (f"{KEY_FILE_TPL % k}.pub", 0o600),
f"{k}_certificate": (f"{KEY_FILE_TPL % k}-cert.pub", 0o600),
f"{k}_public": (f"{KEY_FILE_TPL % k}.pub", 0o644),
f"{k}_certificate": (f"{KEY_FILE_TPL % k}-cert.pub", 0o644),
}
)
PRIV_TO_PUB[f"{k}_private"] = f"{k}_public"
Expand Down
6 changes: 3 additions & 3 deletions tests/unittests/config/test_cc_ssh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,17 +330,17 @@ def test_handle_ssh_keys_in_cfg(
mock.call(
"/etc/ssh/ssh_host_{}_key".format(key_type),
private_value,
384,
0o600,
),
mock.call(
"/etc/ssh/ssh_host_{}_key.pub".format(key_type),
public_value,
384,
0o644,
),
mock.call(
"/etc/ssh/ssh_host_{}_key-cert.pub".format(key_type),
cert_value,
384,
0o644,
),
mock.call(
sshd_conf_fname,
Expand Down
1 change: 1 addition & 0 deletions tools/.github-cla-signers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ MarkMielke
marlluslustosa
matthewruffell
maxnet
Mazorius
megian
michaelrommel
mitechie
Expand Down