OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/quic/spdy_utils.h" | 5 #include "net/quic/spdy_utils.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
113 bool SpdyUtils::CopyAndValidateHeaders(const QuicHeaderList& header_list, | 113 bool SpdyUtils::CopyAndValidateHeaders(const QuicHeaderList& header_list, |
114 int64_t* content_length, | 114 int64_t* content_length, |
115 SpdyHeaderBlock* headers) { | 115 SpdyHeaderBlock* headers) { |
116 for (const auto& p : header_list) { | 116 for (const auto& p : header_list) { |
117 const string& name = p.first; | 117 const string& name = p.first; |
118 if (name.empty()) { | 118 if (name.empty()) { |
119 DVLOG(1) << "Header name must not be empty."; | 119 DVLOG(1) << "Header name must not be empty."; |
120 return false; | 120 return false; |
121 } | 121 } |
122 | 122 |
123 if (std::any_of(name.begin(), name.end(), base::IsAsciiUpper<char>)) { | |
124 DLOG(ERROR) << "Malformed header: Header name " << name | |
125 << " contains upper-case characters."; | |
126 return false; | |
127 } | |
128 | |
129 auto iter = headers->find(name); | 123 auto iter = headers->find(name); |
130 if (iter == headers->end()) { | 124 if (iter == headers->end()) { |
131 (*headers)[name] = p.second; | 125 (*headers)[name] = p.second; |
132 } else if (name == "cookie") { | 126 } else if (name == "cookie") { |
133 // Obeys section 8.1.2.5 in RFC 7540 for cookie reconstruction. | 127 // Obeys section 8.1.2.5 in RFC 7540 for cookie reconstruction. |
134 headers->ReplaceOrAppendHeader( | 128 headers->ReplaceOrAppendHeader( |
135 name, base::StringPrintf("%s; %s", iter->second.as_string().c_str(), | 129 name, base::StringPrintf("%s; %s", iter->second.as_string().c_str(), |
136 p.second.c_str())); | 130 p.second.c_str())); |
137 } else { | 131 } else { |
138 // This header had multiple values, so it must be reconstructed. | 132 // This header had multiple values, so it must be reconstructed. |
139 string value = base::StringPrintf( | 133 string value = base::StringPrintf( |
140 "%s%c%s", iter->second.as_string().c_str(), '\0', p.second.c_str()); | 134 "%s%c%s", iter->second.as_string().c_str(), '\0', p.second.c_str()); |
dahollings
2016/05/23 21:15:17
birenroy@ pointed out that this could be one possi
Ryan Hamilton
2016/05/24 16:08:29
Ah, interesting. That sounds potentially problemat
| |
141 headers->ReplaceOrAppendHeader(name, value); | 135 headers->ReplaceOrAppendHeader(name, value); |
142 } | 136 } |
143 } | 137 } |
144 | 138 |
145 if (ContainsKey(*headers, "content-length")) { | 139 if (ContainsKey(*headers, "content-length")) { |
146 // Check whether multiple values are consistent. | 140 // Check whether multiple values are consistent. |
147 StringPiece content_length_header = (*headers)["content-length"]; | 141 StringPiece content_length_header = (*headers)["content-length"]; |
148 vector<string> values = | 142 vector<string> values = |
149 base::SplitString(content_length_header, base::StringPiece("\0", 1), | 143 base::SplitString(content_length_header, base::StringPiece("\0", 1), |
150 base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); | 144 base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
248 return GURL(GetUrlFromHeaderBlock(headers)).host(); | 242 return GURL(GetUrlFromHeaderBlock(headers)).host(); |
249 } | 243 } |
250 | 244 |
251 // static | 245 // static |
252 bool SpdyUtils::UrlIsValid(const SpdyHeaderBlock& headers) { | 246 bool SpdyUtils::UrlIsValid(const SpdyHeaderBlock& headers) { |
253 string url(GetUrlFromHeaderBlock(headers)); | 247 string url(GetUrlFromHeaderBlock(headers)); |
254 return url != "" && GURL(url).is_valid(); | 248 return url != "" && GURL(url).is_valid(); |
255 } | 249 } |
256 | 250 |
257 } // namespace net | 251 } // namespace net |
OLD | NEW |