diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-07 19:31:32 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-07 19:31:32 +0000 |
| commit | 6b6a49bb7517fbcf957b398ca811eb31f6d05b8b (patch) | |
| tree | b467c877ac82b94da5a3f0f0099e605cda51280f /chromeos/system | |
| parent | 06c13e40a302fbe3a0099bf2bab35a1d0d908e59 (diff) | |
| download | chromium_src-6b6a49bb7517fbcf957b398ca811eb31f6d05b8b.zip chromium_src-6b6a49bb7517fbcf957b398ca811eb31f6d05b8b.tar.gz chromium_src-6b6a49bb7517fbcf957b398ca811eb31f6d05b8b.tar.bz2 | |
Append a timestamp to fake serial numbers.
When running chromeos=1 builds outside ChromeOS, a fake serial number is
generated so that enterprise enrollment can proceed. This change appends
a timestamp to the fake serial number so that it doesn't clash with
previous fake enrollments for the same domain.
BUG=367674
Review URL: https://codereview.chromium.org/270063004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268894 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/system')
| -rw-r--r-- | chromeos/system/statistics_provider.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chromeos/system/statistics_provider.cc b/chromeos/system/statistics_provider.cc index cc33756..7fc6327 100644 --- a/chromeos/system/statistics_provider.cc +++ b/chromeos/system/statistics_provider.cc @@ -11,6 +11,7 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "base/path_service.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/cancellation_flag.h" #include "base/synchronization/waitable_event.h" #include "base/sys_info.h" @@ -272,8 +273,13 @@ void StatisticsProviderImpl::LoadMachineStatistics(bool load_oem_manifest) { if (!base::SysInfo::IsRunningOnChromeOS() && machine_info_.find(kSerialNumber) == machine_info_.end()) { - // Set stub value for testing. - machine_info_[kSerialNumber] = "stub_serial_number"; + // Set stub value for testing. A time value is appended to avoid clashes of + // the same serial for the same domain, which would invalidate earlier + // enrollments. A fake /tmp/machine-info file should be used instead if + // a stable serial is needed, e.g. to test re-enrollment. + base::TimeDelta time = base::Time::Now() - base::Time::UnixEpoch(); + machine_info_[kSerialNumber] = + "stub_serial_number_" + base::Int64ToString(time.InSeconds()); } // Finished loading the statistics. |