Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(404)

Side by Side Diff: net/quic/quic_spdy_server_stream.cc

Issue 337093003: QuicServer: Use Chrome's header parsing rather than Balsa (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@quic_server_3
Patch Set: Address review comments Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/quic_spdy_server_stream.h" 5 #include "net/quic/quic_spdy_server_stream.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "net/quic/quic_in_memory_cache.h" 8 #include "net/quic/quic_in_memory_cache.h"
9 #include "net/quic/quic_session.h" 9 #include "net/quic/quic_session.h"
10 #include "net/spdy/spdy_framer.h" 10 #include "net/spdy/spdy_framer.h"
11 #include "net/tools/quic/spdy_utils.h" 11 #include "net/spdy/spdy_header_block.h"
12 #include "net/spdy/spdy_http_utils.h"
12 13
13 using base::StringPiece; 14 using base::StringPiece;
14 using std::string; 15 using std::string;
15 using net::tools::SpdyUtils;
16 16
17 namespace net { 17 namespace net {
18 18
19 static const size_t kHeaderBufInitialSize = 4096; 19 static const size_t kHeaderBufInitialSize = 4096;
20 20
21 QuicSpdyServerStream::QuicSpdyServerStream(QuicStreamId id, 21 QuicSpdyServerStream::QuicSpdyServerStream(QuicStreamId id,
22 QuicSession* session) 22 QuicSession* session)
23 : QuicDataStream(id, session), 23 : QuicDataStream(id, session),
24 read_buf_(new GrowableIOBuffer()), 24 read_buf_(new GrowableIOBuffer()),
25 request_headers_received_(false) { 25 request_headers_received_(false) {
26 } 26 }
27 27
28 QuicSpdyServerStream::~QuicSpdyServerStream() { 28 QuicSpdyServerStream::~QuicSpdyServerStream() {
29 } 29 }
30 30
31 uint32 QuicSpdyServerStream::ProcessData(const char* data, uint32 data_len) { 31 uint32 QuicSpdyServerStream::ProcessData(const char* data, uint32 data_len) {
32 uint32 total_bytes_processed = 0;
33
34 // Are we still reading the request headers. 32 // Are we still reading the request headers.
35 if (!request_headers_received_) { 33 if (!request_headers_received_) {
36 // Grow the read buffer if necessary. 34 // Grow the read buffer if necessary.
37 if (read_buf_->RemainingCapacity() < (int)data_len) { 35 if (read_buf_->RemainingCapacity() < (int)data_len) {
38 read_buf_->SetCapacity(read_buf_->capacity() + kHeaderBufInitialSize); 36 read_buf_->SetCapacity(read_buf_->capacity() + kHeaderBufInitialSize);
39 } 37 }
40 memcpy(read_buf_->data(), data, data_len); 38 memcpy(read_buf_->data(), data, data_len);
41 read_buf_->set_offset(read_buf_->offset() + data_len); 39 read_buf_->set_offset(read_buf_->offset() + data_len);
42 ParseRequestHeaders(); 40 ParseRequestHeaders();
43 } else {
44 body_.append(data + total_bytes_processed,
45 data_len - total_bytes_processed);
46 } 41 }
47 return data_len; 42 return data_len;
48 } 43 }
49 44
50 void QuicSpdyServerStream::OnFinRead() { 45 void QuicSpdyServerStream::OnFinRead() {
51 ReliableQuicStream::OnFinRead(); 46 ReliableQuicStream::OnFinRead();
52 if (write_side_closed() || fin_buffered()) { 47 if (write_side_closed() || fin_buffered()) {
53 return; 48 return;
54 } 49 }
55 50
56 if (!request_headers_received_) { 51 if (!request_headers_received_) {
57 SendErrorResponse(); // We're not done reading headers. 52 SendErrorResponse(); // We're not done reading headers.
58 } else if ((headers_.content_length_status() ==
59 BalsaHeadersEnums::VALID_CONTENT_LENGTH) &&
60 body_.size() != headers_.content_length()) {
61 SendErrorResponse(); // Invalid content length
62 } else { 53 } else {
63 SendResponse(); 54 SendResponse();
64 } 55 }
65 } 56 }
66 57
67 int QuicSpdyServerStream::ParseRequestHeaders() { 58 int QuicSpdyServerStream::ParseRequestHeaders() {
68 size_t read_buf_len = static_cast<size_t>(read_buf_->offset());
69 SpdyFramer framer(SPDY3); 59 SpdyFramer framer(SPDY3);
70 SpdyHeaderBlock headers; 60 SpdyHeaderBlock headers;
71 char* data = read_buf_->StartOfBuffer(); 61 char* data = read_buf_->StartOfBuffer();
72 size_t len = framer.ParseHeaderBlockInBuffer(data, read_buf_->offset(), 62 size_t len = framer.ParseHeaderBlockInBuffer(data, read_buf_->offset(),
73 &headers); 63 &headers);
74 if (len == 0) { 64 if (len == 0) {
75 return -1; 65 return -1;
76 } 66 }
77 67
78 if (!SpdyUtils::FillBalsaRequestHeaders(headers, &headers_)) { 68 request_url_ = GetUrlFromHeaderBlock(headers, SPDY3, false);
69 if (!request_url_.is_valid()) {
79 SendErrorResponse(); 70 SendErrorResponse();
80 return -1; 71 return -1;
81 } 72 }
82 73
83 size_t delta = read_buf_len - len;
84 if (delta > 0) {
85 body_.append(data + len, delta);
86 }
87
88 request_headers_received_ = true; 74 request_headers_received_ = true;
89 return len; 75 return len;
90 } 76 }
91 77
92 void QuicSpdyServerStream::SendResponse() { 78 void QuicSpdyServerStream::SendResponse() {
93 // Find response in cache. If not found, send error response. 79 // Find response in cache. If not found, send error response.
94 const QuicInMemoryCache::Response* response = 80 const QuicInMemoryCache::Response* response =
95 QuicInMemoryCache::GetInstance()->GetResponse(headers_); 81 QuicInMemoryCache::GetInstance()->GetResponse(request_url_);
96 if (response == NULL) { 82 if (response == NULL) {
97 SendErrorResponse(); 83 SendErrorResponse();
98 return; 84 return;
99 } 85 }
100 86
101 if (response->response_type() == QuicInMemoryCache::CLOSE_CONNECTION) { 87 if (response->response_type() == QuicInMemoryCache::CLOSE_CONNECTION) {
102 DVLOG(1) << "Special response: closing connection."; 88 DVLOG(1) << "Special response: closing connection.";
103 CloseConnection(QUIC_NO_ERROR); 89 CloseConnection(QUIC_NO_ERROR);
104 return; 90 return;
105 } 91 }
106 92
107 if (response->response_type() == QuicInMemoryCache::IGNORE_REQUEST) { 93 if (response->response_type() == QuicInMemoryCache::IGNORE_REQUEST) {
108 DVLOG(1) << "Special response: ignoring request."; 94 DVLOG(1) << "Special response: ignoring request.";
109 return; 95 return;
110 } 96 }
111 97
112 DVLOG(1) << "Sending response for stream " << id(); 98 DVLOG(1) << "Sending response for stream " << id();
113 SendHeadersAndBody(response->headers(), response->body()); 99 SendHeadersAndBody(response->headers(), response->body());
114 } 100 }
115 101
116 void QuicSpdyServerStream::SendErrorResponse() { 102 void QuicSpdyServerStream::SendErrorResponse() {
117 DVLOG(1) << "Sending error response for stream " << id(); 103 DVLOG(1) << "Sending error response for stream " << id();
118 BalsaHeaders headers; 104 scoped_refptr<HttpResponseHeaders> headers
119 headers.SetResponseFirstlineFromStringPieces( 105 = new HttpResponseHeaders("HTTP/1.1 500 Server Error\n"
120 "HTTP/1.1", "500", "Server Error"); 106 "content-length: 3\n");
121 headers.ReplaceOrAppendHeader("content-length", "3");
122 SendHeadersAndBody(headers, "bad"); 107 SendHeadersAndBody(headers, "bad");
123 } 108 }
124 109
125 void QuicSpdyServerStream::SendHeadersAndBody( 110 void QuicSpdyServerStream::SendHeadersAndBody(
126 const BalsaHeaders& response_headers, 111 scoped_refptr<HttpResponseHeaders> response_headers,
127 StringPiece body) { 112 StringPiece body) {
128 // We only support SPDY and HTTP, and neither handles bidirectional streaming. 113 // We only support SPDY and HTTP, and neither handles bidirectional streaming.
129 if (!read_side_closed()) { 114 if (!read_side_closed()) {
130 CloseReadSide(); 115 CloseReadSide();
131 } 116 }
132 117
133 SpdyHeaderBlock header_block = 118 SpdyHeaderBlock header_block;
134 SpdyUtils::ResponseHeadersToSpdyHeaders(response_headers); 119 CreateSpdyHeadersFromHttpResponse(response_headers, &header_block, SPDY3);
135 120
136 WriteHeaders(header_block, body.empty(), NULL); 121 WriteHeaders(header_block, body.empty(), NULL);
137 122
138 if (!body.empty()) { 123 if (!body.empty()) {
139 WriteOrBufferData(body, true, NULL); 124 WriteOrBufferData(body, true, NULL);
140 } 125 }
141 } 126 }
142 127
143 } // namespace net 128 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698