Add support for public account policy to CloudPolicyClient.

net/tools/testserver/device_management.py

 # Copyright (c) 2012 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
 enforced and recommended policies for the device and user scope, and a list
@@ skipping 243 matching lines @@
     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.
     """
     for request in msg.request:
       if (request.policy_type in
-             ('google/chromeos/user', 'google/chromeos/device')):
+             ('google/chromeos/user',
+              'google/chromeos/device',
+              'google/chromeos/publicaccount')):
         if request_type != 'policy':
           return (400, 'Invalid request type')
         else:
           return self.ProcessCloudPolicy(request)
       else:
         return (400, 'Invalid policy_type')
 
   def ProcessAutoEnrollment(self, msg):
     """Handles an auto-enrollment check request.
 
@@ skipping 146 matching lines @@
     """
 
     token_info, error = self.CheckToken()
     if not token_info:
       return error
 
     if msg.machine_id:
       self._server.UpdateMachineId(token_info['device_token'], msg.machine_id)
 
     # Response is only given if the scope is specified in the config file.
-    # Normally 'google/chromeos/device' and 'google/chromeos/user' should be
-    # accepted.
+    # Normally 'google/chromeos/device', 'google/chromeos/user' and
+    # 'google/chromeos/publicaccount' should be accepted.
     policy = self._server.GetPolicies()
     policy_value = ''
+    policy_type = msg.policy_type
+    if msg.settings_entity_id:
+      policy_type += '/' + msg.settings_entity_id

[bartfab (slow), 2012/12/03 12:28:40]

Should we document that in order to set mock public account policy, you need to
specify it under google/chromeos/publicaccount/${user} ?

Also, at that point, |policy_type| does not really fit as a variable name
anymore. Something like |policy_key| or |policy_path| would seem more
appropriate.

[Mattias Nissler (ping if slow), 2012/12/03 13:50:39]

Added an example at the beginning of the file.
Done.

[bartfab (slow), 2012/12/03 14:01:05]

Thanks, that's excellent. I had completely missed it that we have an example
section at the top.

On 2012/12/03 13:50:39, Mattias Nissler wrote:

     if (msg.policy_type in token_info['allowed_policy_types'] and
-        msg.policy_type in policy):
+        policy_type in policy):
       if msg.policy_type == 'google/chromeos/user':
         settings = cp.CloudPolicySettings()
-        self.GatherUserPolicySettings(settings,
-                                      policy[msg.policy_type])
-        policy_value = settings.SerializeToString()
+        self.GatherUserPolicySettings(settings, policy[policy_type])
       elif msg.policy_type == 'google/chromeos/device':
         settings = dp.ChromeDeviceSettingsProto()
-        self.GatherDevicePolicySettings(settings,
-                                        policy[msg.policy_type])
-        policy_value = settings.SerializeToString()
+        self.GatherDevicePolicySettings(settings, policy[policy_type])
+      elif msg.policy_type == 'google/chromeos/publicaccount':
+        settings = cp.CloudPolicySettings()
+        self.GatherUserPolicySettings(settings, policy[policy_type])
 
     # Figure out the key we want to use. If multiple keys are configured, the
     # server will rotate through them in a round-robin fashion.
     signing_key = None
     req_key = None
     key_version = 1
     nkeys = len(self._server.keys)
     if msg.signature_type == dm.PolicyFetchRequest.SHA1_RSA and nkeys > 0:
       if msg.public_key_version in range(1, nkeys + 1):
         # requested key exists, use for signing and rotate.
         req_key = self._server.keys[msg.public_key_version - 1]['private_key']
         key_version = (msg.public_key_version % nkeys) + 1
       signing_key = self._server.keys[key_version - 1]
 
     # Fill the policy data protobuf.
     policy_data = dm.PolicyData()
     policy_data.policy_type = msg.policy_type
     policy_data.timestamp = int(time.time() * 1000)
     policy_data.request_token = token_info['device_token']
-    policy_data.policy_value = policy_value
+    policy_data.policy_value = settings.SerializeToString()
     policy_data.machine_name = token_info['machine_name']
     policy_data.valid_serial_number_missing = (
         token_info['machine_id'] in BAD_MACHINE_IDS)
 
     if signing_key:
       policy_data.public_key_version = key_version
     # There is no way for the testserver to know the user name belonging to
     # the GAIA auth token we received (short of actually talking to GAIA). To
     # address this, we read the username from the policy configuration
     # dictionary, or use a default.
@@ skipping 133 matching lines @@
 
     Returns:
       The newly generated device token for the device.
     """
     dmtoken_chars = []
     while len(dmtoken_chars) < 32:
       dmtoken_chars.append(random.choice('0123456789abcdef'))
     dmtoken = ''.join(dmtoken_chars)
     allowed_policy_types = {
       dm.DeviceRegisterRequest.USER: ['google/chromeos/user'],
-      dm.DeviceRegisterRequest.DEVICE: ['google/chromeos/device'],
+      dm.DeviceRegisterRequest.DEVICE: [
+          'google/chromeos/device',
+          'google/chromeos/publicaccount'
+      ],
       dm.DeviceRegisterRequest.TT: ['google/chromeos/user'],
     }
     if machine_id in KIOSK_MACHINE_IDS:
       enrollment_mode = dm.DeviceRegisterResponse.RETAIL
     else:
       enrollment_mode = dm.DeviceRegisterResponse.ENTERPRISE
     self._registered_tokens[dmtoken] = {
       'device_id': device_id,
       'device_token': dmtoken,
       'allowed_policy_types': allowed_policy_types[type],
@@ skipping 26 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]