1
diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py
2
index 5ef9737..4585e4d 100755
3
--- a/cloudinit/config/cc_set_passwords.py
4
+++ b/cloudinit/config/cc_set_passwords.py
5
@@ -160,7 +160,7 @@ def handle(_name, cfg, cloud, log, args):
6
160
        hashed_users = []
160
        hashed_users = []
7
161
        randlist = []
161
        randlist = []
8
162
        users = []
162
        users = []
10
163
        prog = re.compile(r'\$[1,2a,2y,5,6](\$.+){2}')
163
        prog = re.compile(r'\$(1|2a|2y|5|6)(\$.+){2}')
11
164
        for line in plist:
164
        for line in plist:
12
165
            u, p = line.split(':', 1)
165
            u, p = line.split(':', 1)
13
166
            if prog.match(p) is not None and ":" not in p:
166
            if prog.match(p) is not None and ":" not in p:
14
diff --git a/cloudinit/config/tests/test_set_passwords.py b/cloudinit/config/tests/test_set_passwords.py
15
index b051ec8..a2ea5ec 100644
16
--- a/cloudinit/config/tests/test_set_passwords.py
17
+++ b/cloudinit/config/tests/test_set_passwords.py
18
@@ -68,4 +68,44 @@ class TestHandleSshPwauth(CiTestCase):
19
68
                m_update.assert_called_with({optname: optval})
68
                m_update.assert_called_with({optname: optval})
20
69
        m_subp.assert_not_called()
69
        m_subp.assert_not_called()
21
70
70
22
71
23
72
class TestSetPasswordsHandle(CiTestCase):
24
73
    """Test cc_set_passwords.handle"""
25
74
26
75
    with_logs = True
27
76
28
77
    def test_handle_on_empty_config(self):
29
78
        """handle logs that no password has changed when config is empty."""
30
79
        cloud = self.tmp_cloud(distro='ubuntu')
31
80
        setpass.handle(
32
81
            'IGNORED', cfg={}, cloud=cloud, log=self.logger, args=[])
33
82
        self.assertEqual(
34
83
            "DEBUG: Leaving ssh config 'PasswordAuthentication' unchanged. "
35
84
            'ssh_pwauth=None\n',
36
85
            self.logs.getvalue())
37
86
38
87
    @mock.patch(MODPATH + "util.subp")
39
88
    def test_handle_on_chpasswd_list_parses_common_hashes(self, m_subp):
40
89
        """handle parses command password hashes."""
41
90
        cloud = self.tmp_cloud(distro='ubuntu')
42
91
        valid_hashed_pwds = [
43
92
            'root:$2y$10$8BQjxjVByHA/Ee.O1bCXtO8S7Y5WojbXWqnqYpUW.BrPx/'
44
93
            'Dlew1Va',
45
94
            'ubuntu:$6$5hOurLPO$naywm3Ce0UlmZg9gG2Fl9acWCVEoakMMC7dR52q'
46
95
            'SDexZbrN9z8yHxhUM2b.sxpguSwOlbOQSW/HpXazGGx3oo1']
47
96
        cfg = {'chpasswd': {'list': valid_hashed_pwds}}
48
97
        with mock.patch(MODPATH + 'util.subp') as m_subp:
49
98
            setpass.handle(
50
99
                'IGNORED', cfg=cfg, cloud=cloud, log=self.logger, args=[])
51
100
        self.assertIn(
52
101
            'DEBUG: Handling input for chpasswd as list.',
53
102
            self.logs.getvalue())
54
103
        self.assertIn(
55
104
            "DEBUG: Setting hashed password for ['root', 'ubuntu']",
56
105
            self.logs.getvalue())
57
106
        self.assertEqual(
58
107
            [mock.call(['chpasswd', '-e'],
59
108
             '\n'.join(valid_hashed_pwds) + '\n')],
60
109
            m_subp.call_args_list)
61
110
62
71
# vi: ts=4 expandtab
111
# vi: ts=4 expandtab
Reviewer	Review Type	Date Requested	Status
Server Team CI bot	continuous-integration		Approve on 2019-01-15
Chad Smith		2019-01-11	Approve on 2019-01-15
Scott Moser		2019-01-11	Pending
Review via email: mp+361683@code.launchpad.net