@@ -1,142 +1,92 @@
1−{-# LANGUAGE BangPatterns #-}
21{-# LANGUAGE CPP #-}
32{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE PackageImports #-}
5−{-# LANGUAGE PatternGuards #-}
6−{-# LANGUAGE RecordWildCards #-}
73{-# LANGUAGE ScopedTypeVariables #-}
84{-# LANGUAGE TupleSections #-}
9−{-# LANGUAGE ViewPatterns #-}
105{-# OPTIONS_GHC -fno-warn-deprecations #-}
116
127module Network.Wai.Handler.Warp.Run where
138
14−import "iproute" Data.IP (toHostAddress, toHostAddress6)
159import Control.Arrow (first)
10+import Control.Concurrent (threadDelay)
1611import qualified Control.Concurrent as Conc (yield)
1712import Control.Exception as E
13+import Control.Monad (when, unless, void)
14+import Data.ByteString (ByteString)
1815import qualified Data.ByteString as S
19−import Data.Char (chr)
2016import Data.IORef (IORef, newIORef, readIORef, writeIORef)
2117import Data.Streaming.Network (bindPortTCP)
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
18+import Network (sClose, Socket)
19+import Network.Socket (accept, withSocketsDo, SockAddr)
2920import qualified Network.Socket.ByteString as Sock
3021import 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−
3622import Network.Wai.Handler.Warp.Buffer
3723import Network.Wai.Handler.Warp.Counter
3824import qualified Network.Wai.Handler.Warp.Date as D
3925import 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)
4326import Network.Wai.Handler.Warp.Header
44−import Network.Wai.Handler.Warp.Imports hiding (readInt)
45−import Network.Wai.Handler.Warp.ReadInt
4627import Network.Wai.Handler.Warp.Recv
4728import Network.Wai.Handler.Warp.Request
4829import Network.Wai.Handler.Warp.Response
4930import Network.Wai.Handler.Warp.SendFile
5031import Network.Wai.Handler.Warp.Settings
32+import qualified Network.Wai.Handler.Warp.Timeout as T
5133import Network.Wai.Handler.Warp.Types
52−
34+import Network.Wai.Internal (ResponseReceived (ResponseReceived))
35+import System.IO.Error (isFullErrorType, ioeGetErrorType)
5336
5437#if WINDOWS
5538import Network.Wai.Handler.Warp.Windows
5639#else
40+import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
5741import Network.Socket (fdSocket)
5842#endif
5943
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
44+-- | Default action value for 'Connection'.
45+socketConnection :: Socket -> IO Connection
46+socketConnection s = do
47+ readBuf <- allocateBuffer bufferSize
6848 writeBuf <- allocateBuffer bufferSize
69− let sendall = Sock.sendAll s
70− isH2 <- newIORef False -- HTTP/1.x
7149 return Connection {
7250 connSendMany = Sock.sendMany s
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
51+ , connSendAll = Sock.sendAll s
52+ , connSendFile = defaultSendFile s
53+ , connClose = sClose s >> freeBuffer readBuf >> freeBuffer writeBuf
54+ , connRecv = receive s readBuf bufferSize
55+ , connReadBuffer = readBuf
9056 , connWriteBuffer = writeBuf
9157 , connBufferSize = bufferSize
92− , connHTTP2 = isH2
58+ , connSendFileOverride = Override s
9359 }
9460
95−-- | Run an 'Application' on the given port.
96−-- This calls 'runSettings' with 'defaultSettings'.
61+#if __GLASGOW_HASKELL__ < 702
62+allowInterrupt :: IO ()
63+allowInterrupt = unblock $ return ()
64+#endif
65+
66+-- | Run an 'Application' on the given port. This calls 'runSettings' with
67+-- 'defaultSettings'.
9768run :: Port -> Application -> IO ()
9869run p = runSettings defaultSettings { settingsPort = p }
9970
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'.
103−--
104−-- Since 3.0.9
105−runEnv :: Port -> Application -> IO ()
106−runEnv p app = do
107− mp <- lookupEnv "PORT"
108−
109− maybe (run p app) runReadPort mp
110−
111− where
112− runReadPort :: String -> IO ()
113− runReadPort sp = case reads sp of
114− ((p', _):_) -> run p' app
115− _ -> fail $ "Invalid value in $PORT: " ++ sp
116−
11771-- | Run an 'Application' with the given 'Settings'.
118−-- This opens a listen socket on the port defined in 'Settings' and
119−-- calls 'runSettingsSocket'.
12072runSettings :: Settings -> Application -> IO ()
12173runSettings set app = withSocketsDo $
12274 bracket
12375 (bindPortTCP (settingsPort set) (settingsHost set))
124− close
76+ sClose
12577 (\socket -> do
12678 setSocketCloseOnExec socket
12779 runSettingsSocket set socket app)
12880
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
81+-- | Same as 'runSettings', but uses a user-supplied socket instead of opening
82+-- one. This allows the user to provide, for example, Unix named socket, which
13683-- can be used when reverse HTTP proxying into your application.
13784--
13885-- Note that the 'settingsPort' will still be passed to 'Application's via the
13986-- 'serverPort' record.
87+--
88+-- When the listen socket in the second argument is closed, all live
89+-- connections are gracefully shut-downed.
14090runSettingsSocket :: Settings -> Socket -> Application -> IO ()
14191runSettingsSocket set socket app = do
14292 settingsInstallShutdownHandler set closeListenSocket
@@ -149,20 +99,15 @@ runSettingsSocket set socket app = do
14999 (s, sa) <- accept socket
150100#endif
151101 setSocketCloseOnExec s
152− -- NoDelay causes an error for AF_UNIX.
153− setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
154− conn <- socketConnection set s
102+ conn <- socketConnection s
155103 return (conn, sa)
156104
157− closeListenSocket = close socket
105+ closeListenSocket = sClose socket
158106
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.
107+-- | Allows you to provide a function which will return a 'Connection'. In
108+-- cases where creating the @Connection@ can be expensive, this allows the
109+-- expensive computations to be performed in a separate thread instead of the
110+-- main server loop.
166111--
167112-- Since 1.3.5
168113runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
@@ -172,46 +117,41 @@ runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMa
172117 (conn, sa) <- getConn
173118 return (return conn, sa)
174119
175−-- | This modifies the connection maker so that it returns 'TCP' for 'Transport'
176−-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
177120runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
178121runSettingsConnectionMaker x y =
179− runSettingsConnectionMakerSecure x (toTCP <$> y)
122+ runSettingsConnectionMakerSecure x (go y)
180123 where
181− toTCP = first ((, TCP) <$>)
124+ go = fmap (first (fmap (, False)))
182125
183126----------------------------------------------------------------
184127
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.
128+-- | Allows you to provide a function which will return a function
129+-- which will return 'Connection'.
189130--
190131-- Since 2.1.4
191−runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
132+runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Bool), SockAddr) -> Application -> IO ()
192133runSettingsConnectionMakerSecure set getConnMaker app = do
193134 settingsBeforeMainLoop set
194135 counter <- newCounter
195− withII $ acceptConnection set getConnMaker app counter
136+
137+ D.withDateCache $ \dc ->
138+ F.withFdCache fdCacheDurationInSeconds $ \fc ->
139+ withTimeoutManager $ \tm ->
140+ acceptConnection set getConnMaker app dc fc tm counter
196141 where
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
142+ fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
208143 withTimeoutManager f = case settingsManager set of
209144 Just tm -> f tm
210145 Nothing -> bracket
211− (T.initialize timeoutInSeconds)
146+ (T.initialize $ settingsTimeout set * 1000000)
212147 T.stopManager
213148 f
214149
150+onE :: Settings -> Maybe Request -> SomeException -> IO ()
151+onE set mreq e = case fromException e of
152+ Just (NotEnoughLines []) -> return ()
153+ _ -> settingsOnException set mreq e
154+
215155-- Note that there is a thorough discussion of the exception safety of the
216156-- following code at: https://github.com/yesodweb/wai/issues/146
217157--
@@ -226,22 +166,19 @@ runSettingsConnectionMakerSecure set getConnMaker app = do
226166--
227167-- Our approach is explained in the comments below.
228168acceptConnection :: Settings
229− -> IO (IO (Connection, Transport), SockAddr)
169+ -> IO (IO (Connection, Bool), SockAddr)
230170 -> Application
171+ -> D.DateCache
172+ -> Maybe F.MutableFdCache
173+ -> T.Manager
231174 -> Counter
232− -> InternalInfo
233175 -> IO ()
234−acceptConnection set getConnMaker app counter ii = do
176+acceptConnection set getConnMaker app dc fc tm counter = do
235177 -- First mask all exceptions in acceptLoop. This is necessary to
236178 -- ensure that no async exception is throw between the call to
237179 -- acceptNewConnection and the registering of connClose.
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
180+ void $ mask_ $ acceptLoop
181+ gracefulShutdown counter
245182 where
246183 acceptLoop = do
247184 -- Allow async exceptions before receiving the next connection maker.
@@ -258,195 +195,106 @@ acceptConnection set getConnMaker app counter ii = do
258195 case mx of
259196 Nothing -> return ()
260197 Just (mkConn, addr) -> do
261− fork set mkConn addr app counter ii
198+ fork set mkConn addr app dc fc tm counter
262199 acceptLoop
263200
264201 acceptNewConnection = do
265202 ex <- try getConnMaker
266203 case ex of
267204 Right x -> return $ Just x
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
205+ Left e -> do
206+ onE set Nothing $ toException e
207+ if isFullErrorType (ioeGetErrorType e) then do
208+ -- "resource exhausted (Too many open files)" may
209+ -- happen by accept(). Wait a second hoping that
210+ -- resource will be available.
211+ threadDelay 1000000
212+ acceptNewConnection
213+ else
214+ -- Assuming the listen socket is closed.
215+ return Nothing
276216
277217-- Fork a new worker thread for this connection maker, and ask for a
278218-- function to unmask (i.e., allow async exceptions to be thrown).
279219fork :: Settings
280− -> IO (Connection, Transport)
220+ -> IO (Connection, Bool)
281221 -> SockAddr
282222 -> Application
223+ -> D.DateCache
224+ -> Maybe F.MutableFdCache
225+ -> T.Manager
283226 -> Counter
284− -> InternalInfo
285227 -> IO ()
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
228+fork set mkConn addr app dc fc tm counter = settingsFork set $ \ unmask ->
229+ -- Run the connection maker to get a new connection, and ensure
230+ -- that the connection is closed. If the mkConn call throws an
231+ -- exception, we will leak the connection. If the mkConn call is
232+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
233+ -- protect the server. It is therefore vital that mkConn is well
234+ -- vetted.
235+ --
236+ -- We grab the connection before registering timeouts since the
237+ -- timeouts will be useless during connection creation, due to the
238+ -- fact that async exceptions are still masked.
239+ bracket mkConn closeConn $ \(conn0, isSecure') ->
303240
304241 -- We need to register a timeout handler for this thread, and
305242 -- cancel that handler as soon as we exit.
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
243+ bracket (T.registerKillThread tm) T.cancel $ \th ->
244+
245+ let ii = InternalInfo th fc dc
246+ conn = setSendFile conn0 fc
247+ -- We now have fully registered a connection close handler
248+ -- in the case of all exceptions, so it is safe to one
249+ -- again allow async exceptions.
250+ in unmask .
251+ -- Call the user-supplied on exception code if any
252+ -- exceptions are thrown.
253+ handle (onE set Nothing) .
254+
255+ -- Call the user-supplied code for connection open and close events
256+ bracket (onOpen addr) (onClose addr) $ \goingon ->
257+
258+ -- Actually serve this connection.
259+ -- onnClose above ensures the termination of the connection.
260+ when goingon $ serveConnection conn ii addr isSecure' set app
261+ where
262+ closeConn (conn, _isSecure) = connClose conn
320263
321264 onOpen adr = increase counter >> settingsOnOpen set adr
322265 onClose adr _ = decrease counter >> settingsOnClose set adr
323266
324267serveConnection :: Connection
325268 -> InternalInfo
326− -> T.Handle
327269 -> SockAddr
328− -> Transport
270+ -> Bool -- ^ is secure?
329271 -> Settings
330272 -> Application
331273 -> IO ()
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)
274+serveConnection conn ii addr isSecure' settings app = do
342275 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
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
276+ src <- mkSource (connSource conn th istatus)
277+ recvSendLoop istatus src `E.catch` \e -> do
278+ sendErrorResponse istatus e
279+ throwIO (e :: SomeException)
374280
375281 where
376− getProxyProtocolAddr src =
377− case settingsProxyProtocol settings of
378− ProxyProtocolNone ->
379− return origAddr
380− ProxyProtocolRequired -> do
381− seg <- readSource src
382− parseProxyProtocolHeader src seg
383− ProxyProtocolOptional -> do
384− seg <- readSource src
385− if S.isPrefixOf "PROXY " seg
386− then parseProxyProtocolHeader src seg
387− else do leftoverSource src seg
388− return origAddr
389−
390− parseProxyProtocolHeader src seg = do
391− let (header,seg') = S.break (== 0x0d) seg -- 0x0d == CR
392− maybeAddr = case S.split 0x20 header of -- 0x20 == space
393− ["PROXY","TCP4",clientAddr,_,clientPort,_] ->
394− case [x | (x, t) <- reads (decodeAscii clientAddr), null t] of
395− [a] -> Just (SockAddrInet (readInt clientPort)
396− (toHostAddress a))
397− _ -> Nothing
398− ["PROXY","TCP6",clientAddr,_,clientPort,_] ->
399− case [x | (x, t) <- reads (decodeAscii clientAddr), null t] of
400− [a] -> Just (SockAddrInet6 (readInt clientPort)
401− 0
402− (toHostAddress6 a)
403− 0)
404− _ -> Nothing
405− ("PROXY":"UNKNOWN":_) ->
406− Just origAddr
407− _ ->
408− Nothing
409− case maybeAddr of
410− Nothing -> throwIO (BadProxyHeader (decodeAscii header))
411− Just a -> do leftoverSource src (S.drop 2 seg') -- drop CRLF
412− return a
413−
414− decodeAscii = map (chr . fromEnum) . S.unpack
415−
416− shouldSendErrorResponse se
417− | Just ConnectionClosedByPeer <- fromException se = False
418− | otherwise = True
419−
420− sendErrorResponse req istatus e = do
282+ th = threadHandle ii
283+
284+ sendErrorResponse istatus e = do
421285 status <- readIORef istatus
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
286+ when status $ void $
287+ sendResponse
288+ (settingsServerName settings)
289+ conn ii dummyreq defaultIndexRequestHeader (return S.empty) (errorResponse e)
426290
427− dummyreq addr = defaultRequest { remoteHost = addr }
291+ dummyreq = defaultRequest { remoteHost = addr }
428292
429293 errorResponse e = settingsOnExceptionResponse settings e
430294
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
434− `E.catch` \e -> do
435− settingsOnException settings (Just req) e
436− -- Don't throw the error again to prevent calling settingsOnException twice.
437− return False
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
448−
449− processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
295+ recvSendLoop istatus fromClient = do
296+ (req', mremainingRef, idxhdr) <- recvRequest settings conn ii addr fromClient
297+ let req = req' { isSecure = isSecure' }
450298 -- Let the application run for as long as it wants
451299 T.pause th
452300
@@ -454,78 +302,50 @@ serveConnection conn ii th origAddr transport settings app = do
454302 -- creating the request, we need to make sure that we don't get
455303 -- an async exception before calling the ResponseSource.
456304 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
457− r <- E.try $ app req $ \res -> do
305+ _ <- app req $ \res -> do
458306 T.resume th
459307 -- FIXME consider forcing evaluation of the res here to
460308 -- send more meaningful error messages to the user.
461309 -- However, it may affect performance.
462310 writeIORef istatus False
463− keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
311+ keepAlive <- sendResponse
312+ (settingsServerName settings)
313+ conn ii req idxhdr (readSource fromClient) res
464314 writeIORef keepAliveRef keepAlive
465315 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−
475316 keepAlive <- readIORef keepAliveRef
476317
477318 -- We just send a Response and it takes a time to
478319 -- receive a Request again. If we immediately call recv,
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
320+ -- it is likely to fail and the IO manager works.
321+ -- It is very costy. So, we yield to another Haskell
322+ -- thread hoping that the next Request will arraive
482323 -- when this Haskell thread will be re-scheduled.
483324 -- This improves performance at least when
484325 -- the number of cores is small.
485326 Conc.yield
486327
487− if keepAlive
488− then
328+ when keepAlive $ do
489329 -- If there is an unknown or large amount of data to still be read
490330 -- from the request body, simple drop this connection instead of
491331 -- reading it all in to satisfy a keep-alive request.
492332 case settingsMaximumBodyFlush settings of
493333 Nothing -> do
494− flushEntireBody nextBodyFlush
334+ flushEntireBody (requestBody req)
495335 T.resume th
496− return True
336+ recvSendLoop istatus fromClient
497337 Just maxToRead -> do
498338 let tryKeepAlive = do
499339 -- flush the rest of the request body
500− isComplete <- flushBody nextBodyFlush maxToRead
501− if isComplete then do
340+ isComplete <- flushBody (requestBody req) maxToRead
341+ when isComplete $ do
502342 T.resume th
503− return True
504− else
505− return False
343+ recvSendLoop istatus fromClient
506344 case mremainingRef of
507345 Just ref -> do
508346 remaining <- readIORef ref
509− if remaining <= maxToRead then
510− tryKeepAlive
511− else
512− return False
347+ when (remaining <= maxToRead) tryKeepAlive
513348 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
529349
530350flushEntireBody :: IO ByteString -> IO ()
531351flushEntireBody src =
@@ -550,50 +370,26 @@ flushBody src =
550370 | toRead' >= 0 -> loop toRead'
551371 | otherwise -> return False
552372
553−wrappedRecv :: Connection -> T.Handle -> IORef Bool -> Int -> IO ByteString
554−wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
373+connSource :: Connection -> T.Handle -> IORef Bool -> IO ByteString
374+connSource Connection { connRecv = recv } th istatus = do
555375 bs <- recv
556376 unless (S.null bs) $ do
557377 writeIORef istatus True
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
378+ when (S.length bs >= 2048) $ T.tickle th
572379 return bs
573380
574−-- | Set flag FileCloseOnExec flag on a socket (on Unix)
575−--
576381-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
577−--
578−-- @since 3.2.17
579382setSocketCloseOnExec :: Socket -> IO ()
580383#if WINDOWS
581384setSocketCloseOnExec _ = return ()
582385#else
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
386+setSocketCloseOnExec socket =
387+ setFdOption (fromIntegral $ fdSocket socket) CloseOnExec True
590388#endif
591389
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
390+gracefulShutdown :: Counter -> IO ()
391+gracefulShutdown counter = do
392+ -- To avoid race condition, we just use threadDelay, not MVar.
393+ threadDelay 10000000
394+ noConnections <- isZero counter
395+ unless noConnections $ gracefulShutdown counter