Remove --client_prefix argument and check.

autoupdate.py

 # Copyright (c) 2009-2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from buildutil import BuildObject
 from xml.dom import minidom
 
 import cherrypy
 import os
 import shutil
@@ skipping 29 matching lines @@
 class Autoupdate(BuildObject):
   """Class that contains functionality that handles Chrome OS update pings.
 
   Members:
     serve_only: Serve only pre-built updates. static_dir must contain update.gz
       and stateful.tgz.
     factory_config: Path to the factory config file if handling factory
       requests.
     use_test_image: Use chromiumos_test_image.bin rather than the standard.
     static_url_base: base URL, other than devserver, for update images.
-    client_prefix: The prefix for the update engine client.
     forced_image: Path to an image to use for all updates.
     forced_payload: Path to pre-generated payload to serve.
     port: port to host devserver
     proxy_port: port of local proxy to tell client to connect to you through.
     src_image: If specified, creates a delta payload from this image.
     vm: Set for VM images (doesn't patch kernel)
     board: board for the image.  Needed for pre-generating of updates.
     copy_to_static_root: Copies images generated from the cache to
       ~/static.
   """
 
   def __init__(self, serve_only=None, test_image=False, urlbase=None,
-               factory_config_path=None, client_prefix=None,
+               factory_config_path=None,
                forced_image=None, forced_payload=None,
                port=8080, proxy_port=None, src_image='', vm=False, board=None,
                copy_to_static_root=True, private_key=None,
                *args, **kwargs):
     super(Autoupdate, self).__init__(*args, **kwargs)
     self.serve_only = serve_only
     self.factory_config = factory_config_path
     self.use_test_image = test_image
     if urlbase:
       self.urlbase = urlbase
     else:
       self.urlbase = None
 
-    self.client_prefix = client_prefix
     self.forced_image = forced_image
     self.forced_payload = forced_payload
     self.src_image = src_image
     self.proxy_port = proxy_port
     self.vm = vm
     self.board = board
     self.copy_to_static_root = copy_to_static_root
     self.private_key = private_key
 
     # Path to pre-generated file.
@@ skipping 282 matching lines @@
       os.system('rm -rf "%s"' % full_cache_dir)
       os.makedirs(full_cache_dir)
       return_path = self.GenerateUpdateImage(image_path,
                                              full_cache_dir)
 
       # Clean up cache dir since it's not valid.
       if not return_path:
         os.system('rm -rf "%s"' % full_cache_dir)
         return None
       else:
-        assert (return_path == update_path,
-                'Returned path %s not equal to %s' % (return_path, update_path))
+        assert return_path == update_path, \
+            'Returned path %s not equal to %s' % (return_path, update_path)
 
     self.pregenerated_path = update_path
 
     # Generation complete, copy if requested.
     if self.copy_to_static_root:
       # The final results exist directly in static
       update_payload = os.path.join(static_image_dir,
                                     UPDATE_FILE)
       stateful_payload = os.path.join(static_image_dir,
                                       STATEFUL_FILE)
@@ skipping 218 matching lines @@
       static_urlbase = '%s/static' % self.hostname
 
     # If we have a proxy port, adjust the URL we instruct the client to
     # use to go through the proxy.
     if self.proxy_port:
       static_urlbase = _ChangeUrlPort(static_urlbase, self.proxy_port)
 
     _LogMessage('Using static url base %s' % static_urlbase)
     _LogMessage('Handling update ping as %s: %s' % (self.hostname, data))
 
-    # Check the client prefix to make sure you can support this type of update.
     update_dom = minidom.parseString(data)
     root = update_dom.firstChild
-    if (root.hasAttribute('updaterversion') and
-        not root.getAttribute('updaterversion').startswith(self.client_prefix)):
-      _LogMessage('Got update from unsupported updater:' +
-                root.getAttribute('updaterversion'))
-      return self.GetNoUpdatePayload()
 
     # We only generate update payloads for updatecheck requests.
     update_check = root.getElementsByTagName('o:updatecheck')
     if not update_check:
       _LogMessage('Non-update check received.  Returning blank payload.')
       # TODO(sosa): Generate correct non-updatecheck payload to better test
       # update clients.
       return self.GetNoUpdatePayload()
 
     # Since this is an updatecheck, get information about the requester.
@@ skipping 23 matching lines @@
         is_delta_format = self._IsDeltaFormatFile(filename)
         if label:
           url = '%s/%s/%s' % (static_urlbase, label, payload_path)
         else:
           url = '%s/%s' % (static_urlbase, payload_path)
 
         _LogMessage('Responding to client to use url %s to get image.' % url)
         return self.GetUpdatePayload(hash, sha256, size, url, is_delta_format)
       else:
         return self.GetNoUpdatePayload()