Turn off future-timestamp cloud policy checks on desktop

chrome/browser/policy/cloud/cloud_policy_validator_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
@@ skipping 18 matching lines @@
   EXPECT_EQ(expected_status, arg0->status());
 };
 
 class CloudPolicyValidatorTest : public testing::Test {
  public:
   CloudPolicyValidatorTest()
       : loop_(base::MessageLoop::TYPE_UI),
         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),
         file_thread_(content::BrowserThread::FILE, &loop_) {
     policy_.SetDefaultNewSigningKey();
   }
 
   void Validate(testing::Action<void(UserCloudPolicyValidator*)> check_action) {
     // Create a validator.
     scoped_ptr<UserCloudPolicyValidator> validator = CreateValidator();
@@ skipping 10 matching lines @@
 
   scoped_ptr<UserCloudPolicyValidator> CreateValidator() {
     std::vector<uint8> public_key;
     EXPECT_TRUE(
         PolicyBuilder::CreateTestSigningKey()->ExportPublicKey(&public_key));
     policy_.Build();
 
     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_);
     validator->ValidatePolicyType(dm_protocol::kChromeUserPolicyType);
     validator->ValidatePayload();
     validator->ValidateSignature(public_key, allow_key_rotation_);
     if (allow_key_rotation_)
       validator->ValidateInitialKey();
     return make_scoped_ptr(validator);
   }
 
 
   void CheckSuccessfulValidation(UserCloudPolicyValidator* validator) {
     EXPECT_TRUE(validator->success());
     EXPECT_EQ(policy_.policy().SerializeAsString(),
               validator->policy()->SerializeAsString());
     EXPECT_EQ(policy_.policy_data().SerializeAsString(),
               validator->policy_data()->SerializeAsString());
     EXPECT_EQ(policy_.payload().SerializeAsString(),
               validator->payload()->SerializeAsString());
   }
 
   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_;
   std::string existing_dm_token_;
 
   UserPolicyBuilder policy_;
 
  private:
   MOCK_METHOD1(ValidationCompletion, void(UserCloudPolicyValidator* validator));
 
@@ skipping 40 matching lines @@
   policy_.policy_data().set_policy_type("invalid");
   Validate(CheckStatus(CloudPolicyValidatorBase::VALIDATION_WRONG_POLICY_TYPE));
 }
 
 TEST_F(CloudPolicyValidatorTest, ErrorNoTimestamp) {
   policy_.policy_data().clear_timestamp();
   Validate(CheckStatus(CloudPolicyValidatorBase::VALIDATION_BAD_TIMESTAMP));
 }
 
 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));
 }
 
 TEST_F(CloudPolicyValidatorTest, ErrorOldTimestamp) {
   base::Time timestamp(timestamp_ - base::TimeDelta::FromMinutes(5));
   policy_.policy_data().set_timestamp(
       (timestamp - base::Time::UnixEpoch()).InMilliseconds());
   Validate(CheckStatus(CloudPolicyValidatorBase::VALIDATION_BAD_TIMESTAMP));
 }
 
 TEST_F(CloudPolicyValidatorTest, ErrorTimestampFromTheFuture) {
   base::Time timestamp(timestamp_ + base::TimeDelta::FromMinutes(5));
   policy_.policy_data().set_timestamp(
       (timestamp - base::Time::UnixEpoch()).InMilliseconds());
   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));
 }
 
 TEST_F(CloudPolicyValidatorTest, ErrorNoRequestTokenNotRequired) {
   // Even though DMTokens are not required, if the existing policy has a token,
   // we should still generate an error if the new policy has none.
   policy_.policy_data().clear_request_token();
   ignore_missing_dm_token_ = CloudPolicyValidatorBase::DM_TOKEN_NOT_REQUIRED;
@@ skipping 97 matching lines @@
 
 TEST_F(CloudPolicyValidatorTest, NoRotation) {
   allow_key_rotation_ = false;
   policy_.UnsetNewSigningKey();
   Validate(CheckStatus(CloudPolicyValidatorBase::VALIDATION_OK));
 }
 
 }  // namespace
 
 }  // namespace policy