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

Side by Side Diff: webkit/glue/plugins/plugin_group_unittest.cc

Issue 5918003: Bugfixes for recent PluginGroup refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years 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
« no previous file with comments | « webkit/glue/plugins/plugin_group.cc ('k') | webkit/glue/plugins/plugin_list.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "webkit/glue/plugins/plugin_group.h" 5 #include "webkit/glue/plugins/plugin_group.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/scoped_ptr.h" 10 #include "base/scoped_ptr.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "base/version.h" 14 #include "base/version.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "webkit/glue/plugins/webplugininfo.h" 16 #include "webkit/glue/plugins/webplugininfo.h"
17 #include "webkit/glue/plugins/plugin_list.h" 17 #include "webkit/glue/plugins/plugin_list.h"
18 18
19 static const VersionRangeDefinition kPluginVersionRange[] = { 19 static const VersionRangeDefinition kPluginVersionRange[] = {
20 { "", "", "3.0.44" } 20 { "", "", "3.0.44" }
21 }; 21 };
22 static const VersionRangeDefinition kPlugin3VersionRange[] = { 22 static const VersionRangeDefinition kPlugin3VersionRange[] = {
23 { "0", "4", "3.0.44" } 23 { "0", "4", "3.0.44" }
24 }; 24 };
25 static const VersionRangeDefinition kPlugin4VersionRange[] = { 25 static const VersionRangeDefinition kPlugin4VersionRange[] = {
26 { "4", "5", "4.0.44" } 26 { "4", "5", "4.0.44" }
27 }; 27 };
28 static const VersionRangeDefinition kPlugin34VersionRange[] = { 28 static const VersionRangeDefinition kPlugin34VersionRange[] = {
29 { "0", "4", "3.0.44" }, 29 { "0", "4", "3.0.44" },
30 { "4", "5", "4.0.44" } 30 { "4", "5", "" }
31 }; 31 };
32 32
33 static const PluginGroupDefinition kPluginDef = { 33 static const PluginGroupDefinition kPluginDef = {
34 "myplugin", "MyPlugin", "MyPlugin", kPluginVersionRange, 1, 34 "myplugin", "MyPlugin", "MyPlugin", kPluginVersionRange,
35 "http://latest/" }; 35 arraysize(kPluginVersionRange), "http://latest/" };
36 static const PluginGroupDefinition kPluginDef3 = { 36 static const PluginGroupDefinition kPluginDef3 = {
37 "myplugin-3", "MyPlugin 3", "MyPlugin", kPlugin3VersionRange, 1, 37 "myplugin-3", "MyPlugin 3", "MyPlugin", kPlugin3VersionRange,
38 "http://latest" }; 38 arraysize(kPlugin3VersionRange), "http://latest" };
39 static const PluginGroupDefinition kPluginDef4 = { 39 static const PluginGroupDefinition kPluginDef4 = {
40 "myplugin-4", "MyPlugin 4", "MyPlugin", kPlugin4VersionRange, 1, 40 "myplugin-4", "MyPlugin 4", "MyPlugin", kPlugin4VersionRange,
41 "http://latest" }; 41 arraysize(kPlugin4VersionRange), "http://latest" };
42 static const PluginGroupDefinition kPluginDef34 = { 42 static const PluginGroupDefinition kPluginDef34 = {
43 "myplugin-34", "MyPlugin 3/4", "MyPlugin", kPlugin34VersionRange, 2, 43 "myplugin-34", "MyPlugin 3/4", "MyPlugin", kPlugin34VersionRange,
44 "http://latest" }; 44 arraysize(kPlugin34VersionRange), "http://latest" };
45 static const PluginGroupDefinition kPluginDefNotVulnerable = { 45 static const PluginGroupDefinition kPluginDefNotVulnerable = {
46 "myplugin-latest", "MyPlugin", "MyPlugin", NULL, 0, "http://latest" }; 46 "myplugin-latest", "MyPlugin", "MyPlugin", NULL, 0, "http://latest" };
47 47
48 // name, path, version, desc, mime_types, enabled. 48 // name, path, version, desc.
49 static WebPluginInfo kPlugin2043 = WebPluginInfo( 49 static WebPluginInfo kPlugin2043 = WebPluginInfo(
50 ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("2.0.43"), 50 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.2.0.43")),
51 ASCIIToUTF16("MyPlugin version 2.0.43")); 51 ASCIIToUTF16("2.0.43"), ASCIIToUTF16("MyPlugin version 2.0.43"));
52 static WebPluginInfo kPlugin3043 = WebPluginInfo( 52 static WebPluginInfo kPlugin3043 = WebPluginInfo(
53 ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("3.0.43"), 53 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.43")),
54 ASCIIToUTF16("MyPlugin version 3.0.43")); 54 ASCIIToUTF16("3.0.43"), ASCIIToUTF16("MyPlugin version 3.0.43"));
55 static WebPluginInfo kPlugin3044 = WebPluginInfo( 55 static WebPluginInfo kPlugin3044 = WebPluginInfo(
56 ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("3.0.44"), 56 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.44")),
57 ASCIIToUTF16("MyPlugin version 3.0.44")); 57 ASCIIToUTF16("3.0.44"), ASCIIToUTF16("MyPlugin version 3.0.44"));
58 static WebPluginInfo kPlugin3045 = WebPluginInfo( 58 static WebPluginInfo kPlugin3045 = WebPluginInfo(
59 ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("3.0.45"), 59 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.45")),
60 ASCIIToUTF16("MyPlugin version 3.0.45")); 60 ASCIIToUTF16("3.0.45"), ASCIIToUTF16("MyPlugin version 3.0.45"));
61 static WebPluginInfo kPlugin4043 = WebPluginInfo( 61 static WebPluginInfo kPlugin4043 = WebPluginInfo(
62 ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("4.0.43"), 62 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.4.0.43")),
63 ASCIIToUTF16("MyPlugin version 4.0.43")); 63 ASCIIToUTF16("4.0.43"), ASCIIToUTF16("MyPlugin version 4.0.43"));
64 64
65 class PluginGroupTest : public testing::Test { 65 class PluginGroupTest : public testing::Test {
66 public: 66 public:
67 static PluginGroup* CreatePluginGroup( 67 static PluginGroup* CreatePluginGroup(
68 const PluginGroupDefinition& definition) { 68 const PluginGroupDefinition& definition) {
69 return PluginGroup::FromPluginGroupDefinition(definition); 69 return PluginGroup::FromPluginGroupDefinition(definition);
70 } 70 }
71 static PluginGroup* CreatePluginGroup(const WebPluginInfo& wpi) { 71 static PluginGroup* CreatePluginGroup(const WebPluginInfo& wpi) {
72 return PluginGroup::FromWebPluginInfo(wpi); 72 return PluginGroup::FromWebPluginInfo(wpi);
73 } 73 }
(...skipping 26 matching lines...) Expand all
100 group.reset(PluginGroupTest::CreatePluginGroup(kPluginDef34)); 100 group.reset(PluginGroupTest::CreatePluginGroup(kPluginDef34));
101 EXPECT_TRUE(group->Match(kPlugin2043)); 101 EXPECT_TRUE(group->Match(kPlugin2043));
102 EXPECT_TRUE(group->Match(kPlugin3043)); 102 EXPECT_TRUE(group->Match(kPlugin3043));
103 EXPECT_TRUE(group->Match(kPlugin4043)); 103 EXPECT_TRUE(group->Match(kPlugin4043));
104 } 104 }
105 105
106 TEST(PluginGroupTest, PluginGroupDescription) { 106 TEST(PluginGroupTest, PluginGroupDescription) {
107 string16 desc3043(ASCIIToUTF16("MyPlugin version 3.0.43")); 107 string16 desc3043(ASCIIToUTF16("MyPlugin version 3.0.43"));
108 string16 desc3045(ASCIIToUTF16("MyPlugin version 3.0.45")); 108 string16 desc3045(ASCIIToUTF16("MyPlugin version 3.0.45"));
109 109
110 PluginGroupDefinition plugindefs[] = { kPluginDef3, kPluginDef34 }; 110 PluginGroupDefinition plugindefs[] =
111 for (size_t i = 0; i < 2; ++i) { 111 { kPluginDef, kPluginDef3, kPluginDef34 };
112 for (size_t i = 0; i < arraysize(plugindefs); ++i) {
112 WebPluginInfo plugin3043(kPlugin3043); 113 WebPluginInfo plugin3043(kPlugin3043);
113 WebPluginInfo plugin3045(kPlugin3045); 114 WebPluginInfo plugin3045(kPlugin3045);
114 { 115 {
115 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup( 116 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
116 plugindefs[i])); 117 plugindefs[i]));
117 EXPECT_TRUE(group->Match(plugin3043)); 118 EXPECT_TRUE(group->Match(plugin3043));
118 group->AddPlugin(plugin3043, 0); 119 group->AddPlugin(plugin3043, 0);
119 EXPECT_EQ(desc3043, group->description()); 120 EXPECT_EQ(desc3043, group->description());
120 EXPECT_TRUE(group->IsVulnerable()); 121 EXPECT_TRUE(group->IsVulnerable());
121 EXPECT_TRUE(group->Match(plugin3045)); 122 EXPECT_TRUE(group->Match(plugin3045));
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 { "7.6.6 (1671)", "7.6.6.1671" }, // Quicktime 193 { "7.6.6 (1671)", "7.6.6.1671" }, // Quicktime
193 { "2, 0, 0, 254", "2.0.0.254" }, // DivX 194 { "2, 0, 0, 254", "2.0.0.254" }, // DivX
194 { "3, 0, 0, 0", "3.0.0.0" }, // Picasa 195 { "3, 0, 0, 0", "3.0.0.0" }, // Picasa
195 { "1, 0, 0, 1", "1.0.0.1" }, // Earth 196 { "1, 0, 0, 1", "1.0.0.1" }, // Earth
196 { "10,0,45,2", "10.0.45.2" }, // Flash 197 { "10,0,45,2", "10.0.45.2" }, // Flash
197 { "11.5.7r609", "11.5.7.609"} // Shockwave 198 { "11.5.7r609", "11.5.7.609"} // Shockwave
198 }; 199 };
199 200
200 for (size_t i = 0; i < arraysize(versions); i++) { 201 for (size_t i = 0; i < arraysize(versions); i++) {
201 const WebPluginInfo plugin = WebPluginInfo( 202 const WebPluginInfo plugin = WebPluginInfo(
202 ASCIIToUTF16("Blah Plugin"), ASCIIToUTF16(versions[i][0]), string16()); 203 ASCIIToUTF16("Blah Plugin"), FilePath(FILE_PATH_LITERAL("blahfile")),
204 ASCIIToUTF16(versions[i][0]), string16());
203 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(plugin)); 205 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(plugin));
204 EXPECT_TRUE(group->Match(plugin)); 206 EXPECT_TRUE(group->Match(plugin));
205 group->AddPlugin(plugin, 0); 207 group->AddPlugin(plugin, 0);
206 scoped_ptr<DictionaryValue> data(group->GetDataForUI()); 208 scoped_ptr<DictionaryValue> data(group->GetDataForUI());
207 std::string version; 209 std::string version;
208 data->GetString("version", &version); 210 data->GetString("version", &version);
209 EXPECT_EQ(versions[i][1], version); 211 EXPECT_EQ(versions[i][1], version);
210 } 212 }
211 } 213 }
212 214
213 TEST(PluginGroupTest, DisabledByPolicy) { 215 TEST(PluginGroupTest, DisabledByPolicy) {
214 std::set<string16> disabled_plugins; 216 std::set<string16> disabled_plugins;
215 disabled_plugins.insert(ASCIIToUTF16("Disable this!")); 217 disabled_plugins.insert(ASCIIToUTF16("Disable this!"));
216 disabled_plugins.insert(ASCIIToUTF16("*Google*")); 218 disabled_plugins.insert(ASCIIToUTF16("*Google*"));
217 PluginGroup::SetPolicyDisabledPluginPatterns(disabled_plugins); 219 PluginGroup::SetPolicyDisabledPluginPatterns(disabled_plugins);
218 220
219 EXPECT_FALSE(PluginGroup::IsPluginNameDisabledByPolicy(ASCIIToUTF16("42"))); 221 EXPECT_FALSE(PluginGroup::IsPluginNameDisabledByPolicy(ASCIIToUTF16("42")));
220 EXPECT_TRUE(PluginGroup::IsPluginNameDisabledByPolicy( 222 EXPECT_TRUE(PluginGroup::IsPluginNameDisabledByPolicy(
221 ASCIIToUTF16("Disable this!"))); 223 ASCIIToUTF16("Disable this!")));
222 EXPECT_TRUE(PluginGroup::IsPluginNameDisabledByPolicy( 224 EXPECT_TRUE(PluginGroup::IsPluginNameDisabledByPolicy(
223 ASCIIToUTF16("Google Earth"))); 225 ASCIIToUTF16("Google Earth")));
224 } 226 }
227
228 TEST(PluginGroupTest, IsVulnerable) {
229 // Adobe Reader 10
230 VersionRangeDefinition adobe_reader_version_range[] = {
231 { "10", "11", "" },
232 { "9", "10", "9.4.1" },
233 { "0", "9", "8.2.5" }
234 };
235 PluginGroupDefinition adobe_reader_plugin_def = {
236 "adobe-reader", "Adobe Reader", "Adobe Acrobat",
237 adobe_reader_version_range, arraysize(adobe_reader_version_range),
238 "http://get.adobe.com/reader/" };
239 WebPluginInfo adobe_reader_plugin(ASCIIToUTF16("Adobe Reader"),
240 FilePath(FILE_PATH_LITERAL("/reader.so")),
241 ASCIIToUTF16("10.0.0.396"),
242 ASCIIToUTF16("adobe reader 10"));
243 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
244 adobe_reader_plugin_def));
245 group->AddPlugin(adobe_reader_plugin, 0);
246 PluginGroup group_copy(*group); // Exercise the copy constructor.
247 EXPECT_FALSE(group_copy.IsVulnerable());
248
249 // Silverlight 4
250 VersionRangeDefinition silverlight_version_range[] = {
251 { "0", "4", "3.0.50106.0" },
252 { "4", "5", "" }
253 };
254 PluginGroupDefinition silverlight_plugin_def = {
255 "silverlight", "Silverlight", "Silverlight", silverlight_version_range,
256 arraysize(silverlight_version_range),
257 "http://www.microsoft.com/getsilverlight/" };
258 WebPluginInfo silverlight_plugin(ASCIIToUTF16("Silverlight"),
259 FilePath(FILE_PATH_LITERAL("/silver.so")),
260 ASCIIToUTF16("4.0.50917.0"),
261 ASCIIToUTF16("silverlight 4"));
262 group.reset(PluginGroupTest::CreatePluginGroup(silverlight_plugin_def));
263 group->AddPlugin(silverlight_plugin, 0);
264 EXPECT_FALSE(PluginGroup(*group).IsVulnerable());
265 }
OLDNEW
« no previous file with comments | « webkit/glue/plugins/plugin_group.cc ('k') | webkit/glue/plugins/plugin_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698