From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Thu, 20 May 2021 16:26:49 +0000 (+0000)
Subject: Merge pull request #925 from valentinewallace/ignore-zlib-compressed-msgs
X-Git-Tag: v0.0.98~23
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=63a245e8247319723f78e26809208546df0e2628;hp=5d74cae6c5665a0bd917b24b4fcaf181ff6b5450;p=rust-lightning

Merge pull request #925 from valentinewallace/ignore-zlib-compressed-msgs

Ignore messages with zlib-compressed fields
---

diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs
index f9a263cc..d0f7b132 100644
--- a/fuzz/src/router.rs
+++ b/fuzz/src/router.rs
@@ -133,6 +133,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 					msgs::DecodeError::BadLengthDescriptor => return,
 					msgs::DecodeError::ShortRead => panic!("We picked the length..."),
 					msgs::DecodeError::Io(e) => panic!("{:?}", e),
+					msgs::DecodeError::UnsupportedCompression => return,
 				}
 			}
 		}}
diff --git a/lightning/src/ln/msgs.rs b/lightning/src/ln/msgs.rs
index be99596b..5ae6955d 100644
--- a/lightning/src/ln/msgs.rs
+++ b/lightning/src/ln/msgs.rs
@@ -63,6 +63,8 @@ pub enum DecodeError {
 	/// Error from std::io
 	Io(/// (C-not exported) as ErrorKind doesn't have a reasonable mapping
         ::std::io::ErrorKind),
+	/// The message included zlib-compressed values, which we don't support.
+	UnsupportedCompression,
 }
 
 /// An init message to be sent or received from a peer
@@ -953,6 +955,7 @@ impl fmt::Display for DecodeError {
 			DecodeError::ShortRead => f.write_str("Packet extended beyond the provided bytes"),
 			DecodeError::BadLengthDescriptor => f.write_str("A length descriptor in the packet didn't describe the later data correctly"),
 			DecodeError::Io(ref e) => e.fmt(f),
+			DecodeError::UnsupportedCompression => f.write_str("We don't support receiving messages with zlib-compressed fields"),
 		}
 	}
 }
@@ -1634,17 +1637,18 @@ impl Readable for QueryShortChannelIds {
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
 		let chain_hash: BlockHash = Readable::read(r)?;
 
-		// We expect the encoding_len to always includes the 1-byte
-		// encoding_type and that short_channel_ids are 8-bytes each
 		let encoding_len: u16 = Readable::read(r)?;
-		if encoding_len == 0 || (encoding_len - 1) % 8 != 0 {
-			return Err(DecodeError::InvalidValue);
-		}
+		let encoding_type: u8 = Readable::read(r)?;
 
 		// Must be encoding_type=0 uncompressed serialization. We do not
 		// support encoding_type=1 zlib serialization.
-		let encoding_type: u8 = Readable::read(r)?;
 		if encoding_type != EncodingType::Uncompressed as u8 {
+			return Err(DecodeError::UnsupportedCompression);
+		}
+
+		// We expect the encoding_len to always includes the 1-byte
+		// encoding_type and that short_channel_ids are 8-bytes each
+		if encoding_len == 0 || (encoding_len - 1) % 8 != 0 {
 			return Err(DecodeError::InvalidValue);
 		}
 
@@ -1746,17 +1750,18 @@ impl Readable for ReplyChannelRange {
 		let number_of_blocks: u32 = Readable::read(r)?;
 		let sync_complete: bool = Readable::read(r)?;
 
-		// We expect the encoding_len to always includes the 1-byte
-		// encoding_type and that short_channel_ids are 8-bytes each
 		let encoding_len: u16 = Readable::read(r)?;
-		if encoding_len == 0 || (encoding_len - 1) % 8 != 0 {
-			return Err(DecodeError::InvalidValue);
-		}
+		let encoding_type: u8 = Readable::read(r)?;
 
 		// Must be encoding_type=0 uncompressed serialization. We do not
 		// support encoding_type=1 zlib serialization.
-		let encoding_type: u8 = Readable::read(r)?;
 		if encoding_type != EncodingType::Uncompressed as u8 {
+			return Err(DecodeError::UnsupportedCompression);
+		}
+
+		// We expect the encoding_len to always includes the 1-byte
+		// encoding_type and that short_channel_ids are 8-bytes each
+		if encoding_len == 0 || (encoding_len - 1) % 8 != 0 {
 			return Err(DecodeError::InvalidValue);
 		}
 
diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
index 2559acfc..f9e79429 100644
--- a/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@ -783,6 +783,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref> PeerManager<D
 													}
 													msgs::DecodeError::BadLengthDescriptor => return Err(PeerHandleError { no_connection_possible: false }),
 													msgs::DecodeError::Io(_) => return Err(PeerHandleError { no_connection_possible: false }),
+													msgs::DecodeError::UnsupportedCompression => {
+														log_debug!(self.logger, "We don't support zlib-compressed message fields, ignoring message");
+														continue;
+													}
 												}
 											}
 										};