From 1dbd72547c0f0bbaad9e89b9cd7d7a8034342f0f Mon Sep 17 00:00:00 2001 From: Sam Truzjan Date: Sun, 8 Dec 2013 08:23:50 +0400 Subject: Close connection if peer send invalid protocol string --- src/Network/BitTorrent/Exchange/Wire.hs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/Network') diff --git a/src/Network/BitTorrent/Exchange/Wire.hs b/src/Network/BitTorrent/Exchange/Wire.hs index b04bd378..3ec01ca1 100644 --- a/src/Network/BitTorrent/Exchange/Wire.hs +++ b/src/Network/BitTorrent/Exchange/Wire.hs @@ -73,11 +73,15 @@ data ChannelSide | RemotePeer deriving (Show, Eq, Enum) --- TODO pretty instance +instance Pretty ChannelSide where + pretty = PP.text . show -- | Errors occur when a remote peer violates protocol specification. data ProtocolError - = UnexpectedTopic InfoHash -- ^ peer replied with unexpected infohash. + -- | Protocol string should be 'BitTorrent Protocol' but remote + -- peer send a different string. + = InvalidProtocol ProtocolString + | UnexpectedTopic InfoHash -- ^ peer replied with unexpected infohash. | UnexpectedPeerId PeerId -- ^ peer replied with unexpected peer id. | UnknownTopic InfoHash -- ^ peer requested unknown torrent. | HandshakeRefused -- ^ peer do not send an extended handshake back. @@ -270,6 +274,9 @@ connectWire hs addr extCaps wire = bracket (connectToPeer addr) close $ \ sock -> do hs' <- initiateHandshake sock hs + unless (def == hsProtocol hs') $ do + throwIO $ ProtocolError $ InvalidProtocol (hsProtocol hs') + unless (hsInfoHash hs == hsInfoHash hs') $ do throwIO $ ProtocolError $ UnexpectedTopic (hsInfoHash hs') -- cgit v1.2.3