mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 13:25:43 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: fix handling of WIRE_UPDATE_FAIL_MALFORMED_HTLC.

Browse Source 
1. We asserted that there wouldn't be a raw failcode.
2. We didn't pass the failure information via JSON in this case.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2020-01-23 16:19:42 +10:30 committed by Christian Decker
parent c11212bb52
commit bfcef9002e
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lightningd/pay.c
View File

@ -179,7 +179,7 @@ void json_sendpay_fail_fields(struct json_stream *js,
/* "immediate_routing_failure" is before payment creation. */
if (payment)
json_add_payment_fields(js, payment);
if (pay_errcode == PAY_UNPARSEABLE_ONION)
if (pay_errcode == PAY_UNPARSEABLE_ONION && onionreply)
json_add_hex_talarr(js, "onionreply", onionreply->contents);
else
json_add_routefail_info(js,
@ -487,6 +487,30 @@ remote_routing_failure(const tal_t *ctx,
return routing_failure;
}
/* If our immediate peer says WIRE_UPDATE_FAIL_MALFORMED_HTLC, we only get a
* code, no onion msg. */
static struct routing_failure *
badonion_routing_failure(const tal_t *ctx,
struct lightningd *ld,
const struct wallet_payment *payment,
enum onion_type failcode)
{
struct routing_failure *rf;
rf = tal(ctx, struct routing_failure);
rf->erring_index = 0;
rf->failcode = failcode;
rf->msg = NULL;
rf->erring_node = tal_dup(rf, struct node_id,
&payment->route_nodes[0]);
rf->erring_channel = tal_dup(rf, struct short_channel_id,
&payment->route_channels[0]);
rf->channel_dir = node_id_idx(&ld->id, &payment->route_nodes[0]);
return rf;
}
void payment_store(struct lightningd *ld, struct wallet_payment *payment TAKES)
{
struct sendpay_command *pc;
@ -551,8 +575,15 @@ void payment_failed(struct lightningd *ld, const struct htlc_out *hout,
pay_errcode = PAY_UNPARSEABLE_ONION;
fail = NULL;
failmsg = NULL;
} else if (hout->failcode) {
/* Direct peer told channeld it's a malformed onion using
* update_fail_malformed_htlc. */
failmsg = "malformed onion";
fail = badonion_routing_failure(tmpctx, ld, payment,
hout->failcode);
pay_errcode = PAY_UNPARSEABLE_ONION;
} else {
/* Must be remote fail. */
/* Must be normal remote fail with an onion-wrapped error. */
assert(!hout->failcode);
failmsg = "reply from remote";
/* Try to parse reply. */

1
tests/test_misc.py
View File

@ -1591,7 +1591,6 @@ def test_bad_onion(node_factory, bitcoind):
assert err.value.error['data']['erring_channel'] == route[1]['channel']
@pytest.mark.xfail(strict=True)
@unittest.skipIf(not DEVELOPER, "Needs DEVELOPER=1 to force onion fail")
def test_bad_onion_immediate_peer(node_factory, bitcoind):
"""Test that we handle the malformed msg when we're the origin"""