Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1310)

Unified Diff: chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc

Issue 2784273003: Implement a basic UI flow for cryptohome encryption migration. (Closed)
Patch Set: . Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc
index 66b40f0a18a8a72df4ad2ce9f65a2313019b2dbd..3c78016940940777e99474485f0e9db84979f9c5 100644
--- a/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc
@@ -4,10 +4,19 @@
#include "chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.h"
+#include "chrome/browser/lifetime/application_lifetime.h"
+#include "chromeos/cryptohome/homedir_methods.h"
+#include "chromeos/dbus/cryptohome_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+
namespace {
constexpr char kJsScreenPath[] = "login.EncryptionMigrationScreen";
+// JS API callbacks names.
+constexpr char kJsApiStartMigration[] = "startMigration";
+constexpr char kJsApiRequestRestart[] = "requestRestart";
+
} // namespace
namespace chromeos {
@@ -40,6 +49,11 @@ void EncryptionMigrationScreenHandler::SetDelegate(Delegate* delegate) {
Initialize();
}
+void EncryptionMigrationScreenHandler::SetUserContext(
+ const UserContext& user_context) {
+ user_context_ = user_context;
+}
+
void EncryptionMigrationScreenHandler::DeclareLocalizedValues(
::login::LocalizedValuesBuilder* builder) {}
@@ -53,4 +67,90 @@ void EncryptionMigrationScreenHandler::Initialize() {
}
}
+void EncryptionMigrationScreenHandler::RegisterMessages() {
+ AddCallback(kJsApiStartMigration,
+ &EncryptionMigrationScreenHandler::HandleStartMigration);
+ AddCallback(kJsApiRequestRestart,
+ &EncryptionMigrationScreenHandler::HandleRequestRestart);
+}
+
+void EncryptionMigrationScreenHandler::HandleStartMigration() {
+ StartMigration();
+}
+
+void EncryptionMigrationScreenHandler::HandleRequestRestart() {
+ chrome::AttemptRestart();
xiyuan 2017/03/30 17:55:40 IMHO, continuing signing in would be be better tha
fukino 2017/03/31 02:29:52 I agree with it. I changed the button on the final
+}
+
+void EncryptionMigrationScreenHandler::UpdateUIState(UIState state) {
+ if (state == current_ui_state_)
+ return;
+
+ current_ui_state_ = state;
+ CallJS("setUIState", static_cast<int>(state));
+}
+
+void EncryptionMigrationScreenHandler::StartMigration() {
+ DBusThreadManager::Get()
+ ->GetCryptohomeClient()
+ ->SetDircryptoMigrationProgressHandler(
+ base::Bind(&EncryptionMigrationScreenHandler::OnMigrationProgress,
+ base::Unretained(this)));
+
+ // |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,
+ base::Unretained(this)));
xiyuan 2017/03/30 17:55:40 Let's use a WeakPtr instead of Unretained even tho
fukino 2017/03/31 02:29:52 Done.
+}
+
+void EncryptionMigrationScreenHandler::OnMigrationProgress(
+ cryptohome::DircryptoMigrationStatus status,
+ uint64_t current,
+ uint64_t total) {
+ switch (status) {
+ case cryptohome::DIRCRYPTO_MIGRATION_INITIALIZING:
+ UpdateUIState(UIState::MIGRATING);
+ break;
+ case cryptohome::DIRCRYPTO_MIGRATION_IN_PROGRESS:
+ UpdateUIState(UIState::MIGRATING);
+ CallJS("setMigrationProgress", static_cast<double>(current) / total);
+ break;
+ case cryptohome::DIRCRYPTO_MIGRATION_SUCCESS:
+ case cryptohome::DIRCRYPTO_MIGRATION_FAILED:
+ UpdateUIState(status == cryptohome::DIRCRYPTO_MIGRATION_SUCCESS
+ ? UIState::MIGRATION_SUCCEEDED
+ : UIState::MIGRATION_FAILED);
+ // Stop listening to the progress updates.
+ DBusThreadManager::Get()
+ ->GetCryptohomeClient()
+ ->SetDircryptoMigrationProgressHandler(
+ CryptohomeClient::DircryptoMigrationProgessHandler());
+ break;
+ default:
+ break;
+ }
+}
+
+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

Powered by Google App Engine
This is Rietveld 408576698