Merge server-side changes of the cloud policy protocol

net/tools/testserver/device_management.py

 #!/usr/bin/python2.5
 # 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.
 
 """A bare-bones test server for testing cloud policy support.
 
 This implements a simple cloud policy test server that can be used to test
 chrome's device management service client. The policy information is read from
 the file named device_management in the server's data directory. It contains
@@ skipping 159 matching lines @@
     device_id = self.GetUniqueParam('deviceid')
     if not device_id:
       return (400, 'Missing device identifier')
 
     token_info = self._server.RegisterDevice(device_id,
                                              msg.machine_id,
                                              msg.type)
 
     # Send back the reply.
     response = dm.DeviceManagementResponse()
-    response.error = dm.DeviceManagementResponse.SUCCESS
     response.register_response.device_management_token = (
         token_info['device_token'])
     response.register_response.machine_name = token_info['machine_name']
 
     self.DumpMessage('Response', response)
 
     return (200, response.SerializeToString())
 
   def ProcessUnregister(self, msg):
     """Handles a register request.
@@ skipping 10 matching lines @@
     # Check the management token.
     token, response = self.CheckToken();
     if not token:
       return response
 
     # Unregister the device.
     self._server.UnregisterDevice(token);
 
     # Prepare and send the response.
     response = dm.DeviceManagementResponse()
-    response.error = dm.DeviceManagementResponse.SUCCESS
     response.unregister_response.CopyFrom(dm.DeviceUnregisterResponse())
 
     self.DumpMessage('Response', response)
 
     return (200, response.SerializeToString())
 
   def ProcessInitialPolicy(self, msg):
     """Handles a 'preregister policy' request.
 
     Queries the list of managed users and responds the client if their user
@@ skipping 18 matching lines @@
     else:
       chrome_initial_settings.enrollment_provision = (
           dm.ChromeInitialSettingsProto.UNMANAGED);
 
     policy_data = dm.PolicyData()
     policy_data.policy_type = msg.policy_type
     policy_data.policy_value = chrome_initial_settings.SerializeToString()
 
     # Prepare and send the response.
     response = dm.DeviceManagementResponse()
-    response.error = dm.DeviceManagementResponse.SUCCESS
     fetch_response = response.policy_response.response.add()
     fetch_response.policy_data = (
         policy_data.SerializeToString())
 
     self.DumpMessage('Response', response)
 
     return (200, response.SerializeToString())
 
   def ProcessDevicePolicy(self, msg):
     """Handles a policy request that uses the deprecated protcol.
     TODO(gfeher): Remove this when we certainly don't need it.
 
     Checks for authorization, encodes the policy into protobuf representation
     and constructs the response.
 
     Args:
       msg: The DevicePolicyRequest message received from the client.
 
     Returns:
       A tuple of HTTP status code and response data to send to the client.
     """
 
     # Check the management token.
     token, response = self.CheckToken()
     if not token:
       return response
 
     # Stuff the policy dictionary into a response message and send it back.
     response = dm.DeviceManagementResponse()
-    response.error = dm.DeviceManagementResponse.SUCCESS
     response.policy_response.CopyFrom(dm.DevicePolicyResponse())
 
     # Respond only if the client requested policy for the cros/device scope,
     # since that's where chrome policy is supposed to live in.
     if msg.policy_scope == 'chromeos/device':
       policy = self._server.policy['google/chromeos/user']['mandatory']
       setting = response.policy_response.setting.add()
       setting.policy_key = 'chrome-policy'
       policy_value = dm.GenericSetting()
       for (key, value) in policy.iteritems():
@@ skipping 191 matching lines @@
     policy_data.request_token = token_info['device_token'];
     policy_data.policy_value = policy_value
     policy_data.machine_name = token_info['machine_name']
     if signing_key:
       policy_data.public_key_version = key_version
     policy_data.username = self._server.username
     policy_data.device_id = token_info['device_id']
     signed_data = policy_data.SerializeToString()
 
     response = dm.DeviceManagementResponse()
-    response.error = dm.DeviceManagementResponse.SUCCESS
     fetch_response = response.policy_response.response.add()
     fetch_response.policy_data = signed_data
     if signing_key:
       fetch_response.policy_data_signature = (
           signing_key['private_key'].hashAndSign(signed_data).tostring())
       if msg.public_key_version != key_version:
         fetch_response.new_public_key = signing_key['public_key']
         if req_key:
           fetch_response.new_public_key_signature = (
               req_key.hashAndSign(fetch_response.new_public_key).tostring())
@@ skipping 152 matching lines @@
     return self._registered_tokens.get(dmtoken, None)
 
   def UnregisterDevice(self, dmtoken):
     """Unregisters a device identified by the given DM token.
 
     Args:
       dmtoken: The device management token provided by the client.
     """
     if dmtoken in self._registered_tokens.keys():
       del self._registered_tokens[dmtoken]