Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-01 02:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

wpiutil: WebSocket: Fix Sec-Websocket-Accept computation

Browse Source 
It needs to use the raw SHA1 bytes, not the hex-decoded text.
This commit is contained in:
Peter Johnson
2018-11-18 18:27:06 -08:00
parent 75cc3cda28
commit e4aa45f34b
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpiutil/src/main/native/cpp/WebSocket.cpp
View File

@@ -71,7 +71,7 @@ static StringRef AcceptHash(StringRef key, SmallVectorImpl<char>& buf) {
hash.Update(key);
hash.Update("258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
SmallString<64> hashBuf;
return Base64Encode(hash.Final(hashBuf), buf);
return Base64Encode(hash.RawFinal(hashBuf), buf);
}
WebSocket::WebSocket(uv::Stream& stream, bool server, const private_init&)

2
wpiutil/src/test/native/cpp/WebSocketClientTest.cpp
View File

@@ -40,7 +40,7 @@ class WebSocketClientTest : public WebSocketTest {
SmallString<64> hashBuf;
SmallString<64> acceptBuf;
os << "Sec-WebSocket-Accept: "
<< Base64Encode(hash.Final(hashBuf), acceptBuf) << "\r\n";
<< Base64Encode(hash.RawFinal(hashBuf), acceptBuf) << "\r\n";
if (!mockProtocol.empty())
os << "Sec-WebSocket-Protocol: " << mockProtocol << "\r\n";

3
wpiutil/src/test/native/cpp/WebSocketTest.cpp
View File

@@ -223,6 +223,7 @@ TEST_F(WebSocketTest, CreateServerBasic) {
ASSERT_EQ(value, "Upgrade");
++gotConnection;
} else if (name.equals_lower("sec-websocket-accept")) {
ASSERT_EQ(value, "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
++gotAccept;
} else {
FAIL() << "unexpected header " << name.str();
@@ -232,7 +233,7 @@ TEST_F(WebSocketTest, CreateServerBasic) {
serverPipe->Listen([&]() {
auto conn = serverPipe->Accept();
auto ws = WebSocket::CreateServer(*conn, "foo", "13");
auto ws = WebSocket::CreateServer(*conn, "dGhlIHNhbXBsZSBub25jZQ==", "13");
ws->open.connect([&](StringRef protocol) {
++gotOpen;
ASSERT_TRUE(protocol.empty());