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

Validate that the close reason is proper utf-8. Autobahn 7.5.1

Browse Source
This commit is contained in:
Benjamin Sergeant 2019-09-03 14:35:40 -07:00
parent 7c7c877621
commit deaa753657
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/CHANGELOG.md
View File

@ -3,8 +3,9 @@ All notable changes to this project will be documented in this file.
## [5.1.6] - 2019-09-03 ## [5.1.6] - 2019-09-03
Sending invalid UTF-8 TEXT message should fail and close the connection (fix remaining autobahn test: 6.X UTF-8 Handling) - Sending invalid UTF-8 TEXT message should fail and close the connection (fix remaining autobahn test: 6.X UTF-8 Handling)
Fix failing unittest which was sending binary data in text mode with WebSocket::send to call properly call WebSocket::sendBinary instead. - Fix failing unittest which was sending binary data in text mode with WebSocket::send to call properly call WebSocket::sendBinary instead.
- Validate that the reason is proper utf-8. (fix autobahn test 7.5.1)
## [5.1.5] - 2019-09-03 ## [5.1.5] - 2019-09-03

8
ixwebsocket/IXWebSocketTransport.cpp
View File

@ -37,6 +37,7 @@
#include "IXWebSocketHttpHeaders.h" #include "IXWebSocketHttpHeaders.h"
#include "IXUrlParser.h" #include "IXUrlParser.h"
#include "IXSocketFactory.h" #include "IXSocketFactory.h"
#include "IXUtf8Validator.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -676,6 +677,13 @@ namespace ix
reason.assign(_rxbuf.begin()+ws.header_size + 2, reason.assign(_rxbuf.begin()+ws.header_size + 2,
_rxbuf.begin()+ws.header_size + (size_t) ws.N); _rxbuf.begin()+ws.header_size + (size_t) ws.N);
} }
// Validate that the reason is proper utf-8. Autobahn 7.5.1
if (!validateUtf8(reason))
{
code = WebSocketCloseConstants::kInvalidFramePayloadData;
reason = WebSocketCloseConstants::kInvalidFramePayloadDataMessage;
}
} }
else else
{ {