@@ -1,71 +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)
42+import Network.Wai.Handler.Warp.HTTP2.Types (isHTTP2)
28import Network.Wai.Handler.Warp.Header
43import Network.Wai.Handler.Warp.Header
44+import Network.Wai.Handler.Warp.Imports hiding (readInt)
29import Network.Wai.Handler.Warp.ReadInt
45import Network.Wai.Handler.Warp.ReadInt
30import Network.Wai.Handler.Warp.Recv
46import Network.Wai.Handler.Warp.Recv
31import Network.Wai.Handler.Warp.Request
47import Network.Wai.Handler.Warp.Request
32import Network.Wai.Handler.Warp.Response
48import Network.Wai.Handler.Warp.Response
33import Network.Wai.Handler.Warp.SendFile
49import Network.Wai.Handler.Warp.SendFile
34import Network.Wai.Handler.Warp.Settings
50import Network.Wai.Handler.Warp.Settings
35−import qualified Network.Wai.Handler.Warp.Timeout as T
36import Network.Wai.Handler.Warp.Types
51import Network.Wai.Handler.Warp.Types
37−import Network.Wai.Internal (ResponseReceived (ResponseReceived))
52+
38−import System.Environment (getEnvironment)
39−import System.IO.Error (isFullErrorType, ioeGetErrorType)
41#if WINDOWS
54#if WINDOWS
42import Network.Wai.Handler.Warp.Windows
55import Network.Wai.Handler.Warp.Windows
44−import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
45import Network.Socket (fdSocket)
57import Network.Socket (fdSocket)
48−-- | Default action value for 'Connection'.
60+-- | Creating 'Connection' for plain HTTP based on a given socket.
49−socketConnection :: Socket -> IO Connection
61+socketConnection :: Settings -> Socket -> IO Connection
62+#if MIN_VERSION_network(3,1,1)
63+socketConnection set s = do
50−socketConnection s = do
65+socketConnection _ s = do
51 bufferPool <- newBufferPool
67 bufferPool <- newBufferPool
52 writeBuf <- allocateBuffer bufferSize
68 writeBuf <- allocateBuffer bufferSize
53 let sendall = Sock.sendAll s
69 let sendall = Sock.sendAll s
70+ isH2 <- newIORef False -- HTTP/1.x
54 return Connection {
71 return Connection {
55 connSendMany = Sock.sendMany s
72 connSendMany = Sock.sendMany s
56 , connSendAll = sendall
73 , connSendAll = sendall
57− , connSendFile = defaultSendFile 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
58− , connClose = sClose s >> freeBuffer writeBuf
87+ , connFree = freeBuffer writeBuf
59 , connRecv = receive s bufferPool
88 , connRecv = receive s bufferPool
89+ , connRecvBuf = receiveBuf s
60 , connWriteBuffer = writeBuf
90 , connWriteBuffer = writeBuf
61 , connBufferSize = bufferSize
91 , connBufferSize = bufferSize
64−#if __GLASGOW_HASKELL__ < 702
65−allowInterrupt :: IO ()
66−allowInterrupt = unblock $ return ()
69-- | Run an 'Application' on the given port.
95-- | Run an 'Application' on the given port.
70-- This calls 'runSettings' with 'defaultSettings'.
96-- This calls 'runSettings' with 'defaultSettings'.
71run :: Port -> Application -> IO ()
97run :: Port -> Application -> IO ()
@@ -78,7 +104,7 @@ run p = runSettings defaultSettings { settingsPort = p }
78-- Since 3.0.9
104-- Since 3.0.9
79runEnv :: Port -> Application -> IO ()
105runEnv :: Port -> Application -> IO ()
80runEnv p app = do
106runEnv p app = do
81− mp <- fmap (lookup "PORT") getEnvironment
107+ mp <- lookupEnv "PORT"
83 maybe (run p app) runReadPort mp
109 maybe (run p app) runReadPort mp
@@ -95,7 +121,7 @@ runSettings :: Settings -> Application -> IO ()
95runSettings set app = withSocketsDo $
121runSettings set app = withSocketsDo $
97 (bindPortTCP (settingsPort set) (settingsHost set))
123 (bindPortTCP (settingsPort set) (settingsHost set))
99 (\socket -> do
125 (\socket -> do
100 setSocketCloseOnExec socket
126 setSocketCloseOnExec socket
101 runSettingsSocket set socket app)
127 runSettingsSocket set socket app)
@@ -123,10 +149,12 @@ runSettingsSocket set socket app = do
123 (s, sa) <- accept socket
149 (s, sa) <- accept socket
125 setSocketCloseOnExec s
151 setSocketCloseOnExec s
152+ -- NoDelay causes an error for AF_UNIX.
153+ setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
126− conn <- socketConnection s
154+ conn <- socketConnection set s
127 return (conn, sa)
155 return (conn, sa)
129− closeListenSocket = sClose socket
157+ closeListenSocket = close socket
131-- | The connection setup action would be expensive. A good example
159-- | The connection setup action would be expensive. A good example
132-- is initialization of TLS.
160-- is initialization of TLS.
@@ -148,9 +176,9 @@ runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMa
148-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
176-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
149runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
177runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
150runSettingsConnectionMaker x y =
178runSettingsConnectionMaker x y =
151− runSettingsConnectionMakerSecure x (go y)
179+ runSettingsConnectionMakerSecure x (toTCP <$> y)
153− go = fmap (first (fmap (, TCP)))
181+ toTCP = first ((, TCP) <$>)
155----------------------------------------------------------------
183----------------------------------------------------------------
@@ -164,25 +192,26 @@ runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport),
164runSettingsConnectionMakerSecure set getConnMaker app = do
192runSettingsConnectionMakerSecure set getConnMaker app = do
165 settingsBeforeMainLoop set
193 settingsBeforeMainLoop set
166 counter <- newCounter
194 counter <- newCounter
168− D.withDateCache $ \dc ->
169− F.withFdCache fdCacheDurationInSeconds $ \fc ->
170− withTimeoutManager $ \tm ->
171− 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
173− fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
205+ !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
206+ !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
207+ !timeoutInSeconds = settingsTimeout set * 1000000
174 withTimeoutManager f = case settingsManager set of
208 withTimeoutManager f = case settingsManager set of
175 Just tm -> f tm
209 Just tm -> f tm
176 Nothing -> bracket
210 Nothing -> bracket
177− (T.initialize $ settingsTimeout set * 1000000)
211+ (T.initialize timeoutInSeconds)
178 T.stopManager
212 T.stopManager
181−onE :: Settings -> Maybe Request -> SomeException -> IO ()
182−onE set mreq e = case fromException e of
183− Just (NotEnoughLines []) -> return ()
184− _ -> settingsOnException set mreq e
186-- Note that there is a thorough discussion of the exception safety of the
215-- Note that there is a thorough discussion of the exception safety of the
187-- following code at: https://github.com/yesodweb/wai/issues/146
216-- following code at: https://github.com/yesodweb/wai/issues/146
@@ -199,17 +228,20 @@ onE set mreq e = case fromException e of
199acceptConnection :: Settings
228acceptConnection :: Settings
200 -> IO (IO (Connection, Transport), SockAddr)
229 -> IO (IO (Connection, Transport), SockAddr)
201 -> Application
230 -> Application
203− -> Maybe F.MutableFdCache
205 -> Counter
231 -> Counter
207−acceptConnection set getConnMaker app dc fc tm counter = do
234+acceptConnection set getConnMaker app counter ii = do
208 -- First mask all exceptions in acceptLoop. This is necessary to
235 -- First mask all exceptions in acceptLoop. This is necessary to
209 -- ensure that no async exception is throw between the call to
236 -- ensure that no async exception is throw between the call to
210 -- acceptNewConnection and the registering of connClose.
237 -- acceptNewConnection and the registering of connClose.
239+ -- acceptLoop can be broken by closing the listing socket.
211− 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.
212− gracefulShutdown counter
244+ gracefulShutdown set counter
214 acceptLoop = do
246 acceptLoop = do
215 -- Allow async exceptions before receiving the next connection maker.
247 -- Allow async exceptions before receiving the next connection maker.
@@ -226,24 +258,21 @@ acceptConnection set getConnMaker app dc fc tm counter = do
226 case mx of
258 case mx of
227 Nothing -> return ()
259 Nothing -> return ()
228 Just (mkConn, addr) -> do
260 Just (mkConn, addr) -> do
229− fork set mkConn addr app dc fc tm counter
261+ fork set mkConn addr app counter ii
230 acceptLoop
262 acceptLoop
232 acceptNewConnection = do
264 acceptNewConnection = do
233 ex <- try getConnMaker
265 ex <- try getConnMaker
234 case ex of
266 case ex of
235 Right x -> return $ Just x
267 Right x -> return $ Just x
236− Left e -> do
268+ Left e -> do
237− onE set Nothing $ toException e
269+ let eConnAborted = getErrno eCONNABORTED
238− if isFullErrorType (ioeGetErrorType e) then do
270+ getErrno (Errno cInt) = cInt
239− -- "resource exhausted (Too many open files)" may
271+ if ioe_errno e == Just eConnAborted
240− -- happen by accept(). Wait a second hoping that
241− -- resource will be available.
243− acceptNewConnection
272+ then acceptNewConnection
245− -- Assuming the listen socket is closed.
274+ settingsOnException set Nothing $ toException e
246− return Nothing
275+ return Nothing
248-- 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
249-- function to unmask (i.e., allow async exceptions to be thrown).
278-- function to unmask (i.e., allow async exceptions to be thrown).
@@ -251,63 +280,97 @@ fork :: Settings
251 -> IO (Connection, Transport)
280 -> IO (Connection, Transport)
252 -> SockAddr
281 -> SockAddr
253 -> Application
282 -> Application
255− -> Maybe F.MutableFdCache
257 -> Counter
283 -> Counter
259−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) $
260− -- Run the connection maker to get a new connection, and ensure
290+ -- Run the connection maker to get a new connection, and ensure
261− -- that the connection is closed. If the mkConn call throws an
291+ -- that the connection is closed. If the mkConn call throws an
262− -- exception, we will leak the connection. If the mkConn call is
292+ -- exception, we will leak the connection. If the mkConn call is
263− -- vulnerable to attacks (e.g., Slowloris), we do nothing to
293+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
264− -- protect the server. It is therefore vital that mkConn is well
294+ -- protect the server. It is therefore vital that mkConn is well
265− -- vetted.
295+ -- vetted.
267− -- We grab the connection before registering timeouts since the
297+ -- We grab the connection before registering timeouts since the
268− -- timeouts will be useless during connection creation, due to the
298+ -- timeouts will be useless during connection creation, due to the
269− -- fact that async exceptions are still masked.
299+ -- fact that async exceptions are still masked.
270− bracket mkConn closeConn $ \(conn, transport) ->
300+ bracket mkConn cleanUp (serve unmask)
302+ cleanUp (conn, _) = connClose conn `finally` connFree conn
272 -- We need to register a timeout handler for this thread, and
304 -- We need to register a timeout handler for this thread, and
273 -- cancel that handler as soon as we exit.
305 -- cancel that handler as soon as we exit.
274− bracket (T.registerKillThread tm) T.cancel $ \th ->
306+ serve unmask (conn, transport) = bracket register cancel $ \th -> do
276− let ii = InternalInfo th fc dc
277− -- We now have fully registered a connection close handler
307+ -- We now have fully registered a connection close handler in
278− -- 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
279− -- again allow async exceptions.
309+ -- allow async exceptions.
280− in unmask .
310+ unmask .
281− -- Call the user-supplied on exception code if any
282− -- exceptions are thrown.
283− handle (onE set Nothing) .
285− -- Call the user-supplied code for connection open and close events
311+ -- Call the user-supplied code for connection open and
286− bracket (onOpen addr) (onClose addr) $ \goingon ->
313+ bracket (onOpen addr) (onClose addr) $ \goingon ->
288− -- Actually serve this connection.
314+ -- Actually serve this connection. bracket with closeConn
289− -- bracket with closeConn above ensures the connection is closed.
315+ -- above ensures the connection is closed.
290− when goingon $ serveConnection conn ii addr transport set app
316+ when goingon $ serveConnection conn ii th addr transport set app
292− closeConn (conn, _transport) = connClose conn
318+ register = T.registerKillThread (timeoutManager ii) (connClose conn)
294 onOpen adr = increase counter >> settingsOnOpen set adr
321 onOpen adr = increase counter >> settingsOnOpen set adr
295 onClose adr _ = decrease counter >> settingsOnClose set adr
322 onClose adr _ = decrease counter >> settingsOnClose set adr
297serveConnection :: Connection
324serveConnection :: Connection
298 -> InternalInfo
325 -> InternalInfo
299 -> SockAddr
327 -> SockAddr
300 -> Transport
328 -> Transport
301 -> Settings
329 -> Settings
302 -> Application
330 -> Application
304−serveConnection conn ii origAddr transport settings app = do
332+serveConnection conn ii th origAddr transport settings app = do
333+ -- fixme: Upgrading to HTTP/2 should be supported.
334+ (h2,bs) <- if isHTTP2 transport then
337+ bs0 <- connRecv conn
338+ if S.length bs0 >= 4 && "PRI " `S.isPrefixOf` bs0 then
305 istatus <- newIORef False
342 istatus <- newIORef False
343+ if settingsHTTP2Enabled settings && h2 then do
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
356+ setConnHTTP2 conn True
357+ http2 conn transport ii origAddr settings recvN sendBS app
306− src <- mkSource (connSource conn th istatus)
359+ src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
360+ writeIORef istatus True
361+ leftoverSource src bs
307− addr <- getProxyProtocolAddr src
362+ addr <- getProxyProtocolAddr src
308− 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 ()
309− sendErrorResponse addr istatus e
372+ _ <- sendErrorResponse (dummyreq addr) istatus e
310− throwIO (e :: SomeException)
373+ throwIO e
313 getProxyProtocolAddr src =
376 getProxyProtocolAddr src =
@@ -350,30 +413,38 @@ serveConnection conn ii origAddr transport settings app = do
351 decodeAscii = map (chr . fromEnum) . S.unpack
414 decodeAscii = map (chr . fromEnum) . S.unpack
353− th = threadHandle ii
416+ shouldSendErrorResponse se
417+ | Just ConnectionClosedByPeer <- fromException se = False
355− sendErrorResponse addr istatus e = do
420+ sendErrorResponse req istatus e = do
356 status <- readIORef istatus
421 status <- readIORef istatus
357− when status $ void $
422+ if shouldSendErrorResponse e && status
358− sendResponse
423+ then do
359− (settingsServerName settings)
360− conn ii (dummyreq addr) defaultIndexRequestHeader (return S.empty) (errorResponse e)
424+ sendResponse settings conn ii th req defaultIndexRequestHeader (return S.empty) (errorResponse e)
362 dummyreq addr = defaultRequest { remoteHost = addr }
427 dummyreq addr = defaultRequest { remoteHost = addr }
364 errorResponse e = settingsOnExceptionResponse settings e
429 errorResponse e = settingsOnExceptionResponse settings e
366− http1 addr istatus src = do
431+ http1 firstRequest addr istatus src = do
367− (req', mremainingRef, idxhdr, nextBodyFlush) <- recvRequest settings conn ii addr src
432+ (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
368− let req = req' { isSecure = isTransportSecure transport }
369 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
433 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
370 `E.catch` \e -> do
434 `E.catch` \e -> do
371− -- Call the user-supplied exception handlers, passing the request.
372− sendErrorResponse addr istatus e
373− onE settings (Just req) e
435+ settingsOnException settings (Just req) e
374− -- Don't throw the error again to prevent calling onE twice.
436+ -- Don't throw the error again to prevent calling settingsOnException twice.
375 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
376− when keepAlive $ http1 addr istatus src
447+ when keepAlive $ http1 False addr istatus src
378 processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
449 processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
379 -- Let the application run for as long as it wants
450 -- Let the application run for as long as it wants
@@ -383,32 +454,38 @@ serveConnection conn ii origAddr transport settings app = do
383 -- 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
384 -- an async exception before calling the ResponseSource.
455 -- an async exception before calling the ResponseSource.
385 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
456 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
386− _ <- app req $ \res -> do
457+ r <- E.try $ app req $ \res -> do
387 T.resume th
458 T.resume th
388 -- FIXME consider forcing evaluation of the res here to
459 -- FIXME consider forcing evaluation of the res here to
389 -- send more meaningful error messages to the user.
460 -- send more meaningful error messages to the user.
390 -- However, it may affect performance.
461 -- However, it may affect performance.
391 writeIORef istatus False
462 writeIORef istatus False
392− keepAlive <- sendResponse
393− (settingsServerName settings)
394− conn ii req idxhdr (readSource src) res
463+ keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
395 writeIORef keepAliveRef keepAlive
464 writeIORef keepAliveRef keepAlive
396 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
397 keepAlive <- readIORef keepAliveRef
475 keepAlive <- readIORef keepAliveRef
399 -- We just send a Response and it takes a time to
477 -- We just send a Response and it takes a time to
400 -- receive a Request again. If we immediately call recv,
478 -- receive a Request again. If we immediately call recv,
401− -- 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.
402− -- It is very costly. So, we yield to another Haskell
480+ -- It is very costly, so we yield to another Haskell
403 -- thread hoping that the next Request will arrive
481 -- thread hoping that the next Request will arrive
404 -- when this Haskell thread will be re-scheduled.
482 -- when this Haskell thread will be re-scheduled.
405 -- This improves performance at least when
483 -- This improves performance at least when
406 -- the number of cores is small.
484 -- the number of cores is small.
407 Conc.yield
485 Conc.yield
409− if not keepAlive then
487+ if keepAlive
410− return False
488+ then
412 -- 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
413 -- from the request body, simple drop this connection instead of
490 -- from the request body, simple drop this connection instead of
414 -- reading it all in to satisfy a keep-alive request.
491 -- reading it all in to satisfy a keep-alive request.
@@ -434,6 +511,21 @@ serveConnection conn ii origAddr transport settings app = do
435 return False
512 return False
436 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
438flushEntireBody :: IO ByteString -> IO ()
530flushEntireBody :: IO ByteString -> IO ()
439flushEntireBody src =
531flushEntireBody src =
@@ -458,22 +550,50 @@ flushBody src =
458 | toRead' >= 0 -> loop toRead'
550 | toRead' >= 0 -> loop toRead'
459 | otherwise -> return False
551 | otherwise -> return False
461−connSource :: Connection -> T.Handle -> IORef Bool -> IO ByteString
553+wrappedRecv :: Connection -> T.Handle -> IORef Bool -> Int -> IO ByteString
462−connSource Connection { connRecv = recv } th istatus = do
554+wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
463 bs <- recv
555 bs <- recv
464 unless (S.null bs) $ do
556 unless (S.null bs) $ do
465 writeIORef istatus True
557 writeIORef istatus True
466− when (S.length bs >= 2048) $ T.tickle th
558+ when (S.length bs >= slowlorisSize) $ T.tickle th
467 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)
469-- 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
470setSocketCloseOnExec :: Socket -> IO ()
579setSocketCloseOnExec :: Socket -> IO ()
471#if WINDOWS
580#if WINDOWS
472setSocketCloseOnExec _ = return ()
581setSocketCloseOnExec _ = return ()
474−setSocketCloseOnExec socket =
583+setSocketCloseOnExec socket = do
475− 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
478−gracefulShutdown :: Counter -> IO ()
592+gracefulShutdown :: Settings -> Counter -> IO ()
479−gracefulShutdown counter = waitForZero counter
593+gracefulShutdown set counter =
594+ case settingsGracefulShutdownTimeout set of
598+ void (timeout (seconds * microsPerSecond) (waitForZero counter))
599+ where microsPerSecond = 1000000