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

Unified Diff: chromeos/dbus/session_manager_client.cc

Issue 2774673004: Add stub implementations for state keys and VPD (Closed)
Patch Set: Rebase Created 3 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
« no previous file with comments | « chromeos/dbus/session_manager_client.h ('k') | chromeos/system/statistics_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/session_manager_client.cc
diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc
index 9e87be84e0a371296c29620fa4930b9e484d6049..90322ff80789326d2542afd306515200c97449c8 100644
--- a/chromeos/dbus/session_manager_client.cc
+++ b/chromeos/dbus/session_manager_client.cc
@@ -42,6 +42,7 @@ constexpr char kArcLowDiskError[] =
constexpr char kStubPolicyFile[] = "stub_policy";
constexpr char kStubDevicePolicyFile[] = "stub_device_policy";
+constexpr char kStubStateKeysFile[] = "stub_state_keys";
// Returns a location for |file| that is specific to the given |cryptohome_id|.
// These paths will be relative to DIR_USER_POLICY_KEYS, and can be used only
@@ -74,6 +75,34 @@ void StoreFile(const base::FilePath& path, const std::string& data) {
}
}
+// Helper to asynchronously read (or if missing create) state key stubs.
+std::vector<std::string> ReadCreateStateKeysStub(const base::FilePath& path) {
+ std::string contents;
+ if (base::PathExists(path)) {
+ contents = GetFileContent(path);
+ } else {
+ // Create stub state keys on the fly.
+ for (int i = 0; i < 5; ++i) {
+ contents += crypto::SHA256HashString(
+ base::IntToString(i) +
+ base::Int64ToString(base::Time::Now().ToJavaTime()));
+ }
+ StoreFile(path, contents);
+ }
+
+ std::vector<std::string> state_keys;
+ for (size_t i = 0; i < contents.size() / 32; ++i) {
+ state_keys.push_back(contents.substr(i * 32, 32));
+ }
+ return state_keys;
+}
+
+// Turn pass-by-value into pass-by-reference as expected by StateKeysCallback.
+void RunStateKeysCallbackStub(SessionManagerClient::StateKeysCallback callback,
+ std::vector<std::string> state_keys) {
+ callback.Run(state_keys);
+}
+
} // namespace
// The SessionManagerClient implementation used in production.
@@ -991,12 +1020,18 @@ class SessionManagerClientStubImpl : public SessionManagerClient {
const std::vector<std::string>& flags) override {}
void GetServerBackedStateKeys(const StateKeysCallback& callback) override {
- std::vector<std::string> state_keys;
- for (int i = 0; i < 5; ++i)
- state_keys.push_back(crypto::SHA256HashString(base::IntToString(i)));
-
- if (!callback.is_null())
- callback.Run(state_keys);
+ base::FilePath owner_key_path;
+ CHECK(PathService::Get(chromeos::FILE_OWNER_KEY, &owner_key_path));
+ const base::FilePath state_keys_path =
+ owner_key_path.DirName().AppendASCII(kStubStateKeysFile);
+ base::PostTaskWithTraitsAndReplyWithResult(
+ FROM_HERE,
+ base::TaskTraits()
+ .WithShutdownBehavior(
+ base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN)
+ .MayBlock(),
+ base::Bind(&ReadCreateStateKeysStub, state_keys_path),
+ base::Bind(&RunStateKeysCallbackStub, callback));
}
void CheckArcAvailability(const ArcCallback& callback) override {
« no previous file with comments | « chromeos/dbus/session_manager_client.h ('k') | chromeos/system/statistics_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698