Fix cloud policy duplicate registrations issue.

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 72 matching lines @@
 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' ];
 
+# A special authentication token whose register request must have the
+# re-register flag set. If that flag is not set when a register request with
+# this token is received then the register is refused.
+RE_REGISTER_MAGIC_TOKEN = 'reregistertoken'
+
 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 101 matching lines @@
 
     policy = self._server.GetPolicies()
     if ('*' not in policy['managed_users'] and
         auth not in policy['managed_users']):
       return (403, 'Unmanaged')
 
     device_id = self.GetUniqueParam('deviceid')
     if not device_id:
       return (400, 'Missing device identifier')
 
+    if (auth == RE_REGISTER_MAGIC_TOKEN and
+        msg.reregister != True):
+      return (400, 'Expected reregister request')

[Mattias Nissler (ping if slow), 2013/02/11 18:23:50]

I'm concerned that we keep adding weirdness to the test server to the point
where the code becomes completely incomprehensible.

[Joao da Silva, 2013/02/12 16:33:41]

Reverted.

+
     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']
@@ skipping 452 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]