X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Fonion_message.rs;h=d9d5c0a90376c2cabf5c50ac26b9cd50af23d8a0;hb=2e33acbd9c5ebd605829859a982822df6e0f1723;hp=fcc8dc3cad2a8d60c36ac836acd63254e7814ff2;hpb=1f399b0984d591019320459d804cbad859c608ae;p=rust-lightning

diff --git a/fuzz/src/onion_message.rs b/fuzz/src/onion_message.rs
index fcc8dc3c..d9d5c0a9 100644
--- a/fuzz/src/onion_message.rs
+++ b/fuzz/src/onion_message.rs
@@ -7,6 +7,7 @@ use bitcoin::secp256k1::ecdsa::RecoverableSignature;
 use bitcoin::secp256k1::schnorr;
 
 use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
+use lightning::ln::features::InitFeatures;
 use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
 use lightning::ln::script::ShutdownScript;
 use lightning::offers::invoice::UnsignedBolt12Invoice;
@@ -39,9 +40,20 @@ pub fn do_test<L: Logger>(data: &[u8], logger: &L) {
 			&keys_manager, &keys_manager, logger, &message_router, &offers_msg_handler,
 			&custom_msg_handler
 		);
-		let mut pk = [2; 33]; pk[1] = 0xff;
-		let peer_node_id_not_used = PublicKey::from_slice(&pk).unwrap();
-		onion_messenger.handle_onion_message(&peer_node_id_not_used, &msg);
+
+		let peer_node_id = {
+			let mut secret_bytes = [0; 32];
+			secret_bytes[31] = 2;
+			let secret = SecretKey::from_slice(&secret_bytes).unwrap();
+			PublicKey::from_secret_key(&Secp256k1::signing_only(), &secret)
+		};
+
+		let mut features = InitFeatures::empty();
+		features.set_onion_messages_optional();
+		let init = msgs::Init { features, networks: None, remote_network_address: None };
+
+		onion_messenger.peer_connected(&peer_node_id, &init, false).unwrap();
+		onion_messenger.handle_onion_message(&peer_node_id, &msg);
 	}
 }
 
