added clock interstitial to chrome://interstitials

chrome/browser/ui/webui/interstitials/interstitial_ui.cc

 // Copyright 2014 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/ui/webui/interstitials/interstitial_ui.h"
 
 #include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
@@ skipping 33 matching lines @@
   content::WebContents* web_contents_;
   DISALLOW_COPY_AND_ASSIGN(InterstitialHTMLSource);
 };
 
 SSLBlockingPage* CreateSSLBlockingPage(content::WebContents* web_contents) {
   // Random parameters for SSL blocking page.
   int cert_error = net::ERR_CERT_CONTAINS_ERRORS;
   GURL request_url("https://example.com");
   bool overridable = false;
   bool strict_enforcement = false;
+  base::Time time_triggered_ = base::Time::NowFromSystemTime();
+
   std::string url_param;
   if (net::GetValueForKeyInQuery(web_contents->GetURL(),
                                  "url",
                                  &url_param)) {
     if (GURL(url_param).is_valid())
       request_url = GURL(url_param);
   }
   std::string overridable_param;
   if (net::GetValueForKeyInQuery(web_contents->GetURL(),
                                  "overridable",
                                  &overridable_param)) {
     overridable = overridable_param == "1";
   }
   std::string strict_enforcement_param;
   if (net::GetValueForKeyInQuery(web_contents->GetURL(),
                                  "strict_enforcement",
                                  &strict_enforcement_param)) {
     strict_enforcement = strict_enforcement_param == "1";
   }
+
+  std::string clock_manipulation_param;
+  if (net::GetValueForKeyInQuery(web_contents->GetURL(), "clock_manipulation",
+                                 &clock_manipulation_param) == 1) {
+    cert_error = net::ERR_CERT_DATE_INVALID;
+    time_triggered_ +=
+        base::TimeDelta::FromDays(365 * atoi(clock_manipulation_param.c_str()));
+  }
+
   net::SSLInfo ssl_info;
   ssl_info.cert = new net::X509Certificate(
       request_url.host(), "CA", base::Time::Max(), base::Time::Max());
   // This delegate doesn't create an interstitial.
   int options_mask = 0;
   if (overridable)
     options_mask |= SSLBlockingPage::OVERRIDABLE;
   if (strict_enforcement)
     options_mask |= SSLBlockingPage::STRICT_ENFORCEMENT;
-  return new SSLBlockingPage(web_contents,
-                             cert_error,
-                             ssl_info,
-                             request_url,
-                             options_mask,
-                             base::Callback<void(bool)>());
+  return new SSLBlockingPage(web_contents, cert_error, ssl_info, request_url,
+                             options_mask, base::Callback<void(bool)>(),
+                             time_triggered_);
 }
 
 SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
     content::WebContents* web_contents) {
   SBThreatType threat_type = SB_THREAT_TYPE_URL_MALWARE;
   GURL request_url("http://example.com");
   std::string url_param;
   if (net::GetValueForKeyInQuery(web_contents->GetURL(),
                                  "url",
                                  &url_param)) {
@@ skipping 24 matching lines @@
   SafeBrowsingBlockingPage::UnsafeResource resource;
   resource.url = request_url;
   resource.threat_type =  threat_type;
   // Create a blocking page without showing the interstitial.
   return SafeBrowsingBlockingPage::CreateBlockingPage(
       g_browser_process->safe_browsing_service()->ui_manager().get(),
       web_contents,
       resource);
 }
 
-} //  namespace
+}  // namespace

[lgarron, 2015/02/24 02:28:37]

Nit: still an uneeded extra space in the diff.

[fahl, 2015/02/24 21:23:23]

Done.

 
 InterstitialUI::InterstitialUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
   scoped_ptr<InterstitialHTMLSource> html_source(
       new InterstitialHTMLSource(profile->GetOriginalProfile(),
                                  web_ui->GetWebContents()));
   content::URLDataSource::Add(profile, html_source.release());
 }
 
@@ skipping 35 matching lines @@
   if (StartsWithASCII(path, "ssl", true)) {
     interstitial_delegate.reset(CreateSSLBlockingPage(web_contents_));
   } else if (StartsWithASCII(path, "safebrowsing", true)) {
     interstitial_delegate.reset(CreateSafeBrowsingBlockingPage(web_contents_));
   }
 
   std::string html;
   if (interstitial_delegate.get()) {
     html = interstitial_delegate.get()->GetHTMLContents();
   } else {
-    html = "<html><head><title>Interstitials</title></head>"
-           "<body><h2>Choose an interstitial<h2>"
-           "<h3>SSL</h3>"
-           "<a href='ssl'>example.com</a><br>"
-           "<a href='ssl?url=https://google.com'>SSL (google.com)</a><br>"
-           "<a href='ssl?overridable=1&strict_enforcement=0'>"
-           "    example.com (Overridable)</a>"
-           "<br><br>"
-           "<h3>SafeBrowsing</h3>"
-           "<a href='safebrowsing?type=malware'>Malware</a><br>"
-           "<a href='safebrowsing?type=phishing'>Phishing</a><br>"
-           "<a href='safebrowsing?type=clientside_malware'>"
-           "    Client Side Malware</a><br>"
-           "<a href='safebrowsing?type=clientside_phishing'>"
-           "    Client Side Phishing</a><br>"
-           "</body></html>";
+    html =  "<html><head><title>Interstitials</title></head>"
+            "<body><h2>Choose an interstitial<h2>"
+            "<h3>SSL</h3>"
+            "<a href='ssl'>example.com</a><br>"
+            "<a href='ssl?url=https://google.com'>SSL (google.com)</a><br>"
+            "<a href='ssl?overridable=1&strict_enforcement=0'>"
+            "    example.com (Overridable)</a><br>"
+            "<a href='ssl?clock_manipulation=1'>Clock is ahead</a><br>"
+            "<a href='ssl?clock_manipulation=-1'>Clock is behind</a><br>"
+            "<br><br>"
+            "<h3>SafeBrowsing</h3>"
+            "<a href='safebrowsing?type=malware'>Malware</a><br>"
+            "<a href='safebrowsing?type=phishing'>Phishing</a><br>"
+            "<a href='safebrowsing?type=clientside_malware'>"
+            "    Client Side Malware</a><br>"
+            "<a href='safebrowsing?type=clientside_phishing'>"
+            "    Client Side Phishing</a><br>"
+            "</body></html>";
   }
+

[lgarron, 2015/02/24 02:28:37]

Also an extra space.

[fahl, 2015/02/24 21:23:23]

Done.

   scoped_refptr<base::RefCountedString> html_bytes = new base::RefCountedString;
   html_bytes->data().assign(html.begin(), html.end());
   callback.Run(html_bytes.get());
 }