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

Take lock before accessing sessions collection #6629

Merged
merged 2 commits into from
Nov 12, 2024
Merged

Take lock before accessing sessions collection #6629

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22ce4d4
Take lock before accessing sessions collection
eddyashton Nov 11, 2024
e664aac
Merge branch 'main' into rpc_sessions_locks
achamayou Nov 11, 2024
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
92 changes: 50 additions & 42 deletions src/enclave/rpc_sessions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,15 +616,15 @@ namespace ccf
disp, ::tcp::tcp_inbound, [this](const uint8_t* data, size_t size) {
auto id = serialized::peek<ccf::tls::ConnID>(data, size);

auto search = sessions.find(id);
if (search == sessions.end())
auto session = find_session(id);
if (session == nullptr)
{
LOG_DEBUG_FMT(
"Ignoring tls_inbound for unknown or refused session: {}", id);
return;
}

search->second.second->handle_incoming_data({data, size});
session->handle_incoming_data({data, size});
});

DISPATCHER_SET_MESSAGE_HANDLER(
Expand All @@ -644,58 +644,66 @@ namespace ccf
disp, udp::udp_inbound, [this](const uint8_t* data, size_t size) {
auto id = serialized::peek<int64_t>(data, size);

auto search = sessions.find(id);
if (search == sessions.end())
std::shared_ptr<Session> session;
{
LOG_DEBUG_FMT(
"Ignoring udp::udp_inbound for unknown or refused session: {}",
id);
return;
}
else if (!search->second.second && custom_protocol_subsystem)
{
LOG_DEBUG_FMT("Creating custom UDP session {}", id);
std::lock_guard<ccf::pal::Mutex> guard(lock);

try
auto search = sessions.find(id);
if (search == sessions.end())
{
const auto& conn_id = search->first;
const auto& interface_id = search->second.first;
LOG_DEBUG_FMT(
"Ignoring udp::udp_inbound for unknown or refused session: {}",
id);
return;
}
else if (!search->second.second && custom_protocol_subsystem)
{
LOG_DEBUG_FMT("Creating custom UDP session {}", id);

auto iit = listening_interfaces.find(interface_id);
if (iit == listening_interfaces.end())
try
{
LOG_DEBUG_FMT(
"Failure to create custom protocol session because of "
"unknown interface '{}', ignoring udp::udp_inbound for "
"session: "
"{}",
interface_id,
id);
const auto& conn_id = search->first;
const auto& interface_id = search->second.first;

auto iit = listening_interfaces.find(interface_id);
if (iit == listening_interfaces.end())
{
LOG_DEBUG_FMT(
"Failure to create custom protocol session because of "
"unknown interface '{}', ignoring udp::udp_inbound for "
"session: "
"{}",
interface_id,
id);
}

const auto& interface = iit->second;

search->second.second =
custom_protocol_subsystem->create_session(
interface.app_protocol, conn_id, nullptr);

if (!search->second.second)
{
LOG_DEBUG_FMT(
"Failure to create custom protocol session, ignoring "
"udp::udp_inbound for session: {}",
id);
return;
}
}

const auto& interface = iit->second;

search->second.second = custom_protocol_subsystem->create_session(
interface.app_protocol, conn_id, nullptr);

if (!search->second.second)
catch (const std::exception& ex)
{
LOG_DEBUG_FMT(
"Failure to create custom protocol session, ignoring "
"udp::udp_inbound for session: {}",
id);
"Failure to create custom protocol session: {}", ex.what());
return;
}
}
catch (const std::exception& ex)
{
LOG_DEBUG_FMT(
"Failure to create custom protocol session: {}", ex.what());
return;
}

session = search->second.second;
}

search->second.second->handle_incoming_data({data, size});
session->handle_incoming_data({data, size});
});
}
};
Expand Down
Loading