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

Side by Side Diff: net/websockets/websocket_frame_parser.cc

Issue 10071002: alternative ws header parser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revised Created 8 years, 8 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 | Annotate | Revision Log
OLDNEW
(Empty)
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "net/websockets/websocket_frame_parser.h"
6
7 #include <algorithm>
8 #include "base/basictypes.h"
9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/scoped_vector.h"
12 #include "base/memory/ref_counted.h"
13 #include "net/base/big_endian.h"
14 #include "net/websockets/websocket_frame.h"
15
16 const uint8 kFinalBit = 0x80;
17 const uint8 kReserved1Bit = 0x40;
18 const uint8 kReserved2Bit = 0x20;
19 const uint8 kReserved3Bit = 0x10;
20 const uint8 kOpCodeMask = 0xF;
21 const uint8 kMaskBit = 0x80;
22 const uint8 kPayloadLengthMask = 0x7F;
23 const uint64 kMaxPayloadLengthWithoutExtendedLengthField = 125;
24 const uint64 kPayloadLengthWithTwoByteExtendedLengthField = 126;
25 const uint64 kPayloadLengthWithEightByteExtendedLengthField = 127;
26
27 namespace net {
28
29 WebSocketFrameParser::WebSocketFrameParser()
30 : current_read_pos_(0),
31 frame_offset_(0),
32 failed_(false) {
33 std::fill(masking_key_,
34 masking_key_ + WebSocketFrameHeader::kMaskingKeyLength,
35 '\0');
36 }
37
38 WebSocketFrameParser::~WebSocketFrameParser() {
39 }
40
41 bool WebSocketFrameParser::Decode(
42 const char* data,
43 size_t length,
44 ScopedVector<WebSocketPartialFrame>* frames) {
45 if (failed_)
46 return false;
47 if (!length)
48 return true;
49
50 // TODO(yutak): Remove copy.
51 buffer_.insert(buffer_.end(), data, data + length);
52
53 while (current_read_pos_ < buffer_.size()) {
54 if (!current_frame_header_.get()) {
55 DecodeFrameHeader();
56 if (failed_)
57 return false;
58 // If frame header is incomplete, then carry over the remaining
59 // data to the next round of Decode().
60 if (!current_frame_header_.get())
61 break;
62 }
63
64 scoped_ptr<WebSocketPartialFrame> frame = DecodeFramePayload();
65 DCHECK(frame.get());
66 frames->push_back(frame.release());
67
68 if (current_frame_header_.get()) {
69 DCHECK(current_read_pos_ == buffer_.size());
70 break;
71 }
72 }
73
74 // Drain unnecessary data. TODO(yutak): Remove copy. (but how?)
75 buffer_.erase(buffer_.begin(), buffer_.begin() + current_read_pos_);
76 current_read_pos_ = 0;
77
78 // Sanity check: the size of carried-over data should not exceed
79 // the maximum possible length of a frame header.
80 static const size_t kMaximumFrameHeaderSize =
81 WebSocketFrameHeader::kBaseHeaderSize +
82 WebSocketFrameHeader::kMaximumExtendedLengthSize +
83 WebSocketFrameHeader::kMaskingKeyLength;
84 DCHECK_LT(buffer_.size(), kMaximumFrameHeaderSize);
85
86 return true;
87 }
88
89 void WebSocketFrameParser::DecodeFrameHeader() {
90 typedef WebSocketFrameHeader::OpCode OpCode;
91 static const int kMaskingKeyLength = WebSocketFrameHeader::kMaskingKeyLength;
92
93 DCHECK(!current_frame_header_.get());
94 DCHECK(current_read_pos_ == 0);
95 if (buffer_.size() < 2)
96 return;
97
98 // Pointer handling introduces requirement for developers to manage a kind of
99 // dynamic state.
100 uint8 first_byte = buffer_[0];
101 bool final = (first_byte & kFinalBit) != 0;
102 bool reserved1 = (first_byte & kReserved1Bit) != 0;
103 bool reserved2 = (first_byte & kReserved2Bit) != 0;
104 bool reserved3 = (first_byte & kReserved3Bit) != 0;
105 OpCode opcode = first_byte & kOpCodeMask;
106
107 uint8 second_byte = buffer_[1];
108 bool masked = (second_byte & kMaskBit) != 0;
109 uint64 payload_length = second_byte & kPayloadLengthMask;
110 bool valid_length_format = true;
111 int masking_offset = 2;
112 int masking_size = masked ? 4 : 0;
113 if (payload_length == kPayloadLengthWithTwoByteExtendedLengthField) {
114 // You may want to constant variable for following 4 and 10.
115 if (buffer_.size() < (masking_size + 4))
116 return;
117 uint16 payload_length_16;
118 ReadBigEndian(&buffer_[2], &payload_length_16);
119 if (payload_length <= kMaxPayloadLengthWithoutExtendedLengthField)
120 valid_length_format = false;
121 } else if (payload_length == kPayloadLengthWithEightByteExtendedLengthField) {
122 if (buffer_.size() < (masking_size + 10))
123 return;
124 // ditto.
125 }
126 if (!valid_length_format) {
127 failed_ = true;
128 buffer_.clear();
129 current_read_pos_ = 0;
130 current_frame_header_ = NULL;
131 frame_offset_ = 0;
132 return;
133 }
134
135 // ...
136 }
137
138 scoped_ptr<WebSocketPartialFrame> WebSocketFrameParser::DecodeFramePayload() {
139 static const int kMaskingKeyLength = WebSocketFrameHeader::kMaskingKeyLength;
140
141 const char* current = &buffer_.front() + current_read_pos_;
142 const char* end = &buffer_.front() + buffer_.size();
143 uint64 next_size = std::min<uint64>(
144 end - current,
145 current_frame_header_->payload_length - frame_offset_);
146
147 scoped_ptr<WebSocketPartialFrame> frame(new WebSocketPartialFrame);
148 frame->header = current_frame_header_;
149 frame->final_part = false;
150 frame->data.assign(current, current + next_size);
151 if (current_frame_header_->masked) {
152 // Unmask the payload.
153 // TODO(yutak): This could be faster by doing unmasking for each
154 // machine word (instead of each byte).
155 size_t key_offset = frame_offset_ % kMaskingKeyLength;
156 for (uint64 i = 0; i < next_size; ++i) {
157 frame->data[i] ^= masking_key_[key_offset];
158 key_offset = (key_offset + 1) % kMaskingKeyLength;
159 }
160 }
161
162 current_read_pos_ += next_size;
163 frame_offset_ += next_size;
164
165 DCHECK_LE(frame_offset_, current_frame_header_->payload_length);
166 if (frame_offset_ == current_frame_header_->payload_length) {
167 frame->final_part = true;
168 current_frame_header_ = NULL;
169 frame_offset_ = 0;
170 std::fill(masking_key_, masking_key_ + kMaskingKeyLength, '\0');
171 }
172
173 return frame.Pass();
174 }
175
176 } // namespace net
OLDNEW
« no previous file with comments | « net/websockets/websocket_frame_parser.h ('k') | net/websockets/websocket_frame_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698