[Sync] Implement keystore migration support.

sync/internal_api/sync_encryption_handler_impl.h

Index: sync/internal_api/sync_encryption_handler_impl.h
diff --git a/sync/internal_api/sync_encryption_handler_impl.h b/sync/internal_api/sync_encryption_handler_impl.h
index 1b0b6489c11dad281cb5ea7bf24c408dca14eaa4..6c9b0aaeb77b38cf6aa357239cac65e60df91f7a 100644
--- a/sync/internal_api/sync_encryption_handler_impl.h
+++ b/sync/internal_api/sync_encryption_handler_impl.h
@@ -62,6 +62,9 @@ class SyncEncryptionHandlerImpl
   virtual bool EncryptEverythingEnabled() const OVERRIDE;
   virtual PassphraseState GetPassphraseState() const OVERRIDE;
 
+  // TODO(zea): provide a method for getting the time at which the nigori
+  // node was migrated.
+
   // NigoriHandler implementation.
   // Note: all methods are invoked while the caller holds a transaction.
   virtual void ApplyNigoriUpdate(
@@ -84,6 +87,8 @@ class SyncEncryptionHandlerImpl
   Cryptographer* GetCryptographerUnsafe();
   ModelTypeSet GetEncryptedTypesUnsafe();
 
+  bool MigratedToKeystore();
+
  private:
   FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
                            NigoriEncryptionTypes);
@@ -93,6 +98,22 @@ class SyncEncryptionHandlerImpl
                            EncryptEverythingImplicit);
   FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
                            UnknownSensitiveTypes);
+  FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
+                           GetKeystoreBootstrap);
+  FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
+                           ReceiveMigratedNigoriKeystorePass);
+  FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
+                           ReceiveUmigratedNigoriAfterMigration);
+  FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
+                           SetKeystoreAfterReceivingMigratedNigori);
+  FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
+                           SetCustomPassAfterMigration);
+  FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
+                           SetCustomPassAfterMigrationNoKeystoreKey);
+  FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
+                           SetImplicitPassAfterMigrationNoKeystoreKey);
+  FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
+                           MigrateOnEncryptEverythingKeystorePassphrase);
 
   // Container for members that require thread safety protection.  All members
   // that can be accessed from more than one thread should be held here and
@@ -140,6 +161,26 @@ class SyncEncryptionHandlerImpl
       const sync_pb::NigoriSpecifics& nigori,
       syncable::BaseTransaction* const trans);
 
+  // TODO(zea): make these public and have them replace SetEncryptionPassphrase
+  // and SetDecryptionPassphrase.
+  // Helper methods for handling passphrases once keystore migration has taken
+  // place.
+  //
+  // Sets a new custom passphrase. Should only be called if a custom passphrase
+  // is not already set.
+  // Triggers OnPassphraseAccepted on success, OnPassphraseRequired if a custom
+  // passphrase already existed.
+  void SetCustomPassphrase(const std::string& passphrase,
+                           WriteTransaction* trans,
+                           WriteNode* nigori_node);
+  // Decrypt the encryption keybag using a user provided passphrase.
+  // Should only be called if the current passphrase is a frozen implicit
+  // passphrase or a custom passphrase.
+  // Triggers OnPassphraseAccepted on success, OnPassphraseRequired on failure.
+  void DecryptExplicitPassphrase(const std::string& passphrase,
+                                 WriteTransaction* trans,
+                                 WriteNode* nigori_node);
+
   // The final step of SetEncryptionPassphrase and SetDecryptionPassphrase that
   // notifies observers of the result of the set passphrase operation, updates
   // the nigori node, and does re-encryption.
@@ -153,7 +194,6 @@ class SyncEncryptionHandlerImpl
   // |trans| and |nigori_node|: used to access data in the cryptographer.
   void FinishSetPassphrase(bool success,
                            const std::string& bootstrap_token,
-                           bool is_explicit,
                            WriteTransaction* trans,
                            WriteNode* nigori_node);
 
@@ -168,6 +208,49 @@ class SyncEncryptionHandlerImpl
   Vault* UnlockVaultMutable(syncable::BaseTransaction* const trans);
   const Vault& UnlockVault(syncable::BaseTransaction* const trans) const;
 
+  // Helper method for determining if migratino of a nigori node should be

[tim (not reviewing), 2012/09/06 01:04:20]

migratino!

[Nicolas Zea, 2012/09/06 21:45:27]

Done.

+  // triggered or not.
+  // Conditions for triggering migration:
+  // 1. Cryptographer has no pending keys
+  // 2. Nigori node isn't already properly migrated.
+  // 3. Keystore key is available (if we are not migrated yet).
+  // Note: if the nigori node is migrated but has an invalid state, will return
+  // true (e.g. node has KEYSTORE_PASSPHRASE, local is CUSTOM_PASSPHRASE).
+  bool ShouldTriggerMigration(const sync_pb::NigoriSpecifics& nigori,
+                              const Cryptographer& cryptographer) const;
+
+  // Performs the actual migration of the |nigori_node| to support keystore
+  // encryption iff ShouldTriggerMigration(..) returns true.
+  bool AttemptToMigrateNigoriToKeystore(WriteTransaction* trans,
+                                        WriteNode* nigori_node);
+
+  // Fill |encrypted_blob| with the keystore bootstrap key if |encrypted_blob|'s
+  // contents didn't already contain the key.
+  bool GetKeystoreBootstrapKey(
+      const Cryptographer& cryptographer,
+      const std::string& keystore_key,
+      sync_pb::EncryptedData* encrypted_blob);
+
+  // Helper method for installing the keys encrypted in |encryption_keybag|
+  // into |cryptographer|.
+  // Returns true on success, false if we were unable to install the keybag.
+  // Will not update the default key.
+  bool AttemptToInstallKeybag(const sync_pb::EncryptedData& keybag,
+                              bool update_default,
+                              Cryptographer* cryptographer);
+
+  // Helper method for decrypting pending keys with the keystore bootstrap.
+  // If successful, the default will become the key encrypted in the keystore
+  // bootstrap, and will return true. Else will return false.
+  bool DecryptPendingKeysWithKeystoreKey(
+      const std::string& keystore_key,
+      const sync_pb::EncryptedData& keystore_bootstrap,
+      Cryptographer* cryptographer);
+
+  // Helper to enable encrypt everything, notifying observers if necessary.
+  // Will not perform re-encryption.
+  void EnableEncryptEverythingImpl(syncable::BaseTransaction* const trans);
+
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<SyncEncryptionHandlerImpl> weak_ptr_factory_;
@@ -198,6 +281,9 @@ class SyncEncryptionHandlerImpl
   // instantiation.
   int nigori_overwrite_count_;
 
+  // The time (in ms) the nigori was migrated to support keystore encryption.
+  int64 migration_time_ms_;
+
   DISALLOW_COPY_AND_ASSIGN(SyncEncryptionHandlerImpl);
 };