Enforce new id format (hex str of sha-1)

chrome/browser/extensions/extension.cc

 // Copyright (c) 2006-2008 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.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "net/base/net_util.h"
@@ skipping 51 matching lines @@
     "Required value 'name' is missing or invalid.";
 const char* Extension::kInvalidRunAtError =
     "Invalid value for 'content_scripts[*].run_at'.";
 const char* Extension::kInvalidVersionError =
     "Required value 'version' is missing or invalid.";
 const char* Extension::kInvalidZipHashError =
     "Required key 'zip_hash' is missing or invalid.";
 const char* Extension::kInvalidPluginsDirError =
     "Invalid value for 'plugins_dir'.";
 
+const int Extension::kIdSize = 20;  // SHA1 (160 bits) == 20 bytes
+
 const std::string Extension::VersionString() const {
   return version_->GetString();
 }
 
 // static
 GURL Extension::GetResourceURL(const GURL& extension_url,
                                const std::string& relative_path) {
   DCHECK(extension_url.SchemeIs(chrome::kExtensionScheme));
   DCHECK(extension_url.path() == "/");
 
@@ skipping 83 matching lines @@
       static_cast<uint32>(format_version) != kExpectedFormatVersion) {
     *error = kInvalidFormatVersionError;
     return false;
   }
 
   // Initialize id.
   if (!source.GetString(kIdKey, &id_)) {
     *error = kInvalidIdError;
     return false;
   }
-  // Verify that the id is legal.  This test is basically verifying that it
-  // is ASCII and doesn't have any path components in it.
-  // TODO(erikkay): verify the actual id format - it will be more restrictive
-  // than this.  Perhaps just a hex string?
-  if (!IsStringASCII(id_)) {
-    *error = kInvalidIdError;
-    return false;
-  }
-  FilePath id_path;
-  id_path = id_path.AppendASCII(id_);
-  if ((id_path.value() == FilePath::kCurrentDirectory) ||
-      (id_path.value() == FilePath::kParentDirectory) ||
-      !(id_path.BaseName() == id_path)) {
+
+  // Verify that the id is legal.  The id is a hex string of the SHA-1 hash of
+  // the public key.
+  std::vector<uint8> id_bytes;
+  if (!HexStringToBytes(id_, &id_bytes) || id_bytes.size() != kIdSize) {
     *error = kInvalidIdError;
     return false;
   }
 
   // Initialize URL.
   extension_url_ = GURL(std::string(chrome::kExtensionScheme) +
                         chrome::kStandardSchemeSeparator + id_ + "/");
 
   // Initialize version.
   std::string version_str;
@@ skipping 126 matching lines @@
       script.set_path(Extension::GetResourcePath(path(), file));
       script.set_url(Extension::GetResourceURL(url(), file));
 
       content_scripts_.push_back(script);
     }
   }
 
   return true;
 }