[autotest] Add test for the re-taking of ownership after the owner key is lost

client/site_tests/login_OwnershipApi/login_OwnershipApi.py

 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import dbus
 import dbus.glib
 import gobject
 import logging
 import os
 import tempfile
@@ skipping 21 matching lines @@
         cryptohome.mount_vault(self._testuser, self._testpass, create=True)
         # to prime nssdb.
         self._tempdir = autotemp.tempdir(unique_id=self.__class__.__name__)
         tmpname = self.__generate_temp_filename()
         utils.system_output(cros_ui.xcommand_as('HOME=%s %s %s' %
                                                 (constants.CRYPTOHOME_MOUNT_PT,
                                                  constants.KEYGEN,
                                                  tmpname)))
         os.unlink(tmpname)
 
-        self.use_known_ownerkeys()
+        ownership.use_known_ownerkeys()
         cros_ui.start()
         login.wait_for_browser()
 
 
     def __generate_temp_filename(self):
         just_for_name = tempfile.NamedTemporaryFile(mode='w', delete=True)
         basename = just_for_name.name
         just_for_name.close()  # deletes file.
         return basename
 
 
     def run_once(self):
-        pkey = self.known_privkey()
-        pubkey = self.known_pubkey()
+        pkey = ownership.known_privkey()
+        pubkey = ownership.known_pubkey()
         sm = self.connect_to_session_manager()
         if not sm.StartSession(self._testuser, ''):
             raise error.TestFail('Could not start session for owner')
 
         poldata = self.build_policy_data(owner=self._testuser,
                                          guests=False,
                                          new_users=True,
                                          roaming=True,
                                          whitelist=(self._testuser, 'a@b.c'),
                                          proxies={ 'proxy_mode': 'direct' })
 
         policy_string = self.generate_policy(pkey, pubkey, poldata)
         self.push_policy(policy_string, sm)
         retrieved_policy = self.get_policy(sm)
-
-        if retrieved_policy != policy_string:
-            raise error.TestFail('Policy should not be %s' % retrieved_policy)
-
+        if retrieved_policy is None: raise error.TestFail('Policy not found')
+        self.compare_policy_response(retrieved_policy,
+                                     owner=self._testuser,
+                                     guests=False,
+                                     new_users=True,
+                                     roaming=True,
+                                     whitelist=(self._testuser, 'a@b.c'),
+                                     proxies={ 'proxy_mode': 'direct' })
+        try:
+            # Sanity check against an incorrect policy
+            self.compare_policy_response(retrieved_policy,
+                                         owner=self._testuser,
+                                         guests=True,
+                                         whitelist=(self._testuser, 'a@b.c'),
+                                         proxies={ 'proxy_mode': 'direct' })
+        except ownership.OwnershipError:
+            pass
+        else:
+            raise error.TestFail('Did not detect bad policy')
         if not sm.StopSession(''):
             raise error.TestFail('Could not stop session for owner')
 
 
     def cleanup(self):
         cryptohome.unmount_vault()
         if self._tempdir: self._tempdir.clean()
         cros_ui.start(allow_fail=True)
         super(login_OwnershipApi, self).cleanup()