Skip to content

xpay-handle-pay: bugfix, handle null parameters #7958

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

Merged
merged 3 commits into from
Feb 6, 2025
Merged

xpay-handle-pay: bugfix, handle null parameters #7958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e1f00b
xpay-handle-pay: bugfix, handle null parameters
Lagrang3 Dec 19, 2024
684fc04
xpay-handle-pay: don't assume bolt11 is non NULL
Lagrang3 Dec 19, 2024
4470fa3
xpay-handle-pay: test null params
Lagrang3 Dec 19, 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
37 changes: 23 additions & 14 deletions plugins/xpay/xpay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1888,6 +1888,9 @@ static struct command_result *handle_rpc_command(struct command *cmd,
const char *maxfee = NULL;
struct json_stream *response;

/* pay extra params */
const jsmntok_t *maxfeepercent = NULL, *exemptfee = NULL;

if (!xpay->take_over_pay)
goto dont_redirect;

Expand All @@ -1914,8 +1917,14 @@ static struct command_result *handle_rpc_command(struct command *cmd,
bolt11 = params_tok + 1;
if (params_tok->size == 2)
amount_msat = json_next(bolt11);

/* some arguments could have null values in the list */
if (bolt11 && json_tok_is_null(buf, bolt11))
bolt11 = NULL;
if (amount_msat && json_tok_is_null(buf, amount_msat))
amount_msat = NULL;
} else if (params_tok->type == JSMN_OBJECT) {
const jsmntok_t *t, *maxfeepercent = NULL, *exemptfee = NULL;
const jsmntok_t *t;
size_t i;

json_for_each_obj(i, t, params_tok) {
Expand All @@ -1941,25 +1950,25 @@ static struct command_result *handle_rpc_command(struct command *cmd,
goto dont_redirect;
}
}
if (!bolt11) {
plugin_log(cmd->plugin, LOG_INFORM,
"Not redirecting pay (missing bolt11 parameter)");
goto dont_redirect;
}
/* If this returns NULL, we let pay handle the weird case */
if (!calc_maxfee(cmd, &maxfee, buf,
bolt11, amount_msat,
exemptfee, maxfeepercent)) {
plugin_log(cmd->plugin, LOG_INFORM,
"Not redirecting pay (weird maxfee params)");
goto dont_redirect;
}
} else {
plugin_log(cmd->plugin, LOG_INFORM,
"Not redirecting pay (unexpected params type)");
goto dont_redirect;
}

if (!bolt11) {
plugin_log(cmd->plugin, LOG_INFORM,
"Not redirecting pay (missing bolt11 parameter)");
goto dont_redirect;
}
/* If this returns NULL, we let pay handle the weird case */
if (!calc_maxfee(cmd, &maxfee, buf, bolt11, amount_msat, exemptfee,
maxfeepercent)) {
plugin_log(cmd->plugin, LOG_INFORM,
"Not redirecting pay (weird maxfee params)");
goto dont_redirect;
}

plugin_log(cmd->plugin, LOG_INFORM, "Redirecting pay->xpay");
response = jsonrpc_stream_success(cmd);
json_object_start(response, "replace");
Expand Down
23 changes: 23 additions & 0 deletions tests/test_xpay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,29 @@ def test_xpay_takeover(node_factory, executor):
l1.daemon.wait_for_log('Converted maxfeepercent=0.25, exemptfee=UNSET to maxfee 5000msat')


def test_xpay_takeover_null_parms(node_factory, executor):
"""Test passing through RPC a list of parameters some of which have null
json value."""
l1, l2, l3 = node_factory.line_graph(
3, wait_for_announce=True, opts={"xpay-handle-pay": True}
)

# Amount argument is null.
inv = l3.rpc.invoice(100000, "test_xpay_takeover1", "test_xpay_takeover1")["bolt11"]
l1.rpc.call("pay", [inv, None])
l1.daemon.wait_for_log("Redirecting pay->xpay")

# Amount argument is given
inv = l3.rpc.invoice("any", "test_xpay_takeover2", "test_xpay_takeover2")["bolt11"]
l1.rpc.call("pay", [inv, "100sat"])
l1.daemon.wait_for_log("Redirecting pay->xpay")

# bolt11 invoice cannot be NULL
with pytest.raises(RpcError, match=r"missing required parameter: bolt11"):
l1.rpc.call("pay", [None, "100sat"])
l1.daemon.wait_for_log(r"Not redirecting pay \(missing bolt11 parameter\)")


def test_xpay_preapprove(node_factory):
l1, l2 = node_factory.line_graph(2, opts={'dev-hsmd-fail-preapprove': None})

Expand Down
Loading