Parse onion error codes that occurred within blinded paths

Author: valentinewallace

lightning/src/ln/onion_utils.rs

@@ -413,14 +413,6 @@ where L::Target: Logger {
 	{
 		if res.is_some() { return; }
 
-		let route_hop = match route_hop_opt {
-			Some(hop) => hop,
-			None => return,
-		};
-
-		let amt_to_forward = htlc_msat - route_hop.fee_msat;
-		htlc_msat = amt_to_forward;
-
 		let ammag = gen_ammag_from_shared_secret(shared_secret.as_ref());
 
 		let mut decryption_tmp = Vec::with_capacity(packet_decrypted.len());
@@ -429,11 +421,6 @@ where L::Target: Logger {
 		chacha.process(&packet_decrypted, &mut decryption_tmp[..]);
 		packet_decrypted = decryption_tmp;
 
-		// The failing hop includes either the inbound channel to the recipient or the outbound channel
-		// from the current hop (i.e., the next hop's inbound channel).
-		is_from_final_node = route_hop_idx + 1 == path.hops.len();
-		let failing_route_hop = if is_from_final_node { route_hop } else { &path.hops[route_hop_idx + 1] };
-
 		let err_packet = match msgs::DecodedOnionErrorPacket::read(&mut Cursor::new(&packet_decrypted)) {
 			Ok(p) => p,
 			Err(_) => return
@@ -442,30 +429,58 @@ where L::Target: Logger {
 		let mut hmac = HmacEngine::<Sha256>::new(&um);
 		hmac.input(&err_packet.encode()[32..]);
 
+		// The failing hop includes either the inbound channel to the recipient or the outbound channel
+		// from the current hop (i.e., the next hop's inbound channel).
+		let num_blinded_hops = path.blinded_tail.as_ref().map_or(0, |t| t.hops.len());
+		is_from_final_node = route_hop_idx + 1 == path.hops.len() &&
+			(path.blinded_tail.is_none() || num_blinded_hops == 1);
+
 		if !fixed_time_eq(&Hmac::from_engine(hmac).into_inner(), &err_packet.hmac) { return }
 		let error_code_slice = match err_packet.failuremsg.get(0..2) {
 			Some(s) => s,
-			None => {
+			None if route_hop_opt.is_some() => {
 				// Useless packet that we can't use but it passed HMAC, so it definitely came from the peer
 				// in question
 				let network_update = Some(NetworkUpdate::NodeFailure {
-					node_id: route_hop.pubkey,
+					node_id: route_hop_opt.as_ref().unwrap().pubkey,
 					is_permanent: true,
 				});
-				let short_channel_id = Some(route_hop.short_channel_id);
+				let short_channel_id = Some(route_hop_opt.as_ref().unwrap().short_channel_id);
 				res = Some((network_update, short_channel_id, !is_from_final_node));
 				return
+			},
+			None => return, // Useless packet from a blinded path hop
+		};
+
+		let error_code = u16::from_be_bytes(error_code_slice.try_into().expect("len is 2"));
+		error_code_ret = Some(error_code);
+		error_packet_ret = Some(err_packet.failuremsg[2..].to_vec());
+
+		let route_hop = match route_hop_opt {
+			Some(hop) => hop,
+			None => {
+				res = Some((None, None, true));
+				return
+			}
+		};
+		let failing_route_hop = if is_from_final_node { route_hop } else {
+			match path.hops.get(route_hop_idx + 1) {
+				Some(hop) => hop,
+				None => {
+					res = Some((None, None, true));
+					return
+				}
 			}
 		};
+
+		let amt_to_forward = htlc_msat - route_hop.fee_msat;
+		htlc_msat = amt_to_forward;
+
 		const BADONION: u16 = 0x8000;
 		const PERM: u16 = 0x4000;
 		const NODE: u16 = 0x2000;
 		const UPDATE: u16 = 0x1000;
 
-		let error_code = u16::from_be_bytes(error_code_slice.try_into().expect("len is 2"));
-		error_code_ret = Some(error_code);
-		error_packet_ret = Some(err_packet.failuremsg[2..].to_vec());
-
 		let (debug_field, debug_field_size) = errors::get_onion_debug_field(error_code);
 
 		// indicate that payment parameter has failed and no need to update Route object