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

Unified Diff: chrome/browser/policy/cloud/cloud_policy_validator_unittest.cc

Issue 24041002: Turn off future-timestamp cloud policy checks on desktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed enum name to TIMESTAMP_NOT_BEFORE Created 7 years, 3 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/policy/cloud/cloud_policy_validator_unittest.cc
diff --git a/chrome/browser/policy/cloud/cloud_policy_validator_unittest.cc b/chrome/browser/policy/cloud/cloud_policy_validator_unittest.cc
index 27cc7e4c324c6d742430d49c74cb3b0603e9c967..1efe9a6c30912dd8b75c762ba136a224dc7ecc88 100644
--- a/chrome/browser/policy/cloud/cloud_policy_validator_unittest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_validator_unittest.cc
@@ -36,7 +36,7 @@ class CloudPolicyValidatorTest : public testing::Test {
timestamp_(base::Time::UnixEpoch() +
base::TimeDelta::FromMilliseconds(
PolicyBuilder::kFakeTimestamp)),
- ignore_missing_timestamp_(CloudPolicyValidatorBase::TIMESTAMP_REQUIRED),
+ timestamp_option_(CloudPolicyValidatorBase::TIMESTAMP_REQUIRED),
ignore_missing_dm_token_(CloudPolicyValidatorBase::DM_TOKEN_REQUIRED),
allow_key_rotation_(true),
existing_dm_token_(PolicyBuilder::kFakeToken),
@@ -67,7 +67,7 @@ class CloudPolicyValidatorTest : public testing::Test {
UserCloudPolicyValidator* validator =
UserCloudPolicyValidator::Create(policy_.GetCopy());
validator->ValidateTimestamp(timestamp_, timestamp_,
- ignore_missing_timestamp_);
+ timestamp_option_);
validator->ValidateUsername(PolicyBuilder::kFakeUsername);
validator->ValidateDomain(PolicyBuilder::kFakeDomain);
validator->ValidateDMToken(existing_dm_token_, ignore_missing_dm_token_);
@@ -92,7 +92,7 @@ class CloudPolicyValidatorTest : public testing::Test {
base::MessageLoop loop_;
base::Time timestamp_;
- CloudPolicyValidatorBase::ValidateTimestampOption ignore_missing_timestamp_;
+ CloudPolicyValidatorBase::ValidateTimestampOption timestamp_option_;
CloudPolicyValidatorBase::ValidateDMTokenOption ignore_missing_dm_token_;
std::string signing_key_;
bool allow_key_rotation_;
@@ -153,7 +153,7 @@ TEST_F(CloudPolicyValidatorTest, ErrorNoTimestamp) {
}
TEST_F(CloudPolicyValidatorTest, IgnoreMissingTimestamp) {
- ignore_missing_timestamp_ = CloudPolicyValidatorBase::TIMESTAMP_NOT_REQUIRED;
+ timestamp_option_ = CloudPolicyValidatorBase::TIMESTAMP_NOT_REQUIRED;
policy_.policy_data().clear_timestamp();
Validate(CheckStatus(CloudPolicyValidatorBase::VALIDATION_OK));
}
@@ -172,6 +172,15 @@ TEST_F(CloudPolicyValidatorTest, ErrorTimestampFromTheFuture) {
Validate(CheckStatus(CloudPolicyValidatorBase::VALIDATION_BAD_TIMESTAMP));
}
+TEST_F(CloudPolicyValidatorTest, IgnoreErrorTimestampFromTheFuture) {
+ base::Time timestamp(timestamp_ + base::TimeDelta::FromMinutes(5));
+ timestamp_option_ =
+ CloudPolicyValidatorBase::TIMESTAMP_NOT_BEFORE;
+ policy_.policy_data().set_timestamp(
+ (timestamp - base::Time::UnixEpoch()).InMilliseconds());
+ Validate(CheckStatus(CloudPolicyValidatorBase::VALIDATION_OK));
+}
+
TEST_F(CloudPolicyValidatorTest, ErrorNoRequestToken) {
policy_.policy_data().clear_request_token();
Validate(CheckStatus(CloudPolicyValidatorBase::VALIDATION_WRONG_TOKEN));
« no previous file with comments | « chrome/browser/policy/cloud/cloud_policy_validator.cc ('k') | chrome/browser/policy/cloud/user_cloud_policy_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698