wip

Author: joostjager

fuzz/artifacts/process_onion_failure_target/crash-4d001a633b0b6b83ee696ea0e3178fada091217e

@@ -0,0 +1 @@
+������������������������������������������������������������������������������������������������������������������������������j�

fuzz/corpus/process_onion_failure_target/28174432b91aebe8fc82bb91e3035c34c5e29b65

@@ -0,0 +1 @@
+����������������������#��������������������������������������������������������������������������������������j�

fuzz/corpus/process_onion_failure_target/3056d5d1a9fac8e6c94c1c046eaab7d7c3040e58

@@ -1,11 +1,129 @@
-// Imports that need to be added manually
-use lightning_rapid_gossip_sync::RapidGossipSync;
+use std::sync::Arc;
+
+use bitcoin::{key::Secp256k1, secp256k1::{PublicKey, SecretKey}};
+use lightning::{blinded_path::BlindedHop, ln::{channelmanager::{HTLCSource, PaymentId}, msgs::OnionErrorPacket}, routing::router::{BlindedTail, Path, RouteHop, TrampolineHop}, types::features::{ChannelFeatures, Features, NodeFeatures}, util::test_utils::TestLogger};
 
-use crate::utils::test_logger;
+// Imports that need to be added manually
+use crate::{utils::test_logger::{self}};
 
 /// Actual fuzz test, method signature and name are fixed
 fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
-	println!("data -> {:?}", data);
+	let mut read_pos = 0;
+		macro_rules! get_slice {
+			($len: expr) => {{
+				let slice_len = $len as usize;
+				if data.len() < read_pos + slice_len {
+					return;
+				}
+				read_pos += slice_len;
+				&data[read_pos - slice_len..read_pos]
+			}};
+		}
+
+		let secp_ctx = Secp256k1::new();
+		let logger: Arc<TestLogger> = Arc::new(TestLogger::new());
+
+		let first_hop_htlc_msat_bytes = match get_slice!(8).try_into() {
+			Ok(val) => val,
+			Err(_) => return,
+		};
+
+		let session_priv = match SecretKey::from_slice(get_slice!(32)) {
+			Ok(val) => val,
+			Err(_) => return,
+		};
+
+		let payment_id = match get_slice!(32).try_into() {
+			Ok(val) => PaymentId(val),
+			Err(_) => return,
+		};
+
+		macro_rules! get_pubkey {
+			() => {
+				match PublicKey::from_slice(get_slice!(32)) {
+					Ok(val) => val,
+					Err(_) => return,
+				}
+			};
+		}
+
+		let path = Path {
+			hops: vec![
+				// Bob
+				RouteHop {
+					pubkey: get_pubkey!(),
+					node_features: NodeFeatures::empty(),
+					short_channel_id: 0,
+					channel_features: ChannelFeatures::empty(),
+					fee_msat: 3_000,
+					cltv_expiry_delta: 24,
+					maybe_announced_channel: false,
+				},
+
+				// Carol
+				RouteHop {
+					pubkey: get_pubkey!(),
+					node_features: NodeFeatures::empty(),
+					short_channel_id: (572330 << 40) + (42 << 16) + 2821,
+					channel_features: ChannelFeatures::empty(),
+					fee_msat: 153_000,
+					cltv_expiry_delta: 0,
+					maybe_announced_channel: false,
+				},
+			],
+			blinded_tail: Some(BlindedTail {
+				trampoline_hops: vec![
+					// Carol's pubkey
+					TrampolineHop {
+						pubkey: get_pubkey!(),
+						node_features: Features::empty(),
+						fee_msat: 2_500,
+						cltv_expiry_delta: 24,
+					},
+
+					// Dave's pubkey
+					TrampolineHop {
+						pubkey: get_pubkey!(),
+						node_features: Features::empty(),
+						fee_msat: 2_500,
+						cltv_expiry_delta: 24,
+					},
+
+					// Emily's pubkey
+					TrampolineHop {
+						pubkey: get_pubkey!(),
+						node_features: Features::empty(),
+						fee_msat: 150_500,
+						cltv_expiry_delta: 36,
+					},
+				],
+
+				// Dummy blinded hop (because LDK doesn't allow unblinded Trampoline receives)
+				hops: vec![
+					// Emily's dummy blinded node id
+					BlindedHop {
+						blinded_node_id: get_pubkey!(),
+						encrypted_payload: vec![],
+					}
+				],
+				blinding_point: get_pubkey!(),
+				excess_final_cltv_expiry_delta: 0,
+				final_value_msat: 150_000_000,
+			})};
+
+		let htlc_source = HTLCSource::OutboundRoute {
+			path,
+			session_priv,
+			first_hop_htlc_msat: u64::from_be_bytes(first_hop_htlc_msat_bytes),
+			payment_id,
+		};
+
+		let failure_len = u16::from_be_bytes(get_slice!(2).try_into().unwrap());
+		let encrypted_packet = OnionErrorPacket { data:
+			get_slice!(failure_len as u64).into(),
+		};
+
+		lightning::ln::onion_utils::process_onion_failure(&secp_ctx, &logger, &htlc_source, encrypted_packet);
 }
 
 /// Method that needs to be added manually, {name}_test

fuzz/corpus/process_onion_failure_target/35bb86cacf53de50e70ee6b8a50abd722f17c081

@@ -678,7 +678,7 @@ impl_writeable_tlv_based_enum!(SentHTLCId,
 /// Tracks the inbound corresponding to an outbound HTLC
 #[allow(clippy::derive_hash_xor_eq)] // Our Hash is faithful to the data, we just don't have SecretKey::hash
 #[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) enum HTLCSource {
+pub enum HTLCSource {
 	PreviousHopData(HTLCPreviousHopData),
 	OutboundRoute {
 		path: Path,