forked from rpms/cloud-init
81 lines
3.4 KiB
Diff
81 lines
3.4 KiB
Diff
|
From 4dde2a9bed58aba13c730bf4a7314b21038d7a31 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
Date: Mon, 25 Jan 2021 16:24:29 +0100
|
||
|
|
Subject: [PATCH 2/2] Revert "ssh_util: handle non-default AuthorizedKeysFile
|
||
|
|
config (#586)" (#775)
|
||
|
|
|
||
|
|
RH-Author: Eduardo Terrell Ferrari Otubo (eterrell)
|
||
|
|
RH-MergeRequest: 38: Revert "ssh_util: handle non-default AuthorizedKeysFile config (#586)" (#775)
|
||
|
|
RH-Commit: [1/1] aec2860c773ad1921f3949dc622543e81860c5bf (eterrell/cloud-init)
|
||
|
|
RH-Bugzilla: 1919972
|
||
|
|
|
||
|
|
commit cdc5b81f33aee0ed3ef1ae239e5cec1906d0178a
|
||
|
|
Author: Daniel Watkins <oddbloke@ubuntu.com>
|
||
|
|
Date: Tue Jan 19 12:23:23 2021 -0500
|
||
|
|
|
||
|
|
Revert "ssh_util: handle non-default AuthorizedKeysFile config (#586)" (#775)
|
||
|
|
|
||
|
|
This reverts commit b0e73814db4027dba0b7dc0282e295b7f653325c.
|
||
|
|
|
||
|
|
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 d5113996..c08042d6 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.append(default_authorizedkeys_file)
|
||
|
|
+ auth_key_fns[0] = 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 first file configured on sshd_config
|
||
|
|
- return (auth_key_fns[0], parse_authorized_keys(auth_key_fns))
|
||
|
|
+ # always store all the keys in the user's private file
|
||
|
|
+ return (default_authorizedkeys_file, 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 88a111e3..fd1d1bac 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(authorized_keys, auth_key_fn)
|
||
|
|
+ self.assertEqual("%s/.ssh/authorized_keys" % fpw.pw_dir, 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" % (user_keys, authorized_keys)
|
||
|
|
+ "AuthorizedKeysFile %s %s" % (authorized_keys, user_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(user_keys, auth_key_fn)
|
||
|
|
+ self.assertEqual("%s/.ssh/authorized_keys" % fpw.pw_dir, auth_key_fn)
|
||
|
|
self.assertTrue(VALID_CONTENT['rsa'] in content)
|
||
|
|
self.assertTrue(VALID_CONTENT['dsa'] in content)
|
||
|
|
|
||
|
|
--
|
||
|
|
2.18.4
|
||
|
|
|