Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more sanity checks on a new connection #508

Merged
merged 1 commit into from
May 15, 2024
Merged

Add more sanity checks on a new connection #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/libnuraft/msg_type.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ enum msg_type {

inline bool ATTR_UNUSED is_valid_msg(msg_type type) {
if ( type >= request_vote_request &&
type <= other_response ) {
type <= custom_notification_response ) {
return true;
}
return false;
Expand Down
21 changes: 15 additions & 6 deletions src/asio_service.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,8 @@ limitations under the License.
#include <atomic>
#include <ctime>
#include <exception>
#include <fstream>
#include <list>
#include <queue>
#include <thread>
#include <regex>

#ifdef USE_BOOST_ASIO
using namespace boost;
Expand Down Expand Up @@ -382,9 +379,21 @@ class rpc_session
// byte marker = header_->get_byte();
h_bs.pos(0);
byte marker = h_bs.get_u8();
if (marker == 0x1) {
// Means that this is RPC_RESP, shouldn't happen.
p_er("Wrong packet: expected REQ, got RESP");
if (marker != 0x0) {
// Means that this is not RPC_REQ, shouldn't happen.
p_er("Wrong packet: expected REQ, got %u", marker);

if (impl_->get_options().corrupted_msg_handler_) {
impl_->get_options().corrupted_msg_handler_(header_, nullptr);
}

this->stop();
return;
}

msg_type m_type = (msg_type)h_bs.get_u8();
if (!is_valid_msg(m_type)) {
p_er("Wrong message type: got %u", (uint8_t)m_type);

if (impl_->get_options().corrupted_msg_handler_) {
impl_->get_options().corrupted_msg_handler_(header_, nullptr);
Expand Down
Loading