New protocol and testserver for the Chrome-DMServer protocol

chrome/browser/policy/proto/device_management_backend.proto

-// 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.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
 package enterprise_management;
 
 // Generic value container.
@@ skipping 28 matching lines @@
 message GenericNamedValue {
   required string name = 1;
   optional GenericValue value = 2;
 }
 
 // A setting is a set of generic name value pairs.
 message GenericSetting {
   repeated GenericNamedValue named_value = 1;
 }
 
+// Identify a single device policy setting key/blob pair.
+message NewDevicePolicySetting {

[danno, 2011/01/13 12:09:53]

s/NewDevicePolicy/DevicePolicySettings everywhere in this file.

[danno, 2011/01/13 12:09:53]

For consistency, move this right before NewDevicePolicyRequest.

+  // key that specifies the policy
+  required string policy_key = 1;
+  // setting of the policy that was specified by the key
+  optional string policy_value = 2;

[danno, 2011/01/13 12:09:53]

maybe "serialized_policy_proto"?

+  // watermark for setting value.
+  optional string watermark = 3;
+  
+  // policy_key will specify which of the following messages is contained in
+  // policy_value. (That is, policy_value is a protobuf message sent in a string
+  // blob.) Examples of possible messages encoded in policy_value:
+  //
+  // policy_key = "Homepage" 
+  // policy_value --> message HomepageProto {
+  //   optional string HomepageLocation = X;
+  //   optional bool HomepageIsNewTabPage = X;
+  // }
+  //
+  // policy_key = "JavascriptEnabled"
+  // policy_value --> message JavascriptEnabledProto {
+  //   optional bool JavascriptEnabled = X;
+  // }
+  // etc...
+  //
+  // Each top-level policy in policy_templates.json will have its own key, that
+  // will equal to its name. Lower-level policies (that are parts of groups)
+  // will be bundled in the message that is identified by the key of their
+  // groups.
+}
+
 // Identify a single device policy setting key/value pair.
 message DevicePolicySetting {
   // key of the policy setting
   required string policy_key = 1;
   // value of the setting
   optional GenericSetting policy_value = 2;
   // watermark for setting value.
   optional string watermark = 3;
 }
 
@@ skipping 27 matching lines @@
 }
 
 // Request from device to server to read device policies.
 message DevicePolicyRequest {
   // identify request scope: CrOS settings or other type of settings.
   optional string policy_scope = 1;
   // identify key to the settings: proxy etc.
   repeated DevicePolicySettingRequest setting_request = 2;
 }
 
+// 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 NewDevicePolicyResponse.
+message NewDevicePolicyRequest {
+  // identify key to the settings: proxy etc.

[danno, 2011/01/13 12:09:53]

Add the policy scope here, too.

+  repeated DevicePolicySettingRequest setting_request = 2;
+}
+
 // Response from server to agent for reading policies.
 message DevicePolicyResponse {
   // the result of the settings.
   repeated DevicePolicySetting setting = 1;
 }
 
+// Response from server to agent for reading policies.
+message NewDevicePolicyResponse {
+  // the result of the settings.
+  repeated NewDevicePolicySetting setting = 1;
+}
+
 // Request from the DMAgent on the device to the DMServer.
 // This is container for all requests from client.
 //
 // Authorization:
 // 1. If request is register_request, client must pass in GoogleLogin auth
 //    cookie in Authorization header:
 //      Authorization: GoogleLogin auth=<auth cookie>
 //    The response will contain an unique DMToken for future requests.
 //    Depending on domain policy, the request may need admin approval before
 //    DMToken is issued.
 // 2. For other requests, client must pass in DMToken in Authorization header:
 //    Authorization: GoogleDMToken token=<google dm token>
 //
 // Http Query parameters:
 // Query parameters contain the following information in each request:
 //   request: register/unregister/policy etc.
 //   devicetype: CrOS/Android/Iphone etc.
 //   apptype: CrOS/AndroidDM etc.
 //   deviceid: unique id that identify the device.
 //   agent: identify agent on device.
 message DeviceManagementRequest {
   // Register request.
   optional DeviceRegisterRequest register_request = 1;
 
   // Unregister request.
   optional DeviceUnregisterRequest unregister_request = 2;
 
   // Data request.
   optional DevicePolicyRequest policy_request = 3;
+  
+  // Data request (new protocol).
+  optional NewDevicePolicyRequest new_policy_request = 4;
 }
 
 // Response from server to device.
 message DeviceManagementResponse {
   // Error code to client.
   enum ErrorCode {
     SUCCESS = 0;
     // Returned for register request when device management is not supported
     // for the domain.
     DEVICE_MANAGEMENT_NOT_SUPPORTED = 1;
@@ skipping 15 matching lines @@
   optional string error_message = 2;
 
   // Register response
   optional DeviceRegisterResponse register_response = 3;
 
   // Unregister response
   optional DeviceUnregisterResponse unregister_response = 4;
 
   // Policy response.
   optional DevicePolicyResponse policy_response = 5;
+
+  // Policy response (new protocol).
+  optional NewDevicePolicyResponse new_policy_response = 6;
 }