| 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 1e277a5b752425b7a0ddffdce104728f6aa8f4f9..d00264efdac7467f5accda9b8bdbbff7ceede6e5 100644
|
| --- a/chrome/browser/chromeos/settings/device_oauth2_token_service.cc
|
| +++ b/chrome/browser/chromeos/settings/device_oauth2_token_service.cc
|
| @@ -4,22 +4,242 @@
|
|
|
| #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
|
|
|
| +#include <string>
|
| +#include <vector>
|
| +
|
| #include "base/prefs/pref_registry_simple.h"
|
| #include "base/prefs/pref_service.h"
|
| +#include "base/values.h"
|
| +#include "chrome/browser/browser_process.h"
|
| +#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
|
| +#include "chrome/browser/policy/browser_policy_connector.h"
|
| +#include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chromeos/cryptohome/cryptohome_library.h"
|
| #include "content/public/browser/browser_thread.h"
|
| +#include "google_apis/gaia/gaia_urls.h"
|
| +#include "google_apis/gaia/google_service_auth_error.h"
|
| +
|
| +namespace {
|
| +const char kServiceScopeGetUserInfo[] =
|
| + "https://www.googleapis.com/auth/userinfo.email";
|
| +} // namespace
|
|
|
| namespace chromeos {
|
|
|
| +// A wrapper for the consumer passed to StartRequest, which doesn't call
|
| +// through to the target Consumer unless the refresh token validation is
|
| +// complete.
|
| +class DeviceOAuth2TokenService::ValidatingConsumer
|
| + : public OAuth2TokenService::Consumer,
|
| + public gaia::GaiaOAuthClient::Delegate {
|
| + public:
|
| + explicit ValidatingConsumer(DeviceOAuth2TokenService* token_service,
|
| + Consumer* consumer);
|
| + virtual ~ValidatingConsumer();
|
| +
|
| + void StartValidation();
|
| +
|
| + // OAuth2TokenService::Consumer
|
| + virtual void OnGetTokenSuccess(
|
| + const Request* request,
|
| + const std::string& access_token,
|
| + const base::Time& expiration_time) OVERRIDE;
|
| + virtual void OnGetTokenFailure(
|
| + const Request* request,
|
| + const GoogleServiceAuthError& error) OVERRIDE;
|
| +
|
| + // gaia::GaiaOAuthClient::Delegate implementation.
|
| + virtual void OnRefreshTokenResponse(const std::string& access_token,
|
| + int expires_in_seconds) OVERRIDE;
|
| + virtual void OnGetTokenInfoResponse(scoped_ptr<DictionaryValue> token_info)
|
| + OVERRIDE;
|
| + virtual void OnOAuthError() OVERRIDE;
|
| + virtual void OnNetworkError(int response_code) OVERRIDE;
|
| +
|
| + private:
|
| + void RefreshTokenIsValid(bool is_valid);
|
| + void InformConsumer();
|
| +
|
| + DeviceOAuth2TokenService* token_service_;
|
| + Consumer* consumer_;
|
| + scoped_ptr<gaia::GaiaOAuthClient> gaia_oauth_client_;
|
| +
|
| + // We don't know which will complete first: the validation or the token
|
| + // minting. So, we need to cache the results so the final callback can
|
| + // take action.
|
| +
|
| + // RefreshTokenValidationConsumer results
|
| + bool token_validation_done_;
|
| + bool token_is_valid_;
|
| +
|
| + // OAuth2TokenService::Consumer results
|
| + const Request* request_;
|
| + std::string access_token_;
|
| + base::Time expiration_time_;
|
| + scoped_ptr<GoogleServiceAuthError> error_;
|
| +};
|
| +
|
| +DeviceOAuth2TokenService::ValidatingConsumer::ValidatingConsumer(
|
| + DeviceOAuth2TokenService* token_service,
|
| + Consumer* consumer)
|
| + : token_service_(token_service),
|
| + consumer_(consumer),
|
| + token_validation_done_(false),
|
| + token_is_valid_(false),
|
| + request_(NULL) {
|
| +}
|
| +
|
| +DeviceOAuth2TokenService::ValidatingConsumer::~ValidatingConsumer() {
|
| +}
|
| +
|
| +void DeviceOAuth2TokenService::ValidatingConsumer::StartValidation() {
|
| + DCHECK(!gaia_oauth_client_);
|
| + gaia_oauth_client_.reset(new gaia::GaiaOAuthClient(
|
| + g_browser_process->system_request_context()));
|
| +
|
| + GaiaUrls* gaia_urls = GaiaUrls::GetInstance();
|
| + gaia::OAuthClientInfo client_info;
|
| + client_info.client_id = gaia_urls->oauth2_chrome_client_id();
|
| + client_info.client_secret = gaia_urls->oauth2_chrome_client_secret();
|
| +
|
| + gaia_oauth_client_->RefreshToken(
|
| + client_info,
|
| + token_service_->GetRefreshToken(),
|
| + std::vector<std::string>(1, kServiceScopeGetUserInfo),
|
| + token_service_->max_refresh_token_validation_retries_,
|
| + this);
|
| +}
|
| +
|
| +void DeviceOAuth2TokenService::ValidatingConsumer::OnRefreshTokenResponse(
|
| + const std::string& access_token,
|
| + int expires_in_seconds) {
|
| + gaia_oauth_client_->GetTokenInfo(
|
| + access_token,
|
| + token_service_->max_refresh_token_validation_retries_,
|
| + this);
|
| +}
|
| +
|
| +void DeviceOAuth2TokenService::ValidatingConsumer::OnGetTokenInfoResponse(
|
| + scoped_ptr<DictionaryValue> token_info) {
|
| + std::string gaia_robot_id;
|
| + token_info->GetString("email", &gaia_robot_id);
|
| +
|
| + std::string policy_robot_id = token_service_->GetRobotAccountId();
|
| +
|
| + if (policy_robot_id == gaia_robot_id) {
|
| + RefreshTokenIsValid(true);
|
| + } else {
|
| + if (gaia_robot_id.empty()) {
|
| + LOG(WARNING) << "Device service account owner in policy is empty.";
|
| + } else {
|
| + LOG(INFO) << "Device service account owner in policy does not match "
|
| + << "refresh token owner \"" << gaia_robot_id << "\".";
|
| + }
|
| + RefreshTokenIsValid(false);
|
| + }
|
| +}
|
| +
|
| +void DeviceOAuth2TokenService::ValidatingConsumer::OnOAuthError() {
|
| + RefreshTokenIsValid(false);
|
| +}
|
| +
|
| +void DeviceOAuth2TokenService::ValidatingConsumer::OnNetworkError(
|
| + int response_code) {
|
| + RefreshTokenIsValid(false);
|
| +}
|
| +
|
| +void DeviceOAuth2TokenService::ValidatingConsumer::OnGetTokenSuccess(
|
| + const Request* request,
|
| + const std::string& access_token,
|
| + const base::Time& expiration_time) {
|
| + request_ = request;
|
| + access_token_ = access_token;
|
| + expiration_time_ = expiration_time;
|
| + if (token_validation_done_)
|
| + InformConsumer();
|
| +}
|
| +
|
| +void DeviceOAuth2TokenService::ValidatingConsumer::OnGetTokenFailure(
|
| + const Request* request,
|
| + const GoogleServiceAuthError& error) {
|
| + request_ = request;
|
| + error_.reset(new GoogleServiceAuthError(error.state()));
|
| + if (token_validation_done_)
|
| + InformConsumer();
|
| +}
|
| +
|
| +void DeviceOAuth2TokenService::ValidatingConsumer::RefreshTokenIsValid(
|
| + bool is_valid) {
|
| + token_validation_done_ = true;
|
| + token_is_valid_ = is_valid;
|
| + // If we have a request pointer, then the minting is complete.
|
| + if (request_)
|
| + InformConsumer();
|
| +}
|
| +
|
| +void DeviceOAuth2TokenService::ValidatingConsumer::InformConsumer() {
|
| + DCHECK(request_);
|
| + DCHECK(token_validation_done_);
|
| + if (!token_is_valid_) {
|
| + consumer_->OnGetTokenFailure(request_, GoogleServiceAuthError(
|
| + GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS));
|
| + } else if (error_) {
|
| + consumer_->OnGetTokenFailure(request_, *error_.get());
|
| + } else {
|
| + consumer_->OnGetTokenSuccess(request_, access_token_, expiration_time_);
|
| + }
|
| + token_service_->OnValidationComplete(this, token_is_valid_);
|
| +}
|
| +
|
| DeviceOAuth2TokenService::DeviceOAuth2TokenService(
|
| net::URLRequestContextGetter* getter,
|
| PrefService* local_state)
|
| : OAuth2TokenService(getter),
|
| + refresh_token_is_valid_(false),
|
| + max_refresh_token_validation_retries_(3),
|
| + pending_validators_(new std::set<ValidatingConsumer*>()),
|
| local_state_(local_state) {
|
| }
|
|
|
| DeviceOAuth2TokenService::~DeviceOAuth2TokenService() {
|
| + STLDeleteElements(pending_validators_.get());
|
| +}
|
| +
|
| +// TODO(davidroche): if the caller deletes the returned Request while
|
| +// the fetches are in-flight, the OAuth2TokenService class won't call
|
| +// back into the ValidatingConsumer and we'll end up with stale values
|
| +// in pending_validators_ until this object is deleted. Probably not a
|
| +// big deal, but it should be resolved by returning a Request that this
|
| +// object owns.
|
| +scoped_ptr<OAuth2TokenService::Request> DeviceOAuth2TokenService::StartRequest(
|
| + const OAuth2TokenService::ScopeSet& scopes,
|
| + OAuth2TokenService::Consumer* consumer) {
|
| + DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
|
| +
|
| + if (refresh_token_is_valid_) {
|
| + return OAuth2TokenService::StartRequest(scopes, consumer).Pass();
|
| + } else {
|
| + ValidatingConsumer* validating_consumer = new ValidatingConsumer(this,
|
| + consumer);
|
| + pending_validators_->insert(validating_consumer);
|
| +
|
| + validating_consumer->StartValidation();
|
| + return OAuth2TokenService::StartRequest(scopes, validating_consumer).Pass();
|
| + }
|
| +}
|
| +
|
| +void DeviceOAuth2TokenService::OnValidationComplete(
|
| + ValidatingConsumer* validator,
|
| + bool refresh_token_is_valid) {
|
| + DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
|
| + refresh_token_is_valid_ = refresh_token_is_valid;
|
| + std::set<ValidatingConsumer*>::iterator iter = pending_validators_->find(
|
| + validator);
|
| + if (iter != pending_validators_->end())
|
| + pending_validators_->erase(iter);
|
| + else
|
| + LOG(ERROR) << "OnValidationComplete called for unknown validator";
|
| }
|
|
|
| // static
|
| @@ -49,4 +269,12 @@ std::string DeviceOAuth2TokenService::GetRefreshToken() {
|
| return refresh_token_;
|
| }
|
|
|
| +std::string DeviceOAuth2TokenService::GetRobotAccountId() {
|
| + policy::BrowserPolicyConnector* connector =
|
| + g_browser_process->browser_policy_connector();
|
| + if (connector)
|
| + return connector->GetDeviceCloudPolicyManager()->GetRobotAccountId();
|
| + return std::string();
|
| +}
|
| +
|
| } // namespace chromeos
|
|
|