Update the registration protobuf and the test dm server.

net/tools/testserver/device_management.py

-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# 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
 of managed users.
@@ skipping 60 matching lines @@
 # ASN.1 object identifier for PKCS#1/RSA.
 PKCS1_RSA_OID = '\x2a\x86\x48\x86\xf7\x0d\x01\x01\x01'
 
 # SHA256 sum of "0".
 SHA256_0 = hashlib.sha256('0').digest()
 
 # List of bad machine identifiers that trigger the |valid_serial_number_missing|
 # flag to be set set in the policy fetch response.
 BAD_MACHINE_IDS = [ '123490EN400015' ];
 
+# List of machines that trigger the server to send kiosk enrollment response
+# for the register request.
+KIOSK_MACHINE_IDS = [ 'KIOSK' ];
+
 class RequestHandler(object):
   """Decodes and handles device management requests from clients.
 
   The handler implements all the request parsing and protobuf message decoding
   and encoding. It calls back into the server to lookup, register, and
   unregister clients.
   """
 
   def __init__(self, server, path, headers, request):
     """Initialize the handler.
@@ skipping 110 matching lines @@
 
     token_info = self._server.RegisterDevice(device_id,
                                              msg.machine_id,
                                              msg.type)
 
     # Send back the reply.
     response = dm.DeviceManagementResponse()
     response.register_response.device_management_token = (
         token_info['device_token'])
     response.register_response.machine_name = token_info['machine_name']
+    response.register_response.enrollment_type = token_info['enrollment_mode']
 
     self.DumpMessage('Response', response)
 
     return (200, response.SerializeToString())
 
   def ProcessUnregister(self, msg):
     """Handles a register request.
 
     Checks for authorization, unregisters the device and constructs the
     response.
@@ skipping 371 matching lines @@
     """
     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.TT: ['google/chromeos/user'],
     }
+    if machine_id in KIOSK_MACHINE_IDS:
+      enrollment_mode = dm.DeviceRegisterResponse.KIOSK
+    else:
+      enrollment_mode = dm.DeviceRegisterResponse.ENTERPRISE
     self._registered_tokens[dmtoken] = {
       'device_id': device_id,
       'device_token': dmtoken,
       'allowed_policy_types': allowed_policy_types[type],
       'machine_name': 'chromeos-' + machine_id,
       'machine_id': machine_id,
+      'enrollment_mode': enrollment_mode,
     }
     return self._registered_tokens[dmtoken]
 
   def UpdateMachineId(self, dmtoken, machine_id):
     """Updates the machine identifier for a registered device.
 
     Args:
       dmtoken: The device management token provided by the client.
       machine_id: Updated hardware identifier value.
     """
@@ skipping 13 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]