Sending invalid UTF-8 TEXT message should fail and close the connection (fix **tons** of autobahn test: 6.X UTF-8 Handling)

This commit is contained in:
Benjamin Sergeant
2019-09-03 10:30:22 -07:00
parent ab93e4f168
commit 55934918ff
6 changed files with 11 additions and 6 deletions

View File

@ -447,9 +447,7 @@ namespace ix
bool binary,
const OnProgressCallback& onProgressCallback)
{
return sendMessage(data,
(binary) ? SendMessageKind::Binary: SendMessageKind::Text,
onProgressCallback);
return (binary) ? sendBinary(data, onProgressCallback) : sendText(data, onProgressCallback);
}
WebSocketSendInfo WebSocket::sendBinary(const std::string& text,
@ -463,7 +461,8 @@ namespace ix
{
if (!isValidUtf8(text))
{
stop();
close(WebSocketCloseConstants::kNormalClosureCode,
WebSocketCloseConstants::kInvalidUtf8);
return false;
}
return sendMessage(text, SendMessageKind::Text, onProgressCallback);

View File

@ -23,4 +23,5 @@ namespace ix
const std::string WebSocketCloseConstants::kProtocolErrorReservedBitUsed("Reserved bit used");
const std::string WebSocketCloseConstants::kProtocolErrorPingPayloadOversized("Ping reason control frame with payload length > 125 octets");
const std::string WebSocketCloseConstants::kProtocolErrorCodeControlMessageFragmented("Control message fragmented");
const std::string WebSocketCloseConstants::kInvalidUtf8("Invalid UTF-8");
}

View File

@ -28,5 +28,6 @@ namespace ix
static const std::string kProtocolErrorReservedBitUsed;
static const std::string kProtocolErrorPingPayloadOversized;
static const std::string kProtocolErrorCodeControlMessageFragmented;
static const std::string kInvalidUtf8;
};
} // namespace ix

View File

@ -6,4 +6,4 @@
#pragma once
#define IX_WEBSOCKET_VERSION "5.1.3"
#define IX_WEBSOCKET_VERSION "5.1.4"