Introduce DecodeError::UnknownTLV

Author: dunxen

fuzz/src/router.rs

@@ -135,6 +135,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 					msgs::DecodeError::ShortRead => panic!("We picked the length..."),
 					msgs::DecodeError::Io(e) => panic!("{:?}", e),
 					msgs::DecodeError::UnsupportedCompression => return,
+					msgs::DecodeError::UnknownTLV(_) => return,
 				}
 			}
 		}}

lightning/src/ln/channelmanager.rs

@@ -1765,6 +1765,11 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 						msgs::DecodeError::UnknownRequiredFeature|
 						msgs::DecodeError::InvalidValue|
 						msgs::DecodeError::ShortRead => 0x4000 | 22, // invalid_onion_payload
+						msgs::DecodeError::UnknownTLV(tlv_type) => {
+							let tlv_type = BigSize(tlv_type);
+							let mut v = Vec::with_capacity(tlv_type.serialized_length());
+							return_err!("Unable to decode our hop data", 0x4000 | 22, if let Ok(_) = tlv_type.write(&mut v) { &v[..] } else { &[0;0] });
+						},
 						_ => 0x2000 | 2, // Should never happen
 					};
 					return_err!("Unable to decode our hop data", error_code, &[0;0]);

lightning/src/ln/msgs.rs

@@ -68,6 +68,8 @@ pub enum DecodeError {
         io::ErrorKind),
 	/// The message included zlib-compressed values, which we don't support.
 	UnsupportedCompression,
+	/// The message included a TLV with an unknown type.
+	UnknownTLV(u64),
 }
 
 /// An init message to be sent or received from a peer
@@ -965,6 +967,7 @@ impl fmt::Display for DecodeError {
 			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"),
+			DecodeError::UnknownTLV(tlv_type) => f.write_fmt(format_args!( "Unknown TLV type encountered: {}", tlv_type)),
 		}
 	}
 }

lightning/src/ln/peer_handler.rs

@@ -908,6 +908,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 													msgs::DecodeError::UnsupportedCompression => {
 														log_trace!(self.logger, "We don't support zlib-compressed message fields, ignoring message");
 														continue;
+													},
+													msgs::DecodeError::UnknownTLV(tlv_type) => {
+														log_debug!(self.logger, "Got an unknown TLV type while deserializing message: {}", tlv_type);
+														return Err(PeerHandleError { no_connection_possible: false });
 													}
 												}
 											}