MD Settings: validate startup URLs

chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc

 // 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/ui/webui/settings/settings_startup_pages_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/settings_utils.h"
 #include "chrome/common/pref_names.h"
-#include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/web_ui.h"
+#include "url/gurl.h"
 
 namespace settings {
 
 StartupPagesHandler::StartupPagesHandler(content::WebUI* webui)
     : startup_custom_pages_table_model_(Profile::FromWebUI(webui)) {
 }
 
 StartupPagesHandler::~StartupPagesHandler() {
 }
 
 void StartupPagesHandler::RegisterMessages() {
   if (Profile::FromWebUI(web_ui())->IsOffTheRecord())
     return;
 
   web_ui()->RegisterMessageCallback("addStartupPage",
       base::Bind(&StartupPagesHandler::HandleAddStartupPage,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("onStartupPrefsPageLoad",
       base::Bind(&StartupPagesHandler::HandleOnStartupPrefsPageLoad,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("removeStartupPage",
       base::Bind(&StartupPagesHandler::HandleRemoveStartupPage,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setStartupPagesToCurrentPages",
       base::Bind(&StartupPagesHandler::HandleSetStartupPagesToCurrentPages,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("validateStartupPage",
+      base::Bind(&StartupPagesHandler::HandleValidateStartupPage,
+                 base::Unretained(this)));
 }
 
 void StartupPagesHandler::RenderViewReused() {
   startup_custom_pages_table_model_.SetObserver(nullptr);
   pref_change_registrar_.RemoveAll();
 }
 
 void StartupPagesHandler::OnModelChanged() {
   base::ListValue startup_pages;
   int page_count = startup_custom_pages_table_model_.RowCount();
@@ skipping 21 matching lines @@
   OnModelChanged();
 }
 
 void StartupPagesHandler::OnItemsRemoved(int start, int length) {
   OnModelChanged();
 }
 
 void StartupPagesHandler::HandleAddStartupPage(const base::ListValue* args) {
   std::string url_string;
   if (!args->GetString(0, &url_string)) {
-    DLOG(ERROR) << "Missing URL string parameter";
+    NOTREACHED();
     return;
   }
 
-  GURL url = url_formatter::FixupURL(url_string, std::string());
-  if (!url.is_valid()) {
-    LOG(ERROR) << "FixupURL failed on " << url_string;
+  GURL url;
+  if (!settings_utils::FixupAndValidateStartupPage(url_string, &url)) {
+    NOTREACHED();

[dschuyler, 2016/03/31 20:29:26]

Would these be ok as a DLOG instead of NOTREACHED()?

[Dan Beam, 2016/03/31 22:06:55]

this should never be reached as the user shouldn't be able to add an invalid URL
in the new UI (the [ ADD ] button should be disabled)

     return;
   }
 
   int row_count = startup_custom_pages_table_model_.RowCount();
   int index;
   if (!args->GetInteger(1, &index) || index > row_count)
     index = row_count;
 
   startup_custom_pages_table_model_.Add(index, url);
   SaveStartupPagesPref();
@@ skipping 18 matching lines @@
                  base::Unretained(this)));
 
   const SessionStartupPref startup_pref = SessionStartupPref::GetStartupPref(
       Profile::FromWebUI(web_ui())->GetPrefs());
   startup_custom_pages_table_model_.SetURLs(startup_pref.urls);
 }
 
 void StartupPagesHandler::HandleRemoveStartupPage(const base::ListValue* args) {
   int selected_index;
   if (!args->GetInteger(0, &selected_index)) {
-    DLOG(ERROR) << "Missing index parameter";
+    NOTREACHED();
     return;
   }
 
   if (selected_index < 0 ||
       selected_index >= startup_custom_pages_table_model_.RowCount()) {
-    LOG(ERROR) << "Index out of range " << selected_index;
+    NOTREACHED();
     return;
   }
 
   startup_custom_pages_table_model_.Remove(selected_index);
   SaveStartupPagesPref();
 }
 
 void StartupPagesHandler::HandleSetStartupPagesToCurrentPages(
     const base::ListValue* args) {
   startup_custom_pages_table_model_.SetToCurrentlyOpenPages();
   SaveStartupPagesPref();
 }
 
+void StartupPagesHandler::HandleValidateStartupPage(
+    const base::ListValue* args) {
+  CHECK_EQ(args->GetSize(), 2U);
+
+  const base::Value* callback_id;
+  CHECK(args->Get(0, &callback_id));
+
+  std::string url_string;
+  CHECK(args->GetString(1, &url_string));
+
+  bool valid = settings_utils::FixupAndValidateStartupPage(url_string, nullptr);
+  ResolveJavascriptCallback(*callback_id, base::FundamentalValue(valid));
+}
+
 void StartupPagesHandler::SaveStartupPagesPref() {
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
 
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
   pref.urls = startup_custom_pages_table_model_.GetURLs();
 
   if (pref.urls.empty())
     pref.type = SessionStartupPref::DEFAULT;
 
   SessionStartupPref::SetStartupPref(prefs, pref);
 }
 
 void StartupPagesHandler::UpdateStartupPages() {
   const SessionStartupPref startup_pref = SessionStartupPref::GetStartupPref(
       Profile::FromWebUI(web_ui())->GetPrefs());
   startup_custom_pages_table_model_.SetURLs(startup_pref.urls);
   // The change will go to the JS code in the
   // StartupPagesHandler::OnModelChanged() method.
 }
 
 }  // namespace settings