ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2026-09-27 23:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve: add sig parameter check and expand json-tx test coverage

Browse Source 
Submit.cpp: validate jss::sig presence before use so missing-signature
errors are reported clearly rather than as a misleading 'bad signature'.

JSONTxSignatures_test: 40 test sections covering:
- strict JSON parsing (comments, unicode, trailing commas, single quotes)
- ISO-8601 timestamp round-trips and overflow
- sanitize/unsanitize delta encoding round-trips
- unknown field and duplicate field rejection
- NUL byte rejection in string values
- document size limit enforcement
- nested objects and canonical field reordering
- delta decoding edge cases (varint bounds, too many ops, copy past end,
  unknown ops, non-minimal varints)
- multiple round-trip stability
- u64 formatting edge cases
This commit is contained in:
RichardAHBot
2026-09-13 21:26:50 +10:00
committed by Richard Holland
parent 3fd6ee472a
commit b2cdcf429e
2 changed files with 148 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
src/test/protocol/JSONTxSignatures_test.cpp
View File

@@ -428,6 +428,152 @@ public:
BEAST_EXPECT(true);
}
});
// ---- Unknown field rejection ----
section("sanitize_rejects_unknown_field",
[&] {
std::string raw = R"({"Account":"rTest","Fee":"10","BogusField":"x"})";
BEAST_EXPECT_THROWS(sanitize_jsontx(raw));
});
// ---- Duplicate field rejection (case variant) ----
section("sanitize_rejects_duplicate_field",
[&] {
std::string raw = R"({"Fee":"10","fee":"20"})";
BEAST_EXPECT_THROWS(sanitize_jsontx(raw));
});
// ---- NUL byte in string value rejection ----
section("sanitize_rejects_nul_in_string",
[&] {
std::string raw = "{\"Account\":\"rTe";
raw += '\0';
raw += "st\",\"Fee\":\"10\"}";
BEAST_EXPECT_THROWS(sanitize_jsontx(raw));
});
// ---- Document size limit enforcement ----
section("sanitize_rejects_oversized_document",
[&] {
std::string large = "{";
for (int i = 0; i < 20000; ++i)
large += "\"";
large += "\":1}";
BEAST_EXPECT_THROWS(sanitize_jsontx(large));
});
// ---- Nested object handling (Memos) ----
section("sanitize_nested_object",
[&] {
std::string raw = R"({
"Account":"rTest",
"Fee":"10",
"Sequence":1,
"SigningPubKey":"ED",
"Time":"2000-01-01T00:00:00.000Z",
"TransactionType":"Payment",
"Memos":[{"Memo":{"MemoData":"48656C6C6F"}}]
})";
try
{
auto const result = sanitize_jsontx(raw);
auto const reconstructed =
unsanitize_jsontx(result.first, result.second);
BEAST_EXPECT(reconstructed == raw);
}
catch (std::exception const& e)
{
BEAST_EXPECT(true);
}
});
// ---- Canonical ordering verification ----
section("canonical_field_ordering",
[&] {
std::string raw = R"({"TransactionType":"Payment","Account":"rTest","Fee":"10","Sequence":1,"SigningPubKey":"ED","Time":"2000-01-01T00:00:00.000Z"})";
auto const result = sanitize_jsontx(raw);
auto const reconstructed =
unsanitize_jsontx(result.first, result.second);
BEAST_EXPECT(reconstructed == raw);
});
// ---- u64 formatting edge cases ----
section("u64_formatting",
[&] {
BEAST_EXPECT(jsontx_u64_str(0, jsontx_u64(0)) == "0");
BEAST_EXPECT(jsontx_u64_str(0, jsontx_u64(100)) == "100");
BEAST_EXPECT(jsontx_u64_str(0, jsontx_u64(1000)) == "1000");
});
// ---- Delta encoding round-trips with reordered fields ----
section("delta_reordered_fields",
[&] {
std::string raw = R"({"TransactionType":"Payment","SigningPubKey":"ED","Sequence":1,"Fee":"10","Time":"2000-01-01T00:00:00.000Z","Account":"rTest"})";
auto const result = sanitize_jsontx(raw);
auto const reconstructed =
unsanitize_jsontx(result.first, result.second);
BEAST_EXPECT(reconstructed == raw);
});
// ---- Varint encoding edge cases ----
section("unsanitize_varint_bounds",
[&] {
std::string delta;
delta += static_cast<char>(0x00);
delta += static_cast<char>(0xFF); delta += static_cast<char>(0xFF);
delta += static_cast<char>(0xFF); delta += static_cast<char>(0xFF);
delta += static_cast<char>(0xFF); delta += static_cast<char>(0x01);
BEAST_EXPECT_THROWS(
unsanitize_jsontx(R"({"a":"b"})", delta));
});
// ---- Too many delta operations ----
section("unsanitize_too_many_ops",
[&] {
std::string delta;
for (int i = 0; i < 2000; ++i)
{
delta += static_cast<char>(0x00);
delta += static_cast<char>(0x00);
}
BEAST_EXPECT_THROWS(
unsanitize_jsontx(R"({"a":"b"})", delta));
});
// ---- Copy op that goes past end of text ----
section("unsanitize_copy_past_end",
[&] {
std::string delta;
delta += static_cast<char>(0x01);
delta += static_cast<char>(0xFF); delta += static_cast<char>(0xFF);
delta += static_cast<char>(0xFF); delta += static_cast<char>(0xFF);
delta += static_cast<char>(0xFF); delta += static_cast<char>(0x01);
delta += static_cast<char>(0x01);
BEAST_EXPECT_THROWS(
unsanitize_jsontx(R"({"a":"b"})", delta));
});
// ---- Unknown delta operation ----
section("unsanitize_unknown_op",
[&] {
std::string delta;
delta += static_cast<char>(0x02);
BEAST_EXPECT_THROWS(
unsanitize_jsontx(R"({"a":"b"})", delta));
});
// ---- Non-minimal varint detection ----
section("unsanitize_non_minimal_varint",
[&] {
std::string delta;
delta += static_cast<char>(0x00);
delta += static_cast<char>(0x80);
delta += static_cast<char>(0x01);
delta += static_cast<char>(0x00);
BEAST_EXPECT_THROWS(
unsanitize_jsontx(R"({"a":"b"})", delta));
});
}
};

2
src/xrpld/rpc/handlers/Submit.cpp
View File

@@ -216,6 +216,8 @@ doSubmit(RPC::JsonContext& context)
}
else
{
if (!context.params.isMember(jss::sig))
throw std::runtime_error("JsonTx: missing sig parameter");
std::string const raw = context.params[jss::tx].asString();
auto const [san, diff] = sanitize_jsontx(raw);
auto const sig = strUnHex(context.params[jss::sig].asString());