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_number_conversions.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"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ssl/ssl_blocking_page.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/grit/browser_resources.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "net/base/net_errors.h"
 #include "net/base/url_util.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_info.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 class InterstitialHTMLSource : public content::URLDataSource {
  public:
   InterstitialHTMLSource(Profile* profile,
                          content::WebContents* web_contents);
   ~InterstitialHTMLSource() override;
 
   // content::URLDataSource:
@@ skipping 11 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;
+    int time_offset;
+    if (base::StringToInt(clock_manipulation_param, &time_offset)) {
+      time_triggered_ += base::TimeDelta::FromDays(365 * time_offset);
+    } else {
+      time_triggered_ += base::TimeDelta::FromDays(365*2);

[Bernhard Bauer, 2015/02/26 14:21:44]

Add spaces around the asterisk?

[fahl, 2015/02/26 17:33:19]

Done.

+    }
+  }
   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)>());
+                              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 80 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 = ResourceBundle::GetSharedInstance()
+                         .GetRawDataResource(IDR_SECURITY_INTERSTITIAL_UI_HTML)

[Bernhard Bauer, 2015/02/26 14:21:44]

Nit: Alignment

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