@@ -1,85 +1,110 @@
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
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+
2436import Network.Wai.Handler.Warp.Buffer
2537import Network.Wai.Handler.Warp.Counter
2638import qualified Network.Wai.Handler.Warp.Date as D
2739import 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)
2843import Network.Wai.Handler.Warp.Header
44+import Network.Wai.Handler.Warp.Imports hiding (readInt)
2945import Network.Wai.Handler.Warp.ReadInt
3046import Network.Wai.Handler.Warp.Recv
3147import Network.Wai.Handler.Warp.Request
3248import Network.Wai.Handler.Warp.Response
3349import Network.Wai.Handler.Warp.SendFile
3450import Network.Wai.Handler.Warp.Settings
35−import qualified Network.Wai.Handler.Warp.Timeout as T
3651import Network.Wai.Handler.Warp.Types
37−import Network.Wai.Internal (ResponseReceived (ResponseReceived))
38−import System.Environment (getEnvironment)
39−import System.IO.Error (isFullErrorType, ioeGetErrorType)
52+
4053
4154#if WINDOWS
4255import Network.Wai.Handler.Warp.Windows
4356#else
44−import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
4557import Network.Socket (fdSocket)
4658#endif
4759
48−-- | Default action value for 'Connection'.
49−socketConnection :: Socket -> IO Connection
50−socketConnection s = do
51− readBuf <- allocateBuffer bufferSize
60+-- | Creating 'Connection' for plain HTTP based on a given socket.
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
67+ bufferPool <- newBufferPool
5268 writeBuf <- allocateBuffer bufferSize
69+ let sendall = Sock.sendAll s
70+ isH2 <- newIORef False -- HTTP/1.x
5371 return Connection {
5472 connSendMany = Sock.sendMany s
55− , connSendAll = Sock.sendAll s
56− , connSendFile = defaultSendFile s
57− , connClose = sClose s >> freeBuffer readBuf >> freeBuffer writeBuf
58− , connRecv = receive s readBuf bufferSize
59− , connReadBuffer = readBuf
73+ , connSendAll = sendall
74+ , connSendFile = sendFile s writeBuf bufferSize sendall
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
88+ , connRecv = receive s bufferPool
89+ , connRecvBuf = receiveBuf s
6090 , connWriteBuffer = writeBuf
6191 , connBufferSize = bufferSize
62− , connSendFileOverride = Override s
92+ , connHTTP2 = isH2
6393 }
6494
65−#if __GLASGOW_HASKELL__ < 702
66−allowInterrupt :: IO ()
67−allowInterrupt = unblock $ return ()
68−#endif
69−
70−-- | Run an 'Application' on the given port. This calls 'runSettings' with
71−-- 'defaultSettings'.
95+-- | Run an 'Application' on the given port.
96+-- This calls 'runSettings' with 'defaultSettings'.
7297run :: Port -> Application -> IO ()
7398run p = runSettings defaultSettings { settingsPort = p }
7499
75−-- | Run an 'Application' on the port present in the @PORT@ environment variable
76−--
77−-- Uses the 'Port' given when the variable is unset.
100+-- | Run an 'Application' on the port present in the @PORT@
101+-- environment variable. Uses the 'Port' given when the variable is unset.
102+-- This calls 'runSettings' with 'defaultSettings'.
78103--
79104-- Since 3.0.9
80105runEnv :: Port -> Application -> IO ()
81106runEnv p app = do
82− mp <- fmap (lookup "PORT") getEnvironment
107+ mp <- lookupEnv "PORT"
83108
84109 maybe (run p app) runReadPort mp
85110
@@ -90,24 +115,28 @@ runEnv p app = do
90115 _ -> fail $ "Invalid value in $PORT: " ++ sp
91116
92117-- | Run an 'Application' with the given 'Settings'.
118+-- This opens a listen socket on the port defined in 'Settings' and
119+-- calls 'runSettingsSocket'.
93120runSettings :: Settings -> Application -> IO ()
94121runSettings set app = withSocketsDo $
95122 bracket
96123 (bindPortTCP (settingsPort set) (settingsHost set))
97− sClose
124+ close
98125 (\socket -> do
99126 setSocketCloseOnExec socket
100127 runSettingsSocket set socket app)
101128
102−-- | Same as 'runSettings', but uses a user-supplied socket instead of opening
103−-- one. This allows the user to provide, for example, Unix named socket, which
129+-- | This installs a shutdown handler for the given socket and
130+-- calls 'runSettingsConnection' with the default connection setup action
131+-- which handles plain (non-cipher) HTTP.
132+-- When the listen socket in the second argument is closed, all live
133+-- connections are gracefully shut down.
134+--
135+-- The supplied socket can be a Unix named socket, which
104136-- can be used when reverse HTTP proxying into your application.
105137--
106138-- Note that the 'settingsPort' will still be passed to 'Application's via the
107139-- 'serverPort' record.
108−--
109−-- When the listen socket in the second argument is closed, all live
110−-- connections are gracefully shut down.
111140runSettingsSocket :: Settings -> Socket -> Application -> IO ()
112141runSettingsSocket set socket app = do
113142 settingsInstallShutdownHandler set closeListenSocket
@@ -120,15 +149,20 @@ runSettingsSocket set socket app = do
120149 (s, sa) <- accept socket
121150#endif
122151 setSocketCloseOnExec s
123− 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
124155 return (conn, sa)
125156
126− closeListenSocket = sClose socket
157+ closeListenSocket = close socket
127158
128−-- | Allows you to provide a function which will return a 'Connection'. In
129−-- cases where creating the @Connection@ can be expensive, this allows the
130−-- expensive computations to be performed in a separate thread instead of the
131−-- main server loop.
159+-- | The connection setup action would be expensive. A good example
160+-- is initialization of TLS.
161+-- So, this converts the connection setup action to the connection maker
162+-- which will be executed after forking a new worker thread.
163+-- Then this calls 'runSettingsConnectionMaker' with the connection maker.
164+-- This allows the expensive computations to be performed
165+-- in a separate worker thread instead of the main server loop.
132166--
133167-- Since 1.3.5
134168runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
@@ -138,41 +172,46 @@ runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMa
138172 (conn, sa) <- getConn
139173 return (return conn, sa)
140174
175+-- | This modifies the connection maker so that it returns 'TCP' for 'Transport'
176+-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
141177runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
142178runSettingsConnectionMaker x y =
143− runSettingsConnectionMakerSecure x (go y)
179+ runSettingsConnectionMakerSecure x (toTCP <$> y)
144180 where
145− go = fmap (first (fmap (, TCP)))
181+ toTCP = first ((, TCP) <$>)
146182
147183----------------------------------------------------------------
148184
149−-- | Allows you to provide a function which will return a function
150−-- which will return 'Connection'.
185+-- | The core run function which takes 'Settings',
186+-- a connection maker and 'Application'.
187+-- The connection maker can return a connection of either plain HTTP
188+-- or HTTP over TLS.
151189--
152190-- Since 2.1.4
153191runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
154192runSettingsConnectionMakerSecure set getConnMaker app = do
155193 settingsBeforeMainLoop set
156194 counter <- newCounter
157−
158− D.withDateCache $ \dc ->
159− F.withFdCache fdCacheDurationInSeconds $ \fc ->
160− withTimeoutManager $ \tm ->
161− acceptConnection set getConnMaker app dc fc tm counter
195+ withII $ acceptConnection set getConnMaker app counter
162196 where
163− 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
164208 withTimeoutManager f = case settingsManager set of
165209 Just tm -> f tm
166210 Nothing -> bracket
167− (T.initialize $ settingsTimeout set * 1000000)
211+ (T.initialize timeoutInSeconds)
168212 T.stopManager
169213 f
170214
171−onE :: Settings -> Maybe Request -> SomeException -> IO ()
172−onE set mreq e = case fromException e of
173− Just (NotEnoughLines []) -> return ()
174− _ -> settingsOnException set mreq e
175−
176215-- Note that there is a thorough discussion of the exception safety of the
177216-- following code at: https://github.com/yesodweb/wai/issues/146
178217--
@@ -189,17 +228,20 @@ onE set mreq e = case fromException e of
189228acceptConnection :: Settings
190229 -> IO (IO (Connection, Transport), SockAddr)
191230 -> Application
192− -> D.DateCache
193− -> Maybe F.MutableFdCache
194− -> T.Manager
195231 -> Counter
232+ -> InternalInfo
196233 -> IO ()
197−acceptConnection set getConnMaker app dc fc tm counter = do
234+acceptConnection set getConnMaker app counter ii = do
198235 -- First mask all exceptions in acceptLoop. This is necessary to
199236 -- ensure that no async exception is throw between the call to
200237 -- acceptNewConnection and the registering of connClose.
201− void $ mask_ $ acceptLoop
202− gracefulShutdown counter
238+ --
239+ -- acceptLoop can be broken by closing the listing socket.
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.
244+ gracefulShutdown set counter
203245 where
204246 acceptLoop = do
205247 -- Allow async exceptions before receiving the next connection maker.
@@ -216,24 +258,21 @@ acceptConnection set getConnMaker app dc fc tm counter = do
216258 case mx of
217259 Nothing -> return ()
218260 Just (mkConn, addr) -> do
219− fork set mkConn addr app dc fc tm counter
261+ fork set mkConn addr app counter ii
220262 acceptLoop
221263
222264 acceptNewConnection = do
223265 ex <- try getConnMaker
224266 case ex of
225267 Right x -> return $ Just x
226− Left e -> do
227− onE set Nothing $ toException e
228− if isFullErrorType (ioeGetErrorType e) then do
229− -- "resource exhausted (Too many open files)" may
230− -- happen by accept(). Wait a second hoping that
231− -- resource will be available.
232− threadDelay 1000000
233− acceptNewConnection
234− else
235− -- Assuming the listen socket is closed.
236− 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
237276
238277-- Fork a new worker thread for this connection maker, and ask for a
239278-- function to unmask (i.e., allow async exceptions to be thrown).
@@ -241,64 +280,97 @@ fork :: Settings
241280 -> IO (Connection, Transport)
242281 -> SockAddr
243282 -> Application
244− -> D.DateCache
245− -> Maybe F.MutableFdCache
246− -> T.Manager
247283 -> Counter
284+ -> InternalInfo
248285 -> IO ()
249−fork set mkConn addr app dc fc tm counter = settingsFork set $ \ unmask ->
250− -- Run the connection maker to get a new connection, and ensure
251− -- that the connection is closed. If the mkConn call throws an
252− -- exception, we will leak the connection. If the mkConn call is
253− -- vulnerable to attacks (e.g., Slowloris), we do nothing to
254− -- protect the server. It is therefore vital that mkConn is well
255− -- vetted.
256− --
257− -- We grab the connection before registering timeouts since the
258− -- timeouts will be useless during connection creation, due to the
259− -- fact that async exceptions are still masked.
260− bracket mkConn closeConn $ \(conn0, 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
261303
262304 -- We need to register a timeout handler for this thread, and
263305 -- cancel that handler as soon as we exit.
264− bracket (T.registerKillThread tm) T.cancel $ \th ->
265−
266− let ii = InternalInfo th fc dc
267− conn = setSendFile conn0 fc
268− -- We now have fully registered a connection close handler
269− -- in the case of all exceptions, so it is safe to one
270− -- again allow async exceptions.
271− in unmask .
272− -- Call the user-supplied on exception code if any
273− -- exceptions are thrown.
274− handle (onE set Nothing) .
275−
276− -- Call the user-supplied code for connection open and close events
277− bracket (onOpen addr) (onClose addr) $ \goingon ->
278−
279− -- Actually serve this connection.
280− -- bracket with closeConn above ensures the connection is closed.
281− when goingon $ serveConnection conn ii addr transport set app
282− where
283− 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
284320
285321 onOpen adr = increase counter >> settingsOnOpen set adr
286322 onClose adr _ = decrease counter >> settingsOnClose set adr
287323
288324serveConnection :: Connection
289325 -> InternalInfo
326+ -> T.Handle
290327 -> SockAddr
291328 -> Transport
292329 -> Settings
293330 -> Application
294331 -> IO ()
295−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
335+ return (True, "")
336+ else do
337+ bs0 <- connRecv conn
338+ if S.length bs0 >= 4 && "PRI " `S.isPrefixOf` bs0 then
339+ return (True, bs0)
340+ else
341+ return (False, bs0)
296342 istatus <- newIORef False
297− src <- mkSource (connSource conn th istatus)
298− addr <- getProxyProtocolAddr src
299− http1 addr istatus src `E.catch` \e -> do
300− sendErrorResponse addr istatus e
301− throwIO (e :: SomeException)
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
354+ -- fixme: origAddr
355+ checkTLS
356+ setConnHTTP2 conn True
357+ http2 conn transport ii origAddr settings recvN sendBS app
358+ else do
359+ src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
360+ writeIORef istatus True
361+ leftoverSource src bs
362+ addr <- getProxyProtocolAddr src
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
302374
303375 where
304376 getProxyProtocolAddr src =
@@ -341,32 +413,40 @@ serveConnection conn ii origAddr transport settings app = do
341413
342414 decodeAscii = map (chr . fromEnum) . S.unpack
343415
344− th = threadHandle ii
416+ shouldSendErrorResponse se
417+ | Just ConnectionClosedByPeer <- fromException se = False
418+ | otherwise = True
345419
346− sendErrorResponse addr istatus e = do
420+ sendErrorResponse req istatus e = do
347421 status <- readIORef istatus
348− when status $ void $
349− sendResponse
350− (settingsServerName settings)
351− 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
352426
353427 dummyreq addr = defaultRequest { remoteHost = addr }
354428
355429 errorResponse e = settingsOnExceptionResponse settings e
356430
357− http1 addr istatus src = do
358− (req', mremainingRef, idxhdr) <- recvRequest settings conn ii addr src
359− let req = req' { isSecure = isTransportSecure transport }
360− keepAlive <- processRequest istatus src req mremainingRef idxhdr
431+ http1 firstRequest addr istatus src = do
432+ (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
433+ keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
361434 `E.catch` \e -> do
362− -- Call the user-supplied exception handlers, passing the request.
363− sendErrorResponse addr istatus e
364− onE settings (Just req) e
365− -- Don't throw the error again to prevent calling onE twice.
435+ settingsOnException settings (Just req) e
436+ -- Don't throw the error again to prevent calling settingsOnException twice.
366437 return False
367− when keepAlive $ http1 addr istatus src
368438
369− processRequest istatus src req mremainingRef idxhdr = do
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
448+
449+ processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
370450 -- Let the application run for as long as it wants
371451 T.pause th
372452
@@ -374,44 +454,50 @@ serveConnection conn ii origAddr transport settings app = do
374454 -- creating the request, we need to make sure that we don't get
375455 -- an async exception before calling the ResponseSource.
376456 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
377− _ <- app req $ \res -> do
457+ r <- E.try $ app req $ \res -> do
378458 T.resume th
379459 -- FIXME consider forcing evaluation of the res here to
380460 -- send more meaningful error messages to the user.
381461 -- However, it may affect performance.
382462 writeIORef istatus False
383− keepAlive <- sendResponse
384− (settingsServerName settings)
385− conn ii req idxhdr (readSource src) res
463+ keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
386464 writeIORef keepAliveRef keepAlive
387465 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+
388475 keepAlive <- readIORef keepAliveRef
389476
390477 -- We just send a Response and it takes a time to
391478 -- receive a Request again. If we immediately call recv,
392− -- it is likely to fail and the IO manager works.
393− -- It is very costy. So, we yield to another Haskell
394− -- thread hoping that the next Request will arraive
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
481+ -- thread hoping that the next Request will arrive
395482 -- when this Haskell thread will be re-scheduled.
396483 -- This improves performance at least when
397484 -- the number of cores is small.
398485 Conc.yield
399486
400− if not keepAlive then
401− return False
402− else do
487+ if keepAlive
488+ then
403489 -- If there is an unknown or large amount of data to still be read
404490 -- from the request body, simple drop this connection instead of
405491 -- reading it all in to satisfy a keep-alive request.
406492 case settingsMaximumBodyFlush settings of
407493 Nothing -> do
408− flushEntireBody (requestBody req)
494+ flushEntireBody nextBodyFlush
409495 T.resume th
410496 return True
411497 Just maxToRead -> do
412498 let tryKeepAlive = do
413499 -- flush the rest of the request body
414− isComplete <- flushBody (requestBody req) maxToRead
500+ isComplete <- flushBody nextBodyFlush maxToRead
415501 if isComplete then do
416502 T.resume th
417503 return True
@@ -425,6 +511,21 @@ serveConnection conn ii origAddr transport settings app = do
425511 else
426512 return False
427513 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
428529
429530flushEntireBody :: IO ByteString -> IO ()
430531flushEntireBody src =
@@ -449,26 +550,50 @@ flushBody src =
449550 | toRead' >= 0 -> loop toRead'
450551 | otherwise -> return False
451552
452−connSource :: Connection -> T.Handle -> IORef Bool -> IO ByteString
453−connSource Connection { connRecv = recv } th istatus = do
553+wrappedRecv :: Connection -> T.Handle -> IORef Bool -> Int -> IO ByteString
554+wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
454555 bs <- recv
455556 unless (S.null bs) $ do
456557 writeIORef istatus True
457− when (S.length bs >= 2048) $ T.tickle th
558+ when (S.length bs >= slowlorisSize) $ T.tickle th
559+ return bs
560+
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
458572 return bs
459573
574+-- | Set flag FileCloseOnExec flag on a socket (on Unix)
575+--
460576-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
577+--
578+-- @since 3.2.17
461579setSocketCloseOnExec :: Socket -> IO ()
462580#if WINDOWS
463581setSocketCloseOnExec _ = return ()
464582#else
465−setSocketCloseOnExec socket =
466− 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
467590#endif
468591
469−gracefulShutdown :: Counter -> IO ()
470−gracefulShutdown counter = do
471− -- To avoid race condition, we just use threadDelay, not MVar.
472− threadDelay 10000000
473− noConnections <- isZero counter
474− unless noConnections $ gracefulShutdown 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