Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: extract-method is_valid_id() in rpcimpl (#7907)

Browse Source
This commit is contained in:
Charles Kerr
2025-12-09 18:18:46 -06:00
committed by GitHub
parent ca325e5c42
commit 64231c1076
1 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
libtransmission/rpcimpl.cc
View File

@@ -129,11 +129,29 @@ namespace
namespace namespace
{ {
[[nodiscard]] constexpr bool is_valid_id(tr_variant const& val)
{
switch (val.index())
{
// https://www.jsonrpc.org/specification#request_object
// An identifier established by the Client that MUST contain a String,
// Number, or NULL value if included. .. The value SHOULD normally not
// be Null and Numbers SHOULD NOT contain fractional parts
case tr_variant::StringIndex:
case tr_variant::IntIndex:
case tr_variant::DoubleIndex:
case tr_variant::NullIndex:
return true;
default:
return false;
}
}
// https://www.jsonrpc.org/specification#response_object // https://www.jsonrpc.org/specification#response_object
[[nodiscard]] tr_variant::Map build_response(Error::Code code, tr_variant id, tr_variant::Map&& body) [[nodiscard]] tr_variant::Map build_response(Error::Code code, tr_variant id, tr_variant::Map&& body)
{ {
if (id.index() != tr_variant::StringIndex && id.index() != tr_variant::IntIndex && id.index() != tr_variant::DoubleIndex && if (!is_valid_id(id))
id.index() != tr_variant::NullIndex)
{ {
TR_ASSERT(false); TR_ASSERT(false);
id = nullptr; id = nullptr;
@@ -2893,34 +2911,23 @@ void tr_rpc_request_exec_impl(tr_session* session, tr_variant const& request, tr
auto data = tr_rpc_idle_data{}; auto data = tr_rpc_idle_data{};
data.session = session; data.session = session;
if (is_jsonrpc)
if (auto iter = map->find(is_jsonrpc ? TR_KEY_id : TR_KEY_tag); iter != std::end(*map))
{ {
if (auto it_id = map->find(TR_KEY_id); it_id != std::end(*map)) tr_variant const& id = iter->second;
if (is_jsonrpc && !is_valid_id(id))
{ {
auto const& id = it_id->second; callback(
switch (id.index()) session,
{ build_response(
case tr_variant::StringIndex: Error::INVALID_REQUEST,
case tr_variant::IntIndex: nullptr,
case tr_variant::DoubleIndex: Error::build_data("id type must be String, Number, or Null"sv, {})));
case tr_variant::NullIndex: return;
data.id.merge(id); // copy
break;
default:
callback(
session,
build_response(
Error::INVALID_REQUEST,
nullptr,
Error::build_data("id type must be String, Number, or Null"sv, {})));
return;
}
} }
data.id.merge(id);
} }
else if (auto tag = map->value_if<int64_t>(TR_KEY_tag); tag)
{
data.id = *tag;
}
data.callback = std::move(callback); data.callback = std::move(callback);
auto const is_notification = is_jsonrpc && !data.id.has_value(); auto const is_notification = is_jsonrpc && !data.id.has_value();