Add support for --proxy_port.

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
 import subprocess
 import time
+import urlparse
 
 
 def _LogMessage(message):
   cherrypy.log(message, 'UPDATE')
 
 UPDATE_FILE='update.gz'
 STATEFUL_FILE='stateful.tgz'
 
+
+def _ChangeUrlPort(url, new_port):
+  """Return the URL passed in with a different port"""
+  scheme, netloc, path, query, fragment = urlparse.urlsplit(url)
+  host_port = netloc.split(':')
+
+  if len(host_port) == 1:
+    host_port.append(new_port)
+  else:
+    host_port[1] = new_port
+
+  print host_port
+  netloc = "%s:%s" % tuple(host_port)
+
+  return urlparse.urlunsplit((scheme, netloc, path, query, fragment))
+
+
 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.
   """
 
   def __init__(self, serve_only=None, test_image=False, urlbase=None,
                factory_config_path=None, client_prefix=None,
                forced_image=None, forced_payload=None,
-               port=8080, src_image='', vm=False, board=None,
+               port=8080, proxy_port=None, src_image='', vm=False, board=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
 
     # Track update pregeneration, so we don't recopy if not needed.
     self.pregenerated = False
 
   def _GetSecondsSinceMidnight(self):
     """Returns the seconds since midnight as a decimal value."""
     now = time.localtime()
     return now[3] * 3600 + now[4] * 60 + now[5]
@@ skipping 505 matching lines @@
     # Set hostname as the hostname that the client is calling to and set up
     # the url base.
     self.hostname = cherrypy.request.base
     if self.urlbase:
       static_urlbase = self.urlbase
     elif self.serve_only:
       static_urlbase = '%s/static/archive' % self.hostname
     else:
       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'))
@@ skipping 34 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()