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

Unified Diff: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h

Issue 212653004: Update server-backed state key generation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix re-enrollment test. Created 6 years, 9 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.h
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
index c8d5f489ab1eda2d1cf00bf9c6ae25a2f6a7b0d1..735a7475d5644805e866aec16a46b1ca02c929ff 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
@@ -7,6 +7,7 @@
#include <bitset>
#include <string>
+#include <vector>
#include "base/basictypes.h"
#include "base/callback.h"
@@ -45,6 +46,22 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
typedef std::bitset<32> AllowedDeviceModes;
typedef base::Callback<void(EnrollmentStatus)> EnrollmentCallback;
+ // The power of two determining the size of the time quanta for device state
+ // keys, i.e. the quanta will be of size 2^kDeviceStateKeyTimeQuantumPower
+ // seconds. 2^23 seconds corresponds to 97.09 days.
+ static const int kDeviceStateKeyTimeQuantumPower = 23;
+
+ // The number of future time quanta to generate device state identifiers for.
+ // This determines the interval after which a device will no longer receive
+ // server-backed state information and thus corresponds to the delay until a
+ // device becomes anonymous to the server again.
+ //
+ // The goal here is to guarantee state key validity for 1 year into the
+ // future. 4 quanta are needed to cover a year, but the current quantum is
+ // clipped short in the general case. Hence, one buffer quantum is needed to
+ // make up for the clipping, yielding a total of 5 quanta.
+ static const int kDeviceStateKeyFutureQuanta = 5;
+
// |task_runner| is the runner for policy refresh tasks.
// |background_task_runner| is used to execute long-running background tasks
// that may involve file I/O.
@@ -101,8 +118,14 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
// Returns the machine model, or an empty string if not available.
static std::string GetMachineModel();
- // Returns the stable device state key.
- static std::string GetDeviceStateKey();
+ // Gets the device state keys for |timestamp|. These will cover a time frame
+ // including |timestamp| and extending into the future as configured by the
+ // constants declared above.
+ static bool GetDeviceStateKeys(const base::Time& timestamp,
+ std::vector<std::string>* state_keys);
+
+ // Returns the currently valid device state key.
+ static std::string GetCurrentDeviceStateKey();
// Returns the robot 'email address' associated with the device robot
// account (sometimes called a service account) associated with this device

Powered by Google App Engine
This is Rietveld 408576698