Merge branch 'master' into feature/trio

libp2p/security/insecure/transport.py

@@ -52,13 +52,13 @@ class InsecureSession(BaseSession):
         encoded_msg_bytes = encode_fixedint_prefixed(msg_bytes)
         try:
             await self.write(encoded_msg_bytes)
-        except RawConnError:
-            raise HandshakeFailure("connection closed")
+        except RawConnError as e:
+            raise HandshakeFailure("connection closed") from e
 
         try:
             remote_msg_bytes = await read_fixedint_prefixed(self.conn)
-        except RawConnError:
-            raise HandshakeFailure("connection closed")
+        except RawConnError as e:
+            raise HandshakeFailure("connection closed") from e
         remote_msg = plaintext_pb2.Exchange()
         remote_msg.ParseFromString(remote_msg_bytes)
         received_peer_id = ID(remote_msg.id)
@@ -77,12 +77,12 @@ class InsecureSession(BaseSession):
             received_pubkey = deserialize_public_key(
                 remote_msg.pubkey.SerializeToString()
             )
-        except ValueError:
+        except ValueError as e:
             raise HandshakeFailure(
                 f"unknown `key_type` of remote_msg.pubkey={remote_msg.pubkey}"
-            )
+            ) from e
         except MissingDeserializerError as error:
-            raise HandshakeFailure(error)
+            raise HandshakeFailure() from error
         peer_id_from_received_pubkey = ID.from_pubkey(received_pubkey)
         if peer_id_from_received_pubkey != received_peer_id:
             raise HandshakeFailure(

libp2p/security/secio/transport.py

@@ -131,8 +131,8 @@ class SecureSession(BaseSession):
         msg = await self.conn.read_msg()
         try:
             decrypted_msg = self.remote_encrypter.decrypt_if_valid(msg)
-        except InvalidMACException:
-            raise DecryptionFailedException
+        except InvalidMACException as e:
+            raise DecryptionFailedException() from e
         return decrypted_msg
 
     async def write(self, data: bytes) -> int:
@@ -175,7 +175,7 @@ class Proposal:
         try:
             public_key = deserialize_public_key(public_key_protobuf_bytes)
         except MissingDeserializerError as error:
-            raise SedesException(error)
+            raise SedesException() from error
         exchanges = protobuf.exchanges
         ciphers = protobuf.ciphers
         hashes = protobuf.hashes
@@ -424,8 +424,8 @@ async def create_secure_session(
         await conn.close()
         raise e
     # `IOException` includes errors raised while read from/write to raw connection
-    except IOException:
-        raise SecioException("connection closed")
+    except IOException as e:
+        raise SecioException("connection closed") from e
 
     is_initiator = remote_peer is not None
     session = _mk_session_from(
@@ -435,8 +435,8 @@ async def create_secure_session(
     try:
         received_nonce = await _finish_handshake(session, remote_nonce)
     # `IOException` includes errors raised while read from/write to raw connection
-    except IOException:
-        raise SecioException("connection closed")
+    except IOException as e:
+        raise SecioException("connection closed") from e
     if received_nonce != local_nonce:
         await conn.close()
         raise InconsistentNonce()