Skip to content

Commit a12c3f0

Browse files
Merge pull request #340 from mdklapwijk-forks/MODULES-10867
(MODULES-10867) Ensure ssh key name is unique based on type, content and description
2 parents 1771769 + 980df5a commit a12c3f0

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

manifests/manage_keys.pp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
}
3939
$key_type = $key_def[1]
4040
$key_content = $key_def[2]
41-
$key_name = $key_def[3]
41+
$key_md5 = md5($key_def[2])
42+
$key_name = "${key_def[3]}_${key_md5}"
4243

4344
$key_title = "${user}_${key_type}_${key_name}"
4445

spec/defines/accounts_user_spec.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@
8282
'mode' => params[:home_mode])
8383
end
8484
it { is_expected.to contain_accounts__key_management("#{title}_key_management").with('sshkeys' => params[:sshkeys]) }
85+
it { is_expected.to contain_ssh_authorized_key("#{params[:sshkey_owner]}[email protected]_1e44b207704970cf4acb3470331b0e5c") }
86+
it { is_expected.to contain_ssh_authorized_key("#{params[:sshkey_owner]}_ssh-dss_dan key2_6e9b8958712502a8b31e1c283b6e6fce") }
87+
it { is_expected.to contain_ssh_authorized_key("#{params[:sshkey_owner]}_ecdsa-sha2-nistp521_vagrant2_8c32d1183251df9828f929b935ae0419") }
8588
it { is_expected.to contain_file("#{params[:home]}/.ssh") }
8689
end
8790

0 commit comments

Comments
 (0)