Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Side by Side Diff: chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc

Issue 71303009: Fix browser crash when parsing invalid Settings Override extension (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler. h" 5 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler. h"
6 6
7 #include "base/json/json_string_value_serializer.h" 7 #include "base/json/json_string_value_serializer.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/common/extensions/extension.h" 9 #include "chrome/common/extensions/extension.h"
10 #include "chrome/common/extensions/features/feature_channel.h" 10 #include "chrome/common/extensions/features/feature_channel.h"
(...skipping 14 matching lines...) Expand all
25 " \"search_url\" : \"http://www.foo.com/s?q={searchTerms}\"," 25 " \"search_url\" : \"http://www.foo.com/s?q={searchTerms}\","
26 " \"favicon_url\" : \"http://www.foo.com/favicon.ico\"," 26 " \"favicon_url\" : \"http://www.foo.com/favicon.ico\","
27 " \"suggest_url\" : \"http://www.foo.com/s?q={searchTerms}\"," 27 " \"suggest_url\" : \"http://www.foo.com/s?q={searchTerms}\","
28 " \"encoding\" : \"UTF-8\"," 28 " \"encoding\" : \"UTF-8\","
29 " \"is_default\" : true" 29 " \"is_default\" : true"
30 " }," 30 " },"
31 " \"startup_pages\" : [\"http://www.startup.com\"]" 31 " \"startup_pages\" : [\"http://www.startup.com\"]"
32 " }" 32 " }"
33 "}"; 33 "}";
34 34
35 const char kBrokenManifest[] = "{"
36 " \"version\" : \"1.0.0.0\","
37 " \"name\" : \"Test\","
38 " \"chrome_settings_overrides\" : {"
39 " \"homepage\" : \"{invalid}\","
40 " \"search_provider\" : {"
41 " \"name\" : \"first\","
42 " \"keyword\" : \"firstkey\","
43 " \"search_url\" : \"{invalid}/s?q={searchTerms}\","
44 " \"favicon_url\" : \"{invalid}/favicon.ico\","
45 " \"encoding\" : \"UTF-8\","
46 " \"is_default\" : true"
47 " },"
48 " \"startup_pages\" : [\"{invalid}\"]"
49 " }"
50 "}";
51
35 using extensions::api::manifest_types::ChromeSettingsOverrides; 52 using extensions::api::manifest_types::ChromeSettingsOverrides;
36 using extensions::Extension; 53 using extensions::Extension;
37 using extensions::Manifest; 54 using extensions::Manifest;
38 using extensions::SettingsOverrides; 55 using extensions::SettingsOverrides;
39 namespace manifest_keys = extensions::manifest_keys; 56 namespace manifest_keys = extensions::manifest_keys;
40 57
41 class DeclarativeSettingsTest : public testing::Test { 58 class OverrideSettingsTest : public testing::Test {
42 }; 59 };
43 60
44 61
45 TEST_F(DeclarativeSettingsTest, ParseManifest) { 62 TEST_F(OverrideSettingsTest, ParseManifest) {
46 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_DEV); 63 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_DEV);
47 std::string manifest(kManifest); 64 std::string manifest(kManifest);
48 JSONStringValueSerializer json(&manifest); 65 JSONStringValueSerializer json(&manifest);
49 std::string error; 66 std::string error;
50 scoped_ptr<base::Value> root(json.Deserialize(NULL, &error)); 67 scoped_ptr<base::Value> root(json.Deserialize(NULL, &error));
51 ASSERT_TRUE(root); 68 ASSERT_TRUE(root);
52 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)); 69 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
53 scoped_refptr<Extension> extension = Extension::Create( 70 scoped_refptr<Extension> extension = Extension::Create(
54 base::FilePath(FILE_PATH_LITERAL("//nonexistent")), 71 base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
55 Manifest::INVALID_LOCATION, 72 Manifest::INVALID_LOCATION,
56 *static_cast<base::DictionaryValue*>(root.get()), 73 *static_cast<base::DictionaryValue*>(root.get()),
57 Extension::NO_FLAGS, 74 Extension::NO_FLAGS,
58 &error); 75 &error);
59 ASSERT_TRUE(extension); 76 ASSERT_TRUE(extension);
60 ASSERT_TRUE(extension->manifest()->HasPath(manifest_keys::kSettingsOverride)); 77 ASSERT_TRUE(extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
61 78
62 SettingsOverrides* settings_override = static_cast<SettingsOverrides*>( 79 SettingsOverrides* settings_override = static_cast<SettingsOverrides*>(
63 extension->GetManifestData(manifest_keys::kSettingsOverride)); 80 extension->GetManifestData(manifest_keys::kSettingsOverride));
64 ASSERT_TRUE(settings_override); 81 ASSERT_TRUE(settings_override);
65 ASSERT_TRUE(settings_override->search_engine); 82 ASSERT_TRUE(settings_override->search_engine);
66 EXPECT_TRUE(settings_override->search_engine->is_default); 83 EXPECT_TRUE(settings_override->search_engine->is_default);
67 const ChromeSettingsOverrides::Search_provider* search_engine = 84 const ChromeSettingsOverrides::Search_provider* search_engine =
68 settings_override->search_engine.get(); 85 settings_override->search_engine.get();
69 EXPECT_EQ("first", search_engine->name); 86 EXPECT_EQ("first", search_engine->name);
70 EXPECT_EQ("firstkey", search_engine->keyword); 87 EXPECT_EQ("firstkey", search_engine->keyword);
71 EXPECT_EQ("http://www.foo.com/s?q={searchTerms}", search_engine->search_url); 88 EXPECT_EQ("http://www.foo.com/s?q={searchTerms}", search_engine->search_url);
72 EXPECT_EQ("http://www.foo.com/favicon.ico", search_engine->favicon_url); 89 EXPECT_EQ("http://www.foo.com/favicon.ico", search_engine->favicon_url);
73 EXPECT_EQ("http://www.foo.com/s?q={searchTerms}", 90 EXPECT_EQ("http://www.foo.com/s?q={searchTerms}",
74 *search_engine->suggest_url); 91 *search_engine->suggest_url);
75 EXPECT_EQ("UTF-8", search_engine->encoding); 92 EXPECT_EQ("UTF-8", search_engine->encoding);
76 93
77 EXPECT_EQ(std::vector<GURL>(1, GURL("http://www.startup.com")), 94 EXPECT_EQ(std::vector<GURL>(1, GURL("http://www.startup.com")),
78 settings_override->startup_pages); 95 settings_override->startup_pages);
79 96
80 ASSERT_TRUE(settings_override->homepage); 97 ASSERT_TRUE(settings_override->homepage);
81 EXPECT_EQ(GURL("http://www.homepage.com"), *settings_override->homepage); 98 EXPECT_EQ(GURL("http://www.homepage.com"), *settings_override->homepage);
82 } 99 }
83 100
101 TEST_F(OverrideSettingsTest, ParseBrokenManifest) {
102 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_DEV);
103 std::string manifest(kBrokenManifest);
104 JSONStringValueSerializer json(&manifest);
105 std::string error;
106 scoped_ptr<base::Value> root(json.Deserialize(NULL, &error));
107 ASSERT_TRUE(root);
108 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
109 scoped_refptr<Extension> extension = Extension::Create(
110 base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
111 Manifest::INVALID_LOCATION,
112 *static_cast<base::DictionaryValue*>(root.get()),
113 Extension::NO_FLAGS,
114 &error);
not at google - send to devlin 2013/11/16 00:38:30 EXPECT_EQ(that error you just added, error) ?
vasilii 2013/11/16 00:55:38 Done.
115 EXPECT_FALSE(extension);
116 }
117
84 } // namespace 118 } // namespace
OLDNEW
« no previous file with comments | « chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc ('k') | extensions/common/manifest_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698