Merge pull request #30 from TheBlueMatt/master

Working initial routing sync from lnd node

Author: TheBlueMatt

fuzz/Cargo.toml

@@ -43,6 +43,14 @@ name = "full_stack_target"
 path = "fuzz_targets/full_stack_target.rs"
 
 # message fuzz targets
+[[bin]]
+name = "msg_ping_target"
+path = "fuzz_targets/msg_ping_target.rs"
+
+[[bin]]
+name = "msg_pong_target"
+path = "fuzz_targets/msg_pong_target.rs"
+
 [[bin]]
 name = "msg_accept_channel_target"
 path = "fuzz_targets/msg_targets/msg_accept_channel_target.rs"

fuzz/fuzz_targets/msg_ping_target.rs

@@ -0,0 +1,63 @@
+// This file is auto-generated by gen_target.sh based on msg_target_template.txt
+// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
+
+extern crate lightning;
+
+use lightning::util::reset_rng_state;
+
+use lightning::ln::msgs::{MsgEncodable, MsgDecodable, Ping};
+
+#[inline]
+pub fn do_test(data: &[u8]) {
+	reset_rng_state();
+	if let Ok(msg) = Ping::decode(data) {
+		let _ = msg.encode();
+	}
+}
+
+#[cfg(feature = "afl")]
+extern crate afl;
+#[cfg(feature = "afl")]
+fn main() {
+	afl::read_stdio_bytes(|data| {
+		do_test(&data);
+	});
+}
+
+#[cfg(feature = "honggfuzz")]
+#[macro_use] extern crate honggfuzz;
+#[cfg(feature = "honggfuzz")]
+fn main() {
+	loop {
+		fuzz!(|data| {
+			do_test(data);
+		});
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
+		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);
+	}
+}

fuzz/fuzz_targets/msg_pong_target.rs

@@ -0,0 +1,63 @@
+// This file is auto-generated by gen_target.sh based on msg_target_template.txt
+// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
+
+extern crate lightning;
+
+use lightning::util::reset_rng_state;
+
+use lightning::ln::msgs::{MsgEncodable, MsgDecodable, Pong};
+
+#[inline]
+pub fn do_test(data: &[u8]) {
+	reset_rng_state();
+	if let Ok(msg) = Pong::decode(data) {
+		let _ = msg.encode();
+	}
+}
+
+#[cfg(feature = "afl")]
+extern crate afl;
+#[cfg(feature = "afl")]
+fn main() {
+	afl::read_stdio_bytes(|data| {
+		do_test(&data);
+	});
+}
+
+#[cfg(feature = "honggfuzz")]
+#[macro_use] extern crate honggfuzz;
+#[cfg(feature = "honggfuzz")]
+fn main() {
+	loop {
+		fuzz!(|data| {
+			do_test(data);
+		});
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
+		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);
+	}
+}

fuzz/fuzz_targets/msg_targets/msg_accept_channel_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::AcceptChannel, data, read_pos);
-	}
+	test_msg!(msgs::AcceptChannel, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_closing_signed_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::ClosingSigned, data, read_pos);
-	}
+	test_msg!(msgs::ClosingSigned, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_commitment_signed_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::CommitmentSigned, data, read_pos);
-	}
+	test_msg!(msgs::CommitmentSigned, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_funding_created_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::FundingCreated, data, read_pos);
-	}
+	test_msg!(msgs::FundingCreated, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_funding_locked_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::FundingLocked, data, read_pos);
-	}
+	test_msg!(msgs::FundingLocked, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_funding_signed_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::FundingSigned, data, read_pos);
-	}
+	test_msg!(msgs::FundingSigned, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_open_channel_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::OpenChannel, data, read_pos);
-	}
+	test_msg!(msgs::OpenChannel, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_revoke_and_ack_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::RevokeAndACK, data, read_pos);
-	}
+	test_msg!(msgs::RevokeAndACK, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_shutdown_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::Shutdown, data, read_pos);
-	}
+	test_msg!(msgs::Shutdown, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_target_template.txt

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::MSG_TARGET, data, read_pos);
-	}
+	test_msg!(msgs::MSG_TARGET, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_update_add_htlc_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::UpdateAddHTLC, data, read_pos);
-	}
+	test_msg!(msgs::UpdateAddHTLC, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_update_fail_htlc_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::UpdateFailHTLC, data, read_pos);
-	}
+	test_msg!(msgs::UpdateFailHTLC, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_update_fail_malformed_htlc_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::UpdateFailMalformedHTLC, data, read_pos);
-	}
+	test_msg!(msgs::UpdateFailMalformedHTLC, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_update_fee_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::UpdateFee, data, read_pos);
-	}
+	test_msg!(msgs::UpdateFee, data);
 }
 
 #[cfg(feature = "afl")]

fuzz/fuzz_targets/msg_targets/msg_update_fulfill_htlc_target.rs

@@ -9,15 +9,11 @@ use lightning::util::reset_rng_state;
 use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
 
 mod utils;
-use utils::slice_to_be16;
 
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	let mut read_pos = 0;
-	loop {
-		test_msg!(msgs::UpdateFulfillHTLC, data, read_pos);
-	}
+	test_msg!(msgs::UpdateFulfillHTLC, data);
 }
 
 #[cfg(feature = "afl")]