forked from rpms/cloud-init
99 lines
4.0 KiB
Diff
99 lines
4.0 KiB
Diff
|
From b84a1e6d246bbb758f0530038612bd18eff71767 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
Date: Tue, 8 Dec 2020 13:27:22 +0100
|
||
|
|
Subject: [PATCH 4/4] ssh_util: handle non-default AuthorizedKeysFile config
|
||
|
|
(#586)
|
||
|
|
|
||
|
|
RH-Author: Eduardo Terrell Ferrari Otubo (eterrell)
|
||
|
|
RH-MergeRequest: 28: ssh_util: handle non-default AuthorizedKeysFile config (#586)
|
||
|
|
RH-Commit: [1/1] f7ce396e3002c53a3504e653b58810efb956aa26 (eterrell/cloud-init)
|
||
|
|
RH-Bugzilla: 1862967
|
||
|
|
|
||
|
|
commit b0e73814db4027dba0b7dc0282e295b7f653325c
|
||
|
|
Author: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
Date: Tue Oct 20 18:04:59 2020 +0200
|
||
|
|
|
||
|
|
ssh_util: handle non-default AuthorizedKeysFile config (#586)
|
||
|
|
|
||
|
|
The following commit merged all ssh keys into a default user file
|
||
|
|
`~/.ssh/authorized_keys` in sshd_config had multiple files configured for
|
||
|
|
AuthorizedKeysFile:
|
||
|
|
|
||
|
|
commit f1094b1a539044c0193165a41501480de0f8df14
|
||
|
|
Author: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
Date: Thu Dec 5 17:37:35 2019 +0100
|
||
|
|
|
||
|
|
Multiple file fix for AuthorizedKeysFile config (#60)
|
||
|
|
|
||
|
|
This commit ignored the case when sshd_config would have a single file for
|
||
|
|
AuthorizedKeysFile, but a non default configuration, for example
|
||
|
|
`~/.ssh/authorized_keys_foobar`. In this case cloud-init would grab all keys
|
||
|
|
from this file and write a new one, the default `~/.ssh/authorized_keys`
|
||
|
|
causing the bug.
|
||
|
|
|
||
|
|
rhbz: #1862967
|
||
|
|
|
||
|
|
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
---
|
||
|
|
cloudinit/ssh_util.py | 6 +++---
|
||
|
|
tests/unittests/test_sshutil.py | 6 +++---
|
||
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py
|
||
|
|
index c08042d6..d5113996 100644
|
||
|
|
--- a/cloudinit/ssh_util.py
|
||
|
|
+++ b/cloudinit/ssh_util.py
|
||
|
|
@@ -262,13 +262,13 @@ def extract_authorized_keys(username, sshd_cfg_file=DEF_SSHD_CFG):
|
||
|
|
|
||
|
|
except (IOError, OSError):
|
||
|
|
# Give up and use a default key filename
|
||
|
|
- auth_key_fns[0] = default_authorizedkeys_file
|
||
|
|
+ auth_key_fns.append(default_authorizedkeys_file)
|
||
|
|
util.logexc(LOG, "Failed extracting 'AuthorizedKeysFile' in SSH "
|
||
|
|
"config from %r, using 'AuthorizedKeysFile' file "
|
||
|
|
"%r instead", DEF_SSHD_CFG, auth_key_fns[0])
|
||
|
|
|
||
|
|
- # always store all the keys in the user's private file
|
||
|
|
- return (default_authorizedkeys_file, parse_authorized_keys(auth_key_fns))
|
||
|
|
+ # always store all the keys in the first file configured on sshd_config
|
||
|
|
+ return (auth_key_fns[0], parse_authorized_keys(auth_key_fns))
|
||
|
|
|
||
|
|
|
||
|
|
def setup_user_keys(keys, username, options=None):
|
||
|
|
diff --git a/tests/unittests/test_sshutil.py b/tests/unittests/test_sshutil.py
|
||
|
|
index fd1d1bac..88a111e3 100644
|
||
|
|
--- a/tests/unittests/test_sshutil.py
|
||
|
|
+++ b/tests/unittests/test_sshutil.py
|
||
|
|
@@ -593,7 +593,7 @@ class TestMultipleSshAuthorizedKeysFile(test_helpers.CiTestCase):
|
||
|
|
fpw.pw_name, sshd_config)
|
||
|
|
content = ssh_util.update_authorized_keys(auth_key_entries, [])
|
||
|
|
|
||
|
|
- self.assertEqual("%s/.ssh/authorized_keys" % fpw.pw_dir, auth_key_fn)
|
||
|
|
+ self.assertEqual(authorized_keys, auth_key_fn)
|
||
|
|
self.assertTrue(VALID_CONTENT['rsa'] in content)
|
||
|
|
self.assertTrue(VALID_CONTENT['dsa'] in content)
|
||
|
|
|
||
|
|
@@ -610,7 +610,7 @@ class TestMultipleSshAuthorizedKeysFile(test_helpers.CiTestCase):
|
||
|
|
sshd_config = self.tmp_path('sshd_config')
|
||
|
|
util.write_file(
|
||
|
|
sshd_config,
|
||
|
|
- "AuthorizedKeysFile %s %s" % (authorized_keys, user_keys)
|
||
|
|
+ "AuthorizedKeysFile %s %s" % (user_keys, authorized_keys)
|
||
|
|
)
|
||
|
|
|
||
|
|
(auth_key_fn, auth_key_entries) = ssh_util.extract_authorized_keys(
|
||
|
|
@@ -618,7 +618,7 @@ class TestMultipleSshAuthorizedKeysFile(test_helpers.CiTestCase):
|
||
|
|
)
|
||
|
|
content = ssh_util.update_authorized_keys(auth_key_entries, [])
|
||
|
|
|
||
|
|
- self.assertEqual("%s/.ssh/authorized_keys" % fpw.pw_dir, auth_key_fn)
|
||
|
|
+ self.assertEqual(user_keys, auth_key_fn)
|
||
|
|
self.assertTrue(VALID_CONTENT['rsa'] in content)
|
||
|
|
self.assertTrue(VALID_CONTENT['dsa'] in content)
|
||
|
|
|
||
|
|
--
|
||
|
|
2.18.4
|
||
|
|
|