ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

relocate hook api whitelist to applyhook

Browse Source
This commit is contained in:
Richard Holland
2022-01-25 12:31:40 +00:00
parent 000e0b093e
commit d4ad147bf3
3 changed files with 100 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/ripple/app/tx/applyHook.h
View File

@@ -132,6 +132,80 @@ namespace hook_api
// RH NOTE: Find descriptions of api functions in ./impl/applyHook.cpp and hookapi.h (include for hooks) // RH NOTE: Find descriptions of api functions in ./impl/applyHook.cpp and hookapi.h (include for hooks)
static const std::set<std::string> import_whitelist
{
"accept",
"emit",
"etxn_burden",
"etxn_details",
"etxn_fee_base",
"etxn_generation",
"etxn_reserve",
"float_compare",
"float_divide",
"float_exponent",
"float_exponent_set",
"float_invert",
"float_mantissa",
"float_mantissa_set",
"float_mulratio",
"float_multiply",
"float_int",
"float_negate",
"float_one",
"float_set",
"float_sign",
"float_sign_set",
"float_sto",
"float_sto_set",
"float_sum",
"fee_base",
"_g",
"hook_account",
"hook_hash",
"ledger_seq",
"ledger_last_hash",
"nonce",
"otxn_burden",
"otxn_field",
"otxn_slot",
"otxn_generation",
"otxn_id",
"otxn_type",
"rollback",
"slot",
"slot_clear",
"slot_count",
"slot_id",
"slot_set",
"slot_size",
"slot_subarray",
"slot_subfield",
"slot_type",
"slot_float",
"state",
"state_foreign",
"state_set",
"state_foreign_set",
"trace",
"trace_num",
"trace_float",
"trace_slot",
"util_accid",
"util_raddr",
"util_sha512h",
"util_verify",
"sto_subarray",
"sto_subfield",
"sto_validate",
"sto_emplace",
"sto_erase",
"util_keylet",
"hook_pos",
"hook_param",
"hook_param_set",
"hook_skip"
};
DECLARE_HOOK_FUNCTION(int32_t, _g, uint32_t guard_id, uint32_t maxiter ); DECLARE_HOOK_FUNCTION(int32_t, _g, uint32_t guard_id, uint32_t maxiter );
@@ -282,7 +356,9 @@ namespace hook
uint32_t maxHookStateDataSize(void); uint32_t maxHookStateDataSize(void);
uint32_t maxHookWasmSize(void); uint32_t maxHookWasmSize(void);
uint32_t maxHookParameterSize(void); uint32_t maxHookParameterKeySize(void);
uint32_t maxHookParameterValueSize(void);
uint32_t maxHookChainLength(void); uint32_t maxHookChainLength(void);
uint32_t computeExecutionFee(uint64_t instructionCount); uint32_t computeExecutionFee(uint64_t instructionCount);

99
src/ripple/app/tx/impl/SetHook.cpp
View File

