Make sure that HttpRequestHeaders contains valid key-value pairs.

chrome/browser/extensions/api/declarative_webrequest/webrequest_action.cc

 // Copyright (c) 2012 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/declarative_webrequest/webrequest_action.h"
 
 #include <limits>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/declarative/deduping_factory.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api_constants.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
 #include "chrome/browser/extensions/api/web_request/web_request_permissions.h"
 #include "chrome/browser/guest_view/web_view/web_view_renderer_state.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 #include "third_party/re2/re2/re2.h"
 
 using content::ResourceRequestInfo;
 
 namespace extensions {
 
 namespace helpers = extension_web_request_api_helpers;
 namespace keys = declarative_webrequest_constants;
 
@@ skipping 127 matching lines @@
     const std::string& instance_type,
     const base::Value* json_value,
     std::string* error,
     bool* bad_message) {
   const base::DictionaryValue* dict = NULL;
   CHECK(json_value->GetAsDictionary(&dict));
   std::string name;
   std::string value;
   INPUT_FORMAT_VALIDATE(dict->GetString(keys::kNameKey, &name));
   INPUT_FORMAT_VALIDATE(dict->GetString(keys::kValueKey, &value));
-  if (!helpers::IsValidHeaderName(name)) {
+  if (!net::HttpUtil::IsValidHeaderName(name)) {
     *error = extension_web_request_api_constants::kInvalidHeaderName;
     return scoped_refptr<const WebRequestAction>(NULL);
   }
-  if (!helpers::IsValidHeaderValue(value)) {
+  if (!net::HttpUtil::IsValidHeaderValue(value)) {
     *error = ErrorUtils::FormatErrorMessage(
         extension_web_request_api_constants::kInvalidHeaderValue, name);
     return scoped_refptr<const WebRequestAction>(NULL);
   }
   return scoped_refptr<const WebRequestAction>(
       new WebRequestSetRequestHeaderAction(name, value));
 }
 
 scoped_refptr<const WebRequestAction> CreateRemoveRequestHeaderAction(
     const std::string& instance_type,
     const base::Value* value,
     std::string* error,
     bool* bad_message) {
   const base::DictionaryValue* dict = NULL;
   CHECK(value->GetAsDictionary(&dict));
   std::string name;
   INPUT_FORMAT_VALIDATE(dict->GetString(keys::kNameKey, &name));
-  if (!helpers::IsValidHeaderName(name)) {
+  if (!net::HttpUtil::IsValidHeaderName(name)) {
     *error = extension_web_request_api_constants::kInvalidHeaderName;
     return scoped_refptr<const WebRequestAction>(NULL);
   }
   return scoped_refptr<const WebRequestAction>(
       new WebRequestRemoveRequestHeaderAction(name));
 }
 
 scoped_refptr<const WebRequestAction> CreateAddResponseHeaderAction(
     const std::string& instance_type,
     const base::Value* json_value,
     std::string* error,
     bool* bad_message) {
   const base::DictionaryValue* dict = NULL;
   CHECK(json_value->GetAsDictionary(&dict));
   std::string name;
   std::string value;
   INPUT_FORMAT_VALIDATE(dict->GetString(keys::kNameKey, &name));
   INPUT_FORMAT_VALIDATE(dict->GetString(keys::kValueKey, &value));
-  if (!helpers::IsValidHeaderName(name)) {
+  if (!net::HttpUtil::IsValidHeaderName(name)) {
     *error = extension_web_request_api_constants::kInvalidHeaderName;
     return scoped_refptr<const WebRequestAction>(NULL);
   }
-  if (!helpers::IsValidHeaderValue(value)) {
+  if (!net::HttpUtil::IsValidHeaderValue(value)) {
     *error = ErrorUtils::FormatErrorMessage(
         extension_web_request_api_constants::kInvalidHeaderValue, name);
     return scoped_refptr<const WebRequestAction>(NULL);
   }
   return scoped_refptr<const WebRequestAction>(
       new WebRequestAddResponseHeaderAction(name, value));
 }
 
 scoped_refptr<const WebRequestAction> CreateRemoveResponseHeaderAction(
     const std::string& instance_type,
     const base::Value* json_value,
     std::string* error,
     bool* bad_message) {
   const base::DictionaryValue* dict = NULL;
   CHECK(json_value->GetAsDictionary(&dict));
   std::string name;
   std::string value;
   INPUT_FORMAT_VALIDATE(dict->GetString(keys::kNameKey, &name));
   bool has_value = dict->GetString(keys::kValueKey, &value);
-  if (!helpers::IsValidHeaderName(name)) {
+  if (!net::HttpUtil::IsValidHeaderName(name)) {
     *error = extension_web_request_api_constants::kInvalidHeaderName;
     return scoped_refptr<const WebRequestAction>(NULL);
   }
-  if (has_value && !helpers::IsValidHeaderValue(value)) {
+  if (has_value && !net::HttpUtil::IsValidHeaderValue(value)) {
     *error = ErrorUtils::FormatErrorMessage(
         extension_web_request_api_constants::kInvalidHeaderValue, name);
     return scoped_refptr<const WebRequestAction>(NULL);
   }
   return scoped_refptr<const WebRequestAction>(
       new WebRequestRemoveResponseHeaderAction(name, value, has_value));
 }
 
 scoped_refptr<const WebRequestAction> CreateIgnoreRulesAction(
     const std::string& instance_type,
@@ skipping 903 matching lines @@
     const base::Time& extension_install_time) const {
   CHECK(request_data.stage & stages());
   LinkedPtrEventResponseDelta result(
       new extension_web_request_api_helpers::EventResponseDelta(
           extension_id, extension_install_time));
   result->messages_to_extension.insert(message_);
   return result;
 }
 
 }  // namespace extensions