Implement KeyError for bad key in channel announcement process

Author: Antoine Riard

fuzz/fuzz_targets/channel_target.rs

@@ -249,6 +249,7 @@ pub fn do_test(data: &[u8]) {
 					Some(ErrorAction::DisconnectPeer {..}) => return,
 					Some(ErrorAction::IgnoreError) => None,
 					Some(ErrorAction::SendErrorMessage {..}) => None,
+					Some(ErrorAction::KeyError) => None,
 				},
 			}
 		}

src/ln/channelmanager.rs

@@ -175,7 +175,7 @@ macro_rules! secp_call {
 		match $res {
 			Ok(key) => key,
 			//TODO: Make the err a parameter!
-			Err(_) => return Err(HandleError{err: "Key error", action: None})
+			Err(_) => return Err(HandleError{err: "Key error", action: Some(msgs::ErrorAction::KeyError)}),
 		}
 	};
 }
@@ -1145,9 +1145,18 @@ impl ChainListener for ChannelManager {
 				if let Ok(Some(funding_locked)) = chan_res {
 					let announcement_sigs = match self.get_announcement_sigs(channel) {
 						Ok(res) => res,
-						Err(_e) => {
-							//TODO: push e on events and blow up the channel (it has bad keys)
-							return true;
+						Err(e) => {
+							if e.action.is_some() {
+								new_events.push(events::Event::DisconnectPeer {
+									node_id: channel.get_their_node_id(),
+									msg: None,
+								});
+								failed_channels.push(channel.force_shutdown());
+								short_to_id.remove(&channel.get_short_channel_id().unwrap());
+								return false;
+							} else {
+								return true;
+							}
 						}
 					};
 					new_events.push(events::Event::SendFundingLocked {
@@ -3106,4 +3115,5 @@ mod tests {
 		assert_eq!(channel_state.by_id.len(), 0);
 		assert_eq!(channel_state.short_to_id.len(), 0);
 	}
+
 }

src/ln/msgs.rs

@@ -391,6 +391,8 @@ pub enum ErrorAction {
 	SendErrorMessage {
 		msg: ErrorMessage
 	},
+	/// The peer send us invalid keys for a given action. Disconnect them or tell them. Your call.
+	KeyError,
 }
 
 pub struct HandleError { //TODO: rename me

src/ln/peer_handler.rs

@@ -312,6 +312,9 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 														encode_and_send_msg!(msg, 17);
 														continue;
 													},
+													msgs::ErrorAction::KeyError => {
+														continue; //TODO : return a PeerHandleError and disconnect socket ?
+													}
 												}
 											} else {
 												return Err(PeerHandleError{ no_connection_possible: false });