diff options
| author | zsdc <taras@vyos.io> | 2024-07-11 15:04:16 +0300 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-07-12 12:49:48 +0000 |
| commit | d5b2df9ee794feeaf2f606448cb8497f0508f98e (patch) | |
| tree | 0ebad9c41c07f242d70a4b4551d9b195b7d391bb | |
| parent | 77862f882245a62efef6095e2739d6edfb91d674 (diff) | |
| download | vyos-cloud-init-mergify/bp/circinus/pr-78.tar.gz vyos-cloud-init-mergify/bp/circinus/pr-78.zip | |
SSH KEY: T6568: Fixed adding SSH keys with same commentsmergify/bp/circinus/pr-78
If a key with the same comment already exists in a configuration, generate a new
ID for a new one.
Example of such a case:
```
ssh-rsa <base64> my_user_name
ssh-ed25519 <base64> my_user_name
```
(cherry picked from commit c02b1151e584ea6c0bca35ba6aa87504566f6949)
| -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: |