OLD | NEW |
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" |
(...skipping 29 matching lines...) Expand all Loading... |
40 "myplugin-4", "MyPlugin 4", "MyPlugin", kPlugin4VersionRange, 1, | 40 "myplugin-4", "MyPlugin 4", "MyPlugin", kPlugin4VersionRange, 1, |
41 "http://latest" }; | 41 "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, 2, |
44 "http://latest" }; | 44 "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, mime_types, enabled. |
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 } |
74 protected: | 74 protected: |
75 virtual void TearDown() { | 75 virtual void TearDown() { |
76 PluginGroup::SetPolicyDisabledPluginPatterns(std::set<string16>()); | 76 PluginGroup::SetPolicyDisabledPluginPatterns(std::set<string16>()); |
77 } | 77 } |
78 }; | 78 }; |
79 | 79 |
80 TEST(PluginGroupTest, PluginGroupMatch) { | 80 TEST(PluginGroupTest, PluginGroupMatch) { |
81 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup( | 81 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup( |
82 kPluginDef3)); | 82 kPluginDef3)); |
83 EXPECT_TRUE(group->Match(kPlugin3045)); | 83 EXPECT_TRUE(group->Match(kPlugin3045)); |
84 group->AddPlugin(kPlugin3045, 0); | 84 group->AddPlugin(kPlugin3045, 0, NULL); |
85 EXPECT_FALSE(group->IsVulnerable()); | 85 EXPECT_FALSE(group->IsVulnerable()); |
86 } | 86 } |
87 | 87 |
88 TEST(PluginGroupTest, PluginGroupMatchCorrectVersion) { | 88 TEST(PluginGroupTest, PluginGroupMatchCorrectVersion) { |
89 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup( | 89 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup( |
90 kPluginDef3)); | 90 kPluginDef3)); |
91 EXPECT_TRUE(group->Match(kPlugin2043)); | 91 EXPECT_TRUE(group->Match(kPlugin2043)); |
92 EXPECT_TRUE(group->Match(kPlugin3043)); | 92 EXPECT_TRUE(group->Match(kPlugin3043)); |
93 EXPECT_FALSE(group->Match(kPlugin4043)); | 93 EXPECT_FALSE(group->Match(kPlugin4043)); |
94 | 94 |
(...skipping 13 matching lines...) Expand all Loading... |
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[] = { kPluginDef3, kPluginDef34 }; |
111 for (size_t i = 0; i < 2; ++i) { | 111 for (size_t i = 0; i < 2; ++i) { |
112 WebPluginInfo plugin3043(kPlugin3043); | 112 WebPluginInfo plugin3043(kPlugin3043); |
113 WebPluginInfo plugin3045(kPlugin3045); | 113 WebPluginInfo plugin3045(kPlugin3045); |
114 { | 114 { |
115 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup( | 115 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup( |
116 plugindefs[i])); | 116 plugindefs[i])); |
117 EXPECT_TRUE(group->Match(plugin3043)); | 117 EXPECT_TRUE(group->Match(plugin3043)); |
118 group->AddPlugin(plugin3043, 0); | 118 group->AddPlugin(plugin3043, 0, NULL); |
119 EXPECT_EQ(desc3043, group->description()); | 119 EXPECT_EQ(desc3043, group->description()); |
120 EXPECT_TRUE(group->IsVulnerable()); | 120 EXPECT_TRUE(group->IsVulnerable()); |
121 EXPECT_TRUE(group->Match(plugin3045)); | 121 EXPECT_TRUE(group->Match(plugin3045)); |
122 group->AddPlugin(plugin3045, 1); | 122 group->AddPlugin(plugin3045, 1, NULL); |
123 EXPECT_EQ(desc3043, group->description()); | 123 EXPECT_EQ(desc3043, group->description()); |
124 EXPECT_TRUE(group->IsVulnerable()); | 124 EXPECT_TRUE(group->IsVulnerable()); |
125 } | 125 } |
126 | 126 |
127 { | 127 { |
128 // Disable the first plugin. | 128 // Disable the first plugin. |
129 plugin3043.enabled = false; | 129 plugin3043.enabled = false; |
130 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup( | 130 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup( |
131 plugindefs[i])); | 131 plugindefs[i])); |
132 EXPECT_TRUE(group->Match(plugin3043)); | 132 EXPECT_TRUE(group->Match(plugin3043)); |
133 group->AddPlugin(plugin3043, 0); | 133 group->AddPlugin(plugin3043, 0, NULL); |
134 EXPECT_EQ(desc3043, group->description()); | 134 EXPECT_EQ(desc3043, group->description()); |
135 EXPECT_TRUE(group->IsVulnerable()); | 135 EXPECT_TRUE(group->IsVulnerable()); |
136 EXPECT_FALSE(group->Enabled()); | 136 EXPECT_FALSE(group->Enabled()); |
137 EXPECT_TRUE(group->Match(plugin3045)); | 137 EXPECT_TRUE(group->Match(plugin3045)); |
138 group->AddPlugin(plugin3045, 1); | 138 group->AddPlugin(plugin3045, 1, NULL); |
139 EXPECT_EQ(desc3045, group->description()); | 139 EXPECT_EQ(desc3045, group->description()); |
140 EXPECT_FALSE(group->IsVulnerable()); | 140 EXPECT_FALSE(group->IsVulnerable()); |
141 } | 141 } |
142 | 142 |
143 { | 143 { |
144 // Disable the second plugin. | 144 // Disable the second plugin. |
145 plugin3045.enabled = false; | 145 plugin3045.enabled = false; |
146 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup( | 146 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup( |
147 plugindefs[i])); | 147 plugindefs[i])); |
148 EXPECT_TRUE(group->Match(plugin3043)); | 148 EXPECT_TRUE(group->Match(plugin3043)); |
149 group->AddPlugin(plugin3043, 1); | 149 group->AddPlugin(plugin3043, 1, NULL); |
150 EXPECT_EQ(desc3043, group->description()); | 150 EXPECT_EQ(desc3043, group->description()); |
151 EXPECT_TRUE(group->IsVulnerable()); | 151 EXPECT_TRUE(group->IsVulnerable()); |
152 EXPECT_TRUE(group->Match(plugin3045)); | 152 EXPECT_TRUE(group->Match(plugin3045)); |
153 group->AddPlugin(plugin3045, 0); | 153 group->AddPlugin(plugin3045, 0, NULL); |
154 EXPECT_EQ(desc3043, group->description()); | 154 EXPECT_EQ(desc3043, group->description()); |
155 EXPECT_TRUE(group->IsVulnerable()); | 155 EXPECT_TRUE(group->IsVulnerable()); |
156 } | 156 } |
157 } | 157 } |
158 } | 158 } |
159 | 159 |
160 TEST(PluginGroupTest, PluginGroupDefinition) { | 160 TEST(PluginGroupTest, PluginGroupDefinition) { |
161 const PluginGroupDefinition* definitions = | 161 const PluginGroupDefinition* definitions = |
162 NPAPI::PluginList::GetPluginGroupDefinitions(); | 162 NPAPI::PluginList::GetPluginGroupDefinitions(); |
163 for (size_t i = 0; | 163 for (size_t i = 0; |
164 i < NPAPI::PluginList::GetPluginGroupDefinitionsSize(); | 164 i < NPAPI::PluginList::GetPluginGroupDefinitionsSize(); |
165 ++i) { | 165 ++i) { |
166 scoped_ptr<PluginGroup> def_group( | 166 scoped_ptr<PluginGroup> def_group( |
167 PluginGroupTest::CreatePluginGroup(definitions[i])); | 167 PluginGroupTest::CreatePluginGroup(definitions[i])); |
168 ASSERT_TRUE(def_group.get() != NULL); | 168 ASSERT_TRUE(def_group.get() != NULL); |
169 EXPECT_FALSE(def_group->Match(kPlugin2043)); | 169 EXPECT_FALSE(def_group->Match(kPlugin2043)); |
170 } | 170 } |
171 } | 171 } |
172 | 172 |
173 TEST(PluginGroupTest, DisableOutdated) { | 173 TEST(PluginGroupTest, DisableOutdated) { |
174 PluginGroupDefinition plugindefs[] = { kPluginDef3, kPluginDef34 }; | 174 PluginGroupDefinition plugindefs[] = { kPluginDef3, kPluginDef34 }; |
175 for (size_t i = 0; i < 2; ++i) { | 175 for (size_t i = 0; i < 2; ++i) { |
176 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup( | 176 scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup( |
177 plugindefs[i])); | 177 plugindefs[i])); |
178 group->AddPlugin(kPlugin3043, 0); | 178 group->AddPlugin(kPlugin3043, 0, NULL); |
179 group->AddPlugin(kPlugin3045, 1); | 179 group->AddPlugin(kPlugin3045, 1, NULL); |
| 180 |
180 EXPECT_EQ(ASCIIToUTF16("MyPlugin version 3.0.43"), group->description()); | 181 EXPECT_EQ(ASCIIToUTF16("MyPlugin version 3.0.43"), group->description()); |
181 EXPECT_TRUE(group->IsVulnerable()); | 182 EXPECT_TRUE(group->IsVulnerable()); |
182 | 183 |
183 group->DisableOutdatedPlugins(); | 184 group->DisableOutdatedPlugins(); |
184 EXPECT_EQ(ASCIIToUTF16("MyPlugin version 3.0.45"), group->description()); | 185 EXPECT_EQ(ASCIIToUTF16("MyPlugin version 3.0.45"), group->description()); |
185 EXPECT_FALSE(group->IsVulnerable()); | 186 EXPECT_FALSE(group->IsVulnerable()); |
186 } | 187 } |
187 } | 188 } |
188 | 189 |
189 TEST(PluginGroupTest, VersionExtraction) { | 190 TEST(PluginGroupTest, VersionExtraction) { |
190 // Some real-world plugin versions (spaces, commata, parentheses, 'r', oh my) | 191 // Some real-world plugin versions (spaces, commata, parentheses, 'r', oh my) |
191 const char* versions[][2] = { | 192 const char* versions[][2] = { |
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, NULL); |
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 } |
OLD | NEW |