improve ecies error fatal types

paradigmxyz · Sep 27, 2024 · 59382a4 · 59382a4
1 parent 5b585eb
commit 59382a4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/crates/net/ecies/src/error.rs b/crates/net/ecies/src/error.rs
@@ -13,6 +13,11 @@ impl ECIESError {
     pub fn into_inner(self) -> ECIESErrorImpl {
         *self.inner
     }
+
+    /// Returns a reference to the inner error
+    pub const fn inner(&self) -> &ECIESErrorImpl {
+        &self.inner
+    }
 }
 
 impl fmt::Display for ECIESError {

diff --git a/crates/net/network/src/error.rs b/crates/net/network/src/error.rs
@@ -3,6 +3,7 @@
 use std::{fmt, io, io::ErrorKind, net::SocketAddr};
 
 use reth_dns_discovery::resolver::ResolveError;
+use reth_ecies::ECIESErrorImpl;
 use reth_eth_wire::{
     errors::{EthHandshakeError, EthStreamError, P2PHandshakeError, P2PStreamError},
     DisconnectReason,
@@ -214,7 +215,19 @@ impl SessionError for PendingSessionHandshakeError {
     fn is_fatal_protocol_error(&self) -> bool {
         match self {
             Self::Eth(eth) => eth.is_fatal_protocol_error(),
-            Self::Ecies(_) => true,
+            Self::Ecies(err) => matches!(
+                err.inner(),
+                ECIESErrorImpl::TagCheckDecryptFailed |
+                    ECIESErrorImpl::TagCheckHeaderFailed |
+                    ECIESErrorImpl::TagCheckBodyFailed |
+                    ECIESErrorImpl::InvalidAuthData |
+                    ECIESErrorImpl::InvalidAckData |
+                    ECIESErrorImpl::InvalidHeader |
+                    ECIESErrorImpl::Secp256k1(_) |
+                    ECIESErrorImpl::InvalidHandshake { .. } |
+                    ECIESErrorImpl::UnreadableStream |
+                    ECIESErrorImpl::StreamTimeout
+            ),
             Self::Timeout => false,
         }
     }