cros: Mount the existing eCryptfs vault to start migration.

chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.h"
 
 #include <string>
 #include <utility>
 
 #include "ash/system/devicetype_utils.h"
@@ skipping 236 matching lines @@
   }
   UpdateUIState(UIState::READY);
 
   should_migrate_on_enough_battery_ = true;
   DBusThreadManager::Get()->GetPowerManagerClient()->RequestStatusUpdate();
 }
 
 void EncryptionMigrationScreenHandler::StartMigration() {
   UpdateUIState(UIState::MIGRATING);
 
+  // Mount the existing eCryptfs vault to a temporary location for migration.
+  cryptohome::MountParameters mount(false);
+  mount.to_migrate_from_ecryptfs = true;
+  cryptohome::HomedirMethods::GetInstance()->MountEx(
+      cryptohome::Identification(user_context_.GetAccountId()),
+      cryptohome::Authorization(GetAuthKey()), mount,
+      base::Bind(&EncryptionMigrationScreenHandler::OnMountExistingVault,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
+void EncryptionMigrationScreenHandler::OnMountExistingVault(
+    bool success,
+    cryptohome::MountError return_code,
+    const std::string& mount_hash) {
+  if (!success || return_code != cryptohome::MOUNT_ERROR_NONE) {
+    UpdateUIState(UIState::MIGRATION_FAILED);
+    return;
+  }
+
   DBusThreadManager::Get()
       ->GetCryptohomeClient()
       ->SetDircryptoMigrationProgressHandler(
           base::Bind(&EncryptionMigrationScreenHandler::OnMigrationProgress,
                      weak_ptr_factory_.GetWeakPtr()));
+  cryptohome::HomedirMethods::GetInstance()->MigrateToDircrypto(
+      cryptohome::Identification(user_context_.GetAccountId()),
+      cryptohome::Authorization(GetAuthKey()),

[hashimoto, 2017/04/17 06:30:12]

Authorization argument was removed from MigrateToDircrypto.
(https://chromium-review.googlesource.com/c/472409/6/cryptohome/cryptohome.xml)

Please remove this argument from CryptohommeClient and HomedirMethods.

[fukino, 2017/04/17 06:56:59]

Done.

+      base::Bind(&EncryptionMigrationScreenHandler::OnMigrationRequested,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
 
+cryptohome::KeyDefinition EncryptionMigrationScreenHandler::GetAuthKey() {
   // |auth_key| is created in the same manner as CryptohomeAuthenticator.
   const Key* key = user_context_.GetKey();
   // If the |key| is a plain text password, crash rather than attempting to
   // mount the cryptohome with a plain text password.
   CHECK_NE(Key::KEY_TYPE_PASSWORD_PLAIN, key->GetKeyType());
   // Set the authentication's key label to an empty string, which is a wildcard
   // allowing any key to match. This is necessary because cryptohomes created by
   // Chrome OS M38 and older will have a legacy key with no label while those
   // created by Chrome OS M39 and newer will have a key with the label
   // kCryptohomeGAIAKeyLabel.
-  const cryptohome::KeyDefinition auth_key(key->GetSecret(), std::string(),
-                                           cryptohome::PRIV_DEFAULT);
-  cryptohome::HomedirMethods::GetInstance()->MigrateToDircrypto(
-      cryptohome::Identification(user_context_.GetAccountId()),
-      cryptohome::Authorization(auth_key),
-      base::Bind(&EncryptionMigrationScreenHandler::OnMigrationRequested,
-                 weak_ptr_factory_.GetWeakPtr()));
+  return cryptohome::KeyDefinition(key->GetSecret(), std::string(),
+                                   cryptohome::PRIV_DEFAULT);
 }
 
 void EncryptionMigrationScreenHandler::OnMigrationProgress(
     cryptohome::DircryptoMigrationStatus status,
     uint64_t current,
     uint64_t total) {
   switch (status) {
     case cryptohome::DIRCRYPTO_MIGRATION_INITIALIZING:
       UpdateUIState(UIState::MIGRATING);
       break;
@@ skipping 21 matching lines @@
 void EncryptionMigrationScreenHandler::OnMigrationRequested(bool success) {
   // This function is called when MigrateToDircrypto is correctly requested.
   // It does not mean that the migration is completed. We should know the
   // completion by DircryptoMigrationProgressHandler. success == false means a
   // failure in DBus communication.
   // TODO(fukino): Handle this case. Should we retry or restart?
   DCHECK(success);
 }
 
 }  // namespace chromeos