diff options
| -rw-r--r-- | base/string_util.cc | 48 | ||||
| -rw-r--r-- | base/string_util.h | 8 | ||||
| -rw-r--r-- | base/string_util_unittest.cc | 50 | ||||
| -rw-r--r-- | net/http/http_network_transaction.cc | 143 | ||||
| -rw-r--r-- | net/http/http_network_transaction.h | 6 | ||||
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 39 | ||||
| -rw-r--r-- | net/http/http_request_headers.cc | 133 | ||||
| -rw-r--r-- | net/http/http_request_headers.h | 97 | ||||
| -rw-r--r-- | net/http/http_request_headers_unittest.cc | 120 | ||||
| -rw-r--r-- | net/net.gyp | 3 | ||||
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 6 |
11 files changed, 69 insertions, 584 deletions
diff --git a/base/string_util.cc b/base/string_util.cc index 494d09d..19c1735 100644 --- a/base/string_util.cc +++ b/base/string_util.cc @@ -1324,54 +1324,6 @@ void SplitStringDontTrim(const std::string& str, SplitStringT(str, s, false, r); } -template <typename STR> -static void SplitStringUsingSubstrT(const STR& str, - const STR& s, - std::vector<STR>* r) { - typename STR::size_type begin_index = 0; - while (true) { - const typename STR::size_type end_index = str.find(s, begin_index); - if (end_index == STR::npos) { - const STR term = str.substr(begin_index); - STR tmp; - TrimWhitespace(term, TRIM_ALL, &tmp); - r->push_back(tmp); - return; - } - const STR term = str.substr(begin_index, end_index - begin_index); - STR tmp; - TrimWhitespace(term, TRIM_ALL, &tmp); - r->push_back(tmp); - begin_index = end_index + s.size(); - } -} - -void SplitStringUsingSubstr(const string16& str, - const string16& s, - std::vector<string16>* r) { - SplitStringUsingSubstrT(str, s, r); -} - -void SplitStringUsingSubstr(const std::string& str, - const std::string& s, - std::vector<std::string>* r) { - SplitStringUsingSubstrT(str, s, r); -} - -std::vector<string16> SplitStringUsingSubstr(const string16& str, - const string16& s) { - std::vector<string16> result; - SplitStringUsingSubstr(str, s, &result); - return result; -} - -std::vector<std::string> SplitStringUsingSubstr(const std::string& str, - const std::string& s) { - std::vector<std::string> result; - SplitStringUsingSubstr(str, s, &result); - return result; -} - template<typename STR> static size_t TokenizeT(const STR& str, const STR& delimiters, diff --git a/base/string_util.h b/base/string_util.h index 28cd26f..586c60c 100644 --- a/base/string_util.h +++ b/base/string_util.h @@ -575,14 +575,6 @@ void SplitStringDontTrim(const std::string& str, char s, std::vector<std::string>* r); -// The same as SplitString, but use a substring delimiter instead of a char. -void SplitStringUsingSubstr(const string16& str, - const string16& s, - std::vector<string16>* r); -void SplitStringUsingSubstr(const std::string& str, - const std::string& s, - std::vector<std::string>* r); - // Splits a string into its fields delimited by any of the characters in // |delimiters|. Each field is added to the |tokens| vector. Returns the // number of tokens found. diff --git a/base/string_util_unittest.cc b/base/string_util_unittest.cc index 8fc8f15..78939f5 100644 --- a/base/string_util_unittest.cc +++ b/base/string_util_unittest.cc @@ -11,11 +11,8 @@ #include "base/basictypes.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -using ::testing::ElementsAre; - namespace base { namespace { @@ -1495,49 +1492,4 @@ TEST(StringUtilTest, ContainsOnlyChars) { EXPECT_FALSE(ContainsOnlyChars("123a", "4321")); } -TEST(SplitStringUsingSubstrTest, EmptyString) { - std::vector<std::string> results; - SplitStringUsingSubstr("", "DELIMITER", &results); - ASSERT_EQ(1u, results.size()); - EXPECT_THAT(results, ElementsAre("")); -} - -TEST(SplitStringUsingSubstrTest, StringWithNoDelimiter) { - std::vector<std::string> results; - SplitStringUsingSubstr("alongwordwithnodelimiter", "DELIMITER", &results); - ASSERT_EQ(1u, results.size()); - EXPECT_THAT(results, ElementsAre("alongwordwithnodelimiter")); -} - -TEST(SplitStringUsingSubstrTest, LeadingDelimitersSkipped) { - std::vector<std::string> results; - SplitStringUsingSubstr( - "DELIMITERDELIMITERDELIMITERoneDELIMITERtwoDELIMITERthree", - "DELIMITER", - &results); - ASSERT_EQ(6u, results.size()); - EXPECT_THAT(results, ElementsAre("", "", "", "one", "two", "three")); -} - -TEST(SplitStringUsingSubstrTest, ConsecutiveDelimitersSkipped) { - std::vector<std::string> results; - SplitStringUsingSubstr( - "unoDELIMITERDELIMITERDELIMITERdosDELIMITERtresDELIMITERDELIMITERcuatro", - "DELIMITER", - &results); - ASSERT_EQ(7u, results.size()); - EXPECT_THAT(results, ElementsAre("uno", "", "", "dos", "tres", "", "cuatro")); -} - -TEST(SplitStringUsingSubstrTest, TrailingDelimitersSkipped) { - std::vector<std::string> results; - SplitStringUsingSubstr( - "unDELIMITERdeuxDELIMITERtroisDELIMITERquatreDELIMITERDELIMITERDELIMITER", - "DELIMITER", - &results); - ASSERT_EQ(7u, results.size()); - EXPECT_THAT( - results, ElementsAre("un", "deux", "trois", "quatre", "", "", "")); -} - -} // namespace base +} // base diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 04b341a..1a2c9a0 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -4,11 +4,11 @@ #include "net/http/http_network_transaction.h" +#include "base/format_macros.h" +#include "base/scoped_ptr.h" #include "base/compiler_specific.h" #include "base/field_trial.h" -#include "base/format_macros.h" #include "base/histogram.h" -#include "base/scoped_ptr.h" #include "base/stats_counters.h" #include "base/string_util.h" #include "base/trace_event.h" @@ -25,7 +25,6 @@ #include "net/http/http_basic_stream.h" #include "net/http/http_chunked_decoder.h" #include "net/http/http_network_session.h" -#include "net/http/http_request_headers.h" #include "net/http/http_request_info.h" #include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" @@ -47,112 +46,97 @@ namespace { const std::string* g_next_protos = NULL; void BuildRequestHeaders(const HttpRequestInfo* request_info, - const HttpRequestHeaders& authorization_headers, + const std::string& authorization_headers, const UploadDataStream* upload_data_stream, bool using_proxy, - HttpRequestHeaders* request_headers) { + std::string* request_headers) { + // Headers that will be stripped from request_info->extra_headers to prevent, + // e.g., plugins from overriding headers that are controlled using other + // means. Otherwise a plugin could set a referrer although sending the + // referrer is inhibited. + // TODO(jochen): check whether also other headers should be stripped. + static const char* const kExtraHeadersToBeStripped[] = { + "Referer" + }; + const std::string path = using_proxy ? HttpUtil::SpecForRequest(request_info->url) : HttpUtil::PathForRequest(request_info->url); - request_headers->SetRequestLine( - request_info->method, path, "1.1"); - - request_headers->SetHeader(HttpRequestHeaders::kHost, - GetHostAndOptionalPort(request_info->url)); + *request_headers = + StringPrintf("%s %s HTTP/1.1\r\nHost: %s\r\n", + request_info->method.c_str(), path.c_str(), + GetHostAndOptionalPort(request_info->url).c_str()); // For compat with HTTP/1.0 servers and proxies: - if (using_proxy) { - request_headers->SetHeader(HttpRequestHeaders::kProxyConnection, - "keep-alive"); - } else { - request_headers->SetHeader(HttpRequestHeaders::kConnection, "keep-alive"); - } + if (using_proxy) + *request_headers += "Proxy-"; + *request_headers += "Connection: keep-alive\r\n"; if (!request_info->user_agent.empty()) { - request_headers->SetHeader(HttpRequestHeaders::kUserAgent, - request_info->user_agent); + StringAppendF(request_headers, "User-Agent: %s\r\n", + request_info->user_agent.c_str()); } // Our consumer should have made sure that this is a safe referrer. See for // instance WebCore::FrameLoader::HideReferrer. - if (request_info->referrer.is_valid()) { - request_headers->SetHeader(HttpRequestHeaders::kReferer, - request_info->referrer.spec()); - } + if (request_info->referrer.is_valid()) + StringAppendF(request_headers, "Referer: %s\r\n", + request_info->referrer.spec().c_str()); // Add a content length header? if (upload_data_stream) { - request_headers->SetHeader( - HttpRequestHeaders::kContentLength, - Uint64ToString(upload_data_stream->size())); + StringAppendF(request_headers, "Content-Length: %" PRIu64 "\r\n", + upload_data_stream->size()); } else if (request_info->method == "POST" || request_info->method == "PUT" || request_info->method == "HEAD") { // An empty POST/PUT request still needs a content length. As for HEAD, // IE and Safari also add a content length header. Presumably it is to // support sending a HEAD request to an URL that only expects to be sent a // POST or some other method that normally would have a message body. - request_headers->SetHeader(HttpRequestHeaders::kContentLength, "0"); + *request_headers += "Content-Length: 0\r\n"; } // Honor load flags that impact proxy caches. if (request_info->load_flags & LOAD_BYPASS_CACHE) { - request_headers->SetHeader(HttpRequestHeaders::kPragma, "no-cache"); - request_headers->SetHeader(HttpRequestHeaders::kCacheControl, "no-cache"); + *request_headers += "Pragma: no-cache\r\nCache-Control: no-cache\r\n"; } else if (request_info->load_flags & LOAD_VALIDATE_CACHE) { - request_headers->SetHeader(HttpRequestHeaders::kCacheControl, "max-age=0"); + *request_headers += "Cache-Control: max-age=0\r\n"; } - request_headers->MergeFrom(authorization_headers); - - // Headers that will be stripped from request_info->extra_headers to prevent, - // e.g., plugins from overriding headers that are controlled using other - // means. Otherwise a plugin could set a referrer although sending the - // referrer is inhibited. - // TODO(jochen): check whether also other headers should be stripped. - static const char* const kExtraHeadersToBeStripped[] = { - "Referer" - }; - - // TODO(willchan): Change HttpRequestInfo::extra_headers to be a - // HttpRequestHeaders. - - std::vector<std::string> extra_headers_vector; - Tokenize(request_info->extra_headers, "\r\n", &extra_headers_vector); - HttpRequestHeaders extra_headers; - if (!extra_headers_vector.empty()) { - for (std::vector<std::string>::const_iterator it = - extra_headers_vector.begin(); it != extra_headers_vector.end(); ++it) - extra_headers.AddHeaderFromString(*it); + if (!authorization_headers.empty()) { + *request_headers += authorization_headers; + } - for (size_t i = 0; i < arraysize(kExtraHeadersToBeStripped); ++i) - extra_headers.RemoveHeader(kExtraHeadersToBeStripped[i]); + // TODO(darin): Need to prune out duplicate headers. - request_headers->MergeFrom(extra_headers); - } + *request_headers += HttpUtil::StripHeaders(request_info->extra_headers, + kExtraHeadersToBeStripped, arraysize(kExtraHeadersToBeStripped)); + *request_headers += "\r\n"; } // The HTTP CONNECT method for establishing a tunnel connection is documented // in draft-luotonen-web-proxy-tunneling-01.txt and RFC 2817, Sections 5.2 and // 5.3. void BuildTunnelRequest(const HttpRequestInfo* request_info, - const HttpRequestHeaders& authorization_headers, - HttpRequestHeaders* request_headers) { + const std::string& authorization_headers, + std::string* request_headers) { // RFC 2616 Section 9 says the Host request-header field MUST accompany all // HTTP/1.1 requests. Add "Proxy-Connection: keep-alive" for compat with // HTTP/1.0 proxies such as Squid (required for NTLM authentication). - request_headers->SetRequestLine( - "CONNECT", GetHostAndPort(request_info->url), "1.1"); - request_headers->SetHeader(HttpRequestHeaders::kHost, - GetHostAndOptionalPort(request_info->url)); - request_headers->SetHeader(HttpRequestHeaders::kProxyConnection, - "keep-alive"); + *request_headers = StringPrintf( + "CONNECT %s HTTP/1.1\r\nHost: %s\r\nProxy-Connection: keep-alive\r\n", + GetHostAndPort(request_info->url).c_str(), + GetHostAndOptionalPort(request_info->url).c_str()); - if (!request_info->user_agent.empty()) { - request_headers->SetHeader(HttpRequestHeaders::kUserAgent, - request_info->user_agent); + if (!request_info->user_agent.empty()) + StringAppendF(request_headers, "User-Agent: %s\r\n", + request_info->user_agent.c_str()); + + if (!authorization_headers.empty()) { + *request_headers += authorization_headers; } - request_headers->MergeFrom(authorization_headers); + *request_headers += "\r\n"; } void ProcessAlternateProtocol(const HttpResponseHeaders& headers, @@ -920,25 +904,24 @@ int HttpNetworkTransaction::DoSendRequest() { (HaveAuth(HttpAuth::AUTH_SERVER) || SelectPreemptiveAuth(HttpAuth::AUTH_SERVER)); - HttpRequestHeaders request_headers; - HttpRequestHeaders authorization_headers; + std::string authorization_headers; // TODO(wtc): If BuildAuthorizationHeader fails (returns an authorization // header with no credentials), we should return an error to prevent // entering an infinite auth restart loop. See http://crbug.com/21050. if (have_proxy_auth) - AddAuthorizationHeader(HttpAuth::AUTH_PROXY, &authorization_headers); + authorization_headers.append( + BuildAuthorizationHeader(HttpAuth::AUTH_PROXY)); if (have_server_auth) - AddAuthorizationHeader(HttpAuth::AUTH_SERVER, &authorization_headers); + authorization_headers.append( + BuildAuthorizationHeader(HttpAuth::AUTH_SERVER)); if (establishing_tunnel_) { - BuildTunnelRequest(request_, authorization_headers, &request_headers); + BuildTunnelRequest(request_, authorization_headers, &request_headers_); } else { BuildRequestHeaders(request_, authorization_headers, request_body, - proxy_mode_ == kHTTPProxy, &request_headers); + proxy_mode_ == kHTTPProxy, &request_headers_); } - - request_headers_ = request_headers.ToString(); } headers_valid_ = false; @@ -1612,8 +1595,8 @@ bool HttpNetworkTransaction::ShouldApplyServerAuth() const { !(request_->load_flags & LOAD_DO_NOT_SEND_AUTH_DATA); } -void HttpNetworkTransaction::AddAuthorizationHeader( - HttpAuth::Target target, HttpRequestHeaders* authorization_headers) const { +std::string HttpNetworkTransaction::BuildAuthorizationHeader( + HttpAuth::Target target) const { DCHECK(HaveAuth(target)); // Add a Authorization/Proxy-Authorization header line. @@ -1624,14 +1607,14 @@ void HttpNetworkTransaction::AddAuthorizationHeader( request_, &proxy_info_, &auth_token); - if (rv == OK) { - authorization_headers->SetHeader( - HttpAuth::GetAuthorizationHeaderName(target), auth_token); - } + if (rv == OK) + return HttpAuth::GetAuthorizationHeaderName(target) + + ": " + auth_token + "\r\n"; // TODO(cbentzel): Evict username and password from cache on non-OK return? // TODO(cbentzel): Never use this scheme again if // ERR_UNSUPPORTED_AUTH_SCHEME is returned. + return std::string(); } GURL HttpNetworkTransaction::AuthOrigin(HttpAuth::Target target) const { diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h index 8511808..ca4e882 100644 --- a/net/http/http_network_transaction.h +++ b/net/http/http_network_transaction.h @@ -33,7 +33,6 @@ class ClientSocketFactory; class ClientSocketHandle; class SpdyStream; class HttpNetworkSession; -class HttpRequestHeaders; class HttpStream; class HttpNetworkTransaction : public HttpTransaction { @@ -215,10 +214,9 @@ class HttpNetworkTransaction : public HttpTransaction { // Returns true if we should try to add an Authorization header. bool ShouldApplyServerAuth() const; - // Adds either the proxy auth header, or the origin server auth header, + // Builds either the proxy auth header, or the origin server auth header, // as specified by |target|. - void AddAuthorizationHeader( - HttpAuth::Target target, HttpRequestHeaders* authorization_headers) const; + std::string BuildAuthorizationHeader(HttpAuth::Target target) const; // Returns a log message for all the response headers related to the auth // challenge. diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index d942d334..b25dcfb 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -3379,45 +3379,6 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeaders) { EXPECT_EQ(OK, rv); } -TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeadersStripped) { - SessionDependencies session_deps; - scoped_ptr<HttpTransaction> trans( - new HttpNetworkTransaction(CreateSession(&session_deps))); - - HttpRequestInfo request; - request.method = "GET"; - request.url = GURL("http://www.google.com/"); - request.extra_headers = "referer: www.foo.com\nhEllo: Kitty\rFoO: bar\r\n"; - - MockWrite data_writes[] = { - MockWrite("GET / HTTP/1.1\r\n" - "Host: www.google.com\r\n" - "Connection: keep-alive\r\n" - "hEllo: Kitty\r\n" - "FoO: bar\r\n\r\n"), - }; - - // Lastly, the server responds with the actual content. - MockRead data_reads[] = { - MockRead("HTTP/1.0 200 OK\r\n"), - MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"), - MockRead("Content-Length: 100\r\n\r\n"), - MockRead(false, OK), - }; - - StaticSocketDataProvider data(data_reads, arraysize(data_reads), - data_writes, arraysize(data_writes)); - session_deps.socket_factory.AddSocketDataProvider(&data); - - TestCompletionCallback callback; - - int rv = trans->Start(&request, &callback, NULL); - EXPECT_EQ(ERR_IO_PENDING, rv); - - rv = callback.WaitForResult(); - EXPECT_EQ(OK, rv); -} - TEST_F(HttpNetworkTransactionTest, SOCKS4_HTTP_GET) { SessionDependencies session_deps( CreateFixedProxyService("socks4://myproxy:1080")); diff --git a/net/http/http_request_headers.cc b/net/http/http_request_headers.cc deleted file mode 100644 index 76e1da2..0000000 --- a/net/http/http_request_headers.cc +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright (c) 2010 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 "net/http/http_request_headers.h" - -#include "base/logging.h" -#include "base/string_util.h" -#include "net/http/http_util.h" - -namespace net { - -const char HttpRequestHeaders::kGetMethod[] = "GET"; - -const char HttpRequestHeaders::kCacheControl[] = "Cache-Control"; -const char HttpRequestHeaders::kConnection[] = "Connection"; -const char HttpRequestHeaders::kContentLength[] = "Content-Length"; -const char HttpRequestHeaders::kHost[] = "Host"; -const char HttpRequestHeaders::kPragma[] = "Pragma"; -const char HttpRequestHeaders::kProxyConnection[] = "Proxy-Connection"; -const char HttpRequestHeaders::kReferer[] = "Referer"; -const char HttpRequestHeaders::kUserAgent[] = "User-Agent"; - -HttpRequestHeaders::HttpRequestHeaders() {} -HttpRequestHeaders::~HttpRequestHeaders() {} - -void HttpRequestHeaders::SetRequestLine(const base::StringPiece& method, - const base::StringPiece& path, - const base::StringPiece& version) { - DCHECK(!method.empty()); - DCHECK(!path.empty()); - DCHECK(!version.empty()); - - method_.assign(method.data(), method.length()); - path_.assign(path.data(), path.length()); - version_.assign(version.data(), version.length()); -} - -void HttpRequestHeaders::SetHeader(const base::StringPiece& key, - const base::StringPiece& value) { - HeaderVector::iterator it = FindHeader(key); - if (it != headers_.end()) - it->value = value.as_string(); - else - headers_.push_back(HeaderKeyValuePair(key.as_string(), value.as_string())); -} - -void HttpRequestHeaders::RemoveHeader(const base::StringPiece& key) { - HeaderVector::iterator it = FindHeader(key); - if (it != headers_.end()) - headers_.erase(it); -} - -void HttpRequestHeaders::AddHeaderFromString( - const base::StringPiece& header_line) { - DCHECK_EQ(std::string::npos, header_line.find("\r\n")) - << "\"" << header_line << "\" contains CRLF."; - - const std::string::size_type key_end_index = header_line.find(":"); - if (key_end_index == std::string::npos) { - LOG(DFATAL) << "\"" << header_line << "\" is missing colon delimiter."; - return; - } - - if (key_end_index == 0) { - LOG(DFATAL) << "\"" << header_line << "\" is missing header key."; - return; - } - - const base::StringPiece header_key(header_line.data(), key_end_index); - - const std::string::size_type value_index = key_end_index + 1; - - if (value_index < header_line.size()) { - std::string header_value(header_line.data() + value_index, - header_line.size() - value_index); - std::string::const_iterator header_value_begin = - header_value.begin(); - std::string::const_iterator header_value_end = - header_value.end(); - HttpUtil::TrimLWS(&header_value_begin, &header_value_end); - SetHeader(header_key, - base::StringPiece(&*header_value_begin, - header_value_end - header_value_begin)); - } else if (value_index == header_line.size()) { - SetHeader(header_key, ""); - } else { - NOTREACHED(); - } -} - -void HttpRequestHeaders::MergeFrom(const HttpRequestHeaders& other) { - DCHECK(other.method_.empty()); - DCHECK(other.path_.empty()); - DCHECK(other.version_.empty()); - - for (HeaderVector::const_iterator it = other.headers_.begin(); - it != other.headers_.end(); ++it ) { - SetHeader(it->key, it->value); - } -} - -std::string HttpRequestHeaders::ToString() const { - std::string output; - if (!method_.empty()) { - DCHECK(!path_.empty()); - DCHECK(!version_.empty()); - output = StringPrintf( - "%s %s HTTP/%s\r\n", method_.c_str(), path_.c_str(), version_.c_str()); - } - for (HeaderVector::const_iterator it = headers_.begin(); - it != headers_.end(); ++it) { - if (!it->value.empty()) - StringAppendF(&output, "%s: %s\r\n", it->key.c_str(), it->value.c_str()); - else - StringAppendF(&output, "%s:\r\n", it->key.c_str()); - } - output.append("\r\n"); - return output; -} - -HttpRequestHeaders::HeaderVector::iterator -HttpRequestHeaders::FindHeader(const base::StringPiece& key) { - for (HeaderVector::iterator it = headers_.begin(); - it != headers_.end(); ++it) { - if (!base::strncasecmp(key.data(), it->key.data(), key.length())) - return it; - } - - return headers_.end(); -} - -} // namespace net diff --git a/net/http/http_request_headers.h b/net/http/http_request_headers.h deleted file mode 100644 index 79522aa..0000000 --- a/net/http/http_request_headers.h +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright (c) 2010 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. -// -// HttpRequestHeaders manages the request headers (including the request line). -// It maintains these in a vector of header key/value pairs, thereby maintaining -// the order of the headers. This means that any lookups are linear time -// operations. - -#ifndef NET_HTTP_HTTP_REQUEST_HEADERS_H_ -#define NET_HTTP_HTTP_REQUEST_HEADERS_H_ - -#include <string> -#include <vector> -#include "base/basictypes.h" -#include "base/string_piece.h" - -namespace net { - -class HttpRequestHeaders { - public: - static const char kGetMethod[]; - - static const char kCacheControl[]; - static const char kConnection[]; - static const char kContentLength[]; - static const char kHost[]; - static const char kPragma[]; - static const char kProxyConnection[]; - static const char kReferer[]; - static const char kUserAgent[]; - - HttpRequestHeaders(); - ~HttpRequestHeaders(); - - void SetRequestLine(const base::StringPiece& method, - const base::StringPiece& path, - const base::StringPiece& version); - - // Sets the header value pair for |key| and |value|. If |key| already exists, - // then the header value is modified, but the key is untouched, and the order - // in the vector remains the same. When comparing |key|, case is ignored. - void SetHeader(const base::StringPiece& key, const base::StringPiece& value); - - // Removes the first header that matches (case insensitive) |key|. - void RemoveHeader(const base::StringPiece& key); - - // Parses the header from a string and calls SetHeader() with it. This string - // should not contain any CRLF. As per RFC2616, the format is: - // - // message-header = field-name ":" [ field-value ] - // field-name = token - // field-value = *( field-content | LWS ) - // field-content = <the OCTETs making up the field-value - // and consisting of either *TEXT or combinations - // of token, separators, and quoted-string> - // - // AddHeaderFromString() will trim any LWS surrounding the - // field-content. - void AddHeaderFromString(const base::StringPiece& header_line); - - // Calls SetHeader() on each header from |other|, maintaining order. - void MergeFrom(const HttpRequestHeaders& other); - - // Serializes HttpRequestHeaders to a string representation. Joins all the - // header keys and values with ": ", and inserts "\r\n" between each header - // line, and adds the trailing "\r\n". - std::string ToString() const; - - private: - struct HeaderKeyValuePair { - HeaderKeyValuePair() {} - HeaderKeyValuePair(const base::StringPiece& key, - const base::StringPiece& value) - : key(key.data(), key.size()), value(value.data(), value.size()) {} - - std::string key; - std::string value; - }; - - typedef std::vector<HeaderKeyValuePair> HeaderVector; - - HeaderVector::iterator FindHeader(const base::StringPiece& key); - HeaderVector::const_iterator FindHeader(const base::StringPiece& key) const; - - std::string method_; - std::string path_; - std::string version_; - - HeaderVector headers_; - - DISALLOW_COPY_AND_ASSIGN(HttpRequestHeaders); -}; - -} // namespace net - -#endif // NET_HTTP_HTTP_REQUEST_HEADERS_H_ diff --git a/net/http/http_request_headers_unittest.cc b/net/http/http_request_headers_unittest.cc deleted file mode 100644 index e7e03a9..0000000 --- a/net/http/http_request_headers_unittest.cc +++ /dev/null @@ -1,120 +0,0 @@ -// Copyright (c) 2010 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 "net/http/http_request_headers.h" - -#include "testing/gtest/include/gtest/gtest.h" - -namespace net { - -namespace { - -TEST(HttpRequestHeaders, SetRequestLine) { - HttpRequestHeaders headers; - headers.SetRequestLine( - HttpRequestHeaders::kGetMethod, "/foo", "1.1"); - EXPECT_EQ("GET /foo HTTP/1.1\r\n\r\n", headers.ToString()); -} - -TEST(HttpRequestHeaders, SetHeader) { - HttpRequestHeaders headers; - headers.SetHeader("Foo", "bar"); - EXPECT_EQ("Foo: bar\r\n\r\n", headers.ToString()); -} - -TEST(HttpRequestHeaders, SetMultipleHeaders) { - HttpRequestHeaders headers; - headers.SetHeader("Cookie-Monster", "Nom nom nom"); - headers.SetHeader("Domo-Kun", "Loves Chrome"); - EXPECT_EQ("Cookie-Monster: Nom nom nom\r\nDomo-Kun: Loves Chrome\r\n\r\n", - headers.ToString()); -} - -TEST(HttpRequestHeaders, SetHeaderTwice) { - HttpRequestHeaders headers; - headers.SetHeader("Foo", "bar"); - headers.SetHeader("Foo", "bar"); - EXPECT_EQ("Foo: bar\r\n\r\n", headers.ToString()); -} - -TEST(HttpRequestHeaders, SetHeaderTwiceCaseInsensitive) { - HttpRequestHeaders headers; - headers.SetHeader("Foo", "bar"); - headers.SetHeader("FoO", "Bar"); - EXPECT_EQ("Foo: Bar\r\n\r\n", headers.ToString()); -} - -TEST(HttpRequestHeaders, RemoveHeader) { - HttpRequestHeaders headers; - headers.SetHeader("Foo", "bar"); - headers.RemoveHeader("Foo"); - EXPECT_EQ("\r\n", headers.ToString()); -} - -TEST(HttpRequestHeaders, RemoveHeaderMissingHeader) { - HttpRequestHeaders headers; - headers.SetHeader("Foo", "bar"); - headers.RemoveHeader("Bar"); - EXPECT_EQ("Foo: bar\r\n\r\n", headers.ToString()); -} - -TEST(HttpRequestHeaders, RemoveHeaderCaseInsensitive) { - HttpRequestHeaders headers; - headers.SetHeader("Foo", "bar"); - headers.SetHeader("All-Your-Base", "Belongs To Chrome"); - headers.RemoveHeader("foo"); - EXPECT_EQ("All-Your-Base: Belongs To Chrome\r\n\r\n", headers.ToString()); -} - -TEST(HttpRequestHeaders, AddHeaderFromString) { - HttpRequestHeaders headers; - headers.AddHeaderFromString("Foo: bar"); - EXPECT_EQ("Foo: bar\r\n\r\n", headers.ToString()); -} - -TEST(HttpRequestHeaders, AddHeaderFromStringNoLeadingWhitespace) { - HttpRequestHeaders headers; - headers.AddHeaderFromString("Foo:bar"); - EXPECT_EQ("Foo: bar\r\n\r\n", headers.ToString()); -} - -TEST(HttpRequestHeaders, AddHeaderFromStringMoreLeadingWhitespace) { - HttpRequestHeaders headers; - headers.AddHeaderFromString("Foo: \t \t bar"); - EXPECT_EQ("Foo: bar\r\n\r\n", headers.ToString()); -} - -TEST(HttpRequestHeaders, AddHeaderFromStringTrailingWhitespace) { - HttpRequestHeaders headers; - headers.AddHeaderFromString("Foo: bar \t \t "); - EXPECT_EQ("Foo: bar\r\n\r\n", headers.ToString()); -} - -TEST(HttpRequestHeaders, AddHeaderFromStringLeadingTrailingWhitespace) { - HttpRequestHeaders headers; - headers.AddHeaderFromString("Foo: \t bar\t "); - EXPECT_EQ("Foo: bar\r\n\r\n", headers.ToString()); -} - -TEST(HttpRequestHeaders, AddHeaderFromStringWithEmptyValue) { - HttpRequestHeaders headers; - headers.AddHeaderFromString("Foo:"); - EXPECT_EQ("Foo:\r\n\r\n", headers.ToString()); -} - -TEST(HttpRequestHeaders, MergeFrom) { - HttpRequestHeaders headers; - headers.SetHeader("A", "A"); - headers.SetHeader("B", "B"); - - HttpRequestHeaders headers2; - headers2.SetHeader("B", "b"); - headers2.SetHeader("C", "c"); - headers.MergeFrom(headers2); - EXPECT_EQ("A: A\r\nB: b\r\nC: c\r\n\r\n", headers.ToString()); -} - -} // namespace - -} // namespace net diff --git a/net/net.gyp b/net/net.gyp index 341d8a1..1b66ab8 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -351,8 +351,6 @@ 'http/http_network_session.h', 'http/http_network_transaction.cc', 'http/http_network_transaction.h', - 'http/http_request_headers.cc', - 'http/http_request_headers.h', 'http/http_request_info.h', 'http/http_response_headers.cc', 'http/http_response_headers.h', @@ -665,7 +663,6 @@ 'http/http_chunked_decoder_unittest.cc', 'http/http_network_layer_unittest.cc', 'http/http_network_transaction_unittest.cc', - 'http/http_request_headers_unittest.cc', 'http/http_response_headers_unittest.cc', 'http/http_transaction_unittest.cc', 'http/http_transaction_unittest.h', diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 439851b..dc39667 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -1092,7 +1092,7 @@ TEST_F(URLRequestTestHTTP, VaryHeader) { TestDelegate d; URLRequest req(server_->TestServerPage("echoheader?foo"), &d); req.set_context(context); - req.SetExtraRequestHeaders("foo: 1"); + req.SetExtraRequestHeaders("foo:1"); req.Start(); MessageLoop::current()->Run(); } @@ -1102,7 +1102,7 @@ TEST_F(URLRequestTestHTTP, VaryHeader) { TestDelegate d; URLRequest req(server_->TestServerPage("echoheader?foo"), &d); req.set_context(context); - req.SetExtraRequestHeaders("foo: 1"); + req.SetExtraRequestHeaders("foo:1"); req.Start(); MessageLoop::current()->Run(); @@ -1114,7 +1114,7 @@ TEST_F(URLRequestTestHTTP, VaryHeader) { TestDelegate d; URLRequest req(server_->TestServerPage("echoheader?foo"), &d); req.set_context(context); - req.SetExtraRequestHeaders("foo: 2"); + req.SetExtraRequestHeaders("foo:2"); req.Start(); MessageLoop::current()->Run(); |