f test bad user-generated inbound pmt hashes

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -6422,8 +6422,10 @@ mod tests {
 	use bitcoin::hashes::Hash;
 	use bitcoin::hashes::sha256::Hash as Sha256;
 	use core::time::Duration;
+	use core::sync::atomic::Ordering;
 	use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
 	use ln::channelmanager::{PaymentId, PaymentSendFailure};
+	use ln::channelmanager::inbound_payment;
 	use ln::features::InitFeatures;
 	use ln::functional_test_utils::*;
 	use ln::msgs;
@@ -6438,7 +6440,7 @@ mod tests {
 	fn test_wait_timeout() {
 		use ln::channelmanager::PersistenceNotifier;
 		use sync::Arc;
-		use core::sync::atomic::{AtomicBool, Ordering};
+		use core::sync::atomic::AtomicBool;
 		use std::thread;
 
 		let persistence_notifier = Arc::new(PersistenceNotifier::new());
@@ -6867,6 +6869,35 @@ mod tests {
 			_ => panic!("unexpected error")
 		}
 	}
+
+	#[test]
+	fn bad_inbound_payment_hash() {
+		// Add coverage for checking that a user-provided payment hash matches the payment secret.
+		let chanmon_cfgs = create_chanmon_cfgs(2);
+		let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
+		let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
+		let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
+
+		let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(&nodes[0]);
+		let payment_data = msgs::FinalOnionHopData {
+			payment_secret,
+			total_msat: 100_000,
+		};
+
+		// Ensure that if the payment hash given to `inbound_payment::verify` differs from the original,
+		// payment verification fails as expected.
+		let mut bad_payment_hash = payment_hash.clone();
+		bad_payment_hash.0[0] += 1;
+		match inbound_payment::verify(bad_payment_hash, payment_data.clone(), nodes[0].node.highest_seen_timestamp.load(Ordering::Acquire) as u64, &nodes[0].node.inbound_payment_key, &nodes[0].logger) {
+			Ok(_) => panic!("Unexpected ok"),
+			Err(()) => {
+				nodes[0].logger.assert_log_contains("lightning::ln::channelmanager::inbound_payment".to_string(), "Failing HTLC with user-generated payment_hash".to_string(), 1);
+			}
+		}
+
+		// Check that using the original payment hash succeeds.
+		assert!(inbound_payment::verify(payment_hash, payment_data, nodes[0].node.highest_seen_timestamp.load(Ordering::Acquire) as u64, &nodes[0].node.inbound_payment_key, &nodes[0].logger).is_ok());
+	}
 }
 
 #[cfg(all(any(test, feature = "_test_utils"), feature = "unstable"))]