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

Unified Diff: net/websockets/websocket_frame.cc

Issue 10384180: Add functions used for building WebSocket frame data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove class, add free functions. Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: net/websockets/websocket_frame.cc
diff --git a/net/websockets/websocket_frame.cc b/net/websockets/websocket_frame.cc
index 5e135867aa332a4ec5045249a1c328334d8b60d1..d7c2cb0e99572dfd604b4cd991ceba294d30a91c 100644
--- a/net/websockets/websocket_frame.cc
+++ b/net/websockets/websocket_frame.cc
@@ -4,6 +4,27 @@
#include "net/websockets/websocket_frame.h"
+#include <vector>
+
+#include "base/basictypes.h"
+#include "base/logging.h"
+#include "base/rand_util.h"
+#include "net/base/big_endian.h"
+
+namespace {
+
+const uint8 kFinalBit = 0x80;
+const uint8 kReserved1Bit = 0x40;
+const uint8 kReserved2Bit = 0x20;
+const uint8 kReserved3Bit = 0x10;
+const uint8 kOpCodeMask = 0xF;
+const uint8 kMaskBit = 0x80;
+const uint64 kMaxPayloadLengthWithoutExtendedLengthField = 125;
+const uint64 kPayloadLengthWithTwoByteExtendedLengthField = 126;
+const uint64 kPayloadLengthWithEightByteExtendedLengthField = 127;
+
+} // Unnamed namespace.
+
namespace net {
// Definitions for in-struct constants.
@@ -21,4 +42,92 @@ WebSocketFrameChunk::WebSocketFrameChunk() : final_chunk(false) {
WebSocketFrameChunk::~WebSocketFrameChunk() {
}
+void WriteWebSocketFrameHeader(const WebSocketFrameHeader* header,
+ const char* masking_key,
+ std::vector<char>* output) {
willchan no longer on Chromium 2012/05/21 19:19:52 I think this interface is not correct. The use of
Yuta Kitamura 2012/05/22 10:29:35 The problem here is the header size varies (2 - 14
+ DCHECK(header);
+ DCHECK((header->opcode & kOpCodeMask) == header->opcode)
+ << "header->opcode must fit to kOpCodeMask.";
+ DCHECK(header->payload_length <= static_cast<uint64>(kint64max))
+ << "WebSocket specification doesn't allow a frame longer than "
+ << "kint64max (0x7FFFFFFFFFFFFFFF) bytes.";
+
+ // WebSocket frame format is as follows:
+ // - Common header (2 bytes)
+ // - Optional extended payload length
+ // (2 or 8 bytes, present if actual payload length is more than 125 bytes)
+ // - Optional masking key (4 bytes, present if MASK bit is on)
+ // - Actual payload (XOR masked with masking key if MASK bit is on)
+ //
+ // This function constructs frame header (the first three in the list
+ // above).
+
+ uint8 first_byte = 0u;
+ first_byte |= header->final ? kFinalBit : 0u;
+ first_byte |= header->reserved1 ? kReserved1Bit : 0u;
+ first_byte |= header->reserved2 ? kReserved2Bit : 0u;
+ first_byte |= header->reserved3 ? kReserved3Bit : 0u;
+ first_byte |= header->opcode;
+
+ uint8 second_byte = 0u;
+ second_byte |= header->masked ? kMaskBit : 0u;
+ if (header->payload_length <=
+ kMaxPayloadLengthWithoutExtendedLengthField) {
+ second_byte |= header->payload_length;
+ } else if (header->payload_length <= kuint16max) {
+ second_byte |= kPayloadLengthWithTwoByteExtendedLengthField;
+ } else {
+ second_byte |= kPayloadLengthWithEightByteExtendedLengthField;
+ }
+
+ output->push_back(first_byte);
+ output->push_back(second_byte);
+
+ // Writes "extended payload length" field.
+ if (header->payload_length > kMaxPayloadLengthWithoutExtendedLengthField &&
+ header->payload_length <= kuint16max) {
+ uint16 payload_length_16 = static_cast<uint16>(header->payload_length);
+ char encoded[sizeof(uint16)];
+ WriteBigEndian(encoded, payload_length_16);
+ output->insert(output->end(), encoded, encoded + sizeof(uint16));
+ } else if (header->payload_length > kuint16max) {
+ char encoded[sizeof(uint64)];
+ WriteBigEndian(encoded, header->payload_length);
+ output->insert(output->end(), encoded, encoded + sizeof(uint64));
+ }
+
+ // Writes "masking key" field, if needed.
+ if (header->masked) {
+ DCHECK(masking_key);
+ output->insert(output->end(), masking_key,
+ masking_key + WebSocketFrameHeader::kMaskingKeyLength);
+ } else {
+ DCHECK(!masking_key);
+ }
+}
+
+void GenerateWebSocketMaskingKey(char* masking_key) {
+ // Masking keys should be generated from a cryptographically secure random
+ // number generator, which means web application authors should not be able
+ // to guess the next value of masking key.
+ base::RandBytes(masking_key, WebSocketFrameHeader::kMaskingKeyLength);
+}
+
+void MaskWebSocketFramePayload(const char* masking_key,
+ uint64 frame_offset,
+ std::vector<char>* frame_data) {
+ static const size_t kMaskingKeyLength =
+ WebSocketFrameHeader::kMaskingKeyLength;
+
+ // TODO(yutak): Make masking more efficient by XOR'ing every machine word
+ // (4 or 8 bytes), instead of XOR'ing every byte.
+ size_t masking_key_offset = frame_offset % kMaskingKeyLength;
+ for (std::vector<char>::iterator iter = frame_data->begin();
+ iter != frame_data->end(); ++iter) {
+ *iter ^= masking_key[masking_key_offset++];
+ if (masking_key_offset == kMaskingKeyLength)
+ masking_key_offset = 0;
+ }
+}
+
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698