AU dev-server: Add a sha256 hash to the updatecheck response.

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 os
 import shutil
 import time
@@ skipping 114 matching lines @@
   def _GetSize(self, update_path):
     """Returns the size of the file given."""
     return os.path.getsize(update_path)
 
   def _GetHash(self, update_path):
     """Returns the sha1 of the file given."""
     cmd = ('cat %s | openssl sha1 -binary | openssl base64 | tr \'\\n\' \' \';'
            % update_path)
     return os.popen(cmd).read().rstrip()
 
-  def GetUpdatePayload(self, hash, size, url):
+  # TODO(petkov): Consider optimizing getting both SHA-1 and SHA-256 so that
+  # it takes advantage of reduced I/O and multiple processors. Something like:
+  # % tee < FILE > /dev/null \
+  #     >( openssl dgst -sha256 -binary | openssl base64 ) \
+  #     >( openssl sha1 -binary | openssl base64 )
+  def _GetSHA256(self, update_path):
+    """Returns the sha256 of the file given."""
+    cmd = ('cat %s | openssl dgst -sha256 -binary | openssl base64' %
+           update_path)
+    return os.popen(cmd).read().rstrip()
+
+  def GetUpdatePayload(self, hash, sha256, size, url):
     """Returns a payload to the client corresponding to a new update.
 
     Args:
       hash: hash of update blob
+      sha256: SHA-256 hash of update blob
       size: size of update blob
       url: where to find update blob
     Returns:
       Xml string to be passed back to client.
     """
     payload = """<?xml version="1.0" encoding="UTF-8"?>
       <gupdate xmlns="http://www.google.com/update2/response" protocol="2.0">
         <daystart elapsed_seconds="%s"/>
         <app appid="{%s}" status="ok">
           <ping status="ok"/>
           <updatecheck
             codebase="%s"
             hash="%s"
+            sha256="%s"
             needsadmin="false"
             size="%s"
             status="ok"/>
         </app>
       </gupdate>
     """
     return payload % (self._GetSecondsSinceMidnight(),
-                      self.app_id, url, hash, size)
+                      self.app_id, url, hash, sha256, size)
 
   def GetNoUpdatePayload(self):
     """Returns a payload to the client corresponding to no update."""
     payload = """ < ?xml version = "1.0" encoding = "UTF-8"? >
       < gupdate xmlns = "http://www.google.com/update2/response" protocol = "2.0" >
         < daystart elapsed_seconds = "%s" />
         < app appid = "{%s}" status = "ok" >
           < ping status = "ok" />
           < updatecheck status = "noupdate" />
         </ app >
@@ skipping 232 matching lines @@
               stanza[kind + '_size'])
     return (None, None, None)
 
   def HandleFactoryRequest(self, hostname, board_id, channel):
     (filename, checksum, size) = self.GetFactoryImage(board_id, channel)
     if filename is None:
       web.debug('unable to find image for board %s' % board_id)
       return self.GetNoUpdatePayload()
     url = 'http://%s/static/%s' % (hostname, filename)
     web.debug('returning update payload ' + url)
-    return self.GetUpdatePayload(checksum, size, url)
+    # Factory install is using memento updater which is using the sha-1 hash so
+    # setting sha-256 to an empty string.
+    return self.GetUpdatePayload(checksum, '', size, url)
 
   def HandleUpdatePing(self, data, label=None):
     """Handles an update ping from an update client.
 
     Args:
       data: xml blob from client.
       label: optional label for the update.
     Returns:
       Update payload message for client.
     """
@@ skipping 43 matching lines @@
         self.forced_image = None
       elif self.serve_only:
         has_built_image = self.GenerateImageFromZip(static_image_dir)
       else:
         has_built_image = self.GenerateLatestUpdateImage(board_id,
                                                          client_version,
                                                          static_image_dir)
 
       if has_built_image:
         hash = self._GetHash(os.path.join(static_image_dir, 'update.gz'))
+        sha256 = self._GetSHA256(os.path.join(static_image_dir, 'update.gz'))
         size = self._GetSize(os.path.join(static_image_dir, 'update.gz'))
         if self.static_urlbase and label:
           url = '%s/%s/update.gz' % (self.static_urlbase, label)
         elif self.serve_only:
           url = 'http://%s/static/archive/update.gz' % hostname
         else:
           url = 'http://%s/static/update.gz' % hostname
-        return self.GetUpdatePayload(hash, size, url)
+        return self.GetUpdatePayload(hash, sha256, size, url)
       else:
         return self.GetNoUpdatePayload()