fixup: Handle PeerStorageRetrieval in ChannelManager

Author: adi2011

lightning/src/ln/channelmanager.rs

@@ -52,7 +52,7 @@ use crate::ln::types::ChannelId;
 use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
 use crate::ln::channel::{self, Channel, ChannelError, ChannelUpdateStatus, FundedChannel, ShutdownResult, UpdateFulfillCommitFetch, OutboundV1Channel, ReconnectionMsg, InboundV1Channel, WithChannelContext};
 use crate::ln::channel::PendingV2Channel;
-use crate::ln::our_peer_storage::OurPeerStorage;
+use crate::ln::our_peer_storage::EncryptedOurPeerStorage;
 use crate::ln::channel_state::ChannelDetails;
 use crate::types::features::{Bolt12InvoiceFeatures, ChannelFeatures, ChannelTypeFeatures, InitFeatures, NodeFeatures};
 #[cfg(any(feature = "_test_utils", test))]
@@ -8321,20 +8321,25 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 	fn internal_peer_storage_retrieval(&self, counterparty_node_id: PublicKey, msg: msgs::PeerStorageRetrieval) -> Result<(), MsgHandleErrInternal> {
 		// TODO: Check if have any stale or missing ChannelMonitor.
 		let logger = WithContext::from(&self.logger, Some(counterparty_node_id), None, None);
+		let err = MsgHandleErrInternal::from_chan_no_close(
+			ChannelError::Ignore("Invalid PeerStorageRetrieval message received.".into()),
+			ChannelId([0; 32]),
+		);
+		let err_str = format!("Invalid PeerStorage received from {}", counterparty_node_id);
+
+		let encrypted_ops = match EncryptedOurPeerStorage::new(msg.data) {
+			Ok(encrypted_ops) => encrypted_ops,
+			Err(_) => {
+				log_debug!(logger, "{}", err_str);
+				return Err(err);
+			}
+		};
 
-		let encrypted_ops = OurPeerStorage::EncryptedPeerStorage { cipher: msg.data };
-		let decrypted_data = match encrypted_ops.decrypt_peer_storage(&self.node_signer.get_peer_storage_key()) {
+		let decrypted_data = match encrypted_ops.decrypt(&self.node_signer.get_peer_storage_key()) {
 			Ok(decrypted_ops) => decrypted_ops.into_vec(),
 			Err(_) => {
-				log_debug!(
-					logger,
-					"Invalid PeerStorage received from {}",
-					log_pubkey!(counterparty_node_id)
-				);
-				return Err(MsgHandleErrInternal::from_chan_no_close(
-					ChannelError::Ignore("Invalid PeerStorageRetrieval message received.".into()),
-					ChannelId([0; 32]),
-				));
+				log_debug!(logger, "{}", err_str);
+				return Err(err);
 			}
 		};