| 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 "chrome/browser/ssl/captive_portal_blocking_page.h" | 5 #include "chrome/browser/ssl/captive_portal_blocking_page.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
| 14 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
| 15 #include "chrome/browser/interstitials/security_interstitial_page_test_utils.h" | 15 #include "chrome/browser/interstitials/security_interstitial_page_test_utils.h" |
| 16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
| 17 #include "chrome/browser/ssl/cert_report_helper.h" | 17 #include "chrome/browser/ssl/cert_report_helper.h" |
| 18 #include "chrome/browser/ssl/certificate_reporting_test_utils.h" | 18 #include "chrome/browser/ssl/certificate_reporting_test_utils.h" |
| 19 #include "chrome/browser/ssl/chrome_security_state_model_client.h" |
| 19 #include "chrome/browser/ssl/ssl_cert_reporter.h" | 20 #include "chrome/browser/ssl/ssl_cert_reporter.h" |
| 20 #include "chrome/browser/ui/browser.h" | 21 #include "chrome/browser/ui/browser.h" |
| 21 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 22 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 22 #include "chrome/common/pref_names.h" | 23 #include "chrome/common/pref_names.h" |
| 23 #include "chrome/test/base/in_process_browser_test.h" | 24 #include "chrome/test/base/in_process_browser_test.h" |
| 24 #include "components/captive_portal/captive_portal_detector.h" | 25 #include "components/captive_portal/captive_portal_detector.h" |
| 25 #include "components/prefs/pref_service.h" | 26 #include "components/prefs/pref_service.h" |
| 26 #include "content/public/browser/interstitial_page.h" | 27 #include "content/public/browser/interstitial_page.h" |
| 27 #include "content/public/browser/web_contents.h" | 28 #include "content/public/browser/web_contents.h" |
| 28 #include "content/public/test/browser_test_utils.h" | 29 #include "content/public/test/browser_test_utils.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 EXPECT_EQ(expect_wifi_ssid == EXPECT_WIFI_SSID_YES, | 157 EXPECT_EQ(expect_wifi_ssid == EXPECT_WIFI_SSID_YES, |
| 157 IsInterstitialDisplayingText(contents->GetInterstitialPage(), | 158 IsInterstitialDisplayingText(contents->GetInterstitialPage(), |
| 158 wifi_ssid)); | 159 wifi_ssid)); |
| 159 } | 160 } |
| 160 EXPECT_EQ(expect_login_url == EXPECT_LOGIN_URL_YES, | 161 EXPECT_EQ(expect_login_url == EXPECT_LOGIN_URL_YES, |
| 161 IsInterstitialDisplayingText(contents->GetInterstitialPage(), | 162 IsInterstitialDisplayingText(contents->GetInterstitialPage(), |
| 162 expected_login_hostname)); | 163 expected_login_hostname)); |
| 163 EXPECT_EQ(expect_login_url == EXPECT_LOGIN_URL_NO, | 164 EXPECT_EQ(expect_login_url == EXPECT_LOGIN_URL_NO, |
| 164 IsInterstitialDisplayingText(contents->GetInterstitialPage(), | 165 IsInterstitialDisplayingText(contents->GetInterstitialPage(), |
| 165 kGenericLoginURLText)); | 166 kGenericLoginURLText)); |
| 167 |
| 168 // Check that a red/dangerous lock icon is showing on the interstitial. |
| 169 ChromeSecurityStateModelClient* security_model = |
| 170 ChromeSecurityStateModelClient::FromWebContents(contents); |
| 171 ASSERT_TRUE(security_model); |
| 172 security_state::SecurityStateModel::SecurityInfo security_info; |
| 173 security_model->GetSecurityInfo(&security_info); |
| 174 EXPECT_EQ(security_state::SecurityStateModel::DANGEROUS, |
| 175 security_info.security_level); |
| 166 } | 176 } |
| 167 | 177 |
| 168 void CaptivePortalBlockingPageTest::TestInterstitial( | 178 void CaptivePortalBlockingPageTest::TestInterstitial( |
| 169 bool is_wifi_connection, | 179 bool is_wifi_connection, |
| 170 const std::string& wifi_ssid, | 180 const std::string& wifi_ssid, |
| 171 const GURL& login_url, | 181 const GURL& login_url, |
| 172 ExpectWiFi expect_wifi, | 182 ExpectWiFi expect_wifi, |
| 173 ExpectWiFiSSID expect_wifi_ssid, | 183 ExpectWiFiSSID expect_wifi_ssid, |
| 174 ExpectLoginURL expect_login_url) { | 184 ExpectLoginURL expect_login_url) { |
| 175 TestInterstitial(is_wifi_connection, wifi_ssid, login_url, expect_wifi, | 185 TestInterstitial(is_wifi_connection, wifi_ssid, login_url, expect_wifi, |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 false, ""); | 334 false, ""); |
| 325 return blocking_page; | 335 return blocking_page; |
| 326 } | 336 } |
| 327 }; | 337 }; |
| 328 | 338 |
| 329 // Test that an IDN login domain is decoded properly. | 339 // Test that an IDN login domain is decoded properly. |
| 330 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageIDNTest, | 340 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageIDNTest, |
| 331 ShowLoginIDNIfPortalRedirectsDetectionURL) { | 341 ShowLoginIDNIfPortalRedirectsDetectionURL) { |
| 332 EXPECT_TRUE(VerifyIDNDecoded()); | 342 EXPECT_TRUE(VerifyIDNDecoded()); |
| 333 } | 343 } |
| OLD | NEW |