tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Loosen up handshake size checks to accept javascript clients.

Browse Source 
Reviewers: buda

Reviewed By: buda

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D366
This commit is contained in:
Matej Ferencevic 2017-05-16 10:40:11 +02:00
parent 87e5dc0dfb
commit 9640633dd1
3 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/communication/bolt/v1/session.hpp
View File

@ -85,10 +85,6 @@ class Session : public Loggable {
} else if (buffer_.size() < HANDSHAKE_SIZE) { } else if (buffer_.size() < HANDSHAKE_SIZE) {
logger.debug("Received partial handshake of size {}", buffer_.size()); logger.debug("Received partial handshake of size {}", buffer_.size());
return; return;
} else if (buffer_.size() > HANDSHAKE_SIZE) {
logger.debug("Received too large handshake of size {}", buffer_.size());
ClientFailureInvalidData();
return;
} else { } else {
logger.debug("Decoding handshake of size {}", buffer_.size()); logger.debug("Decoding handshake of size {}", buffer_.size());
} }

6
src/communication/bolt/v1/states/handshake.hpp
View File

@ -33,9 +33,9 @@ State StateHandshakeRun(Session &session) {
} }
session.connected_ = true; session.connected_ = true;
// Delete data from buffer. It is guaranteed that there will be exactly // Delete data from buffer. It is guaranteed that there will more than, or
// 20 bytes in the buffer so we can use buffer_.size() here. // equal to 20 bytes (HANDSHAKE_SIZE) in the buffer.
session.buffer_.Shift(session.buffer_.size()); session.buffer_.Shift(HANDSHAKE_SIZE);
return State::Init; return State::Init;
} }

14
tests/unit/bolt_session.cpp
View File

@ -162,20 +162,6 @@ TEST(BoltSession, HandshakeInTwoPackets) {
CheckOutput(output, handshake_resp, 4); CheckOutput(output, handshake_resp, 4);
} }
TEST(BoltSession, HandshakeTooLarge) {
INIT_VARS;
auto buff = session.Allocate();
memcpy(buff.data, handshake_req, 20);
memcpy(buff.data + 20, handshake_req, 20);
session.Written(40);
session.Execute();
ASSERT_EQ(session.state_, StateT::Close);
ASSERT_FALSE(session.socket_.IsOpen());
PrintOutput(output);
CheckFailureMessage(output);
}
TEST(BoltSession, HandshakeWriteFail) { TEST(BoltSession, HandshakeWriteFail) {
INIT_VARS; INIT_VARS;