@@ -1,86 +1,101 @@
1+{-# LANGUAGE BangPatterns #-}
12{-# LANGUAGE CPP #-}
23{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE PackageImports #-}
5+{-# LANGUAGE PatternGuards #-}
6+{-# LANGUAGE RecordWildCards #-}
37{-# LANGUAGE ScopedTypeVariables #-}
48{-# LANGUAGE TupleSections #-}
9+{-# LANGUAGE ViewPatterns #-}
510{-# OPTIONS_GHC -fno-warn-deprecations #-}
611
712module Network.Wai.Handler.Warp.Run where
813
14+import "iproute" Data.IP (toHostAddress, toHostAddress6)
915import Control.Arrow (first)
10−import Control.Concurrent (threadDelay)
1116import qualified Control.Concurrent as Conc (yield)
1217import Control.Exception as E
13−import Control.Monad (when, unless, void)
14−import Data.ByteString (ByteString)
1518import qualified Data.ByteString as S
1619import Data.Char (chr)
17−import Data.IP (toHostAddress, toHostAddress6)
1820import Data.IORef (IORef, newIORef, readIORef, writeIORef)
1921import Data.Streaming.Network (bindPortTCP)
20−import Network (sClose, Socket)
21−import Network.Socket (accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6))
22+import Foreign.C.Error (Errno(..), eCONNABORTED)
23+import GHC.IO.Exception (IOException(..))
24+import qualified Network.HTTP2 as H2
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)
28+#endif
2229import qualified Network.Socket.ByteString as Sock
2330import Network.Wai
24−import Network.Wai.HTTP2 (Http2Application)
31+import Network.Wai.Internal (ResponseReceived (ResponseReceived))
32+import System.Environment (lookupEnv)
33+import qualified System.TimeManager as T
34+import System.Timeout (timeout)
35+
2536import Network.Wai.Handler.Warp.Buffer
2637import Network.Wai.Handler.Warp.Counter
2738import qualified Network.Wai.Handler.Warp.Date as D
2839import qualified Network.Wai.Handler.Warp.FdCache as F
29−import Network.Wai.Handler.Warp.HTTP2 (http2, isHTTP2, promoteApplication)
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)
3043import Network.Wai.Handler.Warp.Header
44+import Network.Wai.Handler.Warp.Imports hiding (readInt)
3145import Network.Wai.Handler.Warp.ReadInt
3246import Network.Wai.Handler.Warp.Recv
3347import Network.Wai.Handler.Warp.Request
3448import Network.Wai.Handler.Warp.Response
3549import Network.Wai.Handler.Warp.SendFile
3650import Network.Wai.Handler.Warp.Settings
37−import qualified Network.Wai.Handler.Warp.Timeout as T
3851import Network.Wai.Handler.Warp.Types
39−import Network.Wai.Internal (ResponseReceived (ResponseReceived))
40−import System.Environment (getEnvironment)
41−import System.IO.Error (isFullErrorType, ioeGetErrorType)
52+
4253
4354#if WINDOWS
4455import Network.Wai.Handler.Warp.Windows
4556#else
46−import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
4757import Network.Socket (fdSocket)
4858#endif
4959
5060-- | Creating 'Connection' for plain HTTP based on a given socket.
51−socketConnection :: Socket -> IO Connection
52−socketConnection s = do
61+socketConnection :: Settings -> Socket -> IO Connection
62+#if MIN_VERSION_network(3,1,1)
63+socketConnection set s = do
64+#else
65+socketConnection _ s = do
66+#endif
5367 bufferPool <- newBufferPool
5468 writeBuf <- allocateBuffer bufferSize
5569 let sendall = Sock.sendAll s
70+ isH2 <- newIORef False -- HTTP/1.x
5671 return Connection {
5772 connSendMany = Sock.sendMany s
5873 , connSendAll = sendall
5974 , connSendFile = sendFile s writeBuf bufferSize sendall
60− , connClose = sClose s >> freeBuffer writeBuf
75+#if MIN_VERSION_network(3,1,1)
76+ , connClose = do
77+ h2 <- readIORef isH2
78+ let tm = if h2 then settingsGracefulCloseTimeout2 set
79+ else settingsGracefulCloseTimeout1 set
80+ if tm == 0 then
81+ close s
82+ else
83+ gracefulClose s tm `E.catch` \(E.SomeException _) -> return ()
84+#else
85+ , connClose = close s
86+#endif
87+ , connFree = freeBuffer writeBuf
6188 , connRecv = receive s bufferPool
6289 , connRecvBuf = receiveBuf s
6390 , connWriteBuffer = writeBuf
6491 , connBufferSize = bufferSize
92+ , connHTTP2 = isH2
6593 }
6694
67−#if __GLASGOW_HASKELL__ < 702
68−allowInterrupt :: IO ()
69−allowInterrupt = unblock $ return ()
70−#endif
71−
72−-- Used to duplicate the 'app' argument for all of the non-HTTP2 variants.
73−runWithPromotedApp :: (Http2Application -> Application -> a) -> Application -> a
74−runWithPromotedApp f = flip f <*> promoteApplication
75−
7695-- | Run an 'Application' on the given port.
7796-- This calls 'runSettings' with 'defaultSettings'.
7897run :: Port -> Application -> IO ()
79−run = runWithPromotedApp . runHttp2
80−
81−-- | The HTTP/2-aware eqivalent of 'run'.
82−runHttp2 :: Port -> Http2Application -> Application -> IO ()
83−runHttp2 p = runHttp2Settings defaultSettings { settingsPort = p }
98+run p = runSettings defaultSettings { settingsPort = p }
8499
85100-- | Run an 'Application' on the port present in the @PORT@
86101-- environment variable. Uses the 'Port' given when the variable is unset.
@@ -88,36 +103,28 @@ runHttp2 p = runHttp2Settings defaultSettings { settingsPort = p }
88103--
89104-- Since 3.0.9
90105runEnv :: Port -> Application -> IO ()
91−runEnv = runWithPromotedApp . runHttp2Env
92−
93−-- | The HTTP/2-aware eqivalent of 'runEnv'.
94−runHttp2Env :: Port -> Http2Application -> Application -> IO ()
95−runHttp2Env p app2 app = do
96− mp <- fmap (lookup "PORT") getEnvironment
106+runEnv p app = do
107+ mp <- lookupEnv "PORT"
97108
98109 maybe (run p app) runReadPort mp
99110
100111 where
101112 runReadPort :: String -> IO ()
102113 runReadPort sp = case reads sp of
103− ((p', _):_) -> runHttp2 p' app2 app
114+ ((p', _):_) -> run p' app
104115 _ -> fail $ "Invalid value in $PORT: " ++ sp
105116
106117-- | Run an 'Application' with the given 'Settings'.
107118-- This opens a listen socket on the port defined in 'Settings' and
108119-- calls 'runSettingsSocket'.
109120runSettings :: Settings -> Application -> IO ()
110−runSettings = runWithPromotedApp . runHttp2Settings
111−
112−-- | The HTTP/2-aware eqivalent of 'runSettings'.
113−runHttp2Settings :: Settings -> Http2Application -> Application -> IO ()
114−runHttp2Settings set app2 app = withSocketsDo $
121+runSettings set app = withSocketsDo $
115122 bracket
116123 (bindPortTCP (settingsPort set) (settingsHost set))
117− sClose
124+ close
118125 (\socket -> do
119126 setSocketCloseOnExec socket
120− runHttp2SettingsSocket set socket app2 app)
127+ runSettingsSocket set socket app)
121128
122129-- | This installs a shutdown handler for the given socket and
123130-- calls 'runSettingsConnection' with the default connection setup action
@@ -131,14 +138,9 @@ runHttp2Settings set app2 app = withSocketsDo $
131138-- Note that the 'settingsPort' will still be passed to 'Application's via the
132139-- 'serverPort' record.
133140runSettingsSocket :: Settings -> Socket -> Application -> IO ()
134−runSettingsSocket set socket = runWithPromotedApp $
135− runHttp2SettingsSocket set socket
136−
137−-- | The HTTP/2-aware eqivalent of 'runSettingsSocket'.
138−runHttp2SettingsSocket :: Settings -> Socket -> Http2Application -> Application -> IO ()
139−runHttp2SettingsSocket set socket app2 app = do
141+runSettingsSocket set socket app = do
140142 settingsInstallShutdownHandler set closeListenSocket
141− runHttp2SettingsConnection set getConn app2 app
143+ runSettingsConnection set getConn app
142144 where
143145 getConn = do
144146#if WINDOWS
@@ -147,10 +149,12 @@ runHttp2SettingsSocket set socket app2 app = do
147149 (s, sa) <- accept socket
148150#endif
149151 setSocketCloseOnExec s
150− conn <- socketConnection s
152+ -- NoDelay causes an error for AF_UNIX.
153+ setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
154+ conn <- socketConnection set s
151155 return (conn, sa)
152156
153− closeListenSocket = sClose socket
157+ closeListenSocket = close socket
154158
155159-- | The connection setup action would be expensive. A good example
156160-- is initialization of TLS.
@@ -162,13 +166,7 @@ runHttp2SettingsSocket set socket app2 app = do
162166--
163167-- Since 1.3.5
164168runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
165−runSettingsConnection set getConn = runWithPromotedApp $
166− runHttp2SettingsConnection set getConn
167−
168−-- | The HTTP/2-aware eqivalent of 'runSettingsConnection'.
169−runHttp2SettingsConnection :: Settings -> IO (Connection, SockAddr) -> Http2Application -> Application -> IO ()
170−runHttp2SettingsConnection set getConn app2 app =
171− runHttp2SettingsConnectionMaker set getConnMaker app2 app
169+runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMaker app
172170 where
173171 getConnMaker = do
174172 (conn, sa) <- getConn
@@ -177,15 +175,10 @@ runHttp2SettingsConnection set getConn app2 app =
177175-- | This modifies the connection maker so that it returns 'TCP' for 'Transport'
178176-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
179177runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
180−runSettingsConnectionMaker x y = runWithPromotedApp $
181− runHttp2SettingsConnectionMaker x y
182−
183−-- | The HTTP/2-aware eqivalent of 'runSettingsConnectionMaker'.
184−runHttp2SettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Http2Application -> Application -> IO ()
185−runHttp2SettingsConnectionMaker x y =
186− runHttp2SettingsConnectionMakerSecure x (go y)
178+runSettingsConnectionMaker x y =
179+ runSettingsConnectionMakerSecure x (toTCP <$> y)
187180 where
188− go = fmap (first (fmap (, TCP)))
181+ toTCP = first ((, TCP) <$>)
189182
190183----------------------------------------------------------------
191184
@@ -196,25 +189,26 @@ runHttp2SettingsConnectionMaker x y =
196189--
197190-- Since 2.1.4
198191runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
199−runSettingsConnectionMakerSecure set getConnMaker = runWithPromotedApp $
200− runHttp2SettingsConnectionMakerSecure set getConnMaker
201−
202−-- | The HTTP/2-aware eqivalent of 'runSettingsConnectionMakerSecure'.
203−runHttp2SettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Http2Application -> Application -> IO ()
204−runHttp2SettingsConnectionMakerSecure set getConnMaker app2 app = do
192+runSettingsConnectionMakerSecure set getConnMaker app = do
205193 settingsBeforeMainLoop set
206194 counter <- newCounter
207−
208− D.withDateCache $ \dc ->
209− F.withFdCache fdCacheDurationInSeconds $ \fc ->
210− withTimeoutManager $ \tm ->
211− acceptConnection set getConnMaker app2 app dc fc tm counter
195+ withII $ acceptConnection set getConnMaker app counter
212196 where
213− fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
197+ withII action =
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
203+ action ii
204+
205+ !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
206+ !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
207+ !timeoutInSeconds = settingsTimeout set * 1000000
214208 withTimeoutManager f = case settingsManager set of
215209 Just tm -> f tm
216210 Nothing -> bracket
217− (T.initialize $ settingsTimeout set * 1000000)
211+ (T.initialize timeoutInSeconds)
218212 T.stopManager
219213 f
220214
@@ -233,19 +227,21 @@ runHttp2SettingsConnectionMakerSecure set getConnMaker app2 app = do
233227-- Our approach is explained in the comments below.
234228acceptConnection :: Settings
235229 -> IO (IO (Connection, Transport), SockAddr)
236− -> Http2Application
237230 -> Application
238− -> D.DateCache
239− -> Maybe F.MutableFdCache
240− -> T.Manager
241231 -> Counter
232+ -> InternalInfo
242233 -> IO ()
243−acceptConnection set getConnMaker app2 app dc fc tm counter = do
234+acceptConnection set getConnMaker app counter ii = do
244235 -- First mask all exceptions in acceptLoop. This is necessary to
245236 -- ensure that no async exception is throw between the call to
246237 -- acceptNewConnection and the registering of connClose.
238+ --
239+ -- acceptLoop can be broken by closing the listing socket.
247240 void $ mask_ acceptLoop
248− gracefulShutdown counter
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.
244+ gracefulShutdown set counter
249245 where
250246 acceptLoop = do
251247 -- Allow async exceptions before receiving the next connection maker.
@@ -262,84 +258,78 @@ acceptConnection set getConnMaker app2 app dc fc tm counter = do
262258 case mx of
263259 Nothing -> return ()
264260 Just (mkConn, addr) -> do
265− fork set mkConn addr app2 app dc fc tm counter
261+ fork set mkConn addr app counter ii
266262 acceptLoop
267263
268264 acceptNewConnection = do
269265 ex <- try getConnMaker
270266 case ex of
271267 Right x -> return $ Just x
272− Left e -> do
273− settingsOnException set Nothing $ toException e
274− if isFullErrorType (ioeGetErrorType e) then do
275− -- "resource exhausted (Too many open files)" may
276− -- happen by accept(). Wait a second hoping that
277− -- resource will be available.
278− threadDelay 1000000
279− acceptNewConnection
280− else
281− -- Assuming the listen socket is closed.
282− return Nothing
268+ Left e -> do
269+ let eConnAborted = getErrno eCONNABORTED
270+ getErrno (Errno cInt) = cInt
271+ if ioe_errno e == Just eConnAborted
272+ then acceptNewConnection
273+ else do
274+ settingsOnException set Nothing $ toException e
275+ return Nothing
283276
284277-- Fork a new worker thread for this connection maker, and ask for a
285278-- function to unmask (i.e., allow async exceptions to be thrown).
286279fork :: Settings
287280 -> IO (Connection, Transport)
288281 -> SockAddr
289− -> Http2Application
290282 -> Application
291− -> D.DateCache
292− -> Maybe F.MutableFdCache
293− -> T.Manager
294283 -> Counter
284+ -> InternalInfo
295285 -> IO ()
296−fork set mkConn addr app2 app dc fc tm counter = settingsFork set $ \ unmask ->
297− -- Run the connection maker to get a new connection, and ensure
298− -- that the connection is closed. If the mkConn call throws an
299− -- exception, we will leak the connection. If the mkConn call is
300− -- vulnerable to attacks (e.g., Slowloris), we do nothing to
301− -- protect the server. It is therefore vital that mkConn is well
302− -- vetted.
303− --
304− -- We grab the connection before registering timeouts since the
305− -- timeouts will be useless during connection creation, due to the
306− -- fact that async exceptions are still masked.
307− bracket mkConn closeConn $ \(conn, transport) ->
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) $
290+ -- Run the connection maker to get a new connection, and ensure
291+ -- that the connection is closed. If the mkConn call throws an
292+ -- exception, we will leak the connection. If the mkConn call is
293+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
294+ -- protect the server. It is therefore vital that mkConn is well
295+ -- vetted.
296+ --
297+ -- We grab the connection before registering timeouts since the
298+ -- timeouts will be useless during connection creation, due to the
299+ -- fact that async exceptions are still masked.
300+ bracket mkConn cleanUp (serve unmask)
301+ where
302+ cleanUp (conn, _) = connClose conn `finally` connFree conn
308303
309304 -- We need to register a timeout handler for this thread, and
310305 -- cancel that handler as soon as we exit.
311− bracket (T.registerKillThread tm) T.cancel $ \th ->
312−
313− let ii = InternalInfo th tm fc dc
314− -- We now have fully registered a connection close handler
315− -- in the case of all exceptions, so it is safe to one
316− -- again allow async exceptions.
317− in unmask .
318− -- Call the user-supplied on exception code if any
319− -- exceptions are thrown.
320− handle (settingsOnException set Nothing) .
321−
322− -- Call the user-supplied code for connection open and close events
323− bracket (onOpen addr) (onClose addr) $ \goingon ->
324−
325− -- Actually serve this connection.
326− -- bracket with closeConn above ensures the connection is closed.
327− when goingon $ serveConnection conn ii addr transport set app2 app
328− where
329− closeConn (conn, _transport) = connClose conn
306+ serve unmask (conn, transport) = bracket register cancel $ \th -> do
307+ -- We now have fully registered a connection close handler in
308+ -- the case of all exceptions, so it is safe to once again
309+ -- allow async exceptions.
310+ unmask .
311+ -- Call the user-supplied code for connection open and
312+ -- close events
313+ bracket (onOpen addr) (onClose addr) $ \goingon ->
314+ -- Actually serve this connection. bracket with closeConn
315+ -- above ensures the connection is closed.
316+ when goingon $ serveConnection conn ii th addr transport set app
317+ where
318+ register = T.registerKillThread (timeoutManager ii) (connClose conn)
319+ cancel = T.cancel
330320
331321 onOpen adr = increase counter >> settingsOnOpen set adr
332322 onClose adr _ = decrease counter >> settingsOnClose set adr
333323
334324serveConnection :: Connection
335325 -> InternalInfo
326+ -> T.Handle
336327 -> SockAddr
337328 -> Transport
338329 -> Settings
339− -> Http2Application
340330 -> Application
341331 -> IO ()
342−serveConnection conn ii origAddr transport settings app2 app = do
332+serveConnection conn ii th origAddr transport settings app = do
343333 -- fixme: Upgrading to HTTP/2 should be supported.
344334 (h2,bs) <- if isHTTP2 transport then
345335 return (True, "")
@@ -349,19 +339,39 @@ serveConnection conn ii origAddr transport settings app2 app = do
349339 return (True, bs0)
350340 else
351341 return (False, bs0)
352− if h2 then do
353− recvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
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
354354 -- fixme: origAddr
355− http2 conn ii origAddr transport settings recvN app2
355+ checkTLS
356+ setConnHTTP2 conn True
357+ http2 conn transport ii origAddr settings recvN sendBS app
356358 else do
357− istatus <- newIORef False
358359 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
359360 writeIORef istatus True
360361 leftoverSource src bs
361362 addr <- getProxyProtocolAddr src
362− http1 addr istatus src `E.catch` \e -> do
363− sendErrorResponse addr istatus e
364− throwIO (e :: SomeException)
363+ http1 True addr istatus src `E.catch` \e ->
364+ case () of
365+ ()
366+ -- See comment below referencing
367+ -- https://github.com/yesodweb/wai/issues/618
368+ | Just NoKeepAliveRequest <- fromException e -> return ()
369+ -- No valid request
370+ | Just (BadFirstLine _) <- fromException e -> return ()
371+ | otherwise -> do
372+ _ <- sendErrorResponse (dummyreq addr) istatus e
373+ throwIO e
374+
365375 where
366376 getProxyProtocolAddr src =
367377 case settingsProxyProtocol settings of
@@ -403,30 +413,38 @@ serveConnection conn ii origAddr transport settings app2 app = do
403413
404414 decodeAscii = map (chr . fromEnum) . S.unpack
405415
406− th = threadHandle ii
416+ shouldSendErrorResponse se
417+ | Just ConnectionClosedByPeer <- fromException se = False
418+ | otherwise = True
407419
408− sendErrorResponse addr istatus e = do
420+ sendErrorResponse req istatus e = do
409421 status <- readIORef istatus
410− when status $ void $
411− sendResponse
412− (settingsServerName settings)
413− conn ii (dummyreq addr) defaultIndexRequestHeader (return S.empty) (errorResponse e)
422+ if shouldSendErrorResponse e && status
423+ then do
424+ sendResponse settings conn ii th req defaultIndexRequestHeader (return S.empty) (errorResponse e)
425+ else return False
414426
415427 dummyreq addr = defaultRequest { remoteHost = addr }
416428
417429 errorResponse e = settingsOnExceptionResponse settings e
418430
419− http1 addr istatus src = do
420− (req', mremainingRef, idxhdr, nextBodyFlush) <- recvRequest settings conn ii addr src
421− let req = req' { isSecure = isTransportSecure transport }
431+ http1 firstRequest addr istatus src = do
432+ (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
422433 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
423434 `E.catch` \e -> do
424− -- Call the user-supplied exception handlers, passing the request.
425− sendErrorResponse addr istatus e
426435 settingsOnException settings (Just req) e
427436 -- Don't throw the error again to prevent calling settingsOnException twice.
428437 return False
429− when keepAlive $ http1 addr istatus src
438+
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
447+ when keepAlive $ http1 False addr istatus src
430448
431449 processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
432450 -- Let the application run for as long as it wants
@@ -436,32 +454,38 @@ serveConnection conn ii origAddr transport settings app2 app = do
436454 -- creating the request, we need to make sure that we don't get
437455 -- an async exception before calling the ResponseSource.
438456 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
439− _ <- app req $ \res -> do
457+ r <- E.try $ app req $ \res -> do
440458 T.resume th
441459 -- FIXME consider forcing evaluation of the res here to
442460 -- send more meaningful error messages to the user.
443461 -- However, it may affect performance.
444462 writeIORef istatus False
445− keepAlive <- sendResponse
446− (settingsServerName settings)
447− conn ii req idxhdr (readSource src) res
463+ keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
448464 writeIORef keepAliveRef keepAlive
449465 return ResponseReceived
466+ case r of
467+ Right ResponseReceived -> return ()
468+ Left e@(SomeException _)
469+ | Just (ExceptionInsideResponseBody e') <- fromException e -> throwIO e'
470+ | otherwise -> do
471+ keepAlive <- sendErrorResponse req istatus e
472+ settingsOnException settings (Just req) e
473+ writeIORef keepAliveRef keepAlive
474+
450475 keepAlive <- readIORef keepAliveRef
451476
452477 -- We just send a Response and it takes a time to
453478 -- receive a Request again. If we immediately call recv,
454− -- it is likely to fail and the IO manager works.
455− -- It is very costly. So, we yield to another Haskell
479+ -- it is likely to fail and cause the IO manager to do some work.
480+ -- It is very costly, so we yield to another Haskell
456481 -- thread hoping that the next Request will arrive
457482 -- when this Haskell thread will be re-scheduled.
458483 -- This improves performance at least when
459484 -- the number of cores is small.
460485 Conc.yield
461486
462− if not keepAlive then
463− return False
464− else
487+ if keepAlive
488+ then
465489 -- If there is an unknown or large amount of data to still be read
466490 -- from the request body, simple drop this connection instead of
467491 -- reading it all in to satisfy a keep-alive request.
@@ -487,6 +511,21 @@ serveConnection conn ii origAddr transport settings app2 app = do
487511 else
488512 return False
489513 Nothing -> tryKeepAlive
514+ else
515+ return False
516+
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
521+
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
525+ where
526+ einfo = H2.encodeInfo id 0
527+ frame = H2.GoAwayFrame 0 etype debugmsg
528+ bytestream = H2.encodeFrame einfo frame
490529
491530flushEntireBody :: IO ByteString -> IO ()
492531flushEntireBody src =
@@ -519,14 +558,42 @@ wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
519558 when (S.length bs >= slowlorisSize) $ T.tickle th
520559 return bs
521560
561+wrappedRecvN :: T.Handle -> IORef Bool -> Int -> (BufSize -> IO ByteString) -> (BufSize -> IO ByteString)
562+wrappedRecvN th istatus slowlorisSize readN bufsize = do
563+ bs <- readN bufsize
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
572+ return bs
573+
574+-- | Set flag FileCloseOnExec flag on a socket (on Unix)
575+--
522576-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
577+--
578+-- @since 3.2.17
523579setSocketCloseOnExec :: Socket -> IO ()
524580#if WINDOWS
525581setSocketCloseOnExec _ = return ()
526582#else
527−setSocketCloseOnExec socket =
528− setFdOption (fromIntegral $ fdSocket socket) CloseOnExec True
583+setSocketCloseOnExec socket = do
584+#if MIN_VERSION_network(3,0,0)
585+ fd <- fdSocket socket
586+#else
587+ let fd = fdSocket socket
588+#endif
589+ F.setFileCloseOnExec $ fromIntegral fd
529590#endif
530591
531−gracefulShutdown :: Counter -> IO ()
532−gracefulShutdown counter = waitForZero counter
592+gracefulShutdown :: Settings -> Counter -> IO ()
593+gracefulShutdown set counter =
594+ case settingsGracefulShutdownTimeout set of
595+ Nothing ->
596+ waitForZero counter
597+ (Just seconds) ->
598+ void (timeout (seconds * microsPerSecond) (waitForZero counter))
599+ where microsPerSecond = 1000000