Skip to content

[release-3.7] Generate RSA Host key for alinux2 platforms #2423

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
merged 1 commit into from
Aug 15, 2023
Merged

[release-3.7] Generate RSA Host key for alinux2 platforms #2423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 2 additions & 13 deletions cookbooks/aws-parallelcluster-environment/files/login_nodes/keys-manager.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ function create_keys() {
info "Creating host keys"
ssh-keygen -t ecdsa -f "$FOLDER_PATH/ssh_host_ecdsa_key" -q -P ""
ssh-keygen -t ed25519 -f "$FOLDER_PATH/ssh_host_ed25519_key" -q -P ""
if is_not_alinux; then
ssh-keygen -t rsa -f "$FOLDER_PATH/ssh_host_rsa_key" -q -P ""
fi
ssh-keygen -t rsa -f "$FOLDER_PATH/ssh_host_rsa_key" -q -P ""
if is_ubuntu; then
ssh-keygen -t dsa -f "$FOLDER_PATH/ssh_host_dsa_key" -q -P ""
fi
Expand All @@ -49,9 +47,7 @@ function import_keys() {
rm -f /etc/ssh/ssh_host_*
cp "$FOLDER_PATH/ssh_host_ecdsa"* /etc/ssh/
cp "$FOLDER_PATH/ssh_host_ed25519"* /etc/ssh/
if is_not_alinux; then
cp "$FOLDER_PATH/ssh_host_rsa"* /etc/ssh/
fi
cp "$FOLDER_PATH/ssh_host_rsa"* /etc/ssh/
if is_ubuntu; then
cp "$FOLDER_PATH/ssh_host_dsa"* /etc/ssh/
chown root:root /etc/ssh/ssh_host_*
Expand All @@ -63,13 +59,6 @@ function import_keys() {
chmod 644 /etc/ssh/ssh_host_*_key.pub
}

function is_not_alinux() {
if grep -q "Amazon" <<< "$OS"; then
return 1
fi
return 0
}

function is_ubuntu() {
if grep -q "Ubuntu" <<< "$OS"; then
return 0
Expand Down
6 changes: 1 addition & 5 deletions cookbooks/aws-parallelcluster-environment/test/controls/login_nodes_keys_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@
# See the License for the specific language governing permissions and limitations under the License.

keys_manager_script_dir = "/opt/parallelcluster/scripts/login_nodes"
key_types = %w(ecdsa ed25519)
is_not_amazon = !os_properties.amazon_family?
key_types = %w(ecdsa ed25519 rsa)
is_ubuntu = os_properties.ubuntu?
if is_not_amazon
key_types << 'rsa'
end
if is_ubuntu
key_types << 'dsa'
end
Expand Down