diff options
author | asargent <asargent@chromium.org> | 2014-09-26 14:15:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-26 21:15:46 +0000 |
commit | 49264e03b28ad3813382bef032839eddf893fa7e (patch) | |
tree | 6894d1f42c019d9d802217d790e96592f24b33b1 /extensions/browser | |
parent | aaaae22e5c7a31658ecb7a562d4d6562d54fe2e7 (diff) | |
download | chromium_src-49264e03b28ad3813382bef032839eddf893fa7e.zip chromium_src-49264e03b28ad3813382bef032839eddf893fa7e.tar.gz chromium_src-49264e03b28ad3813382bef032839eddf893fa7e.tar.bz2 |
Fix case-sensitivity problems in extension content verification
On case-insensitive filesystems, extensions can generate requests
(script src tags, XHR's, etc.) to their own resources using a
relative path with incorrect case and have those requests
work (see crbug.com/29941 for some history). However, for
extension content verification, we were looking up the expected
file content hashes using the relative path given in the request,
not the actual filename, which meant that any difference in case
would be treated as "no hashes for this file".
This patch switches to using case-insensitive lookups, but uses a
multimap so that case-sensitive filesystems should not experience
problems.
BUG=412693
TEST=Install the test extension at http://goo.gl/rOpGDu, and turn
on content verification to Enforce mode in about:flags. Without
this patch, the extension will get force disabled on
windows/mac. With the patch, this should be fixed.
Review URL: https://codereview.chromium.org/585583003
Cr-Commit-Position: refs/heads/master@{#297032}
Diffstat (limited to 'extensions/browser')
-rw-r--r-- | extensions/browser/content_hash_fetcher.cc | 6 | ||||
-rw-r--r-- | extensions/browser/content_hash_reader.cc | 7 | ||||
-rw-r--r-- | extensions/browser/verified_contents.cc | 30 | ||||
-rw-r--r-- | extensions/browser/verified_contents.h | 20 | ||||
-rw-r--r-- | extensions/browser/verified_contents_unittest.cc | 90 |
5 files changed, 103 insertions, 50 deletions
diff --git a/extensions/browser/content_hash_fetcher.cc b/extensions/browser/content_hash_fetcher.cc index aa3475e..3ffdcc0 100644 --- a/extensions/browser/content_hash_fetcher.cc +++ b/extensions/browser/content_hash_fetcher.cc @@ -379,9 +379,7 @@ bool ContentHashFetcherJob::CreateHashes(const base::FilePath& hashes_file) { extension_path_.AppendRelativePath(full_path, &relative_path); relative_path = relative_path.NormalizePathSeparatorsTo('/'); - const std::string* expected_root = - verified_contents_->GetTreeHashRoot(relative_path); - if (!expected_root) + if (!verified_contents_->HasTreeHashRoot(relative_path)) continue; std::string contents; @@ -396,7 +394,7 @@ bool ContentHashFetcherJob::CreateHashes(const base::FilePath& hashes_file) { ComputedHashes::ComputeHashesForContent(contents, block_size_, &hashes); std::string root = ComputeTreeHashRoot(hashes, block_size_ / crypto::kSHA256Length); - if (expected_root && *expected_root != root) { + if (!verified_contents_->TreeHashRootEquals(relative_path, root)) { VLOG(1) << "content mismatch for " << relative_path.AsUTF8Unsafe(); hash_mismatch_paths_.insert(relative_path); continue; diff --git a/extensions/browser/content_hash_reader.cc b/extensions/browser/content_hash_reader.cc index 76fb3e2..76c7e60 100644 --- a/extensions/browser/content_hash_reader.cc +++ b/extensions/browser/content_hash_reader.cc @@ -85,14 +85,9 @@ bool ContentHashReader::Init() { block_size_ % crypto::kSHA256Length != 0) return false; - const std::string* expected_root = - verified_contents_->GetTreeHashRoot(relative_path_); - if (!expected_root) - return false; - std::string root = ComputeTreeHashRoot(hashes_, block_size_ / crypto::kSHA256Length); - if (*expected_root != root) + if (!verified_contents_->TreeHashRootEquals(relative_path_, root)) return false; status_ = SUCCESS; diff --git a/extensions/browser/verified_contents.cc b/extensions/browser/verified_contents.cc index 47c9466..d9ff75c2 100644 --- a/extensions/browser/verified_contents.cc +++ b/extensions/browser/verified_contents.cc @@ -186,8 +186,9 @@ bool VerifiedContents::InitFrom(const base::FilePath& path, return false; base::FilePath file_path = base::FilePath::FromUTF8Unsafe(file_path_string); - root_hashes_[file_path] = std::string(); - root_hashes_[file_path].swap(root_hash); + RootHashes::iterator i = root_hashes_.insert(std::make_pair( + base::StringToLowerASCII(file_path.value()), std::string())); + i->second.swap(root_hash); } break; @@ -195,13 +196,24 @@ bool VerifiedContents::InitFrom(const base::FilePath& path, return true; } -const std::string* VerifiedContents::GetTreeHashRoot( - const base::FilePath& relative_path) { - std::map<base::FilePath, std::string>::const_iterator i = - root_hashes_.find(relative_path.NormalizePathSeparatorsTo('/')); - if (i == root_hashes_.end()) - return NULL; - return &i->second; +bool VerifiedContents::HasTreeHashRoot( + const base::FilePath& relative_path) const { + base::FilePath::StringType path = base::StringToLowerASCII( + relative_path.NormalizePathSeparatorsTo('/').value()); + return root_hashes_.find(path) != root_hashes_.end(); +} + +bool VerifiedContents::TreeHashRootEquals(const base::FilePath& relative_path, + const std::string& expected) const { + base::FilePath::StringType path = base::StringToLowerASCII( + relative_path.NormalizePathSeparatorsTo('/').value()); + for (RootHashes::const_iterator i = root_hashes_.find(path); + i != root_hashes_.end(); + ++i) { + if (expected == i->second) + return true; + } + return false; } // We're loosely following the "JSON Web Signature" draft spec for signing diff --git a/extensions/browser/verified_contents.h b/extensions/browser/verified_contents.h index 1cf0bdb..7e7b7f9 100644 --- a/extensions/browser/verified_contents.h +++ b/extensions/browser/verified_contents.h @@ -46,9 +46,10 @@ class VerifiedContents { const std::string& extension_id() const { return extension_id_; } const base::Version& version() const { return version_; } - // This returns a pointer to the binary form of an expected sha256 root hash - // for |relative_path| computing using a tree hash algorithm. - const std::string* GetTreeHashRoot(const base::FilePath& relative_path); + bool HasTreeHashRoot(const base::FilePath& relative_path) const; + + bool TreeHashRootEquals(const base::FilePath& relative_path, + const std::string& expected) const; // If InitFrom has not been called yet, or was used in "ignore invalid // signature" mode, this can return false. @@ -83,8 +84,17 @@ class VerifiedContents { std::string extension_id_; base::Version version_; - // The expected treehash root hashes for each file. - std::map<base::FilePath, std::string> root_hashes_; + // The expected treehash root hashes for each file, lower cased so we can do + // case-insensitive lookups. + // + // We use a multi-map here so that we can do fast lookups of paths from + // requests on case-insensitive systems (windows, mac) where the request path + // might not have the exact right capitalization, but not break + // case-sensitive systems (linux, chromeos). TODO(asargent) - we should give + // developers client-side warnings in each of those cases, and have the + // webstore reject the cases they can statically detect. See crbug.com/29941 + typedef std::multimap<base::FilePath::StringType, std::string> RootHashes; + RootHashes root_hashes_; DISALLOW_COPY_AND_ASSIGN(VerifiedContents); }; diff --git a/extensions/browser/verified_contents_unittest.cc b/extensions/browser/verified_contents_unittest.cc index 80f1f81..865129c 100644 --- a/extensions/browser/verified_contents_unittest.cc +++ b/extensions/browser/verified_contents_unittest.cc @@ -19,21 +19,14 @@ namespace extensions { namespace { -bool Base64UrlStringEquals(std::string input, const std::string* bytes) { - if (!bytes) - return false; - if (!VerifiedContents::FixupBase64Encoding(&input)) - return false; +std::string DecodeBase64Url(const std::string& encoded) { + std::string fixed_up_base64 = encoded; + if (!VerifiedContents::FixupBase64Encoding(&fixed_up_base64)) + return std::string(); std::string decoded; - if (!base::Base64Decode(input, &decoded)) - return false; - if (decoded.size() != bytes->size()) - return false; - - if (bytes->empty()) - return true; - - return decoded == *bytes; + if (!base::Base64Decode(fixed_up_base64, &decoded)) + return std::string(); + return decoded; } bool GetPublicKey(const base::FilePath& path, std::string* public_key) { @@ -68,24 +61,69 @@ TEST(VerifiedContents, Simple) { EXPECT_EQ(contents.extension_id(), "abcdefghijklmnopabcdefghijklmnop"); EXPECT_EQ("1.2.3", contents.version().GetString()); - EXPECT_TRUE(Base64UrlStringEquals( - "-vyyIIn7iSCzg7X3ICUI5wZa3tG7w7vyiCckxZdJGfs", - contents.GetTreeHashRoot( - base::FilePath::FromUTF8Unsafe("manifest.json")))); - EXPECT_TRUE(Base64UrlStringEquals( - "txHiG5KQvNoPOSH5FbQo9Zb5gJ23j3oFB0Ru9DOnziw", - contents.GetTreeHashRoot( - base::FilePath::FromUTF8Unsafe("background.js")))); + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("manifest.json"), + DecodeBase64Url("-vyyIIn7iSCzg7X3ICUI5wZa3tG7w7vyiCckxZdJGfs"))); + + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("background.js"), + DecodeBase64Url("txHiG5KQvNoPOSH5FbQo9Zb5gJ23j3oFB0Ru9DOnziw"))); base::FilePath foo_bar_html = base::FilePath(FILE_PATH_LITERAL("foo")).AppendASCII("bar.html"); EXPECT_FALSE(foo_bar_html.IsAbsolute()); - EXPECT_TRUE( - Base64UrlStringEquals("L37LFbT_hmtxRL7AfGZN9YTpW6yoz_ZiQ1opLJn1NZU", - contents.GetTreeHashRoot(foo_bar_html))); + EXPECT_TRUE(contents.TreeHashRootEquals( + foo_bar_html, + DecodeBase64Url("L37LFbT_hmtxRL7AfGZN9YTpW6yoz_ZiQ1opLJn1NZU"))); base::FilePath nonexistent = base::FilePath::FromUTF8Unsafe("nonexistent"); - EXPECT_TRUE(contents.GetTreeHashRoot(nonexistent) == NULL); + EXPECT_FALSE(contents.HasTreeHashRoot(nonexistent)); + + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("lowercase.html"), + DecodeBase64Url("HpLotLGCmmOdKYvGQmD3OkXMKGs458dbanY4WcfAZI0"))); + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("Lowercase.Html"), + DecodeBase64Url("HpLotLGCmmOdKYvGQmD3OkXMKGs458dbanY4WcfAZI0"))); + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("LOWERCASE.HTML"), + DecodeBase64Url("HpLotLGCmmOdKYvGQmD3OkXMKGs458dbanY4WcfAZI0"))); + + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("ALLCAPS.HTML"), + DecodeBase64Url("bl-eV8ENowvtw6P14D4X1EP0mlcMoG-_aOx5o9C1364"))); + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("AllCaps.Html"), + DecodeBase64Url("bl-eV8ENowvtw6P14D4X1EP0mlcMoG-_aOx5o9C1364"))); + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("allcaps.html"), + DecodeBase64Url("bl-eV8ENowvtw6P14D4X1EP0mlcMoG-_aOx5o9C1364"))); + + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("MixedCase.Html"), + DecodeBase64Url("zEAO9FwciigMNy3NtU2XNb-dS5TQMmVNx0T9h7WvXbQ"))); + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("MIXEDCASE.HTML"), + DecodeBase64Url("zEAO9FwciigMNy3NtU2XNb-dS5TQMmVNx0T9h7WvXbQ"))); + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("mixedcase.html"), + DecodeBase64Url("zEAO9FwciigMNy3NtU2XNb-dS5TQMmVNx0T9h7WvXbQ"))); + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("mIxedcAse.Html"), + DecodeBase64Url("zEAO9FwciigMNy3NtU2XNb-dS5TQMmVNx0T9h7WvXbQ"))); + + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("mIxedcAse.Html"), + DecodeBase64Url("nKRqUcJg1_QZWAeCb4uFd5ouC0McuGavKp8TFDRqBgg"))); + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("MIXEDCASE.HTML"), + DecodeBase64Url("nKRqUcJg1_QZWAeCb4uFd5ouC0McuGavKp8TFDRqBgg"))); + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("mixedcase.html"), + DecodeBase64Url("nKRqUcJg1_QZWAeCb4uFd5ouC0McuGavKp8TFDRqBgg"))); + EXPECT_TRUE(contents.TreeHashRootEquals( + base::FilePath::FromUTF8Unsafe("MixedCase.Html"), + DecodeBase64Url("nKRqUcJg1_QZWAeCb4uFd5ouC0McuGavKp8TFDRqBgg"))); } } // namespace extensions |