@@ -40,7 +40,9 @@
#include <functional> #include <functional>
#include <wasmedge/wasmedge.h> #include <wasmedge/wasmedge.h>
#define DEBUG_GUARD_CHECK 0
#define HS_ACC() ctx.tx.getAccountID(sfAccount) << "-" << ctx.tx.getTransactionID() #define HS_ACC() ctx.tx.getAccountID(sfAccount) << "-" << ctx.tx.getTransactionID()
namespace ripple { namespace ripple {
// RH TODO deal with overflow on leb128 // RH TODO deal with overflow on leb128
@@ -76,86 +78,6 @@ parseLeb128(std::vector<unsigned char>& buf, int start_offset, int* end_offset)
}\ }\
} }
// RH TODO find a better home for this or a better solution?
const std::set<std::string> import_whitelist
{
"accept",
"emit",
"etxn_burden",
"etxn_details",
"etxn_fee_base",
"etxn_generation",
"etxn_reserve",
"float_compare",
"float_divide",
"float_exponent",
"float_exponent_set",
"float_invert",
"float_mantissa",
"float_mantissa_set",
"float_mulratio",
"float_multiply",
"float_int",
"float_negate",
"float_one",
"float_set",
"float_sign",
"float_sign_set",
"float_sto",
"float_sto_set",
"float_sum",
"fee_base",
"_g",
"hook_account",
"hook_hash",
"ledger_seq",
"ledger_last_hash",
"nonce",
"otxn_burden",
"otxn_field",
"otxn_slot",
"otxn_generation",
"otxn_id",
"otxn_type",
"rollback",
"slot",
"slot_clear",
"slot_count",
"slot_id",
"slot_set",
"slot_size",
"slot_subarray",
"slot_subfield",
"slot_type",
"slot_float",
"state",
"state_foreign",
"state_set",
"state_foreign_set",
"trace",
"trace_num",
"trace_float",
"trace_slot",
"util_accid",
"util_raddr",
"util_sha512h",
"util_verify",
"sto_subarray",
"sto_subfield",
"sto_validate",
"sto_emplace",
"sto_erase",
"util_keylet",
"hook_pos",
"hook_param",
"hook_param_set",
"hook_skip"
};
#define DEBUG_GUARD_CHECK 0
// checks the WASM binary for the appropriate required _g guard calls and rejects it if they are not found // checks the WASM binary for the appropriate required _g guard calls and rejects it if they are not found
// start_offset is where the codesection or expr under analysis begins and end_offset is where it ends // start_offset is where the codesection or expr under analysis begins and end_offset is where it ends
// returns {valid, worst case instruction count} // returns {valid, worst case instruction count}
@@ -654,6 +576,14 @@ validateHookSetEntry(SetHookCtx& ctx, STObject const& hookSetObj)
<< "]: Malformed transaction: SetHook sfHookGrants did not contain sfHookGrant object."; << "]: Malformed transaction: SetHook sfHookGrants did not contain sfHookGrant object.";
return {false, 0}; return {false, 0};
} }
else if (!hookGrantObj->isFieldPresent(sfAuthorize) && !hookGrantObj->isFieldPresent(sfHookHash))
{
JLOG(ctx.j.trace())
<< "HookSet[" << HS_ACC()
<< "]: Malformed transaction: SetHook sfHookGrant object did not contain either sfAuthorize "
<< "or sfHookHash.";
return {false, 0};
}
} }
} }
@@ -847,7 +777,7 @@ validateHookSetEntry(SetHookCtx& ctx, STObject const& hookSetObj)
if (import_name == "_g") if (import_name == "_g")
{ {
guard_import_number = func_upto; guard_import_number = func_upto;
} else if (import_whitelist.find(import_name) == import_whitelist.end()) } else if (hook_api::import_whitelist.find(import_name) == hook_api::import_whitelist.end())
{ {
JLOG(ctx.j.trace()) JLOG(ctx.j.trace())
<< "HookSet[" << HS_ACC() << "]: Malformed transaction. " << "HookSet[" << HS_ACC() << "]: Malformed transaction. "
@@ -1348,7 +1278,8 @@ SetHook::setHook()
}; };
const int blobMax = hook::maxHookWasmSize(); const int blobMax = hook::maxHookWasmSize();
const int paramMax = hook::maxHookParameterSize(); const int paramKeyMax = hook::maxHookParameterKeySize();
const int paramValueMax = hook::maxHookParameterValueSize();
auto const accountKeylet = keylet::account(account_); auto const accountKeylet = keylet::account(account_);
auto const ownerDirKeylet = keylet::ownerDir(account_); auto const ownerDirKeylet = keylet::ownerDir(account_);
auto const hookKeylet = keylet::hook(account_); auto const hookKeylet = keylet::hook(account_);
@@ -1746,7 +1677,7 @@ SetHook::setHook()
ripple::Blob paramName = hookParameterObj->getFieldVL(sfHookParameterName); ripple::Blob paramName = hookParameterObj->getFieldVL(sfHookParameterName);
fprintf(stderr, "PATH R\n"); fprintf(stderr, "PATH R\n");
if (paramName.size() > paramMax) if (paramName.size() > paramKeyMax)
{ {
fprintf(stderr, "PATH S\n"); fprintf(stderr, "PATH S\n");
JLOG(ctx.j.trace()) JLOG(ctx.j.trace())
@@ -1762,7 +1693,7 @@ SetHook::setHook()
// parameter update or set operation // parameter update or set operation
ripple::Blob newValue = hookParameterObj->getFieldVL(sfHookParameterValue); ripple::Blob newValue = hookParameterObj->getFieldVL(sfHookParameterValue);
fprintf(stderr, "PATH V\n"); fprintf(stderr, "PATH V\n");
if (newValue.size() > paramMax) if (newValue.size() > paramValueMax)
{ {
fprintf(stderr, "PATH W\n"); fprintf(stderr, "PATH W\n");
JLOG(ctx.j.trace()) JLOG(ctx.j.trace())

12
src/ripple/app/tx/impl/applyHook.cpp
View File

@@ -230,7 +230,11 @@ uint32_t hook::maxHookWasmSize(void)
return 0xFFFFU; return 0xFFFFU;
} }
uint32_t hook::maxHookParameterSize(void) uint32_t hook::maxHookParameterKeySize(void)
{
return 32;
}
uint32_t hook::maxHookParameterValueSize(void)
{ {
return 128; return 128;
} }
@@ -4038,13 +4042,13 @@ DEFINE_HOOK_FUNCTION(
if (kread_len < 1) if (kread_len < 1)
return TOO_SMALL; return TOO_SMALL;
if (kread_len > 32) if (kread_len > hook::maxHookParameterKeySize())
return TOO_BIG; return TOO_BIG;
if (hread_len != 32) if (hread_len != hook::maxHookParameterKeySize())
return INVALID_ARGUMENT; return INVALID_ARGUMENT;
if (read_len > hook::maxHookParameterSize()) if (read_len > hook::maxHookParameterValueSize())
return TOO_BIG; return TOO_BIG;
std::vector<uint8_t> paramName { kread_ptr + memory, kread_ptr + kread_len + memory }; std::vector<uint8_t> paramName { kread_ptr + memory, kread_ptr + kread_len + memory };