From e88c7210f81d5c09d9f60f7f9d6946de4f18146f Mon Sep 17 00:00:00 2001 From: Duncan Dean Date: Sat, 30 Oct 2021 10:25:44 +0200 Subject: [PATCH] Add mpp_timeout and invalid_onion_payload descriptions & handling --- lightning/src/ln/onion_route_tests.rs | 9 +++++++++ lightning/src/ln/onion_utils.rs | 2 +- lightning/src/util/errors.rs | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lightning/src/ln/onion_route_tests.rs b/lightning/src/ln/onion_route_tests.rs index 05b108fb..4feae104 100644 --- a/lightning/src/ln/onion_route_tests.rs +++ b/lightning/src/ln/onion_route_tests.rs @@ -563,4 +563,13 @@ fn test_onion_failure() { msg.cltv_expiry = htlc_cltv; msg.onion_routing_packet = onion_packet; }, ||{}, true, Some(21), Some(NetworkUpdate::NodeFailure{node_id: route.paths[0][0].pubkey, is_permanent: true}), Some(route.paths[0][0].short_channel_id)); + + run_onion_failure_test_with_fail_intercept("mpp_timeout", 200, &nodes, &route, &payment_hash, &payment_secret, |_msg| {}, |msg| { + // Tamper returning error message + let session_priv = SecretKey::from_slice(&[3; 32]).unwrap(); + let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap(); + msg.reason = onion_utils::build_first_hop_failure_packet(&onion_keys[1].shared_secret[..], 23, &[0;0]); + }, ||{ + nodes[2].node.fail_htlc_backwards(&payment_hash); + }, true, Some(23), None, None); } diff --git a/lightning/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs index c1767c02..12dc0e03 100644 --- a/lightning/src/ln/onion_utils.rs +++ b/lightning/src/ln/onion_utils.rs @@ -380,7 +380,7 @@ pub(super) fn process_onion_failure(secp_ctx: & // indicate that payment parameter has failed and no need to // update Route object let payment_failed = match error_code & 0xff { - 15|16|17|18|19 => true, + 15|16|17|18|19|23 => true, _ => false, } && is_from_final_node; // PERM bit observed below even if this error is from the intermediate nodes diff --git a/lightning/src/util/errors.rs b/lightning/src/util/errors.rs index 0c6099f7..820bf31c 100644 --- a/lightning/src/util/errors.rs +++ b/lightning/src/util/errors.rs @@ -119,6 +119,8 @@ pub(crate) fn get_onion_error_description(error_code: u16) -> (&'static str, &'s _c if _c == 19 => ("The final node indicated the amount in the HTLC does not match the value in the onion", "final_incorrect_htlc_amount"), _c if _c == UPDATE|20 => ("Node indicated the outbound channel has been disabled", "channel_disabled"), _c if _c == 21 => ("Node indicated the CLTV expiry in the HTLC is too far in the future", "expiry_too_far"), + _c if _c == PERM|22 => ("Node indicated that the decrypted onion per-hop payload was not understood by it or is incomplete", "invalid_onion_payload"), + _c if _c == 23 => ("The final node indicated the complete amount of the multi-part payment was not received within a reasonable time", "mpp_timeout"), _ => ("Unknown", ""), } } -- 2.30.2