Add HasPublicKey to crx_id.

tools/crx_id/crx_id.py

 #!/usr/bin/env python
 # 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.
 
 """ Read a CRX file and write out the App ID and the Full Hash of the ID.
 See: http://code.google.com/chrome/extensions/crx.html
 and 'http://stackoverflow.com/questions/'
   + '1882981/google-chrome-alphanumeric-hashes-to-identify-extensions'
 for docs on the format.
@@ skipping 77 matching lines @@
 
 def GetPublicKeyUnpacked(f, filepath):
   manifest = json.load(f)
   if 'key' not in manifest:
     # Use the path as the public key.
     # See Extension::GenerateIdForPath in extension.cc
     return GetPublicKeyFromPath(filepath)
   else:
     return base64.standard_b64decode(manifest['key'])
 
-def GetPublicKey(filename, from_test_path):
-  if from_test_path:
+def HasPublicKey(filename):
+  if os.path.isdir(filename):
+    with open(os.path.join(filename, 'manifest.json'), 'rb') as f:
+      manifest = json.load(f)
+      return 'key' in manifest
+  return False
+
+def GetPublicKey(filename, from_file_path):
+  if from_file_path:
     return GetPublicKeyFromPath(filename)
 
   pub_key = ''
   if os.path.isdir(filename):
     # Assume it's an unpacked extension
     f = open(os.path.join(filename, 'manifest.json'), 'rb')
     pub_key = GetPublicKeyUnpacked(f, filename)
     f.close()
   else:
     # Assume it's a packed extension.
     f = open(filename, 'rb')
     pub_key = GetPublicKeyPacked(f)
     f.close()
   return pub_key
 
-def GetCRXHash(filename, from_test_path=False):
-  pub_key = GetPublicKey(filename, from_test_path)
+def GetCRXHash(filename, from_file_path=False):
+  pub_key = GetPublicKey(filename, from_file_path)
   pub_key_hash = hashlib.sha256(pub_key).digest()
   return HexTo256(pub_key_hash)
 
-def GetCRXAppID(filename, from_test_path=False):
-  pub_key = GetPublicKey(filename, from_test_path)
+def GetCRXAppID(filename, from_file_path=False):
+  pub_key = GetPublicKey(filename, from_file_path)
   pub_key_hash = hashlib.sha256(pub_key).digest()
   # AppID is the MPDecimal of only the first 128 bits of the hash.
   return HexToMPDecimal(pub_key_hash[:128/8])
 
 def main(argv):
   if len(argv) != 2:
     usage(argv)
     return 1
   print 'Raw Bytes: %s' % GetCRXHash(sys.argv[1])
   print 'AppID: %s' % GetCRXAppID(sys.argv[1])
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))