Unpunycode search keywords and short names.

chrome/browser/extensions/api/search_engines_private/search_engines_private_api.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/extensions/api/search_engines_private/search_engines_private_api.h"
 
+#include <string>
+
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/hotword_audio_history_handler.h"
 #include "chrome/browser/search/hotword_service.h"
 #include "chrome/browser/search/hotword_service_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "extensions/browser/extension_function_registry.h"
+#include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
 
 namespace search_engines_private = api::search_engines_private;
 
 const char kHotwordServiceMissing[] = "Cannot retrieve hotword service";
 const char kRetrainWithoutAlwaysOnEnabledError[] =
     "Cannot retrain without always search and audio logging enabled";
 const char kOptInWithAudioLoggingError[] =
@@ skipping 79 matching lines @@
     ~SearchEnginesPrivateAddOtherSearchEngineFunction() {
 }
 
 ExtensionFunction::ResponseAction
 SearchEnginesPrivateAddOtherSearchEngineFunction::Run() {
   scoped_ptr<search_engines_private::AddOtherSearchEngine::Params> parameters =
       search_engines_private::AddOtherSearchEngine::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(parameters.get());
 
   TemplateURLData data;
-  data.SetShortName(base::UTF8ToUTF16(parameters->name));
-  data.SetKeyword(base::UTF8ToUTF16(parameters->keyword));
+  // Unpunycode short name and keyword.
+  data.SetShortName(net::IDNToUnicode(parameters->name, std::string()));

[Matt Giuca, 2015/07/17 04:13:11]

This should not be unpunycoded. The name and keyword parameters are not domains
and should not be expected to be Punycode-encoded (they are being passed in
through an API).

If the rationale for this change is that users might type in an IDN-encoded
domain into the "keyword" or "short name" field, and that will get passed
through this API, and we want to decode those, I would say:
a) that is not our concern. The user typed/pasted a string into a text field,
and we should respect that string. There is no reason to decode the string in
this text field any more than if they typed/pasted it into any other text field.
b) if we did want to decode that user input, it should be done at the user
interface level, not at the API level. You should do the decoding in the
settings page UI, not here.

[alshabalin, 2015/07/20 14:06:37]

Done.

+  data.SetKeyword(net::IDNToUnicode(parameters->keyword, std::string()));
   data.SetURL(parameters->url);
   TemplateURL* turl = new TemplateURL(data);
 
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(chrome_details_.GetProfile());
   template_url_service->Add(turl);
   return RespondNow(NoArguments());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 13 matching lines @@
   scoped_ptr<search_engines_private::UpdateSearchEngine::Params> parameters =
       search_engines_private::UpdateSearchEngine::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(parameters.get());
 
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(chrome_details_.GetProfile());
   TemplateURL* turl =
       template_url_service->GetTemplateURLForGUID(parameters->guid);
 
   template_url_service->ResetTemplateURL(
       turl, base::UTF8ToUTF16(parameters->name),

[Matt Giuca, 2015/07/17 04:13:11]

If you're going to change addOtherSearchEngine, you also need to change this
behaviour (updateSearchEngine).

(But I'm telling you to revert the above change, so you shouldn't have to do
anything here.)

       base::UTF8ToUTF16(parameters->keyword), parameters->url);
 
   return RespondNow(NoArguments());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SearchEnginesPrivateRemoveSearchEngineFunction
 
 SearchEnginesPrivateRemoveSearchEngineFunction::
     SearchEnginesPrivateRemoveSearchEngineFunction()
@@ skipping 160 matching lines @@
   } else {
     if (prefs->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled))
       return RespondNow(Error(kAlreadyOptedInError));
   }
 
   hotword_service->OptIntoHotwording(launch_mode);
   return RespondNow(NoArguments());
 }
 
 }  // namespace extensions