@@ -1,73 +1,97 @@
1+{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE PackageImports #-}
5+{-# LANGUAGE PatternGuards #-}
6+{-# LANGUAGE RecordWildCards #-}
3{-# LANGUAGE ScopedTypeVariables #-}
7{-# LANGUAGE ScopedTypeVariables #-}
4{-# LANGUAGE TupleSections #-}
8{-# LANGUAGE TupleSections #-}
9+{-# LANGUAGE ViewPatterns #-}
5{-# OPTIONS_GHC -fno-warn-deprecations #-}
10{-# OPTIONS_GHC -fno-warn-deprecations #-}
7module Network.Wai.Handler.Warp.Run where
12module Network.Wai.Handler.Warp.Run where
14+import "iproute" Data.IP (toHostAddress, toHostAddress6)
9import Control.Arrow (first)
15import Control.Arrow (first)
10−import Control.Concurrent (threadDelay)
11import qualified Control.Concurrent as Conc (yield)
16import qualified Control.Concurrent as Conc (yield)
12import Control.Exception as E
17import Control.Exception as E
13−import Control.Monad (when, unless, void)
14−import Data.ByteString (ByteString)
15import qualified Data.ByteString as S
18import qualified Data.ByteString as S
16import Data.Char (chr)
19import Data.Char (chr)
17−import Data.IP (toHostAddress, toHostAddress6)
18import Data.IORef (IORef, newIORef, readIORef, writeIORef)
20import Data.IORef (IORef, newIORef, readIORef, writeIORef)
19import Data.Streaming.Network (bindPortTCP)
21import Data.Streaming.Network (bindPortTCP)
20−import Network (sClose, Socket)
22+import Foreign.C.Error (Errno(..), eCONNABORTED)
23+import GHC.IO.Exception (IOException(..))
24+import qualified Network.HTTP2 as H2
21−import Network.Socket (accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6))
25+import Network.Socket (Socket, close, accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6), setSocketOption, SocketOption(..))
26+#if MIN_VERSION_network(3,1,1)
27+import Network.Socket (gracefulClose)
22import qualified Network.Socket.ByteString as Sock
29import qualified Network.Socket.ByteString as Sock
23import Network.Wai
30import Network.Wai
31+import Network.Wai.Internal (ResponseReceived (ResponseReceived))
32+import System.Environment (lookupEnv)
33+import qualified System.TimeManager as T
34+import System.Timeout (timeout)
24import Network.Wai.Handler.Warp.Buffer
36import Network.Wai.Handler.Warp.Buffer
25import Network.Wai.Handler.Warp.Counter
37import Network.Wai.Handler.Warp.Counter
26import qualified Network.Wai.Handler.Warp.Date as D
38import qualified Network.Wai.Handler.Warp.Date as D
27import qualified Network.Wai.Handler.Warp.FdCache as F
39import qualified Network.Wai.Handler.Warp.FdCache as F
40+import qualified Network.Wai.Handler.Warp.FileInfoCache as I
41+import Network.Wai.Handler.Warp.HTTP2 (http2)
28−import Network.Wai.Handler.Warp.HTTP2
42+import Network.Wai.Handler.Warp.HTTP2.Types (isHTTP2)
29import Network.Wai.Handler.Warp.Header
43import Network.Wai.Handler.Warp.Header
44+import Network.Wai.Handler.Warp.Imports hiding (readInt)
30import Network.Wai.Handler.Warp.ReadInt
45import Network.Wai.Handler.Warp.ReadInt
31import Network.Wai.Handler.Warp.Recv
46import Network.Wai.Handler.Warp.Recv
32import Network.Wai.Handler.Warp.Request
47import Network.Wai.Handler.Warp.Request
33import Network.Wai.Handler.Warp.Response
48import Network.Wai.Handler.Warp.Response
34import Network.Wai.Handler.Warp.SendFile
49import Network.Wai.Handler.Warp.SendFile
35import Network.Wai.Handler.Warp.Settings
50import Network.Wai.Handler.Warp.Settings
36−import qualified Network.Wai.Handler.Warp.Timeout as T
37import Network.Wai.Handler.Warp.Types
51import Network.Wai.Handler.Warp.Types
38−import Network.Wai.Internal (ResponseReceived (ResponseReceived))
52+
39−import System.Environment (getEnvironment)
40−import System.IO.Error (isFullErrorType, ioeGetErrorType)
42#if WINDOWS
54#if WINDOWS
43import Network.Wai.Handler.Warp.Windows
55import Network.Wai.Handler.Warp.Windows
45−import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
46import Network.Socket (fdSocket)
57import Network.Socket (fdSocket)
49-- | Creating 'Connection' for plain HTTP based on a given socket.
60-- | Creating 'Connection' for plain HTTP based on a given socket.
50−socketConnection :: Socket -> IO Connection
61+socketConnection :: Settings -> Socket -> IO Connection
62+#if MIN_VERSION_network(3,1,1)
63+socketConnection set s = do
51−socketConnection s = do
65+socketConnection _ s = do
52 bufferPool <- newBufferPool
67 bufferPool <- newBufferPool
53 writeBuf <- allocateBuffer bufferSize
68 writeBuf <- allocateBuffer bufferSize
54 let sendall = Sock.sendAll s
69 let sendall = Sock.sendAll s
70+ isH2 <- newIORef False -- HTTP/1.x
55 return Connection {
71 return Connection {
56 connSendMany = Sock.sendMany s
72 connSendMany = Sock.sendMany s
57 , connSendAll = sendall
73 , connSendAll = sendall
58 , connSendFile = sendFile s writeBuf bufferSize sendall
74 , connSendFile = sendFile s writeBuf bufferSize sendall
75+#if MIN_VERSION_network(3,1,1)
78+ let tm = if h2 then settingsGracefulCloseTimeout2 set
79+ else settingsGracefulCloseTimeout1 set
83+ gracefulClose s tm `E.catch` \(E.SomeException _) -> return ()
85+ , connClose = close s
59− , connClose = sClose s >> freeBuffer writeBuf
87+ , connFree = freeBuffer writeBuf
60 , connRecv = receive s bufferPool
88 , connRecv = receive s bufferPool
61 , connRecvBuf = receiveBuf s
89 , connRecvBuf = receiveBuf s
62 , connWriteBuffer = writeBuf
90 , connWriteBuffer = writeBuf
63 , connBufferSize = bufferSize
91 , connBufferSize = bufferSize
66−#if __GLASGOW_HASKELL__ < 702
67−allowInterrupt :: IO ()
68−allowInterrupt = unblock $ return ()
71-- | Run an 'Application' on the given port.
95-- | Run an 'Application' on the given port.
72-- This calls 'runSettings' with 'defaultSettings'.
96-- This calls 'runSettings' with 'defaultSettings'.
73run :: Port -> Application -> IO ()
97run :: Port -> Application -> IO ()
@@ -80,7 +104,7 @@ run p = runSettings defaultSettings { settingsPort = p }
80-- Since 3.0.9
104-- Since 3.0.9
81runEnv :: Port -> Application -> IO ()
105runEnv :: Port -> Application -> IO ()
82runEnv p app = do
106runEnv p app = do
83− mp <- fmap (lookup "PORT") getEnvironment
107+ mp <- lookupEnv "PORT"
85 maybe (run p app) runReadPort mp
109 maybe (run p app) runReadPort mp
@@ -97,7 +121,7 @@ runSettings :: Settings -> Application -> IO ()
97runSettings set app = withSocketsDo $
121runSettings set app = withSocketsDo $
99 (bindPortTCP (settingsPort set) (settingsHost set))
123 (bindPortTCP (settingsPort set) (settingsHost set))
101 (\socket -> do
125 (\socket -> do
102 setSocketCloseOnExec socket
126 setSocketCloseOnExec socket
103 runSettingsSocket set socket app)
127 runSettingsSocket set socket app)
@@ -125,10 +149,12 @@ runSettingsSocket set socket app = do
125 (s, sa) <- accept socket
149 (s, sa) <- accept socket
127 setSocketCloseOnExec s
151 setSocketCloseOnExec s
152+ -- NoDelay causes an error for AF_UNIX.
153+ setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
128− conn <- socketConnection s
154+ conn <- socketConnection set s
129 return (conn, sa)
155 return (conn, sa)
131− closeListenSocket = sClose socket
157+ closeListenSocket = close socket
133-- | The connection setup action would be expensive. A good example
159-- | The connection setup action would be expensive. A good example
134-- is initialization of TLS.
160-- is initialization of TLS.
@@ -150,9 +176,9 @@ runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMa
150-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
176-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
151runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
177runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
152runSettingsConnectionMaker x y =
178runSettingsConnectionMaker x y =
153− runSettingsConnectionMakerSecure x (go y)
179+ runSettingsConnectionMakerSecure x (toTCP <$> y)
155− go = fmap (first (fmap (, TCP)))
181+ toTCP = first ((, TCP) <$>)
157----------------------------------------------------------------
183----------------------------------------------------------------
@@ -166,17 +192,23 @@ runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport),
166runSettingsConnectionMakerSecure set getConnMaker app = do
192runSettingsConnectionMakerSecure set getConnMaker app = do
167 settingsBeforeMainLoop set
193 settingsBeforeMainLoop set
168 counter <- newCounter
194 counter <- newCounter
170− D.withDateCache $ \dc ->
171− F.withFdCache fdCacheDurationInSeconds $ \fc ->
172− withTimeoutManager $ \tm ->
173− acceptConnection set getConnMaker app dc fc tm counter
195+ withII $ acceptConnection set getConnMaker app counter
198+ withTimeoutManager $ \tm ->
199+ D.withDateCache $ \dc ->
200+ F.withFdCache fdCacheDurationInSeconds $ \fdc ->
201+ I.withFileInfoCache fdFileInfoDurationInSeconds $ \fic -> do
202+ let ii = InternalInfo tm dc fdc fic
175− fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
205+ !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
206+ !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
207+ !timeoutInSeconds = settingsTimeout set * 1000000
176 withTimeoutManager f = case settingsManager set of
208 withTimeoutManager f = case settingsManager set of
177 Just tm -> f tm
209 Just tm -> f tm
178 Nothing -> bracket
210 Nothing -> bracket
179− (T.initialize $ settingsTimeout set * 1000000)
211+ (T.initialize timeoutInSeconds)
180 T.stopManager
212 T.stopManager
@@ -196,17 +228,20 @@ runSettingsConnectionMakerSecure set getConnMaker app = do
196acceptConnection :: Settings
228acceptConnection :: Settings
197 -> IO (IO (Connection, Transport), SockAddr)
229 -> IO (IO (Connection, Transport), SockAddr)
198 -> Application
230 -> Application
200− -> Maybe F.MutableFdCache
202 -> Counter
231 -> Counter
204−acceptConnection set getConnMaker app dc fc tm counter = do
234+acceptConnection set getConnMaker app counter ii = do
205 -- First mask all exceptions in acceptLoop. This is necessary to
235 -- First mask all exceptions in acceptLoop. This is necessary to
206 -- ensure that no async exception is throw between the call to
236 -- ensure that no async exception is throw between the call to
207 -- acceptNewConnection and the registering of connClose.
237 -- acceptNewConnection and the registering of connClose.
239+ -- acceptLoop can be broken by closing the listing socket.
208 void $ mask_ acceptLoop
240 void $ mask_ acceptLoop
241+ -- In some cases, we want to stop Warp here without graceful shutdown.
242+ -- So, async exceptions are allowed here.
243+ -- That's why `finally` is not used.
209− gracefulShutdown counter
244+ gracefulShutdown set counter
211 acceptLoop = do
246 acceptLoop = do
212 -- Allow async exceptions before receiving the next connection maker.
247 -- Allow async exceptions before receiving the next connection maker.
@@ -223,24 +258,21 @@ acceptConnection set getConnMaker app dc fc tm counter = do
223 case mx of
258 case mx of
224 Nothing -> return ()
259 Nothing -> return ()
225 Just (mkConn, addr) -> do
260 Just (mkConn, addr) -> do
226− fork set mkConn addr app dc fc tm counter
261+ fork set mkConn addr app counter ii
227 acceptLoop
262 acceptLoop
229 acceptNewConnection = do
264 acceptNewConnection = do
230 ex <- try getConnMaker
265 ex <- try getConnMaker
231 case ex of
266 case ex of
232 Right x -> return $ Just x
267 Right x -> return $ Just x
233− Left e -> do
268+ Left e -> do
269+ let eConnAborted = getErrno eCONNABORTED
270+ getErrno (Errno cInt) = cInt
271+ if ioe_errno e == Just eConnAborted
272+ then acceptNewConnection
234− settingsOnException set Nothing $ toException e
274+ settingsOnException set Nothing $ toException e
235− if isFullErrorType (ioeGetErrorType e) then do
236− -- "resource exhausted (Too many open files)" may
237− -- happen by accept(). Wait a second hoping that
238− -- resource will be available.
242− -- Assuming the listen socket is closed.
243− return Nothing
275+ return Nothing
245-- Fork a new worker thread for this connection maker, and ask for a
277-- Fork a new worker thread for this connection maker, and ask for a
246-- function to unmask (i.e., allow async exceptions to be thrown).
278-- function to unmask (i.e., allow async exceptions to be thrown).
@@ -248,57 +280,56 @@ fork :: Settings
248 -> IO (Connection, Transport)
280 -> IO (Connection, Transport)
249 -> SockAddr
281 -> SockAddr
250 -> Application
282 -> Application
252− -> Maybe F.MutableFdCache
254 -> Counter
283 -> Counter
256−fork set mkConn addr app dc fc tm counter = settingsFork set $ \ unmask ->
286+fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
287+ -- Call the user-supplied on exception code if any
288+ -- exceptions are thrown.
289+ handle (settingsOnException set Nothing) $
257− -- Run the connection maker to get a new connection, and ensure
290+ -- Run the connection maker to get a new connection, and ensure
258− -- that the connection is closed. If the mkConn call throws an
291+ -- that the connection is closed. If the mkConn call throws an
259− -- exception, we will leak the connection. If the mkConn call is
292+ -- exception, we will leak the connection. If the mkConn call is
260− -- vulnerable to attacks (e.g., Slowloris), we do nothing to
293+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
261− -- protect the server. It is therefore vital that mkConn is well
294+ -- protect the server. It is therefore vital that mkConn is well
262− -- vetted.
295+ -- vetted.
264− -- We grab the connection before registering timeouts since the
297+ -- We grab the connection before registering timeouts since the
265− -- timeouts will be useless during connection creation, due to the
298+ -- timeouts will be useless during connection creation, due to the
266− -- fact that async exceptions are still masked.
299+ -- fact that async exceptions are still masked.
267− bracket mkConn closeConn $ \(conn, transport) ->
300+ bracket mkConn cleanUp (serve unmask)
302+ cleanUp (conn, _) = connClose conn `finally` connFree conn
269 -- We need to register a timeout handler for this thread, and
304 -- We need to register a timeout handler for this thread, and
270 -- cancel that handler as soon as we exit.
305 -- cancel that handler as soon as we exit.
271− bracket (T.registerKillThread tm) T.cancel $ \th ->
306+ serve unmask (conn, transport) = bracket register cancel $ \th -> do
273− let ii = InternalInfo th tm fc dc
274− -- We now have fully registered a connection close handler
307+ -- We now have fully registered a connection close handler in
275− -- in the case of all exceptions, so it is safe to one
308+ -- the case of all exceptions, so it is safe to once again
276− -- again allow async exceptions.
309+ -- allow async exceptions.
277− in unmask .
310+ unmask .
278− -- Call the user-supplied on exception code if any
279− -- exceptions are thrown.
280− handle (settingsOnException set Nothing) .
282− -- Call the user-supplied code for connection open and close events
311+ -- Call the user-supplied code for connection open and
283− bracket (onOpen addr) (onClose addr) $ \goingon ->
313+ bracket (onOpen addr) (onClose addr) $ \goingon ->
285− -- Actually serve this connection.
314+ -- Actually serve this connection. bracket with closeConn
286− -- bracket with closeConn above ensures the connection is closed.
315+ -- above ensures the connection is closed.
287− when goingon $ serveConnection conn ii addr transport set app
316+ when goingon $ serveConnection conn ii th addr transport set app
289− closeConn (conn, _transport) = connClose conn
318+ register = T.registerKillThread (timeoutManager ii) (connClose conn)
291 onOpen adr = increase counter >> settingsOnOpen set adr
321 onOpen adr = increase counter >> settingsOnOpen set adr
292 onClose adr _ = decrease counter >> settingsOnClose set adr
322 onClose adr _ = decrease counter >> settingsOnClose set adr
294serveConnection :: Connection
324serveConnection :: Connection
295 -> InternalInfo
325 -> InternalInfo
296 -> SockAddr
327 -> SockAddr
297 -> Transport
328 -> Transport
298 -> Settings
329 -> Settings
299 -> Application
330 -> Application
301−serveConnection conn ii origAddr transport settings app = do
332+serveConnection conn ii th origAddr transport settings app = do
302 -- fixme: Upgrading to HTTP/2 should be supported.
333 -- fixme: Upgrading to HTTP/2 should be supported.
303 (h2,bs) <- if isHTTP2 transport then
334 (h2,bs) <- if isHTTP2 transport then
304 return (True, "")
335 return (True, "")
@@ -308,19 +339,39 @@ serveConnection conn ii origAddr transport settings app = do
308 return (True, bs0)
339 return (True, bs0)
310 return (False, bs0)
341 return (False, bs0)
342+ istatus <- newIORef False
311− if h2 then do
343+ if settingsHTTP2Enabled settings && h2 then do
312− recvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
344+ rawRecvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
345+ -- This thread becomes the sender in http2 library.
346+ -- In the case of event source, one request comes and one
347+ -- worker gets busy. But it is likely that the receiver does
348+ -- not receive any data at all while the sender is sending
349+ -- output data from the worker. It's not good enough to tickle
350+ -- the time handler in the receiver only. So, we should tickle
351+ -- the time handler in both the receiver and the sender.
352+ let recvN = wrappedRecvN th istatus (settingsSlowlorisSize settings) rawRecvN
353+ sendBS x = connSendAll conn x >> T.tickle th
313 -- fixme: origAddr
354 -- fixme: origAddr
356+ setConnHTTP2 conn True
314− http2 conn ii origAddr transport settings recvN app
357+ http2 conn transport ii origAddr settings recvN sendBS app
316− istatus <- newIORef False
317− src <- mkSource (wrappedRecv conn th istatus)
359+ src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
318 writeIORef istatus True
360 writeIORef istatus True
319 leftoverSource src bs
361 leftoverSource src bs
320 addr <- getProxyProtocolAddr src
362 addr <- getProxyProtocolAddr src
321− http1 addr istatus src `E.catch` \e -> do
363+ http1 True addr istatus src `E.catch` \e ->
366+ -- See comment below referencing
367+ -- https://github.com/yesodweb/wai/issues/618
368+ | Just NoKeepAliveRequest <- fromException e -> return ()
370+ | Just (BadFirstLine _) <- fromException e -> return ()
322− sendErrorResponse addr istatus e
372+ _ <- sendErrorResponse (dummyreq addr) istatus e
323− throwIO (e :: SomeException)
373+ throwIO e
325 getProxyProtocolAddr src =
376 getProxyProtocolAddr src =
326 case settingsProxyProtocol settings of
377 case settingsProxyProtocol settings of
@@ -362,30 +413,38 @@ serveConnection conn ii origAddr transport settings app = do
363 decodeAscii = map (chr . fromEnum) . S.unpack
414 decodeAscii = map (chr . fromEnum) . S.unpack
365− th = threadHandle ii
416+ shouldSendErrorResponse se
417+ | Just ConnectionClosedByPeer <- fromException se = False
367− sendErrorResponse addr istatus e = do
420+ sendErrorResponse req istatus e = do
368 status <- readIORef istatus
421 status <- readIORef istatus
369− when status $ void $
422+ if shouldSendErrorResponse e && status
370− sendResponse
423+ then do
371− (settingsServerName settings)
372− conn ii (dummyreq addr) defaultIndexRequestHeader (return S.empty) (errorResponse e)
424+ sendResponse settings conn ii th req defaultIndexRequestHeader (return S.empty) (errorResponse e)
374 dummyreq addr = defaultRequest { remoteHost = addr }
427 dummyreq addr = defaultRequest { remoteHost = addr }
376 errorResponse e = settingsOnExceptionResponse settings e
429 errorResponse e = settingsOnExceptionResponse settings e
378− http1 addr istatus src = do
431+ http1 firstRequest addr istatus src = do
379− (req', mremainingRef, idxhdr, nextBodyFlush) <- recvRequest settings conn ii addr src
432+ (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
380− let req = req' { isSecure = isTransportSecure transport }
381 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
433 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
382 `E.catch` \e -> do
434 `E.catch` \e -> do
383− -- Call the user-supplied exception handlers, passing the request.
384− sendErrorResponse addr istatus e
385 settingsOnException settings (Just req) e
435 settingsOnException settings (Just req) e
386 -- Don't throw the error again to prevent calling settingsOnException twice.
436 -- Don't throw the error again to prevent calling settingsOnException twice.
387 return False
437 return False
439+ -- When doing a keep-alive connection, the other side may just
440+ -- close the connection. We don't want to treat that as an
441+ -- exceptional situation, so we pass in False to http1 (which
442+ -- in turn passes in False to recvRequest), indicating that
443+ -- this is not the first request. If, when trying to read the
444+ -- request headers, no data is available, recvRequest will
445+ -- throw a NoKeepAliveRequest exception, which we catch here
446+ -- and ignore. See: https://github.com/yesodweb/wai/issues/618
388− when keepAlive $ http1 addr istatus src
447+ when keepAlive $ http1 False addr istatus src
390 processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
449 processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
391 -- Let the application run for as long as it wants
450 -- Let the application run for as long as it wants
@@ -395,32 +454,38 @@ serveConnection conn ii origAddr transport settings app = do
395 -- creating the request, we need to make sure that we don't get
454 -- creating the request, we need to make sure that we don't get
396 -- an async exception before calling the ResponseSource.
455 -- an async exception before calling the ResponseSource.
397 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
456 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
398− _ <- app req $ \res -> do
457+ r <- E.try $ app req $ \res -> do
399 T.resume th
458 T.resume th
400 -- FIXME consider forcing evaluation of the res here to
459 -- FIXME consider forcing evaluation of the res here to
401 -- send more meaningful error messages to the user.
460 -- send more meaningful error messages to the user.
402 -- However, it may affect performance.
461 -- However, it may affect performance.
403 writeIORef istatus False
462 writeIORef istatus False
404− keepAlive <- sendResponse
405− (settingsServerName settings)
406− conn ii req idxhdr (readSource src) res
463+ keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
407 writeIORef keepAliveRef keepAlive
464 writeIORef keepAliveRef keepAlive
408 return ResponseReceived
465 return ResponseReceived
467+ Right ResponseReceived -> return ()
468+ Left e@(SomeException _)
469+ | Just (ExceptionInsideResponseBody e') <- fromException e -> throwIO e'
471+ keepAlive <- sendErrorResponse req istatus e
472+ settingsOnException settings (Just req) e
473+ writeIORef keepAliveRef keepAlive
409 keepAlive <- readIORef keepAliveRef
475 keepAlive <- readIORef keepAliveRef
411 -- We just send a Response and it takes a time to
477 -- We just send a Response and it takes a time to
412 -- receive a Request again. If we immediately call recv,
478 -- receive a Request again. If we immediately call recv,
413− -- it is likely to fail and the IO manager works.
479+ -- it is likely to fail and cause the IO manager to do some work.
414− -- It is very costly. So, we yield to another Haskell
480+ -- It is very costly, so we yield to another Haskell
415 -- thread hoping that the next Request will arrive
481 -- thread hoping that the next Request will arrive
416 -- when this Haskell thread will be re-scheduled.
482 -- when this Haskell thread will be re-scheduled.
417 -- This improves performance at least when
483 -- This improves performance at least when
418 -- the number of cores is small.
484 -- the number of cores is small.
419 Conc.yield
485 Conc.yield
421− if not keepAlive then
487+ if keepAlive
422− return False
488+ then
424 -- If there is an unknown or large amount of data to still be read
489 -- If there is an unknown or large amount of data to still be read
425 -- from the request body, simple drop this connection instead of
490 -- from the request body, simple drop this connection instead of
426 -- reading it all in to satisfy a keep-alive request.
491 -- reading it all in to satisfy a keep-alive request.
@@ -446,6 +511,21 @@ serveConnection conn ii origAddr transport settings app = do
447 return False
512 return False
448 Nothing -> tryKeepAlive
513 Nothing -> tryKeepAlive
517+ checkTLS = case transport of
518+ TCP -> return () -- direct
519+ tls -> unless (tls12orLater tls) $ goaway conn H2.InadequateSecurity "Weak TLS"
520+ tls12orLater tls = tlsMajorVersion tls == 3 && tlsMinorVersion tls >= 3
522+-- connClose must not be called here since Run:fork calls it
523+goaway :: Connection -> H2.ErrorCodeId -> ByteString -> IO ()
524+goaway Connection{..} etype debugmsg = connSendAll bytestream
526+ einfo = H2.encodeInfo id 0
527+ frame = H2.GoAwayFrame 0 etype debugmsg
528+ bytestream = H2.encodeFrame einfo frame
450flushEntireBody :: IO ByteString -> IO ()
530flushEntireBody :: IO ByteString -> IO ()
451flushEntireBody src =
531flushEntireBody src =
@@ -470,22 +550,50 @@ flushBody src =
470 | toRead' >= 0 -> loop toRead'
550 | toRead' >= 0 -> loop toRead'
471 | otherwise -> return False
551 | otherwise -> return False
473−wrappedRecv :: Connection -> T.Handle -> IORef Bool -> IO ByteString
553+wrappedRecv :: Connection -> T.Handle -> IORef Bool -> Int -> IO ByteString
474−wrappedRecv Connection { connRecv = recv } th istatus = do
554+wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
475 bs <- recv
555 bs <- recv
476 unless (S.null bs) $ do
556 unless (S.null bs) $ do
477 writeIORef istatus True
557 writeIORef istatus True
478− when (S.length bs >= 2048) $ T.tickle th
558+ when (S.length bs >= slowlorisSize) $ T.tickle th
479 return bs
559 return bs
561+wrappedRecvN :: T.Handle -> IORef Bool -> Int -> (BufSize -> IO ByteString) -> (BufSize -> IO ByteString)
562+wrappedRecvN th istatus slowlorisSize readN bufsize = do
564+ unless (S.null bs) $ do
565+ writeIORef istatus True
566+ -- TODO: think about the slowloris protection in HTTP2: current code
567+ -- might open a slow-loris attack vector. Rather than timing we should
568+ -- consider limiting the per-client connections assuming that in HTTP2
569+ -- we should allow only few connections per host (real-world
570+ -- deployments with large NATs may be trickier).
571+ when (S.length bs >= slowlorisSize || bufsize <= slowlorisSize) $ T.tickle th
574+-- | Set flag FileCloseOnExec flag on a socket (on Unix)
481-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
576-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
482setSocketCloseOnExec :: Socket -> IO ()
579setSocketCloseOnExec :: Socket -> IO ()
483#if WINDOWS
580#if WINDOWS
484setSocketCloseOnExec _ = return ()
581setSocketCloseOnExec _ = return ()
486−setSocketCloseOnExec socket =
583+setSocketCloseOnExec socket = do
487− setFdOption (fromIntegral $ fdSocket socket) CloseOnExec True
584+#if MIN_VERSION_network(3,0,0)
585+ fd <- fdSocket socket
587+ let fd = fdSocket socket
589+ F.setFileCloseOnExec $ fromIntegral fd
490−gracefulShutdown :: Counter -> IO ()
592+gracefulShutdown :: Settings -> Counter -> IO ()
491−gracefulShutdown counter = waitForZero counter
593+gracefulShutdown set counter =
594+ case settingsGracefulShutdownTimeout set of
598+ void (timeout (seconds * microsPerSecond) (waitForZero counter))
599+ where microsPerSecond = 1000000