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

Unified Diff: chrome/browser/chromeos/settings/session_manager_operation.cc

Issue 2877503002: Abandon user sign in when policy is retrieved before session started. (Closed)
Patch Set: Created 3 years, 7 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/settings/session_manager_operation.cc
diff --git a/chrome/browser/chromeos/settings/session_manager_operation.cc b/chrome/browser/chromeos/settings/session_manager_operation.cc
index ed847589209fa0736305c5404076c0db125bdf0a..424198f02f664f4b9331c04d2654e63f49feb2dd 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation.cc
+++ b/chrome/browser/chromeos/settings/session_manager_operation.cc
@@ -23,6 +23,8 @@
#include "crypto/rsa_private_key.h"
#include "crypto/signature_creator.h"
+using RetrievePolicyResponseType =
+ chromeos::SessionManagerClient::RetrievePolicyResponseType;
using ownership::OwnerKeyUtil;
using ownership::PublicKey;
@@ -138,12 +140,15 @@ void SessionManagerOperation::RetrieveDeviceSettings() {
}
void SessionManagerOperation::BlockingRetrieveDeviceSettings() {
- ValidateDeviceSettings(
- session_manager_client()->BlockingRetrieveDevicePolicy());
+ std::string policy_blob;
+ RetrievePolicyResponseType response =
+ session_manager_client()->BlockingRetrieveDevicePolicy(&policy_blob);
+ ValidateDeviceSettings(policy_blob, response);
}
void SessionManagerOperation::ValidateDeviceSettings(
- const std::string& policy_blob) {
+ const std::string& policy_blob,
+ RetrievePolicyResponseType response_type) {
std::unique_ptr<em::PolicyFetchResponse> policy(
new em::PolicyFetchResponse());
if (policy_blob.empty()) {
@@ -151,8 +156,7 @@ void SessionManagerOperation::ValidateDeviceSettings(
return;
}
- if (!policy->ParseFromString(policy_blob) ||
- !policy->IsInitialized()) {
+ if (!policy->ParseFromString(policy_blob) || !policy->IsInitialized()) {
ReportResult(DeviceSettingsService::STORE_INVALID_POLICY);
return;
}
« no previous file with comments | « chrome/browser/chromeos/settings/session_manager_operation.h ('k') | chromeos/dbus/blocking_method_caller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698