New protocol and testserver for the Chrome-DMServer protocol

net/tools/testserver/testserver.py

 #!/usr/bin/python2.4
-# Copyright (c) 2006-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.
 
 """This is a simple HTTP server used for testing Chrome.
 
 It supports several test URLs, as specified by the handlers in TestPageHandler.
 By default, it listens on an ephemeral port and sends the port number back to
 the originating process over a pipe. The originating process can specify an
 explicit port if necessary.
 It can use https if you specify the flag --https=CERT where CERT is the path
@@ skipping 1264 matching lines @@
     """Delegates to the device management service used for cloud policy."""
     if not self._ShouldHandleRequest("/device_management"):
       return False
 
     raw_request = self.ReadRequestBody()
 
     if not self.server._device_management_handler:
       import device_management
       policy_path = os.path.join(self.server.data_dir, 'device_management')
       self.server._device_management_handler = (
-          device_management.TestServer(policy_path))
+          device_management.TestServer(policy_path,
+                                       self.server.policy_cert_chain))
 
     http_response, raw_reply = (
         self.server._device_management_handler.HandleRequest(self.path,
                                                              self.headers,
                                                              raw_request))
     self.send_response(http_response)
     self.end_headers()
     self.wfile.write(raw_reply)
     return True
 
@@ skipping 114 matching lines @@
                            options.ssl_bulk_cipher)
       print 'HTTPS server started on port %d...' % server.server_port
     else:
       server = StoppableHTTPServer(('127.0.0.1', port), TestPageHandler)
       print 'HTTP server started on port %d...' % server.server_port
 
     server.data_dir = MakeDataDir()
     server.file_root_url = options.file_root_url
     server_data['port'] = server.server_port
     server._device_management_handler = None
+    server.policy_cert_chain = options.policy_cert_chain
   elif options.server_type == SERVER_SYNC:
     server = SyncHTTPServer(('127.0.0.1', port), SyncPageHandler)
     print 'Sync HTTP server started on port %d...' % server.server_port
     print 'Sync XMPP server started on port %d...' % server.xmpp_port
     server_data['port'] = server.server_port
     server_data['xmpp_port'] = server.xmpp_port
   # means FTP Server
   else:
     my_data_dir = MakeDataDir()
 
@@ skipping 78 matching lines @@
                            'that will be accepted by the SSL server. Valid '
                            'values are "aes256", "aes128", "3des", "rc4". If '
                            'omitted, all algorithms will be used. This '
                            'option may appear multiple times, indicating '
                            'multiple algorithms should be enabled.');
   option_parser.add_option('', '--file-root-url', default='/files/',
                            help='Specify a root URL for files served.')
   option_parser.add_option('', '--startup-pipe', type='int',
                            dest='startup_pipe',
                            help='File handle of pipe to parent process')
+  option_parser.add_option('', '--policy-cert-chain', action='append',
+                           help='Specify a certificate to sign policy '
+                                'responses. This option may used multiple '
+                                'times to define a certificate chain. '
+                                'The first element of the chain should be the '
+                                'root certificate and the last element will be '
+                                'used for signing.')

[Mattias Nissler (ping if slow), 2011/01/28 10:29:34]

If you reverse the order, please update this comment.

[gfeher, 2011/01/28 13:42:10]

Done.

   options, args = option_parser.parse_args()
 
   sys.exit(main(options, args))