Add validation to extension packaging.

chrome/browser/extensions/extension_creator.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/extensions/extension_creator.h"
 
 #include <vector>
 #include <string>
 
 #include "base/crypto/rsa_private_key.h"
 #include "base/crypto/signature_creator.h"
 #include "base/file_util.h"
 #include "base/scoped_handle.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
+#include "chrome/browser/extensions/extension_file_util.h"
 #include "chrome/browser/extensions/sandboxed_extension_unpacker.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/zip.h"
 #include "net/base/base64.h"
 
 namespace {
   const int kRSAKeySize = 1024;
 };
 
 bool ExtensionCreator::InitializeInput(
@@ skipping 17 matching lines @@
   // If an |output_private_key| path is given, make sure it doesn't over-write
   // an existing private key.
   if (private_key_path.value().empty() &&
       !private_key_output_path.value().empty() &&
       file_util::PathExists(private_key_output_path)) {
       error_message_ = "A private key for specified extension already exists. "
                        "Reuse that key or delete it first.";
       return false;
   }
 
+  // Load the extension once. We don't really need it, but this does a lot of
+  // useful validation of the structure.
+  scoped_ptr<Extension> extension(
+      extension_file_util::LoadExtension(extension_dir,
+                                         false,  // key not required
+                                         &error_message_));
+  if (!extension.get())
+    return false;  // LoadExtension already set error_message_.
+
   return true;
 }
 
 base::RSAPrivateKey* ExtensionCreator::ReadInputKey(const FilePath&
     private_key_path) {
   if (!file_util::PathExists(private_key_path)) {
     error_message_ = "Input value for private key must exist.";
     return false;
   }
 
@@ skipping 169 matching lines @@
   bool result = false;
   if (CreateZip(extension_dir, temp_dir.path(), &zip_path) &&
       SignZip(zip_path, key_pair.get(), &signature) &&
       WriteCRX(zip_path, key_pair.get(), signature, crx_path)) {
     result = true;
   }
 
   file_util::Delete(zip_path, false);
   return result;
 }