New protocol and testserver for the Chrome-DMServer protocol

chrome/browser/policy/proto/device_management_backend.proto

Index: chrome/browser/policy/proto/device_management_backend.proto
diff --git a/chrome/browser/policy/proto/device_management_backend.proto b/chrome/browser/policy/proto/device_management_backend.proto
index 0f2451b962239e714ca9b7523344c2ba86b58573..3fbdb6edbae6136ab8c85b15ce1a607e282ec41e 100644
--- a/chrome/browser/policy/proto/device_management_backend.proto
+++ b/chrome/browser/policy/proto/device_management_backend.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -8,6 +8,8 @@ option optimize_for = LITE_RUNTIME;
 
 package enterprise_management;
 
+import "cloud_policy.proto";
+
 // Generic value container.
 message GenericValue {
   enum ValueType {
@@ -62,12 +64,20 @@ message DeviceRegisterRequest {
   // reregister device without erasing server state.
   // it can be used to refresh dmtoken etc.
   optional bool reregister = 1;
+
+  // This should be the uniqe id of the device, e.g. serial number
+  optional string device_id = 2;
+
+  // username? (currently this is also sent as an HTTP POST parameter)
 }
 
 // Response from server to device register request.
 message DeviceRegisterResponse {
   // device mangement toke for this registration.
   required string device_management_token = 1;
+
+  // Name assigned to the device.
+  optional string device_name = 2;
 }
 
 // Request from device to server to unregister device.
@@ -100,6 +110,34 @@ message DevicePolicyResponse {
   repeated DevicePolicySetting setting = 1;
 }
 
+// Request from device to server to read device policies.
+// The use of this message instead of DevicePolicyRequest indicates
+// that the client is expecting a response of type
+// CloudPolicyResponse.
+message CloudPolicyRequest {
+  // identify request scope: CrOS device setting, CrOS user setting
+  // or other type of settings.
+  optional string policy_scope = 1;
+}
+
+// Response from server to device for reading policies.
+message CloudPolicyResponse {
+  // Serialized SignedCloudPolicyResponse.
+  optional bytes signed_response = 1;
+  // Signature of the above data.
+  optional bytes signature = 2;
+}
+
+// this is used only for the DMServer -> ChromeOS response
+message SignedCloudPolicyResponse {
+  // The following two are necessary agains replay attacks.
+  optional int64 timestamp = 1;
+  optional string device_token = 2;
+  optional string device_name = 3;
+  // CloudPolicySettings is defined in cloud_policy.proto.
+  optional CloudPolicySettings settings = 4;
+}
+
 // Request from the DMAgent on the device to the DMServer.
 // This is container for all requests from client.
 //
@@ -115,7 +153,7 @@ message DevicePolicyResponse {
 //
 // Http Query parameters:
 // Query parameters contain the following information in each request:
-//   request: register/unregister/policy etc.
+//   request: register/unregister/policy/cloud_policy etc.
 //   devicetype: CrOS/Android/Iphone etc.
 //   apptype: CrOS/AndroidDM etc.
 //   deviceid: unique id that identify the device.
@@ -129,6 +167,9 @@ message DeviceManagementRequest {
 
   // Data request.
   optional DevicePolicyRequest policy_request = 3;
+
+  // Data request (new protocol).
+  optional CloudPolicyRequest cloud_policy_request = 4;
 }
 
 // Response from server to device.
@@ -164,4 +205,7 @@ message DeviceManagementResponse {
 
   // Policy response.
   optional DevicePolicyResponse policy_response = 5;
-}
+
+  // Policy response (new protocol).
+  optional CloudPolicyResponse cloud_policy_response  = 6;
+}