Skip to content

ssh-util: allow cloudinit to merge all ssh keys into a custom user file, defined in AuthorizedKeysFile (#937)

Emanuele Giuseppe Esposito requested to merge eesposit/cloud-init-centos-:bz_1979099_90 into c9s 
BZ: 1979099
TESTED: By me and QA
BREW: 38043260

Conflicts: upstream patch modifies tests/integration_tests/util.py, that is
not present in RHEL.

commit 9b52405c6f0de5e00d5ee9c1d13540425d8f6bf5
Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Date:   Mon Jul 12 20:21:02 2021 +0200

    ssh-util: allow cloudinit to merge all ssh keys into a custom user file, defined in AuthorizedKeysFile (#937)

    This patch aims to fix LP1911680, by analyzing the files provided
    in sshd_config and merge all keys into an user-specific file. Also
    introduces additional tests to cover this specific case.

    The file is picked by analyzing the path given in AuthorizedKeysFile.

    If it points inside the current user folder (path is /home/user/*), it
    means it is an user-specific file, so we can copy all user-keys there.
    If it contains a %u or %h, it means that there will be a specific
    authorized_keys file for each user, so we can copy all user-keys there.
    If no path points to an user-specific file, for example when only
    /etc/ssh/authorized_keys is given, default to ~/.ssh/authorized_keys.
    Note that if there are more than a single user-specific file, the last
    one will be picked.

    Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
    Co-authored-by: James Falcon <therealfalcon@gmail.com>

    LP: #1911680
    RHBZ:1862967

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>

Merge request reports