hex/wstunnel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set a timeout to the httpProxy connexion

Browse source
This commit is contained in:
Erèbe 2016-05-31 13:27:01 +02:00
parent 3cd5dba661
commit 8d33cf9698
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Tunnel.hs
View file

@ -31,6 +31,7 @@ import qualified Network.WebSockets.Stream as WS
import qualified Network.Connection as NC import qualified Network.Connection as NC
import Protocols import Protocols
import System.IO (IOMode (ReadWriteMode)) import System.IO (IOMode (ReadWriteMode))
import System.Timeout
@ -110,21 +111,25 @@ runTunnelingClientWith info@TunnelSettings{..} app conn = do
httpProxyConnection :: (HostName, PortNumber) -> TunnelSettings -> (Connection -> IO ()) -> IO () httpProxyConnection :: (HostName, PortNumber) -> TunnelSettings -> (Connection -> IO ()) -> IO ()
httpProxyConnection (host, port) TunnelSettings{..} app = httpProxyConnection (host, port) TunnelSettings{..} app =
myTry $ N.runTCPClient (N.clientSettingsTCP (fromIntegral port) (fromString host)) $ \conn -> do myTry $ N.runTCPClient (N.clientSettingsTCP (fromIntegral port) (fromString host)) $ \conn -> do
void $ N.appWrite conn $ "CONNECT " <> fromString serverHost <> ":" <> fromString (show serverPort) <> " HTTP/1.0\r\n" _ <- sendConnectRequest conn
<> "Host: " <> fromString serverHost <> ":" <> fromString (show serverPort) <>"\r\n\r\n" responseM <- timeout (1000000 * 10) $ readProxyResponse mempty conn
response <- readProxyResponse mempty conn let response = fromMaybe "No response of the proxy aftre 10s" responseM
if isConnected response
then app (toConnection conn) if isAuthorized response
then app $ toConnection conn
else putStrLn $ "Proxy refused the connection :: \n" <> fromString (BC.unpack response) else putStrLn $ "Proxy refused the connection :: \n" <> fromString (BC.unpack response)
where where
sendConnectRequest h = N.appWrite h $ "CONNECT " <> fromString serverHost <> ":" <> fromString (show serverPort) <> " HTTP/1.0\r\n"
<> "Host: " <> fromString serverHost <> ":" <> fromString (show serverPort) <>"\r\n\r\n"
readProxyResponse buff conn = do readProxyResponse buff conn = do
response <- N.appRead conn response <- N.appRead conn
if "\r\n\r\n" `BC.isInfixOf` response if "\r\n\r\n" `BC.isInfixOf` response
then return $ buff <> response then return $ buff <> response
else readProxyResponse (buff <> response) conn else readProxyResponse (buff <> response) conn
isConnected response = " 200 " `BC.isInfixOf` response isAuthorized response = " 200 " `BC.isInfixOf` response
tcpConnection :: TunnelSettings -> (Connection -> IO ()) -> IO () tcpConnection :: TunnelSettings -> (Connection -> IO ()) -> IO ()
tcpConnection TunnelSettings{..} app = tcpConnection TunnelSettings{..} app =