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

Unified Diff: chrome/browser/chromeos/settings/device_oauth2_token_service.cc

Issue 384383002: Do not try to decrypt empty refresh token (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/settings/device_oauth2_token_service.cc
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service.cc b/chrome/browser/chromeos/settings/device_oauth2_token_service.cc
index dc52043a2022ca7e42f2df35c52fc567067ee64b..041ccb6a9b8eea2dce489baf3e4c81cf4c115b26 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service.cc
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service.cc
@@ -235,13 +235,15 @@ void DeviceOAuth2TokenService::DidGetSystemSalt(
// Otherwise, load the refresh token from |local_state_|.
std::string encrypted_refresh_token =
local_state_->GetString(prefs::kDeviceRobotAnyApiRefreshToken);
- CryptohomeTokenEncryptor encryptor(system_salt_);
- refresh_token_ = encryptor.DecryptWithSystemSalt(encrypted_refresh_token);
- if (!encrypted_refresh_token.empty() && refresh_token_.empty()) {
- LOG(ERROR) << "Failed to decrypt refresh token.";
- state_ = STATE_NO_TOKEN;
- FireRefreshTokensLoaded();
- return;
+ if (!encrypted_refresh_token.empty()) {
+ CryptohomeTokenEncryptor encryptor(system_salt_);
+ refresh_token_ = encryptor.DecryptWithSystemSalt(encrypted_refresh_token);
+ if (refresh_token_.empty()) {
+ LOG(ERROR) << "Failed to decrypt refresh token.";
+ state_ = STATE_NO_TOKEN;
+ FireRefreshTokensLoaded();
+ return;
+ }
}
state_ = STATE_VALIDATION_PENDING;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698