improve error handling in webRTC-related noise function

src/crypto/noise/mod.rs

@@ -164,6 +164,11 @@ impl NoiseContext {
     /// Get remote public key from the received Noise payload.
     #[cfg(feature = "webrtc")]
     pub fn get_remote_public_key(&mut self, reply: &[u8]) -> Result<PublicKey, NegotiationError> {
+        if reply.len() < 2 {
+            tracing::error!(target: LOG_TARGET, "reply too short to contain length prefix");
+            return Err(NegotiationError::ParseError(ParseError::InvalidReplyLength));
+        }
+
         let (len_slice, reply) = reply.split_at(2);
         let len = u16::from_be_bytes(
             len_slice

src/error.rs

@@ -181,6 +181,9 @@ pub enum ParseError {
     /// This error is protocol specific.
     #[error("Invalid data")]
     InvalidData,
+    /// The provided reply length is not valid
+    #[error("Invalid reply length")]
+    InvalidReplyLength,
 }
 
 #[derive(Debug, thiserror::Error)]

src/lib.rs

@@ -60,7 +60,6 @@ use transport::Endpoint;
 use types::ConnectionId;
 
 use std::{collections::HashSet, sync::Arc};
-
 pub use bandwidth::BandwidthSink;
 pub use error::Error;
 pub use peer_id::PeerId;
@@ -332,9 +331,11 @@ impl Litep2p {
 
             for address in transport_listen_addresses {
                 transport_manager.register_listen_address(address.clone());
-                listen_addresses.push(address.with(Protocol::P2p(
-                    Multihash::from_bytes(&local_peer_id.to_bytes()).unwrap(),
-                )));
+                let peer_id_multihash = match Multihash::from_bytes(&local_peer_id.to_bytes()) {
+                    Ok(hash) => hash,
+                    Err(_) => continue,
+                };
+                listen_addresses.push(address.with(Protocol::P2p(peer_id_multihash)));
             }
 
             transport_manager.register_transport(SupportedTransport::Tcp, Box::new(transport));
@@ -349,9 +350,11 @@ impl Litep2p {
 
             for address in transport_listen_addresses {
                 transport_manager.register_listen_address(address.clone());
-                listen_addresses.push(address.with(Protocol::P2p(
-                    Multihash::from_bytes(&local_peer_id.to_bytes()).unwrap(),
-                )));
+                let peer_id_multihash = match Multihash::from_bytes(&local_peer_id.to_bytes()) {
+                    Ok(hash) => hash,
+                    Err(_) => continue,
+                };
+                listen_addresses.push(address.with(Protocol::P2p(peer_id_multihash)));
             }
 
             transport_manager.register_transport(SupportedTransport::Quic, Box::new(transport));
@@ -366,9 +369,11 @@ impl Litep2p {
 
             for address in transport_listen_addresses {
                 transport_manager.register_listen_address(address.clone());
-                listen_addresses.push(address.with(Protocol::P2p(
-                    Multihash::from_bytes(&local_peer_id.to_bytes()).unwrap(),
-                )));
+                let peer_id_multihash = match Multihash::from_bytes(&local_peer_id.to_bytes()) {
+                    Ok(hash) => hash,
+                    Err(_) => continue,
+                };
+                listen_addresses.push(address.with(Protocol::P2p(peer_id_multihash)));
             }
 
             transport_manager.register_transport(SupportedTransport::WebRtc, Box::new(transport));
@@ -383,9 +388,11 @@ impl Litep2p {
 
             for address in transport_listen_addresses {
                 transport_manager.register_listen_address(address.clone());
-                listen_addresses.push(address.with(Protocol::P2p(
-                    Multihash::from_bytes(&local_peer_id.to_bytes()).unwrap(),
-                )));
+                let peer_id_multihash = match Multihash::from_bytes(&local_peer_id.to_bytes()) {
+                    Ok(hash) => hash,
+                    Err(_) => continue,
+                };
+                listen_addresses.push(address.with(Protocol::P2p(peer_id_multihash)));
             }
 
             transport_manager