OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <openssl/evp.h> | 5 #include <openssl/evp.h> |
6 #include <openssl/rsa.h> | 6 #include <openssl/rsa.h> |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 #include <stdlib.h> | 9 #include <stdlib.h> |
10 | 10 |
11 #include <memory> | 11 #include <memory> |
12 #include <string> | 12 #include <string> |
13 #include <vector> | 13 #include <vector> |
14 | 14 |
15 #include "base/bind.h" | 15 #include "base/bind.h" |
16 #include "base/callback.h" | 16 #include "base/callback.h" |
17 #include "base/files/file_path.h" | 17 #include "base/files/file_path.h" |
18 #include "base/files/file_util.h" | 18 #include "base/files/file_util.h" |
19 #include "base/run_loop.h" | 19 #include "base/run_loop.h" |
20 #include "base/strings/string_number_conversions.h" | 20 #include "base/strings/string_number_conversions.h" |
21 #include "base/strings/utf_string_conversions.h" | 21 #include "base/strings/utf_string_conversions.h" |
22 #include "base/values.h" | 22 #include "base/values.h" |
23 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_serv ice.h" | |
24 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_serv ice_factory.h" | |
25 #include "chrome/browser/extensions/api/certificate_provider/certificate_provide r_api.h" | |
23 #include "chrome/browser/extensions/extension_apitest.h" | 26 #include "chrome/browser/extensions/extension_apitest.h" |
24 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 27 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
25 #include "chrome/test/base/ui_test_utils.h" | 28 #include "chrome/test/base/ui_test_utils.h" |
26 #include "components/policy/core/browser/browser_policy_connector.h" | 29 #include "components/policy/core/browser/browser_policy_connector.h" |
27 #include "components/policy/core/common/mock_configuration_policy_provider.h" | 30 #include "components/policy/core/common/mock_configuration_policy_provider.h" |
28 #include "components/policy/core/common/policy_map.h" | 31 #include "components/policy/core/common/policy_map.h" |
29 #include "components/policy/core/common/policy_types.h" | 32 #include "components/policy/core/common/policy_types.h" |
30 #include "components/policy/policy_constants.h" | 33 #include "components/policy/policy_constants.h" |
31 #include "content/public/browser/render_frame_host.h" | 34 #include "content/public/browser/render_frame_host.h" |
32 #include "content/public/browser/web_contents.h" | 35 #include "content/public/browser/web_contents.h" |
33 #include "content/public/test/test_navigation_observer.h" | 36 #include "content/public/test/test_navigation_observer.h" |
34 #include "content/public/test/test_utils.h" | 37 #include "content/public/test/test_utils.h" |
35 #include "crypto/rsa_private_key.h" | 38 #include "crypto/rsa_private_key.h" |
36 #include "crypto/scoped_openssl_types.h" | 39 #include "crypto/scoped_openssl_types.h" |
37 #include "extensions/common/extension.h" | 40 #include "extensions/common/extension.h" |
38 #include "extensions/test/result_catcher.h" | 41 #include "extensions/test/result_catcher.h" |
39 #include "net/test/spawned_test_server/spawned_test_server.h" | 42 #include "net/test/spawned_test_server/spawned_test_server.h" |
40 #include "testing/gmock/include/gmock/gmock.h" | 43 #include "testing/gmock/include/gmock/gmock.h" |
44 #include "ui/views/controls/label.h" | |
45 #include "ui/views/controls/textfield/textfield.h" | |
46 #include "ui/views/widget/widget.h" | |
41 | 47 |
42 using testing::Return; | 48 using testing::Return; |
43 using testing::_; | 49 using testing::_; |
44 | 50 |
45 namespace { | 51 namespace { |
46 | 52 |
47 void IgnoreResult(const base::Closure& callback, const base::Value* value) { | 53 void IgnoreResult(const base::Closure& callback, const base::Value* value) { |
48 callback.Run(); | 54 callback.Run(); |
49 } | 55 } |
50 | 56 |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
115 std::string JsUint8Array(const std::vector<uint8_t>& bytes) { | 121 std::string JsUint8Array(const std::vector<uint8_t>& bytes) { |
116 std::string res = "new Uint8Array(["; | 122 std::string res = "new Uint8Array(["; |
117 for (const uint8_t byte : bytes) { | 123 for (const uint8_t byte : bytes) { |
118 res += base::UintToString(byte); | 124 res += base::UintToString(byte); |
119 res += ", "; | 125 res += ", "; |
120 } | 126 } |
121 res += "])"; | 127 res += "])"; |
122 return res; | 128 return res; |
123 } | 129 } |
124 | 130 |
131 // Enters the code in the ShowPinDialog window and pushes the OK event. | |
132 void EnterCode(chromeos::CertificateProviderService* service, | |
133 const base::string16& code) { | |
134 chromeos::RequestPinView* view = | |
135 service->pin_dialog_manager()->active_view_for_testing(); | |
136 view->textfield_for_testing()->SetText(code); | |
137 view->Accept(); | |
138 base::RunLoop().RunUntilIdle(); | |
139 } | |
140 | |
141 // Enters the valid code for extensions from local example folders, in the | |
142 // ShowPinDialog window and waits for the window to close. | |
143 void EnterCorrectPin(chromeos::CertificateProviderService* service) { | |
144 views::Widget* active_window = | |
145 service->pin_dialog_manager()->active_window_for_testing(); | |
146 EnterCode(service, base::ASCIIToUTF16("1234")); | |
147 | |
148 // Wait for extension to send request to close the window. | |
149 while (!active_window->IsClosed()) { | |
150 base::RunLoop().RunUntilIdle(); | |
Devlin
2016/10/20 21:20:44
Busy loops are generally bad, and timeouts over fa
igorcov
2016/10/25 16:38:35
I could probably make an WidgetObserver and involv
Devlin
2016/10/26 16:59:15
What about waiting for a message from the extensio
igorcov
2016/11/04 15:51:41
Implemented, thanks!
| |
151 } | |
152 } | |
153 | |
154 // Enters an invalid code for extensions from local example folders, in the | |
155 // ShowPinDialog window and waits for the window to update with the error. | |
156 void EnterWrongPin(chromeos::CertificateProviderService* service) { | |
157 EnterCode(service, base::ASCIIToUTF16("567")); | |
158 | |
159 chromeos::RequestPinView* view = | |
160 service->pin_dialog_manager()->active_view_for_testing(); | |
161 // Waiting for extension to open the dialog again with an error in red | |
162 // displayed. | |
163 while (view->error_label_for_testing()->enabled_color() != SK_ColorRED) { | |
164 base::RunLoop().RunUntilIdle(); | |
165 } | |
166 } | |
167 | |
125 class CertificateProviderApiTest : public ExtensionApiTest { | 168 class CertificateProviderApiTest : public ExtensionApiTest { |
126 public: | 169 public: |
127 CertificateProviderApiTest() {} | 170 CertificateProviderApiTest() {} |
128 | 171 |
129 void SetUpInProcessBrowserTestFixture() override { | 172 void SetUpInProcessBrowserTestFixture() override { |
130 EXPECT_CALL(provider_, IsInitializationComplete(_)) | 173 EXPECT_CALL(provider_, IsInitializationComplete(_)) |
131 .WillRepeatedly(Return(true)); | 174 .WillRepeatedly(Return(true)); |
132 policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_); | 175 policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_); |
133 | 176 |
134 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); | 177 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); |
(...skipping 15 matching lines...) Expand all Loading... | |
150 nullptr); | 193 nullptr); |
151 provider_.UpdateChromePolicy(policy); | 194 provider_.UpdateChromePolicy(policy); |
152 | 195 |
153 content::RunAllPendingInMessageLoop(); | 196 content::RunAllPendingInMessageLoop(); |
154 } | 197 } |
155 | 198 |
156 protected: | 199 protected: |
157 policy::MockConfigurationPolicyProvider provider_; | 200 policy::MockConfigurationPolicyProvider provider_; |
158 }; | 201 }; |
159 | 202 |
203 class CertificateProviderRequestPinTest : public CertificateProviderApiTest { | |
204 public: | |
205 // Loads certificate_provider extension from |folder| and |file_name|. | |
206 // Returns the CertificateProviderService object from browser context. | |
207 chromeos::CertificateProviderService* LoadRequestPinExtension( | |
208 const std::string& folder, | |
209 const std::string& file_name) { | |
210 content::WebContents* extension_contents = | |
Devlin
2016/10/20 21:20:44
How is that the extension_contents when the extens
igorcov
2016/10/25 16:38:35
You're right, we need this just for browser contex
Devlin
2016/10/26 16:59:15
Browser tests have a profile() accessor.
igorcov
2016/11/04 15:51:41
Fixed, Thanks.
| |
211 browser()->tab_strip_model()->GetActiveWebContents(); | |
212 chromeos::CertificateProviderService* service = | |
213 chromeos::CertificateProviderServiceFactory::GetForBrowserContext( | |
214 extension_contents->GetBrowserContext()); | |
215 const base::FilePath extension_path = | |
216 test_data_dir_.AppendASCII("certificate_provider/" + folder); | |
217 const extensions::Extension* const extension = | |
218 LoadExtension(extension_path); | |
219 service->pin_dialog_manager()->AddSignRequestId(extension->id(), 123); | |
220 ui_test_utils::NavigateToURL(browser(), | |
221 extension->GetResourceURL(file_name)); | |
222 base::RunLoop().RunUntilIdle(); | |
Devlin
2016/10/20 21:20:44
What's this for?
igorcov
2016/10/25 16:38:35
I expected the browser would need some time to nav
Devlin
2016/10/26 16:59:15
Yep, NavigateToURL() blocks until navigation is co
| |
223 return service; | |
224 } | |
225 }; | |
226 | |
160 } // namespace | 227 } // namespace |
161 | 228 |
162 IN_PROC_BROWSER_TEST_F(CertificateProviderApiTest, Basic) { | 229 IN_PROC_BROWSER_TEST_F(CertificateProviderApiTest, Basic) { |
163 // Start an HTTPS test server that requests a client certificate. | 230 // Start an HTTPS test server that requests a client certificate. |
164 net::SpawnedTestServer::SSLOptions ssl_options; | 231 net::SpawnedTestServer::SSLOptions ssl_options; |
165 ssl_options.request_client_certificate = true; | 232 ssl_options.request_client_certificate = true; |
166 net::SpawnedTestServer https_server(net::SpawnedTestServer::TYPE_HTTPS, | 233 net::SpawnedTestServer https_server(net::SpawnedTestServer::TYPE_HTTPS, |
167 ssl_options, base::FilePath()); | 234 ssl_options, base::FilePath()); |
168 ASSERT_TRUE(https_server.Start()); | 235 ASSERT_TRUE(https_server.Start()); |
169 | 236 |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
261 base::RunLoop run_loop; | 328 base::RunLoop run_loop; |
262 const std::string code = "replyWithSignatureSecondTime();"; | 329 const std::string code = "replyWithSignatureSecondTime();"; |
263 bool result = false; | 330 bool result = false; |
264 extension_contents->GetMainFrame()->ExecuteJavaScriptForTests( | 331 extension_contents->GetMainFrame()->ExecuteJavaScriptForTests( |
265 base::ASCIIToUTF16(code), | 332 base::ASCIIToUTF16(code), |
266 base::Bind(&StoreBool, &result, run_loop.QuitClosure())); | 333 base::Bind(&StoreBool, &result, run_loop.QuitClosure())); |
267 run_loop.Run(); | 334 run_loop.Run(); |
268 EXPECT_TRUE(result); | 335 EXPECT_TRUE(result); |
269 } | 336 } |
270 } | 337 } |
338 | |
339 // User enters the correct PIN. | |
340 IN_PROC_BROWSER_TEST_F(CertificateProviderRequestPinTest, ShowPinDialogAccept) { | |
341 chromeos::CertificateProviderService* service = | |
342 LoadRequestPinExtension("request_pin", "basic.html"); | |
343 | |
344 // Enter the valid PIN. | |
345 EnterCorrectPin(service); | |
346 | |
347 // The view should be set to nullptr when the window is closed. | |
348 EXPECT_EQ(service->pin_dialog_manager()->active_view_for_testing(), nullptr); | |
349 } | |
350 | |
351 // User closes the dialog kMaxClosedDialogsPer10Mins times, and the extension | |
352 // should be blocked from showing it again. | |
353 IN_PROC_BROWSER_TEST_F(CertificateProviderRequestPinTest, ShowPinDialogClose) { | |
354 chromeos::CertificateProviderService* service = | |
355 LoadRequestPinExtension("request_pin", "basic.html"); | |
356 | |
357 views::Widget* window = | |
358 service->pin_dialog_manager()->active_window_for_testing(); | |
359 for (int i = 0; | |
360 i < extensions::api::certificate_provider::kMaxClosedDialogsPer10Mins; | |
361 i++) { | |
362 window->Close(); | |
363 // Waiting for the new window to pop up. | |
364 while (service->pin_dialog_manager()->active_view_for_testing() == nullptr) | |
365 base::RunLoop().RunUntilIdle(); | |
Devlin
2016/10/20 21:20:44
ditto re busy loops
| |
366 | |
367 window = service->pin_dialog_manager()->active_window_for_testing(); | |
368 } | |
369 | |
370 // This time when closed, the window should not be able to pop up again. | |
371 window->Close(); | |
372 base::RunLoop().RunUntilIdle(); | |
Devlin
2016/10/20 21:20:44
If the "while" on line 364 was needed, then this w
igorcov
2016/10/25 16:38:35
It's different, because we don't have to wait for
Devlin
2016/11/01 16:24:30
It's not really different, though.
If the while (
| |
373 EXPECT_EQ(service->pin_dialog_manager()->active_view_for_testing(), nullptr); | |
374 } | |
375 | |
376 // User enters a wrong PIN first and a correct PIN on the second try. | |
377 IN_PROC_BROWSER_TEST_F(CertificateProviderRequestPinTest, | |
378 ShowPinDialogWrongPin) { | |
379 chromeos::CertificateProviderService* service = | |
380 LoadRequestPinExtension("request_pin", "basic.html"); | |
381 EnterWrongPin(service); | |
382 | |
383 // The window should be active. | |
384 EXPECT_EQ( | |
385 service->pin_dialog_manager()->active_window_for_testing()->IsVisible(), | |
386 true); | |
387 EXPECT_NE(service->pin_dialog_manager()->active_view_for_testing(), nullptr); | |
Devlin
2016/10/20 21:20:44
If this were null, your expectation above would se
igorcov
2016/10/25 16:38:35
I think you misread, one is active_window_for_test
| |
388 | |
389 // Enter the valid PIN. | |
390 EnterCorrectPin(service); | |
391 | |
392 // The view should be set to nullptr when the window is closed. | |
393 EXPECT_EQ(service->pin_dialog_manager()->active_view_for_testing(), nullptr); | |
394 } | |
395 | |
396 // User enters wrong PIN three times. | |
397 IN_PROC_BROWSER_TEST_F(CertificateProviderRequestPinTest, | |
398 ShowPinDialogWrongPinThreeTimes) { | |
399 chromeos::CertificateProviderService* service = | |
400 LoadRequestPinExtension("request_pin", "basic.html"); | |
401 for (int i = 0; i < 3; i++) { | |
402 EnterWrongPin(service); | |
403 } | |
404 | |
405 chromeos::RequestPinView* view = | |
406 service->pin_dialog_manager()->active_view_for_testing(); | |
407 | |
408 // The textfield has to be disabled, as extension does not allow input now. | |
409 EXPECT_EQ(view->textfield_for_testing()->enabled(), false); | |
410 | |
411 // Close the dialog. | |
412 service->pin_dialog_manager()->active_window_for_testing()->Close(); | |
413 base::RunLoop().RunUntilIdle(); | |
414 EXPECT_EQ(service->pin_dialog_manager()->active_view_for_testing(), nullptr); | |
415 } | |
416 | |
417 // User closes the dialog while the extension is processing the request. | |
418 IN_PROC_BROWSER_TEST_F(CertificateProviderRequestPinTest, | |
419 ShowPinDialogCloseWhileProcessing) { | |
420 chromeos::CertificateProviderService* service = | |
421 LoadRequestPinExtension("request_pin", "basic_lock.html"); | |
422 | |
423 EnterCode(service, base::ASCIIToUTF16("123")); | |
424 service->pin_dialog_manager()->active_window_for_testing()->Close(); | |
425 base::RunLoop().RunUntilIdle(); | |
426 // The view should be set to nullptr when the window is closed. | |
427 EXPECT_EQ(service->pin_dialog_manager()->active_view_for_testing(), nullptr); | |
428 } | |
OLD | NEW |