kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(server) server should not mask data when sending to client (some python client libraries enforce that and assert)

Browse Source
This commit is contained in:
Benjamin Sergeant 2019-03-22 09:53:56 -07:00
parent 68a53aa884
commit 4ef3073ca4
2 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ixwebsocket/IXWebSocketTransport.cpp
View File

@ -58,6 +58,7 @@ namespace ix
constexpr size_t WebSocketTransport::kChunkSize; constexpr size_t WebSocketTransport::kChunkSize;
WebSocketTransport::WebSocketTransport() : WebSocketTransport::WebSocketTransport() :
_useMask(true),
_readyState(CLOSED), _readyState(CLOSED),
_closeCode(0), _closeCode(0),
_closeWireSize(0), _closeWireSize(0),
@ -123,6 +124,8 @@ namespace ix
// Server // Server
WebSocketInitResult WebSocketTransport::connectToSocket(int fd, int timeoutSecs) WebSocketInitResult WebSocketTransport::connectToSocket(int fd, int timeoutSecs)
{ {
_useMask = false;
std::string errorMsg; std::string errorMsg;
_socket = createSocket(fd, errorMsg); _socket = createSocket(fd, errorMsg);
@ -280,10 +283,12 @@ namespace ix
_txbuf.insert(_txbuf.end(), header.begin(), header.end()); _txbuf.insert(_txbuf.end(), header.begin(), header.end());
_txbuf.insert(_txbuf.end(), begin, end); _txbuf.insert(_txbuf.end(), begin, end);
// Masking if (_useMask)
for (size_t i = 0; i != (size_t) message_size; ++i)
{ {
*(_txbuf.end() - (size_t) message_size + i) ^= masking_key[i&0x3]; for (size_t i = 0; i != (size_t) message_size; ++i)
{
*(_txbuf.end() - (size_t) message_size + i) ^= masking_key[i&0x3];
}
} }
} }
@ -667,27 +672,33 @@ namespace ix
if (message_size < 126) if (message_size < 126)
{ {
header[1] = (message_size & 0xff) | 0x80; header[1] = (message_size & 0xff) | (_useMask ? 0x80 : 0);
header[2] = masking_key[0]; if (_useMask)
header[3] = masking_key[1]; {
header[4] = masking_key[2]; header[2] = masking_key[0];
header[5] = masking_key[3]; header[3] = masking_key[1];
header[4] = masking_key[2];
header[5] = masking_key[3];
}
} }
else if (message_size < 65536) else if (message_size < 65536)
{ {
header[1] = 126 | 0x80; header[1] = 126 | (_useMask ? 0x80 : 0);
header[2] = (message_size >> 8) & 0xff; header[2] = (message_size >> 8) & 0xff;
header[3] = (message_size >> 0) & 0xff; header[3] = (message_size >> 0) & 0xff;
header[4] = masking_key[0]; if (_useMask)
header[5] = masking_key[1]; {
header[6] = masking_key[2]; header[4] = masking_key[0];
header[7] = masking_key[3]; header[5] = masking_key[1];
header[6] = masking_key[2];
header[7] = masking_key[3];
}
} }
else else
{ // TODO: run coverage testing here { // TODO: run coverage testing here
header[1] = 127 | 0x80; header[1] = 127 | (_useMask ? 0x80 : 0);
header[2] = (message_size >> 56) & 0xff; header[2] = (message_size >> 56) & 0xff;
header[3] = (message_size >> 48) & 0xff; header[3] = (message_size >> 48) & 0xff;
header[4] = (message_size >> 40) & 0xff; header[4] = (message_size >> 40) & 0xff;
@ -697,10 +708,13 @@ namespace ix
header[8] = (message_size >> 8) & 0xff; header[8] = (message_size >> 8) & 0xff;
header[9] = (message_size >> 0) & 0xff; header[9] = (message_size >> 0) & 0xff;
header[10] = masking_key[0]; if (_useMask)
header[11] = masking_key[1]; {
header[12] = masking_key[2]; header[10] = masking_key[0];
header[13] = masking_key[3]; header[11] = masking_key[1];
header[12] = masking_key[2];
header[13] = masking_key[3];
}
} }
// _txbuf will keep growing until it can be transmitted over the socket: // _txbuf will keep growing until it can be transmitted over the socket:
@ -762,6 +776,8 @@ namespace ix
if (_readyState == CLOSING || _readyState == CLOSED) return; if (_readyState == CLOSING || _readyState == CLOSED) return;
std::cout << "I WAS HERE" << std::endl;
// See list of close events here: // See list of close events here:
// https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent // https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
// We use 1000: normal closure. // We use 1000: normal closure.

4
ixwebsocket/IXWebSocketTransport.h
View File

@ -100,6 +100,10 @@ namespace ix
uint8_t masking_key[4]; uint8_t masking_key[4];
}; };
// Tells whether we should mask the data we send.
// client should mask but server should not
bool _useMask;
// Buffer for reading from our socket. That buffer is never resized. // Buffer for reading from our socket. That buffer is never resized.
std::vector<uint8_t> _readbuf; std::vector<uint8_t> _readbuf;