@@ -211,7 +223,84 @@ mod tests {
 
 	#[test]
 	fn test_no_onion_message_breakage() {
-		let two_unblinded_hops_om = "020000000000000000000000000000000000000000000000000000000000000e01055600020000000000000000000000000000000000000000000000000000000000000e0135043304210202020202020202020202020202020202020202020202020202020202020202026d000000000000000000000000000000eb0000000000000000000000000000000000000000000000000000000000000036041096000000000000000000000000000000fd1092202a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000";
+		let one_hop_om = "\
+			020000000000000000000000000000000000000000000000000000000000000e01055600020000000000000\
+			000000000000000000000000000000000000000000000000e01ae0276020000000000000000000000000000\
+			000000000000000000000000000000000002020000000000000000000000000000000000000000000000000\
+			000000000000e0101022a0000000000000000000000000000014551231950b75fc4402da1732fc9bebf0010\
+			9500000000000000000000000000000004106d000000000000000000000000000000fd1092202a2a2a2a2a2\
+			a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a0000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000005600000000000000000000000000000000000000000000\
+			000000000000000000";
+		let logger = TrackingLogger { lines: Mutex::new(HashMap::new()) };
+		super::do_test(&::hex::decode(one_hop_om).unwrap(), &logger);
+		{
+			let log_entries = logger.lines.lock().unwrap();
+			assert_eq!(log_entries.get(&("lightning::onion_message::messenger".to_string(),
+						"Received an onion message with path_id None and a reply_path".to_string())), Some(&1));
+			assert_eq!(log_entries.get(&("lightning::onion_message::messenger".to_string(),
+						"Sending onion message when responding to Custom onion message with path_id None".to_string())), Some(&1));
+		}
+
+		let two_unblinded_hops_om = "\
+			020000000000000000000000000000000000000000000000000000000000000e01055600020000000000000\
+			000000000000000000000000000000000000000000000000e01350433042102020202020202020202020202\
+			02020202020202020202020202020202020202026d000000000000000000000000000000eb0000000000000\
+			000000000000000000000000000000000000000000000000036041096000000000000000000000000000000\
+			fd1092202a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000004800000000000000000000000000000000000000000000\
+			000000000000000000";
 		let logger = TrackingLogger { lines: Mutex::new(HashMap::new()) };
 		super::do_test(&::hex::decode(two_unblinded_hops_om).unwrap(), &logger);
 		{
@@ -219,7 +308,40 @@ mod tests {
 			assert_eq!(log_entries.get(&("lightning::onion_message::messenger".to_string(), "Forwarding an onion message to peer 020202020202020202020202020202020202020202020202020202020202020202".to_string())), Some(&1));
 		}
 
-		let two_unblinded_two_blinded_om = "020000000000000000000000000000000000000000000000000000000000000e01055600020000000000000000000000000000000000000000000000000000000000000e0135043304210202020202020202020202020202020202020202020202020202020202020202026d0000000000000000000000000000009e0000000000000000000000000000000000000000000000000000000000000058045604210203030303030303030303030303030303030303030303030303030303030303020821020000000000000000000000000000000000000000000000000000000000000e0196000000000000000000000000000000e9000000000000000000000000000000000000000000000000000000000000003504330421020404040404040404040404040404040404040404040404040404040404040402ca00000000000000000000000000000042000000000000000000000000000000000000000000000000000000000000003604103f000000000000000000000000000000fd1092202a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000";
+		let two_unblinded_two_blinded_om = "\
+			020000000000000000000000000000000000000000000000000000000000000e01055600020000000000000\
+			000000000000000000000000000000000000000000000000e01350433042102020202020202020202020202\
+			02020202020202020202020202020202020202026d0000000000000000000000000000009e0000000000000\
+			000000000000000000000000000000000000000000000000058045604210203030303030303030303030303\
+			030303030303030303030303030303030303020821020000000000000000000000000000000000000000000\
+			000000000000000000e0196000000000000000000000000000000e900000000000000000000000000000000\
+			000000000000000000000000000000350433042102040404040404040404040404040404040404040404040\
+			4040404040404040402ca000000000000000000000000000000420000000000000000000000000000000000\
+			00000000000000000000000000003604103f000000000000000000000000000000fd1092202a2a2a2a2a2a2\
+			a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000004800000000000000000000000000000000000000000000\
+			000000000000000000";
 		let logger = TrackingLogger { lines: Mutex::new(HashMap::new()) };
 		super::do_test(&::hex::decode(two_unblinded_two_blinded_om).unwrap(), &logger);
 		{
@@ -227,7 +349,40 @@ mod tests {
 			assert_eq!(log_entries.get(&("lightning::onion_message::messenger".to_string(), "Forwarding an onion message to peer 020202020202020202020202020202020202020202020202020202020202020202".to_string())), Some(&1));
 		}
 
-		let three_blinded_om = "020000000000000000000000000000000000000000000000000000000000000e01055600020000000000000000000000000000000000000000000000000000000000000e0135043304210202020202020202020202020202020202020202020202020202020202020202026d000000000000000000000000000000b20000000000000000000000000000000000000000000000000000000000000035043304210203030303030303030303030303030303030303030303030303030303030303029600000000000000000000000000000033000000000000000000000000000000000000000000000000000000000000003604104e000000000000000000000000000000fd1092202a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000";
+		let three_blinded_om = "\
+			020000000000000000000000000000000000000000000000000000000000000e01055600020000000000000\
+			000000000000000000000000000000000000000000000000e01350433042102020202020202020202020202\
+			02020202020202020202020202020202020202026d000000000000000000000000000000b20000000000000\
+			000000000000000000000000000000000000000000000000035043304210203030303030303030303030303\
+			030303030303030303030303030303030303029600000000000000000000000000000033000000000000000\
+			000000000000000000000000000000000000000000000003604104e000000000000000000000000000000fd\
+			1092202a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a00000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+			000000000000000000000000000000000000000004800000000000000000000000000000000000000000000\
+			000000000000000000";
 		let logger = TrackingLogger { lines: Mutex::new(HashMap::new()) };
 		super::do_test(&::hex::decode(three_blinded_om).unwrap(), &logger);
 		{