9dc578a · typeable/wai

git.iko.soy/typeable/wai

on master help sign in

Wrap recvN in HTTP2 to tickle the timer.

9dc578aLucas DiCioccio9 years ago

warp/Network/Wai/Handler/Warp/Run.hs+16−2

compare with master

unifiedsplit

@@ -331,12 +331,13 @@ serveConnection conn ii1 origAddr transport settings app = do

331 return (True, bs0)

332 else

333 return (False, bs0)

334+ istatus <- newIORef False

334 if settingsHTTP2Enabled settings && h2 then do

335 if settingsHTTP2Enabled settings && h2 then do

335− recvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)

336+ rawRecvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)

337+ let recvN = wrappedRecvN th istatus (settingsSlowlorisSize settings) rawRecvN

336 -- fixme: origAddr

338 -- fixme: origAddr

337 http2 conn ii1 origAddr transport settings recvN app

339 http2 conn ii1 origAddr transport settings recvN app

338 else do

340 else do

339− istatus <- newIORef False

340 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))

341 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))

341 writeIORef istatus True

342 writeIORef istatus True

342 leftoverSource src bs

343 leftoverSource src bs

@@ -512,6 +513,19 @@ wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do

512 when (S.length bs >= slowlorisSize) $ T.tickle th

513 when (S.length bs >= slowlorisSize) $ T.tickle th

513 return bs

514 return bs

514

515

516+wrappedRecvN :: T.Handle -> IORef Bool -> Int -> (BufSize -> IO ByteString) -> (BufSize -> IO ByteString)

517+wrappedRecvN th istatus slowlorisSize readN bufsize = do

518+ bs <- readN bufsize

519+ unless (S.null bs) $ do

520+ writeIORef istatus True

521+ -- TODO: think about the slowloris protection in HTTP2: current code

522+ -- might open a slow-loris attack vector. Rather than timing we should

523+ -- consider limiting the per-client connections assuming that in HTTP2

524+ -- we should allow only few connections per host (real-world

525+ -- deployments with large NATs may be trickier).

526+ when (S.length bs >= slowlorisSize || bufsize <= slowlorisSize) $ T.tickle th

527+ return bs

528+

515-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs

529-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs

516setSocketCloseOnExec :: Socket -> IO ()

530setSocketCloseOnExec :: Socket -> IO ()

517#if WINDOWS

531#if WINDOWS