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

Unified Diff: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

Issue 12538009: Public Sessions: fetch device robot api token during enterprise enrollment. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: updated tests Created 7 years, 8 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/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
index 984d9a806fb4a7956739b278baa94e3baa4c1aa1..16f5e9220bb98e680b7371ced112be79865acb09 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -7,20 +7,27 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
+#include "base/message_loop.h"
#include "base/prefs/pref_registry_simple.h"
#include "base/prefs/testing_pref_service.h"
#include "base/run_loop.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/cryptohome_library.h"
#include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
#include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
+#include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
+#include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
#include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
#include "chrome/browser/policy/cloud/cloud_policy_client.h"
#include "chrome/browser/policy/cloud/mock_device_management_service.h"
#include "chrome/browser/policy/cloud/proto/device_management_backend.pb.h"
#include "chrome/browser/prefs/browser_prefs.h"
+#include "chrome/test/base/testing_browser_process.h"
#include "chromeos/dbus/cryptohome_client.h"
#include "chromeos/dbus/dbus_client_implementation_type.h"
+#include "net/url_request/test_url_fetcher_factory.h"
+#include "net/url_request/url_request_test_util.h"
#include "policy/policy_constants.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -35,7 +42,7 @@ using testing::_;
namespace em = enterprise_management;
namespace policy {
-namespace {
+namespace test {
void CopyLockResult(base::RunLoop* loop,
EnterpriseInstallAttributes::LockResult* out,
@@ -61,17 +68,31 @@ class DeviceCloudPolicyManagerChromeOSTest
DeviceSettingsTestBase::SetUp();
chrome::RegisterLocalState(local_state_.registry());
manager_.Init();
+
+ // DeviceOAuth2TokenService uses the system request context to fetch
+ // OAuth tokens, then writes the token to local state, encrypting it
+ // first with methods in CrosLibrary.
+ TestingBrowserProcess::GetGlobal()->SetSystemRequestContext(
+ new net::TestURLRequestContextGetter(loop_.message_loop_proxy()));
+ TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_);
+ chromeos::DeviceOAuth2TokenServiceFactory::Initialize();
+ chromeos::CrosLibrary::Initialize(true);
}
virtual void TearDown() OVERRIDE {
manager_.Shutdown();
DeviceSettingsTestBase::TearDown();
+
+ chromeos::DeviceOAuth2TokenServiceFactory::Shutdown();
+ chromeos::CrosLibrary::Shutdown();
+ TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
}
scoped_ptr<chromeos::CryptohomeLibrary> cryptohome_library_;
scoped_ptr<chromeos::CryptohomeClient> stub_cryptohome_client_;
EnterpriseInstallAttributes install_attributes_;
+ net::TestURLFetcherFactory url_fetcher_factory_;
TestingPrefServiceSimple local_state_;
MockDeviceManagementService device_management_service_;
@@ -152,7 +173,8 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
DeviceCloudPolicyManagerChromeOSEnrollmentTest()
: is_auto_enrollment_(false),
register_status_(DM_STATUS_SUCCESS),
- fetch_status_(DM_STATUS_SUCCESS),
+ policy_fetch_status_(DM_STATUS_SUCCESS),
+ robot_auth_fetch_status_(DM_STATUS_SUCCESS),
store_result_(true),
status_(EnrollmentStatus::ForStatus(EnrollmentStatus::STATUS_SUCCESS)),
done_(false) {}
@@ -170,8 +192,10 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
register_response_.mutable_register_response()->set_device_management_token(
PolicyBuilder::kFakeToken);
- fetch_response_.mutable_policy_response()->add_response()->CopyFrom(
+ policy_fetch_response_.mutable_policy_response()->add_response()->CopyFrom(
device_policy_.policy());
+ robot_auth_fetch_response_.mutable_service_api_access_response()
+ ->set_auth_code("auth_code_for_test");
loaded_blob_ = device_policy_.GetBlob();
// Initialize the manager.
@@ -234,11 +258,11 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
// Process registration.
ASSERT_TRUE(register_job);
- MockDeviceManagementJob* fetch_job = NULL;
+ MockDeviceManagementJob* policy_fetch_job = NULL;
EXPECT_CALL(device_management_service_,
CreateJob(DeviceManagementRequestJob::TYPE_POLICY_FETCH))
.Times(AtMost(1))
- .WillOnce(device_management_service_.CreateAsyncJob(&fetch_job));
+ .WillOnce(device_management_service_.CreateAsyncJob(&policy_fetch_job));
EXPECT_CALL(device_management_service_, StartJob(_, _, _, _, _, _, _))
.Times(AtMost(1));
register_job->SendResponse(register_status_, register_response_);
@@ -248,18 +272,52 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
return;
// Process policy fetch.
- ASSERT_TRUE(fetch_job);
- fetch_job->SendResponse(fetch_status_, fetch_response_);
+ ASSERT_TRUE(policy_fetch_job);
+ policy_fetch_job->SendResponse(policy_fetch_status_,
+ policy_fetch_response_);
if (done_)
return;
// Process verification.
+ MockDeviceManagementJob* robot_auth_fetch_job = NULL;
+ EXPECT_CALL(device_management_service_,
+ CreateJob(DeviceManagementRequestJob::TYPE_API_AUTH_CODE_FETCH))
+ .Times(AtMost(1))
+ .WillOnce(device_management_service_.CreateAsyncJob(
+ &robot_auth_fetch_job));
+ EXPECT_CALL(device_management_service_, StartJob(_, _, _, _, _, _, _))
+ .Times(AtMost(1));
base::RunLoop().RunUntilIdle();
+ Mock::VerifyAndClearExpectations(&device_management_service_);
if (done_)
return;
+ // Process robot auth token fetch.
+ ASSERT_TRUE(robot_auth_fetch_job);
+ robot_auth_fetch_job->SendResponse(robot_auth_fetch_status_,
+ robot_auth_fetch_response_);
+ Mock::VerifyAndClearExpectations(&device_management_service_);
+
+ if (done_)
+ return;
+
+ // Process robot refresh token fetch.
+ // DeviceCloudPolicyManagerChromeOS holds an EnrollmentHandlerChromeOS which
+ // holds a GaiaOAuthClient that fetches the refresh token during enrollment.
+ // We return a successful OAuth response via a TestURLFetcher to trigger the
+ // happy path for these classes so that enrollment can continue.
+ net::TestURLFetcher* url_fetcher = url_fetcher_factory_.GetFetcherByID(0);
+ ASSERT_TRUE(url_fetcher);
+ url_fetcher->set_status(net::URLRequestStatus());
+ url_fetcher->set_response_code(200);
+ url_fetcher->SetResponseString("{\"access_token\":\"accessToken4Test\","
+ "\"expires_in\":1234,"
+ "\"refresh_token\":\"refreshToken4Test\"}");
+ url_fetcher->delegate()->OnURLFetchComplete(url_fetcher);
+ base::RunLoop().RunUntilIdle();
+
// Process policy store.
device_settings_test_helper_.set_store_result(store_result_);
device_settings_test_helper_.FlushStore();
@@ -274,6 +332,14 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
owner_key_util_->SetPublicKeyFromPrivateKey(
device_policy_.new_signing_key());
ReloadDeviceSettings();
+
+ if (done_)
+ return;
+
+ // Process robot refresh token store.
+ EXPECT_EQ(
+ "refreshToken4Test",
+ chromeos::DeviceOAuth2TokenServiceFactory::Get()->GetRefreshToken());
}
bool is_auto_enrollment_;
@@ -281,8 +347,11 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
DeviceManagementStatus register_status_;
em::DeviceManagementResponse register_response_;
- DeviceManagementStatus fetch_status_;
- em::DeviceManagementResponse fetch_response_;
+ DeviceManagementStatus policy_fetch_status_;
+ em::DeviceManagementResponse policy_fetch_response_;
+
+ DeviceManagementStatus robot_auth_fetch_status_;
+ em::DeviceManagementResponse robot_auth_fetch_response_;
bool store_result_;
std::string loaded_blob_;
@@ -333,7 +402,7 @@ TEST_F(DeviceCloudPolicyManagerChromeOSEnrollmentTest, RegistrationFailed) {
}
TEST_F(DeviceCloudPolicyManagerChromeOSEnrollmentTest, PolicyFetchFailed) {
- fetch_status_ = DM_STATUS_REQUEST_FAILED;
+ policy_fetch_status_ = DM_STATUS_REQUEST_FAILED;
RunTest();
ExpectFailedEnrollment(EnrollmentStatus::STATUS_POLICY_FETCH_FAILED);
EXPECT_EQ(DM_STATUS_REQUEST_FAILED, status_.client_status());
@@ -341,8 +410,8 @@ TEST_F(DeviceCloudPolicyManagerChromeOSEnrollmentTest, PolicyFetchFailed) {
TEST_F(DeviceCloudPolicyManagerChromeOSEnrollmentTest, ValidationFailed) {
device_policy_.policy().set_policy_data_signature("bad");
- fetch_response_.clear_policy_response();
- fetch_response_.mutable_policy_response()->add_response()->CopyFrom(
+ policy_fetch_response_.clear_policy_response();
+ policy_fetch_response_.mutable_policy_response()->add_response()->CopyFrom(
device_policy_.policy());
RunTest();
ExpectFailedEnrollment(EnrollmentStatus::STATUS_VALIDATION_FAILED);
@@ -366,5 +435,5 @@ TEST_F(DeviceCloudPolicyManagerChromeOSEnrollmentTest, LoadError) {
status_.store_status());
}
Mattias Nissler (ping if slow) 2013/04/22 10:59:00 We should probably have a couple test cases that c
-} // namespace
+} // namespace test
} // namespace policy

Powered by Google App Engine
This is Rietveld 408576698