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

Unified Diff: chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc

Issue 861953002: Add login url to captive portal interstitial. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mmenke comments Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
diff --git a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a5d34836d0eff82fc0d60e11f663d28958e7f42d
--- /dev/null
+++ b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
@@ -0,0 +1,143 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ssl/captive_portal_blocking_page.h"
+
+#include <string>
+
+#include "base/callback.h"
+#include "base/logging.h"
+#include "base/macros.h"
+#include "base/prefs/pref_service.h"
+#include "base/strings/stringprintf.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/pref_names.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "components/captive_portal/captive_portal_detector.h"
+#include "content/public/browser/interstitial_page.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/test/browser_test_utils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
+
+// Partial text in the captive portal interstitial's main paragraph when the
+// login domain isn't displayed.
+const char kGenericLoginURLText[] = "its login page";
+const char kBrokenSSL[] = "https://broken.ssl";
+
+// Returns true if the interstitial contains |text| in its body.
+bool IsInterstitialDisplayingText(content::InterstitialPage* interstitial,
+ const std::string& text) {
+ // It's valid for |text| to contain "\'", but simply look for "'" instead
+ // since this function is used for searching host names and a predefined
+ // string.
+ DCHECK(text.find("\'") == std::string::npos);
+ std::string command = base::StringPrintf(
+ "var hasText = document.body.textContent.indexOf('%s') >= 0;"
+ "window.domAutomationController.send(hasText);",
+ text.c_str());
+ bool result = false;
+ EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+ interstitial->GetMainFrame(), command, &result));
+ return result;
+}
+
+class CaptivePortalBlockingPageTest : public InProcessBrowserTest {
+ public:
+ CaptivePortalBlockingPageTest() {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(CaptivePortalBlockingPageTest);
+};
+
+// The captive portal interstitial should show the login url if the login url
+// is different than the captive portal ping url (i.e. the portal intercepts
+// requests via HTTP redirects).
+IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
+ ShowLoginDomainIfPortalRedirectsDetectionURL) {
+ const GURL kLandingUrl("http://captive.portal/landing_url");
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ DCHECK(contents);
+ // Blocking page is owned by the interstitial.
+ CaptivePortalBlockingPage* blocking_page = new CaptivePortalBlockingPage(
+ contents, GURL(kBrokenSSL), kLandingUrl, base::Callback<void(bool)>());
+ blocking_page->Show();
+
+ WaitForInterstitialAttach(contents);
+ EXPECT_TRUE(
+ WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame()));
+
+ EXPECT_TRUE(IsInterstitialDisplayingText(contents->GetInterstitialPage(),
+ kLandingUrl.host()));
+ EXPECT_FALSE(IsInterstitialDisplayingText(contents->GetInterstitialPage(),
+ kGenericLoginURLText));
+}
+
+// The captive portal interstitial should show a generic text if the login url
+// is the same as the captive portal ping url (i.e. the portal intercepts
+// requests without using HTTP redirects).
+IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
+ DontShowLoginDomainIfPortalDoesntRedirectDetectionURL) {
+ const GURL kLandingUrl(captive_portal::CaptivePortalDetector::kDefaultURL);
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ DCHECK(contents);
+ // Blocking page is owned by the interstitial.
+ CaptivePortalBlockingPage* blocking_page = new CaptivePortalBlockingPage(
+ contents, GURL(kBrokenSSL), kLandingUrl, base::Callback<void(bool)>());
+ blocking_page->Show();
+
+ WaitForInterstitialAttach(contents);
+ EXPECT_TRUE(
+ WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame()));
+
+ EXPECT_FALSE(IsInterstitialDisplayingText(contents->GetInterstitialPage(),
+ kLandingUrl.host()));
+ EXPECT_TRUE(IsInterstitialDisplayingText(contents->GetInterstitialPage(),
+ kGenericLoginURLText));
+}
+
+class CaptivePortalBlockingPageIDNTest : public InProcessBrowserTest {
+public:
+ // InProcessBrowserTest:
+ void SetUpOnMainThread() override {
+ // Clear AcceptLanguages to force punycode decoding.
+ browser()->profile()->GetPrefs()->SetString(prefs::kAcceptLanguages,
+ std::string());
+ }
+};
+
+// Same as ShowLoginDomainIfPortalRedirectsDetectionURL, except the login
+// domain is an IDN.
+IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageIDNTest,
+ ShowLoginIDNIfPortalRedirectsDetectionURL) {
+ const char kHostname[] =
+ "xn--d1abbgf6aiiy.xn--p1ai";
+ const char kHostnameJSUnicode[] =
+ "\\u043f\\u0440\\u0435\\u0437\\u0438\\u0434\\u0435\\u043d\\u0442."
+ "\\u0440\\u0444";
+ std::string landing_url_spec =
+ base::StringPrintf("http://%s/landing_url", kHostname);
+ GURL landing_url(landing_url_spec);
+
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ DCHECK(contents);
+ // Blocking page is owned by the interstitial.
+ CaptivePortalBlockingPage* blocking_page = new CaptivePortalBlockingPage(
+ contents, GURL(kBrokenSSL), landing_url, base::Callback<void(bool)>());
+ blocking_page->Show();
+
+ WaitForInterstitialAttach(contents);
+ EXPECT_TRUE(
+ WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame()));
+
+ EXPECT_TRUE(IsInterstitialDisplayingText(contents->GetInterstitialPage(),
+ kHostnameJSUnicode));
+ EXPECT_FALSE(IsInterstitialDisplayingText(contents->GetInterstitialPage(),
+ kGenericLoginURLText));
+}

Powered by Google App Engine
This is Rietveld 408576698