diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-07-12 18:33:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-12 18:33:35 +0100 |
| commit | fb6fdbb1deb3901391548fd723914d5b2d3752fc (patch) | |
| tree | e01b74779291219777a0422cb57d2e69e10ff39b | |
| parent | 61d7ba9ba122e1ca210f2a7f0524684a4040922d (diff) | |
| parent | 90271f46d0caf88a7d5cd9d3a72eb291b38d2d35 (diff) | |
| download | vyos-cloud-init-sagitta.tar.gz vyos-cloud-init-sagitta.zip | |
Merge pull request #80 from vyos/mergify/bp/sagitta/pr-78sagitta
SSH KEY: T6568: Fixed adding SSH keys with same comments (backport #78)
| -rw-r--r-- | cloudinit/config/cc_vyos.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cloudinit/config/cc_vyos.py b/cloudinit/config/cc_vyos.py index 9c9ac697..96324e4b 100644 --- a/cloudinit/config/cc_vyos.py +++ b/cloudinit/config/cc_vyos.py @@ -91,6 +91,11 @@ def set_ssh_login(config, user, key_string): logger.info("Generating UUID for an SSH key because a comment is empty or unacceptable by CLI") key_parsed.comment = "cloud-init-{}".format(uuid4()) + # check if a key with the same comment already exists + if config.exists(['system', 'login', 'user', user, 'authentication', 'public-keys', key_parsed.comment]): + logger.debug("Generating UUID for an SSH key because a public key with comment {} already exists for user {}".format(key_parsed.comment, user)) + key_parsed.comment = "cloud-init-{}".format(uuid4()) + config.set(['system', 'login', 'user', user, 'authentication', 'public-keys', key_parsed.comment, 'key'], value=key_parsed.base64, replace=True) config.set(['system', 'login', 'user', user, 'authentication', 'public-keys', key_parsed.comment, 'type'], value=key_parsed.keytype, replace=True) if key_parsed.options: |