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

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

Issue 10388253: Revert 138502 - Move version metadata from PluginGroup into PluginInstaller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 months 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/plugins/npapi/plugin_group.cc ('k') | webkit/plugins/npapi/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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/plugins/npapi/plugin_group.h" 5 #include "webkit/plugins/npapi/plugin_group.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/string16.h"
12 #include "base/string_util.h"
11 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "base/values.h"
12 #include "base/version.h" 15 #include "base/version.h"
13 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 #include "webkit/plugins/webplugininfo.h"
14 18
15 namespace webkit { 19 namespace webkit {
16 namespace npapi { 20 namespace npapi {
17 21
18 TEST(PluginGroupTest, VersionExtraction) { 22 static const VersionRangeDefinition kPluginVersionRange[] = {
23 { "", "", "3.0.44" }
24 };
25 static const VersionRangeDefinition kPlugin3VersionRange[] = {
26 { "0", "4", "3.0.44" }
27 };
28 static const VersionRangeDefinition kPlugin4VersionRange[] = {
29 { "4", "5", "4.0.44" }
30 };
31 static const VersionRangeDefinition kPlugin34VersionRange[] = {
32 { "0", "4", "3.0.44" },
33 { "4", "5", "" }
34 };
35
36 static const PluginGroupDefinition kPluginDef = {
37 "myplugin", "MyPlugin", "MyPlugin", kPluginVersionRange,
38 arraysize(kPluginVersionRange) };
39 static const PluginGroupDefinition kPluginDef3 = {
40 "myplugin-3", "MyPlugin 3", "MyPlugin", kPlugin3VersionRange,
41 arraysize(kPlugin3VersionRange) };
42 static const PluginGroupDefinition kPluginDef4 = {
43 "myplugin-4", "MyPlugin 4", "MyPlugin", kPlugin4VersionRange,
44 arraysize(kPlugin4VersionRange) };
45 static const PluginGroupDefinition kPluginDef34 = {
46 "myplugin-34", "MyPlugin 3/4", "MyPlugin", kPlugin34VersionRange,
47 arraysize(kPlugin34VersionRange) };
48 static const PluginGroupDefinition kPluginDefNotVulnerable = {
49 "myplugin-latest", "MyPlugin", "MyPlugin", NULL, 0 };
50
51 const PluginGroupDefinition kPluginDefinitions[] = {
52 kPluginDef,
53 kPluginDef3,
54 kPluginDef4,
55 kPluginDef34,
56 kPluginDefNotVulnerable,
57 };
58
59 // name, path, version, desc.
60 static const WebPluginInfo kPluginNoVersion = WebPluginInfo(
61 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.2.0.43")),
62 string16(), ASCIIToUTF16("MyPlugin version 2.0.43"));
63 static const WebPluginInfo kPlugin2043 = WebPluginInfo(
64 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.2.0.43")),
65 ASCIIToUTF16("2.0.43"), ASCIIToUTF16("MyPlugin version 2.0.43"));
66 static const WebPluginInfo kPlugin3043 = WebPluginInfo(
67 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.43")),
68 ASCIIToUTF16("3.0.43"), ASCIIToUTF16("MyPlugin version 3.0.43"));
69 static const WebPluginInfo kPlugin3044 = WebPluginInfo(
70 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.44")),
71 ASCIIToUTF16("3.0.44"), ASCIIToUTF16("MyPlugin version 3.0.44"));
72 static const WebPluginInfo kPlugin3045 = WebPluginInfo(
73 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.45")),
74 ASCIIToUTF16("3.0.45"), ASCIIToUTF16("MyPlugin version 3.0.45"));
75 static const WebPluginInfo kPlugin3045r = WebPluginInfo(
76 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.45")),
77 ASCIIToUTF16("3.0r45"), ASCIIToUTF16("MyPlugin version 3.0r45"));
78 static const WebPluginInfo kPlugin4043 = WebPluginInfo(
79 ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.4.0.43")),
80 ASCIIToUTF16("4.0.43"), ASCIIToUTF16("MyPlugin version 4.0.43"));
81
82 class PluginGroupTest : public testing::Test {
83 public:
84 static PluginGroup* CreatePluginGroup(
85 const PluginGroupDefinition& definition) {
86 return PluginGroup::FromPluginGroupDefinition(definition);
87 }
88 static PluginGroup* CreatePluginGroup(const WebPluginInfo& wpi) {
89 return PluginGroup::FromWebPluginInfo(wpi);
90 }
91 };
92
93 TEST_F(PluginGroupTest, PluginGroupMatch) {
94 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
95 kPluginDef3));
96 EXPECT_TRUE(group->Match(kPlugin3045));
97 EXPECT_TRUE(group->Match(kPlugin3045r));
98 EXPECT_FALSE(group->Match(kPluginNoVersion));
99 group->AddPlugin(kPlugin3045);
100 EXPECT_FALSE(group->IsVulnerable(kPlugin3045));
101
102 group.reset(PluginGroupTest::CreatePluginGroup(kPluginDef));
103 EXPECT_FALSE(group->Match(kPluginNoVersion));
104 }
105
106 TEST_F(PluginGroupTest, PluginGroupMatchCorrectVersion) {
107 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
108 kPluginDef3));
109 EXPECT_TRUE(group->Match(kPlugin2043));
110 EXPECT_TRUE(group->Match(kPlugin3043));
111 EXPECT_FALSE(group->Match(kPlugin4043));
112
113 group.reset(PluginGroupTest::CreatePluginGroup(kPluginDef4));
114 EXPECT_FALSE(group->Match(kPlugin2043));
115 EXPECT_FALSE(group->Match(kPlugin3043));
116 EXPECT_TRUE(group->Match(kPlugin4043));
117
118 group.reset(PluginGroupTest::CreatePluginGroup(kPluginDef34));
119 EXPECT_TRUE(group->Match(kPlugin2043));
120 EXPECT_TRUE(group->Match(kPlugin3043));
121 EXPECT_TRUE(group->Match(kPlugin4043));
122 }
123
124 TEST_F(PluginGroupTest, PluginGroupDefinition) {
125 for (size_t i = 0; i < arraysize(kPluginDefinitions); ++i) {
126 scoped_ptr<PluginGroup> def_group(
127 PluginGroupTest::CreatePluginGroup(kPluginDefinitions[i]));
128 ASSERT_TRUE(def_group.get() != NULL);
129 }
130 }
131
132 TEST_F(PluginGroupTest, VersionExtraction) {
19 // Some real-world plugin versions (spaces, commata, parentheses, 'r', oh my) 133 // Some real-world plugin versions (spaces, commata, parentheses, 'r', oh my)
20 const char* versions[][2] = { 134 const char* versions[][2] = {
21 { "7.6.6 (1671)", "7.6.6.1671" }, // Quicktime 135 { "7.6.6 (1671)", "7.6.6.1671" }, // Quicktime
22 { "2, 0, 0, 254", "2.0.0.254" }, // DivX 136 { "2, 0, 0, 254", "2.0.0.254" }, // DivX
23 { "3, 0, 0, 0", "3.0.0.0" }, // Picasa 137 { "3, 0, 0, 0", "3.0.0.0" }, // Picasa
24 { "1, 0, 0, 1", "1.0.0.1" }, // Earth 138 { "1, 0, 0, 1", "1.0.0.1" }, // Earth
25 { "10,0,45,2", "10.0.45.2" }, // Flash 139 { "10,0,45,2", "10.0.45.2" }, // Flash
26 { "10.1 r102", "10.1.102"}, // Flash 140 { "10.1 r102", "10.1.102"}, // Flash
27 { "10.3 d180", "10.3.180" }, // Flash (Debug) 141 { "10.3 d180", "10.3.180" }, // Flash (Debug)
28 { "11.5.7r609", "11.5.7.609"}, // Shockwave 142 { "11.5.7r609", "11.5.7.609"}, // Shockwave
29 { "1.6.0_22", "1.6.0.22"}, // Java 143 { "1.6.0_22", "1.6.0.22"}, // Java
30 }; 144 };
31 145
32 for (size_t i = 0; i < arraysize(versions); i++) { 146 for (size_t i = 0; i < arraysize(versions); i++) {
33 scoped_ptr<Version> version(PluginGroup::CreateVersionFromString( 147 scoped_ptr<Version> version(PluginGroup::CreateVersionFromString(
34 ASCIIToUTF16(versions[i][0]))); 148 ASCIIToUTF16(versions[i][0])));
35 EXPECT_EQ(versions[i][1], version->GetString()); 149 EXPECT_STREQ(versions[i][1], version->GetString().c_str());
36 } 150 }
37 } 151 }
38 152
153 TEST_F(PluginGroupTest, IsVulnerable) {
154 // Adobe Reader 10
155 VersionRangeDefinition adobe_reader_version_range[] = {
156 { "10", "11", "" },
157 { "9", "10", "9.4.1" },
158 { "0", "9", "8.2.5" }
159 };
160 PluginGroupDefinition adobe_reader_plugin_def = {
161 "adobe-reader", "Adobe Reader", "Adobe Acrobat",
162 adobe_reader_version_range, arraysize(adobe_reader_version_range) };
163 WebPluginInfo adobe_reader_plugin(ASCIIToUTF16("Adobe Reader"),
164 FilePath(FILE_PATH_LITERAL("/reader.so")),
165 ASCIIToUTF16("10.0.0.396"),
166 ASCIIToUTF16("adobe reader 10"));
167 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
168 adobe_reader_plugin_def));
169 group->AddPlugin(adobe_reader_plugin);
170 PluginGroup group_copy(*group); // Exercise the copy constructor.
171 EXPECT_FALSE(group_copy.IsVulnerable(adobe_reader_plugin));
172
173 // Silverlight 4
174 VersionRangeDefinition silverlight_version_range[] = {
175 { "0", "4", "3.0.50106.0" },
176 { "4", "5", "" }
177 };
178 PluginGroupDefinition silverlight_plugin_def = {
179 "silverlight", "Silverlight", "Silverlight", silverlight_version_range,
180 arraysize(silverlight_version_range) };
181 WebPluginInfo silverlight_plugin(ASCIIToUTF16("Silverlight"),
182 FilePath(FILE_PATH_LITERAL("/silver.so")),
183 ASCIIToUTF16("4.0.50917.0"),
184 ASCIIToUTF16("silverlight 4"));
185 group.reset(PluginGroupTest::CreatePluginGroup(silverlight_plugin_def));
186 group->AddPlugin(silverlight_plugin);
187 EXPECT_FALSE(PluginGroup(*group).IsVulnerable(silverlight_plugin));
188 }
189
39 } // namespace npapi 190 } // namespace npapi
40 } // namespace webkit 191 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/npapi/plugin_group.cc ('k') | webkit/plugins/npapi/plugin_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698