X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Ffuzz_targets%2Ffull_stack_target.rs;h=75456127eb2c7e0d195f50425f29bdf601410120;hb=ada2154b40237d22edc72ab553ca4a4d42d4a2c1;hp=25d539922e0ea2cc16d3c8f2f0317d061781e00d;hpb=20fa9d331d4fadb766199011eac3aef852531809;p=rust-lightning diff --git a/fuzz/fuzz_targets/full_stack_target.rs b/fuzz/fuzz_targets/full_stack_target.rs index 25d53992..75456127 100644 --- a/fuzz/fuzz_targets/full_stack_target.rs +++ b/fuzz/fuzz_targets/full_stack_target.rs @@ -10,7 +10,6 @@ use bitcoin::network::constants::Network; use bitcoin::network::serialize::{serialize, BitcoinHash}; use bitcoin::util::hash::Sha256dHash; -use crypto::sha2::Sha256; use crypto::digest::Digest; use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil}; @@ -21,6 +20,12 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor}; use lightning::ln::router::Router; use lightning::util::events::{EventsProvider,Event}; use lightning::util::reset_rng_state; +use lightning::util::logger::Logger; +use lightning::util::sha2::Sha256; + +mod utils; + +use utils::test_logger; use secp256k1::key::{PublicKey,SecretKey}; use secp256k1::Secp256k1; @@ -84,10 +89,10 @@ struct FuzzEstimator { input: Arc, } impl FeeEstimator for FuzzEstimator { - fn get_est_sat_per_vbyte(&self, _: ConfirmationTarget) -> u64 { + fn get_est_sat_per_1000_weight(&self, _: ConfirmationTarget) -> u64 { //TODO: We should actually be testing at least much more than 64k... match self.input.get_slice(2) { - Some(slice) => slice_to_be16(slice) as u64, + Some(slice) => slice_to_be16(slice) as u64 * 250, None => 0 } } @@ -169,21 +174,22 @@ pub fn do_test(data: &[u8]) { Err(_) => return, }; + let logger: Arc = Arc::new(test_logger::TestLogger{}); let monitor = Arc::new(TestChannelMonitor{}); - let watch = Arc::new(ChainWatchInterfaceUtil::new()); + let watch = Arc::new(ChainWatchInterfaceUtil::new(Arc::clone(&logger))); let broadcast = Arc::new(TestBroadcaster{}); - let channelmanager = ChannelManager::new(our_network_key, slice_to_be32(get_slice!(4)), get_slice!(1)[0] != 0, Network::Bitcoin, fee_est.clone(), monitor.clone(), watch.clone(), broadcast.clone()).unwrap(); - let router = Arc::new(Router::new(PublicKey::from_secret_key(&secp_ctx, &our_network_key).unwrap())); + let channelmanager = ChannelManager::new(our_network_key, slice_to_be32(get_slice!(4)), get_slice!(1)[0] != 0, Network::Bitcoin, fee_est.clone(), monitor.clone(), watch.clone(), broadcast.clone(), Arc::clone(&logger)).unwrap(); + let router = Arc::new(Router::new(PublicKey::from_secret_key(&secp_ctx, &our_network_key).unwrap(), Arc::clone(&logger))); let peers = RefCell::new([false; 256]); let handler = PeerManager::new(MessageHandler { chan_handler: channelmanager.clone(), route_handler: router.clone(), - }, our_network_key); + }, our_network_key, Arc::clone(&logger)); let mut should_forward = false; - let mut payments_received = Vec::new(); + let mut payments_received: Vec<[u8; 32]> = Vec::new(); let mut payments_sent = 0; let mut pending_funding_generation: Vec<([u8; 32], u64, Script)> = Vec::new(); let mut pending_funding_signatures = HashMap::new(); @@ -240,7 +246,6 @@ pub fn do_test(data: &[u8]) { let mut sha = Sha256::new(); sha.input(&payment_hash); sha.result(&mut payment_hash); - for i in 1..32 { payment_hash[i] = 0; } payments_sent += 1; match channelmanager.send_payment(route, payment_hash) { Ok(_) => {}, @@ -252,7 +257,8 @@ pub fn do_test(data: &[u8]) { if !peers.borrow()[peer_id as usize] { return; } let their_key = get_pubkey!(); let chan_value = slice_to_be24(get_slice!(3)) as u64; - if channelmanager.create_channel(their_key, chan_value, 0).is_err() { return; } + let push_msat_value = slice_to_be24(get_slice!(3)) as u64; + if channelmanager.create_channel(their_key, chan_value, push_msat_value, 0).is_err() { return; } }, 6 => { let mut channels = channelmanager.list_channels(); @@ -263,29 +269,21 @@ pub fn do_test(data: &[u8]) { }, 7 => { if should_forward { - channelmanager.process_pending_htlc_forward(); + channelmanager.process_pending_htlc_forwards(); handler.process_events(); should_forward = false; } }, 8 => { for payment in payments_received.drain(..) { - let mut payment_preimage = None; - for i in 0..payments_sent { - let mut payment_hash = [0; 32]; - payment_hash[0..8].copy_from_slice(&be64_to_array(i)); - let mut sha = Sha256::new(); - sha.input(&payment_hash); - sha.result(&mut payment_hash); - for i in 1..32 { payment_hash[i] = 0; } - if payment_hash == payment { - payment_hash = [0; 32]; - payment_hash[0..8].copy_from_slice(&be64_to_array(i)); - payment_preimage = Some(payment_hash); - break; - } - } - channelmanager.claim_funds(payment_preimage.unwrap()); + let mut payment_preimage = [0; 32]; + payment_preimage[0] = payment[0]; + let mut sha = Sha256::new(); + sha.input(&payment_preimage); + let mut payment_hash_check = [0; 32]; + sha.result(&mut payment_hash_check); + assert!(payment_hash_check == payment); + channelmanager.claim_funds(payment_preimage); } }, 9 => { @@ -294,13 +292,21 @@ pub fn do_test(data: &[u8]) { } }, 10 => { - for funding_generation in pending_funding_generation.drain(..) { + for funding_generation in pending_funding_generation.drain(..) { let mut tx = Transaction { version: 0, lock_time: 0, input: Vec::new(), output: vec![TxOut { value: funding_generation.1, script_pubkey: funding_generation.2, }] }; let funding_output = OutPoint::new(Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0); - channelmanager.funding_transaction_generated(&funding_generation.0, funding_output.clone()); - pending_funding_signatures.insert(funding_output, tx); + let mut found_duplicate_txo = false; + for chan in channelmanager.list_channels() { + if chan.channel_id == funding_output.to_channel_id() { + found_duplicate_txo = true; + } + } + if !found_duplicate_txo { + channelmanager.funding_transaction_generated(&funding_generation.0, funding_output.clone()); + pending_funding_signatures.insert(funding_output, tx); + } } }, 11 => { @@ -368,29 +374,11 @@ fn main() { } } +extern crate hex; #[cfg(test)] mod tests { - fn extend_vec_from_hex(hex: &str, out: &mut Vec) { - let mut b = 0; - for (idx, c) in hex.as_bytes().iter().enumerate() { - b <<= 4; - match *c { - b'A'...b'F' => b |= c - b'A' + 10, - b'a'...b'f' => b |= c - b'a' + 10, - b'0'...b'9' => b |= c - b'0', - _ => panic!("Bad hex"), - } - if (idx & 1) == 1 { - out.push(b); - b = 0; - } - } - } - #[test] fn duplicate_crash() { - let mut a = Vec::new(); - extend_vec_from_hex("00", &mut a); - super::do_test(&a); + super::do_test(&::hex::decode("00").unwrap()); } }