From 4e3c9deef6bdd76e9ea4d0bc34d8407e4e8c2c49 Mon Sep 17 00:00:00 2001 From: Dominik Perpeet Date: Thu, 20 Apr 2017 09:47:17 +0200 Subject: [PATCH 12/23] test: Test machine keys against md5 and non-md5 We don't care which format is used, so just test against both instead of determining what we think is used depending on the distribution. commit 50ffe4dc22739792ccd6ef9d2ef216d9ed5f73f8 Closes #7025 Reviewed-by: Stef Walter --- test/verify/check-multi-machine-key | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/test/verify/check-multi-machine-key b/test/verify/check-multi-machine-key index d8fe921..04c3457 100755 --- a/test/verify/check-multi-machine-key +++ b/test/verify/check-multi-machine-key @@ -61,11 +61,6 @@ class TestMultiMachineKeyAuth(MachineCase): 'machine2': { } } - def use_md5(self, m): - return 'rhel' in m.image or 'centos' in m.image or \ - m.image == "continuous-atomic" or \ - m.image == "debian-8" - def load_key(self, name, password): self.browser.switch_to_top() self.browser.eval_js("loaded = false") @@ -87,11 +82,12 @@ class TestMultiMachineKeyAuth(MachineCase): """.format(name, password)) self.browser.eval_js("cockpit.user().done(load)") - def check_keys(self, keys): + def check_keys(self, keys_md5, keys): def normalize(k): return re.sub("/home/admin/\\.ssh/[^ ]*|test@test|ecdsa w/o comment", "", k) - self.assertEqual(normalize(self.browser.eval_js("cockpit.spawn([ 'ssh-add', '-l' ])")), - normalize("\n".join(keys) + "\n")) + self.assertIn(normalize(self.browser.eval_js("cockpit.spawn([ 'ssh-add', '-l' ])")), + [normalize("\n".join(keys_md5) + "\n"), + normalize("\n".join(keys) + "\n")]) def setUp(self): MachineCase.setUp(self) @@ -135,17 +131,10 @@ class TestMultiMachineKeyAuth(MachineCase): if m1.atomic_image: self.load_key('id_rsa', 'foobar') b.wait_js_cond('loaded === true'); - if self.use_md5(m1): - self.check_keys([ - "2048 93:40:9e:67:82:78:a8:99:89:39:d5:ba:e0:50:70:e1 id_rsa (RSA)"]) - else: - self.check_keys([ - "2048 SHA256:SRvBhCmkCEVnJ6ascVH0AoVEbS3nPbowZkNevJnXtgw id_rsa (RSA)"]) - elif self.use_md5(m1): - self.check_keys(KEY_IDS_MD5) - else: - # Check our keys were loaded. - self.check_keys(KEY_IDS) + self.check_keys(["2048 93:40:9e:67:82:78:a8:99:89:39:d5:ba:e0:50:70:e1 id_rsa (RSA)"], + ["2048 SHA256:SRvBhCmkCEVnJ6ascVH0AoVEbS3nPbowZkNevJnXtgw id_rsa (RSA)"]) + # Check our keys were loaded. + self.check_keys(KEY_IDS_MD5, KEY_IDS) # Add machine b.switch_to_top() -- 2.13.5