ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2026-06-03 08:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

additional defensive check, malformed check,

Browse Source
This commit is contained in:
tequ
2025-10-16 15:34:30 +09:00
parent 106abfa9e0
commit caa486f19c
2 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/ripple/app/tx/impl/SetCron.cpp
View File

@@ -61,15 +61,25 @@ SetCron::preflight(PreflightContext const& ctx)
bool const hasDelay = tx.isFieldPresent(sfDelaySeconds);
bool const hasRepeat = tx.isFieldPresent(sfRepeatCount);
if (hasRepeat && !hasDelay)
if (tx.isFlag(tfCronUnset))
{
JLOG(j.warn()) << "SetCron: DelaySeconds must also be specified when "
"RepeatCount is present.";
return temMALFORMED;
if (hasDelay || hasRepeat)
{
JLOG(j.debug()) << "SetCron: tfCronUnset flag cannot be used with "
"DelaySeconds or RepeatCount.";
return temMALFORMED;
}
}
if (hasDelay)
else
{
if (!hasDelay)
{
JLOG(j.debug()) << "SetCron: DelaySeconds must be "
"specified to create a cron.";
return temMALFORMED;
}
// check delay is not too high
auto delay = tx.getFieldU32(sfDelaySeconds);
if (delay > 31536000UL /* 365 days in seconds */)
{
@@ -77,27 +87,18 @@ SetCron::preflight(PreflightContext const& ctx)
"days in seconds).";
return temMALFORMED;
}
}
if (hasRepeat)
{
auto recur = tx.getFieldU32(sfRepeatCount);
if (recur > 256)
// check repeat is not too high
if (hasRepeat)
{
JLOG(j.debug())
<< "SetCron: RepeatCount too high. Limit is 256. Issue "
"new SetCron to increase.";
return temMALFORMED;
}
}
if (tx.isFlag(tfCronUnset))
{
if (hasDelay || hasRepeat)
{
JLOG(j.warn()) << "SetCron: tfCronUnset flag cannot be used with "
"DelaySeconds or RepeatCount.";
return temMALFORMED;
auto recur = tx.getFieldU32(sfRepeatCount);
if (recur > 256)
{
JLOG(j.debug())
<< "SetCron: RepeatCount too high. Limit is 256. Issue "
"new SetCron to increase.";
return temMALFORMED;
}
}
}
@@ -136,7 +137,8 @@ SetCron::doApply()
if (!isDelete)
{
delay = tx.getFieldU32(sfDelaySeconds);
if (tx.isFieldPresent(sfDelaySeconds))
delay = tx.getFieldU32(sfDelaySeconds);
if (tx.isFieldPresent(sfRepeatCount))
recur = tx.getFieldU32(sfRepeatCount);
}
@@ -242,9 +244,8 @@ SetCron::calculateBaseFee(ReadView const& view, STTx const& tx)
auto const baseFee = Transactor::calculateBaseFee(view, tx);
auto const hasRepeat = tx.isFieldPresent(sfRepeatCount);
auto const hasDelay = tx.isFieldPresent(sfDelaySeconds);
if (!hasRepeat && !hasDelay)
if (tx.isFlag(tfCronUnset))
// delete cron
return baseFee;
@@ -253,7 +254,7 @@ SetCron::calculateBaseFee(ReadView const& view, STTx const& tx)
// single Cron txn (2). For a RepeatCount of 1 we have this txn,
// the first time the cron executes, and the second time (3).
uint32_t const additionalExpectedExecutions =
tx.getFieldU32(sfRepeatCount) + 1;
hasRepeat ? tx.getFieldU32(sfRepeatCount) + 1 : 1;
auto const additionalFee = baseFee * additionalExpectedExecutions;
if (baseFee + additionalFee < baseFee)

15
src/test/app/Cron_test.cpp
View File

@@ -50,7 +50,7 @@ struct Cron_test : public beast::unit_test::suite
auto tx = cron::set(alice);
// CLAIM
env(cron::set(alice), fee(XRP(1)), expectResult);
env(cron::set(alice), cron::delay(100), fee(XRP(1)), expectResult);
env.close();
}
}
@@ -102,10 +102,16 @@ struct Cron_test : public beast::unit_test::suite
// delete
expected = baseFee;
env(cron::set(alice), fee(expected - 1), ter(telINSUF_FEE_P));
env(cron::set(alice),
txflags(tfCronUnset),
fee(expected - 1),
ter(telINSUF_FEE_P));
env.close();
env(cron::set(alice), fee(expected), ter(tesSUCCESS));
env(cron::set(alice),
txflags(tfCronUnset),
fee(expected),
ter(tesSUCCESS));
env.close();
}
@@ -137,6 +143,9 @@ struct Cron_test : public beast::unit_test::suite
// temMALFORMED
{
// Invalid both DelaySeconds and RepeatCount are not specified
env(cron::set(alice), ter(temMALFORMED));
// Invalid DelaySeconds and RepeatCount combination
// (only RepeatCount specified)
env(cron::set(alice), cron::repeat(256), ter(temMALFORMED));