X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Ffuzz_targets%2Ffull_stack_target.rs;h=8f7ec2df0a76013918e2ec7b154deceed7057cab;hb=0f965d319f76bc89a7dd88a2c08c88ed0186f6c2;hp=bc9e23472170968a038bb2ee82d4ed6ee6f08e87;hpb=e93c9fbeaf6312fb77bce1ad96a2abb44124f136;p=rust-lightning diff --git a/fuzz/fuzz_targets/full_stack_target.rs b/fuzz/fuzz_targets/full_stack_target.rs index bc9e2347..8f7ec2df 100644 --- a/fuzz/fuzz_targets/full_stack_target.rs +++ b/fuzz/fuzz_targets/full_stack_target.rs @@ -21,11 +21,18 @@ 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; + +mod utils; + +use utils::test_logger; use secp256k1::key::{PublicKey,SecretKey}; use secp256k1::Secp256k1; +use std::cell::RefCell; use std::collections::HashMap; +use std::hash::Hash; use std::sync::Arc; use std::sync::atomic::{AtomicUsize,Ordering}; @@ -82,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 } } @@ -104,15 +111,31 @@ impl BroadcasterInterface for TestBroadcaster { fn broadcast_transaction(&self, _tx: &Transaction) {} } -#[derive(Clone, PartialEq, Eq, Hash)] -struct Peer { +#[derive(Clone)] +struct Peer<'a> { id: u8, + peers_connected: &'a RefCell<[bool; 256]>, } -impl SocketDescriptor for Peer { +impl<'a> SocketDescriptor for Peer<'a> { fn send_data(&mut self, data: &Vec, write_offset: usize, _resume_read: bool) -> usize { assert!(write_offset < data.len()); data.len() - write_offset } + fn disconnect_socket(&mut self) { + assert!(self.peers_connected.borrow()[self.id as usize]); + self.peers_connected.borrow_mut()[self.id as usize] = false; + } +} +impl<'a> PartialEq for Peer<'a> { + fn eq(&self, other: &Self) -> bool { + self.id == other.id + } +} +impl<'a> Eq for Peer<'a> {} +impl<'a> Hash for Peer<'a> { + fn hash(&self, h: &mut H) { + self.id.hash(h) + } } #[inline] @@ -151,19 +174,20 @@ pub fn do_test(data: &[u8]) { Err(_) => return, }; + let logger: Arc = Arc::new(test_logger::TestLogger::new()); 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 peers = [false; 256]; let mut should_forward = false; let mut payments_received = Vec::new(); let mut payments_sent = 0; @@ -176,44 +200,44 @@ pub fn do_test(data: &[u8]) { 0 => { let mut new_id = 0; for i in 1..256 { - if !peers[i-1] { + if !peers.borrow()[i-1] { new_id = i; break; } } if new_id == 0 { return; } - peers[new_id - 1] = true; - handler.new_outbound_connection(get_pubkey!(), Peer{id: (new_id - 1) as u8}).unwrap(); + peers.borrow_mut()[new_id - 1] = true; + handler.new_outbound_connection(get_pubkey!(), Peer{id: (new_id - 1) as u8, peers_connected: &peers}).unwrap(); }, 1 => { let mut new_id = 0; for i in 1..256 { - if !peers[i-1] { + if !peers.borrow()[i-1] { new_id = i; break; } } if new_id == 0 { return; } - peers[new_id - 1] = true; - handler.new_inbound_connection(Peer{id: (new_id - 1) as u8}).unwrap(); + peers.borrow_mut()[new_id - 1] = true; + handler.new_inbound_connection(Peer{id: (new_id - 1) as u8, peers_connected: &peers}).unwrap(); }, 2 => { let peer_id = get_slice!(1)[0]; - if !peers[peer_id as usize] { return; } - peers[peer_id as usize] = false; - handler.disconnect_event(&Peer{id: peer_id}); + if !peers.borrow()[peer_id as usize] { return; } + peers.borrow_mut()[peer_id as usize] = false; + handler.disconnect_event(&Peer{id: peer_id, peers_connected: &peers}); }, 3 => { let peer_id = get_slice!(1)[0]; - if !peers[peer_id as usize] { return; } - match handler.read_event(&mut Peer{id: peer_id}, get_slice!(get_slice!(1)[0]).to_vec()) { + if !peers.borrow()[peer_id as usize] { return; } + match handler.read_event(&mut Peer{id: peer_id, peers_connected: &peers}, get_slice!(get_slice!(1)[0]).to_vec()) { Ok(res) => assert!(!res), - Err(_) => { peers[peer_id as usize] = false; } + Err(_) => { peers.borrow_mut()[peer_id as usize] = false; } } }, 4 => { let value = slice_to_be24(get_slice!(3)) as u64; - let route = match router.get_route(&get_pubkey!(), &Vec::new(), value, 42) { + let route = match router.get_route(&get_pubkey!(), None, &Vec::new(), value, 42) { Ok(route) => route, Err(_) => return, }; @@ -231,7 +255,7 @@ pub fn do_test(data: &[u8]) { }, 5 => { let peer_id = get_slice!(1)[0]; - if !peers[peer_id as usize] { return; } + 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; } @@ -245,7 +269,7 @@ 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; } @@ -350,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()); } }