@@ -1,142 +1,92 @@
1−{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
3{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE PackageImports #-}
5−{-# LANGUAGE PatternGuards #-}
6−{-# LANGUAGE RecordWildCards #-}
7{-# LANGUAGE ScopedTypeVariables #-}
3{-# LANGUAGE ScopedTypeVariables #-}
8{-# LANGUAGE TupleSections #-}
4{-# LANGUAGE TupleSections #-}
9−{-# LANGUAGE ViewPatterns #-}
10{-# OPTIONS_GHC -fno-warn-deprecations #-}
5{-# OPTIONS_GHC -fno-warn-deprecations #-}
12module Network.Wai.Handler.Warp.Run where
7module Network.Wai.Handler.Warp.Run where
14−import "iproute" Data.IP (toHostAddress, toHostAddress6)
15import Control.Arrow (first)
9import Control.Arrow (first)
10+import Control.Concurrent (threadDelay)
16import qualified Control.Concurrent as Conc (yield)
11import qualified Control.Concurrent as Conc (yield)
17import Control.Exception as E
12import Control.Exception as E
13+import Control.Monad (when, unless, void)
14+import Data.ByteString (ByteString)
18import qualified Data.ByteString as S
15import qualified Data.ByteString as S
19−import Data.Char (chr)
20import Data.IORef (IORef, newIORef, readIORef, writeIORef)
16import Data.IORef (IORef, newIORef, readIORef, writeIORef)
21import Data.Streaming.Network (bindPortTCP)
17import Data.Streaming.Network (bindPortTCP)
22−import Foreign.C.Error (Errno(..), eCONNABORTED)
18+import Network (sClose, Socket)
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(..))
19+import Network.Socket (accept, withSocketsDo, SockAddr)
26−#if MIN_VERSION_network(3,1,1)
27−import Network.Socket (gracefulClose)
29import qualified Network.Socket.ByteString as Sock
20import qualified Network.Socket.ByteString as Sock
30import Network.Wai
21import 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)
36import Network.Wai.Handler.Warp.Buffer
22import Network.Wai.Handler.Warp.Buffer
37import Network.Wai.Handler.Warp.Counter
23import Network.Wai.Handler.Warp.Counter
38import qualified Network.Wai.Handler.Warp.Date as D
24import qualified Network.Wai.Handler.Warp.Date as D
39import qualified Network.Wai.Handler.Warp.FdCache as F
25import 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)
43import Network.Wai.Handler.Warp.Header
26import Network.Wai.Handler.Warp.Header
44−import Network.Wai.Handler.Warp.Imports hiding (readInt)
45−import Network.Wai.Handler.Warp.ReadInt
46import Network.Wai.Handler.Warp.Recv
27import Network.Wai.Handler.Warp.Recv
47import Network.Wai.Handler.Warp.Request
28import Network.Wai.Handler.Warp.Request
48import Network.Wai.Handler.Warp.Response
29import Network.Wai.Handler.Warp.Response
49import Network.Wai.Handler.Warp.SendFile
30import Network.Wai.Handler.Warp.SendFile
50import Network.Wai.Handler.Warp.Settings
31import Network.Wai.Handler.Warp.Settings
32+import qualified Network.Wai.Handler.Warp.Timeout as T
51import Network.Wai.Handler.Warp.Types
33import Network.Wai.Handler.Warp.Types
52−
34+import Network.Wai.Internal (ResponseReceived (ResponseReceived))
35+import System.IO.Error (isFullErrorType, ioeGetErrorType)
54#if WINDOWS
37#if WINDOWS
55import Network.Wai.Handler.Warp.Windows
38import Network.Wai.Handler.Warp.Windows
40+import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
57import Network.Socket (fdSocket)
41import Network.Socket (fdSocket)
60−-- | Creating 'Connection' for plain HTTP based on a given socket.
44+-- | Default action value for 'Connection'.
61−socketConnection :: Settings -> Socket -> IO Connection
45+socketConnection :: Socket -> IO Connection
62−#if MIN_VERSION_network(3,1,1)
63−socketConnection set s = do
65−socketConnection _ s = do
46+socketConnection s = do
66−#endif
47+ readBuf <- allocateBuffer bufferSize
67− bufferPool <- newBufferPool
68 writeBuf <- allocateBuffer bufferSize
48 writeBuf <- allocateBuffer bufferSize
69− let sendall = Sock.sendAll s
70− isH2 <- newIORef False -- HTTP/1.x
71 return Connection {
49 return Connection {
72 connSendMany = Sock.sendMany s
50 connSendMany = Sock.sendMany s
73− , connSendAll = sendall
51+ , connSendAll = Sock.sendAll s
74− , connSendFile = sendFile s writeBuf bufferSize sendall
52+ , connSendFile = defaultSendFile s
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
87− , connFree = freeBuffer writeBuf
53+ , connClose = sClose s >> freeBuffer readBuf >> freeBuffer writeBuf
88− , connRecv = receive s bufferPool
54+ , connRecv = receive s readBuf bufferSize
89− , connRecvBuf = receiveBuf s
55+ , connReadBuffer = readBuf
90 , connWriteBuffer = writeBuf
56 , connWriteBuffer = writeBuf
91 , connBufferSize = bufferSize
57 , connBufferSize = bufferSize
92− , connHTTP2 = isH2
58+ , connSendFileOverride = Override s
61+#if __GLASGOW_HASKELL__ < 702
62+allowInterrupt :: IO ()
63+allowInterrupt = unblock $ return ()
95−-- | Run an 'Application' on the given port.
66+-- | Run an 'Application' on the given port. This calls 'runSettings' with
96−-- This calls 'runSettings' with 'defaultSettings'.
67+-- 'defaultSettings'.
97run :: Port -> Application -> IO ()
68run :: Port -> Application -> IO ()
98run p = runSettings defaultSettings { settingsPort = p }
69run p = runSettings defaultSettings { settingsPort = p }
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'.
105−runEnv :: Port -> Application -> IO ()
107− mp <- lookupEnv "PORT"
109− maybe (run p app) runReadPort mp
112− runReadPort :: String -> IO ()
113− runReadPort sp = case reads sp of
114− ((p', _):_) -> run p' app
115− _ -> fail $ "Invalid value in $PORT: " ++ sp
117-- | Run an 'Application' with the given 'Settings'.
71-- | Run an 'Application' with the given 'Settings'.
118−-- This opens a listen socket on the port defined in 'Settings' and
119−-- calls 'runSettingsSocket'.
120runSettings :: Settings -> Application -> IO ()
72runSettings :: Settings -> Application -> IO ()
121runSettings set app = withSocketsDo $
73runSettings set app = withSocketsDo $
123 (bindPortTCP (settingsPort set) (settingsHost set))
75 (bindPortTCP (settingsPort set) (settingsHost set))
125 (\socket -> do
77 (\socket -> do
126 setSocketCloseOnExec socket
78 setSocketCloseOnExec socket
127 runSettingsSocket set socket app)
79 runSettingsSocket set socket app)
129−-- | This installs a shutdown handler for the given socket and
81+-- | Same as 'runSettings', but uses a user-supplied socket instead of opening
130−-- calls 'runSettingsConnection' with the default connection setup action
82+-- one. This allows the user to provide, for example, Unix named socket, which
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.
135−-- The supplied socket can be a Unix named socket, which
136-- can be used when reverse HTTP proxying into your application.
83-- can be used when reverse HTTP proxying into your application.
138-- Note that the 'settingsPort' will still be passed to 'Application's via the
85-- Note that the 'settingsPort' will still be passed to 'Application's via the
139-- 'serverPort' record.
86-- 'serverPort' record.
88+-- When the listen socket in the second argument is closed, all live
89+-- connections are gracefully shut-downed.
140runSettingsSocket :: Settings -> Socket -> Application -> IO ()
90runSettingsSocket :: Settings -> Socket -> Application -> IO ()
141runSettingsSocket set socket app = do
91runSettingsSocket set socket app = do
142 settingsInstallShutdownHandler set closeListenSocket
92 settingsInstallShutdownHandler set closeListenSocket
@@ -149,20 +99,15 @@ runSettingsSocket set socket app = do
149 (s, sa) <- accept socket
99 (s, sa) <- accept socket
151 setSocketCloseOnExec s
101 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
155 return (conn, sa)
103 return (conn, sa)
157− closeListenSocket = close socket
105+ closeListenSocket = sClose socket
159−-- | The connection setup action would be expensive. A good example
107+-- | Allows you to provide a function which will return a 'Connection'. In
160−-- is initialization of TLS.
108+-- cases where creating the @Connection@ can be expensive, this allows the
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
109+-- expensive computations to be performed in a separate thread instead of the
165−-- in a separate worker thread instead of the main server loop.
110+-- main server loop.
167-- Since 1.3.5
112-- Since 1.3.5
168runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
113runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
@@ -172,46 +117,41 @@ runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMa
172 (conn, sa) <- getConn
117 (conn, sa) <- getConn
173 return (return conn, sa)
118 return (return conn, sa)
175−-- | This modifies the connection maker so that it returns 'TCP' for 'Transport'
176−-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
177runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
120runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
178runSettingsConnectionMaker x y =
121runSettingsConnectionMaker x y =
179− runSettingsConnectionMakerSecure x (toTCP <$> y)
122+ runSettingsConnectionMakerSecure x (go y)
181− toTCP = first ((, TCP) <$>)
124+ go = fmap (first (fmap (, False)))
183----------------------------------------------------------------
126----------------------------------------------------------------
185−-- | The core run function which takes 'Settings',
128+-- | Allows you to provide a function which will return a function
186−-- a connection maker and 'Application'.
129+-- which will return 'Connection'.
187−-- The connection maker can return a connection of either plain HTTP
190-- Since 2.1.4
131-- Since 2.1.4
191−runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
132+runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Bool), SockAddr) -> Application -> IO ()
192runSettingsConnectionMakerSecure set getConnMaker app = do
133runSettingsConnectionMakerSecure set getConnMaker app = do
193 settingsBeforeMainLoop set
134 settingsBeforeMainLoop set
194 counter <- newCounter
135 counter <- newCounter
137+ D.withDateCache $ \dc ->
138+ F.withFdCache fdCacheDurationInSeconds $ \fc ->
139+ withTimeoutManager $ \tm ->
195− withII $ acceptConnection set getConnMaker app counter
140+ acceptConnection set getConnMaker app dc fc tm 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
205− !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
142+ fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
206− !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
207− !timeoutInSeconds = settingsTimeout set * 1000000
208 withTimeoutManager f = case settingsManager set of
143 withTimeoutManager f = case settingsManager set of
209 Just tm -> f tm
144 Just tm -> f tm
210 Nothing -> bracket
145 Nothing -> bracket
211− (T.initialize timeoutInSeconds)
146+ (T.initialize $ settingsTimeout set * 1000000)
212 T.stopManager
147 T.stopManager
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
215-- Note that there is a thorough discussion of the exception safety of the
155-- Note that there is a thorough discussion of the exception safety of the
216-- following code at: https://github.com/yesodweb/wai/issues/146
156-- following code at: https://github.com/yesodweb/wai/issues/146
@@ -226,22 +166,19 @@ runSettingsConnectionMakerSecure set getConnMaker app = do
227-- Our approach is explained in the comments below.
167-- Our approach is explained in the comments below.
228acceptConnection :: Settings
168acceptConnection :: Settings
229− -> IO (IO (Connection, Transport), SockAddr)
169+ -> IO (IO (Connection, Bool), SockAddr)
230 -> Application
170 -> Application
172+ -> Maybe F.MutableFdCache
231 -> Counter
174 -> Counter
234−acceptConnection set getConnMaker app counter ii = do
176+acceptConnection set getConnMaker app dc fc tm counter = do
235 -- First mask all exceptions in acceptLoop. This is necessary to
177 -- First mask all exceptions in acceptLoop. This is necessary to
236 -- ensure that no async exception is throw between the call to
178 -- ensure that no async exception is throw between the call to
237 -- acceptNewConnection and the registering of connClose.
179 -- acceptNewConnection and the registering of connClose.
239− -- acceptLoop can be broken by closing the listing socket.
240− void $ mask_ acceptLoop
180+ 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
181+ gracefulShutdown counter
246 acceptLoop = do
183 acceptLoop = do
247 -- Allow async exceptions before receiving the next connection maker.
184 -- Allow async exceptions before receiving the next connection maker.
@@ -258,195 +195,106 @@ acceptConnection set getConnMaker app counter ii = do
258 case mx of
195 case mx of
259 Nothing -> return ()
196 Nothing -> return ()
260 Just (mkConn, addr) -> do
197 Just (mkConn, addr) -> do
261− fork set mkConn addr app counter ii
198+ fork set mkConn addr app dc fc tm counter
262 acceptLoop
199 acceptLoop
264 acceptNewConnection = do
201 acceptNewConnection = do
265 ex <- try getConnMaker
202 ex <- try getConnMaker
266 case ex of
203 case ex of
267 Right x -> return $ Just x
204 Right x -> return $ Just x
268− Left e -> do
205+ Left e -> do
269− let eConnAborted = getErrno eCONNABORTED
206+ onE set Nothing $ toException e
270− getErrno (Errno cInt) = cInt
207+ if isFullErrorType (ioeGetErrorType e) then do
271− if ioe_errno e == Just eConnAborted
208+ -- "resource exhausted (Too many open files)" may
209+ -- happen by accept(). Wait a second hoping that
210+ -- resource will be available.
272− then acceptNewConnection
212+ acceptNewConnection
274− settingsOnException set Nothing $ toException e
214+ -- Assuming the listen socket is closed.
275− return Nothing
215+ return Nothing
277-- Fork a new worker thread for this connection maker, and ask for a
217-- Fork a new worker thread for this connection maker, and ask for a
278-- function to unmask (i.e., allow async exceptions to be thrown).
218-- function to unmask (i.e., allow async exceptions to be thrown).
279fork :: Settings
219fork :: Settings
280− -> IO (Connection, Transport)
220+ -> IO (Connection, Bool)
281 -> SockAddr
221 -> SockAddr
282 -> Application
222 -> Application
224+ -> Maybe F.MutableFdCache
283 -> Counter
226 -> Counter
286−fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
228+fork set mkConn addr app dc fc tm counter = 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
229+ -- Run the connection maker to get a new connection, and ensure
291− -- that the connection is closed. If the mkConn call throws an
230+ -- that the connection is closed. If the mkConn call throws an
292− -- exception, we will leak the connection. If the mkConn call is
231+ -- exception, we will leak the connection. If the mkConn call is
293− -- vulnerable to attacks (e.g., Slowloris), we do nothing to
232+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
294− -- protect the server. It is therefore vital that mkConn is well
233+ -- protect the server. It is therefore vital that mkConn is well
295− -- vetted.
234+ -- vetted.
297− -- We grab the connection before registering timeouts since the
236+ -- We grab the connection before registering timeouts since the
298− -- timeouts will be useless during connection creation, due to the
237+ -- timeouts will be useless during connection creation, due to the
299− -- fact that async exceptions are still masked.
238+ -- fact that async exceptions are still masked.
300− bracket mkConn cleanUp (serve unmask)
239+ bracket mkConn closeConn $ \(conn0, isSecure') ->
302− cleanUp (conn, _) = connClose conn `finally` connFree conn
304 -- We need to register a timeout handler for this thread, and
241 -- We need to register a timeout handler for this thread, and
305 -- cancel that handler as soon as we exit.
242 -- cancel that handler as soon as we exit.
306− serve unmask (conn, transport) = bracket register cancel $ \th -> do
243+ bracket (T.registerKillThread tm) T.cancel $ \th ->
245+ let ii = InternalInfo th fc dc
246+ conn = setSendFile conn0 fc
307− -- We now have fully registered a connection close handler in
247+ -- We now have fully registered a connection close handler
308− -- the case of all exceptions, so it is safe to once again
248+ -- in the case of all exceptions, so it is safe to one
309− -- allow async exceptions.
249+ -- again allow async exceptions.
310− unmask .
250+ in unmask .
251+ -- Call the user-supplied on exception code if any
252+ -- exceptions are thrown.
253+ handle (onE set Nothing) .
311− -- Call the user-supplied code for connection open and
255+ -- Call the user-supplied code for connection open and close events
313− bracket (onOpen addr) (onClose addr) $ \goingon ->
256+ bracket (onOpen addr) (onClose addr) $ \goingon ->
314− -- Actually serve this connection. bracket with closeConn
258+ -- Actually serve this connection.
315− -- above ensures the connection is closed.
259+ -- onnClose above ensures the termination of the connection.
316− when goingon $ serveConnection conn ii th addr transport set app
260+ when goingon $ serveConnection conn ii addr isSecure' set app
318− register = T.registerKillThread (timeoutManager ii) (connClose conn)
262+ closeConn (conn, _isSecure) = connClose conn
321 onOpen adr = increase counter >> settingsOnOpen set adr
264 onOpen adr = increase counter >> settingsOnOpen set adr
322 onClose adr _ = decrease counter >> settingsOnClose set adr
265 onClose adr _ = decrease counter >> settingsOnClose set adr
324serveConnection :: Connection
267serveConnection :: Connection
325 -> InternalInfo
268 -> InternalInfo
327 -> SockAddr
269 -> SockAddr
328− -> Transport
270+ -> Bool -- ^ is secure?
329 -> Settings
271 -> Settings
330 -> Application
272 -> Application
332−serveConnection conn ii th origAddr transport settings app = do
274+serveConnection conn ii addr isSecure' 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
342 istatus <- newIORef False
275 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
359− src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
276+ src <- mkSource (connSource conn th istatus)
360− writeIORef istatus True
361− leftoverSource src bs
362− addr <- getProxyProtocolAddr src
363− http1 True addr istatus src `E.catch` \e ->
277+ recvSendLoop istatus src `E.catch` \e -> do
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 ()
372− _ <- sendErrorResponse (dummyreq addr) istatus e
278+ sendErrorResponse istatus e
373− throwIO e
279+ throwIO (e :: SomeException)
376− getProxyProtocolAddr src =
282+ th = threadHandle ii
377− case settingsProxyProtocol settings of
283+
378− ProxyProtocolNone ->
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
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)
398− ["PROXY","TCP6",clientAddr,_,clientPort,_] ->
399− case [x | (x, t) <- reads (decodeAscii clientAddr), null t] of
400− [a] -> Just (SockAddrInet6 (readInt clientPort)
405− ("PROXY":"UNKNOWN":_) ->
410− Nothing -> throwIO (BadProxyHeader (decodeAscii header))
411− Just a -> do leftoverSource src (S.drop 2 seg') -- drop CRLF
414− decodeAscii = map (chr . fromEnum) . S.unpack
416− shouldSendErrorResponse se
417− | Just ConnectionClosedByPeer <- fromException se = False
420− sendErrorResponse req istatus e = do
284+ sendErrorResponse istatus e = do
421 status <- readIORef istatus
285 status <- readIORef istatus
422− if shouldSendErrorResponse e && status
286+ when status $ void $
423− then do
287+ sendResponse
288+ (settingsServerName settings)
424− sendResponse settings conn ii th req defaultIndexRequestHeader (return S.empty) (errorResponse e)
289+ conn ii dummyreq defaultIndexRequestHeader (return S.empty) (errorResponse e)
427− dummyreq addr = defaultRequest { remoteHost = addr }
291+ dummyreq = defaultRequest { remoteHost = addr }
429 errorResponse e = settingsOnExceptionResponse settings e
293 errorResponse e = settingsOnExceptionResponse settings e
431− http1 firstRequest addr istatus src = do
295+ recvSendLoop istatus fromClient = do
432− (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
296+ (req', mremainingRef, idxhdr) <- recvRequest settings conn ii addr fromClient
433− keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
297+ let req = req' { isSecure = isSecure' }
435− settingsOnException settings (Just req) e
436− -- Don't throw the error again to prevent calling settingsOnException twice.
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
449− processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
450 -- Let the application run for as long as it wants
298 -- Let the application run for as long as it wants
451 T.pause th
299 T.pause th
@@ -454,78 +302,50 @@ serveConnection conn ii th origAddr transport settings app = do
454 -- creating the request, we need to make sure that we don't get
302 -- creating the request, we need to make sure that we don't get
455 -- an async exception before calling the ResponseSource.
303 -- an async exception before calling the ResponseSource.
456 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
304 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
457− r <- E.try $ app req $ \res -> do
305+ _ <- app req $ \res -> do
458 T.resume th
306 T.resume th
459 -- FIXME consider forcing evaluation of the res here to
307 -- FIXME consider forcing evaluation of the res here to
460 -- send more meaningful error messages to the user.
308 -- send more meaningful error messages to the user.
461 -- However, it may affect performance.
309 -- However, it may affect performance.
462 writeIORef istatus False
310 writeIORef istatus False
311+ keepAlive <- sendResponse
312+ (settingsServerName settings)
463− keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
313+ conn ii req idxhdr (readSource fromClient) res
464 writeIORef keepAliveRef keepAlive
314 writeIORef keepAliveRef keepAlive
465 return ResponseReceived
315 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
475 keepAlive <- readIORef keepAliveRef
316 keepAlive <- readIORef keepAliveRef
477 -- We just send a Response and it takes a time to
318 -- We just send a Response and it takes a time to
478 -- receive a Request again. If we immediately call recv,
319 -- receive a Request again. If we immediately call recv,
479− -- it is likely to fail and cause the IO manager to do some work.
320+ -- it is likely to fail and the IO manager works.
480− -- It is very costly, so we yield to another Haskell
321+ -- It is very costy. So, we yield to another Haskell
481− -- thread hoping that the next Request will arrive
322+ -- thread hoping that the next Request will arraive
482 -- when this Haskell thread will be re-scheduled.
323 -- when this Haskell thread will be re-scheduled.
483 -- This improves performance at least when
324 -- This improves performance at least when
484 -- the number of cores is small.
325 -- the number of cores is small.
485 Conc.yield
326 Conc.yield
487− if keepAlive
328+ when keepAlive $ do
489 -- If there is an unknown or large amount of data to still be read
329 -- If there is an unknown or large amount of data to still be read
490 -- from the request body, simple drop this connection instead of
330 -- from the request body, simple drop this connection instead of
491 -- reading it all in to satisfy a keep-alive request.
331 -- reading it all in to satisfy a keep-alive request.
492 case settingsMaximumBodyFlush settings of
332 case settingsMaximumBodyFlush settings of
493 Nothing -> do
333 Nothing -> do
494− flushEntireBody nextBodyFlush
334+ flushEntireBody (requestBody req)
495 T.resume th
335 T.resume th
496− return True
336+ recvSendLoop istatus fromClient
497 Just maxToRead -> do
337 Just maxToRead -> do
498 let tryKeepAlive = do
338 let tryKeepAlive = do
499 -- flush the rest of the request body
339 -- flush the rest of the request body
500− isComplete <- flushBody nextBodyFlush maxToRead
340+ isComplete <- flushBody (requestBody req) maxToRead
501− if isComplete then do
341+ when isComplete $ do
502 T.resume th
342 T.resume th
503− return True
343+ recvSendLoop istatus fromClient
506 case mremainingRef of
344 case mremainingRef of
507 Just ref -> do
345 Just ref -> do
508 remaining <- readIORef ref
346 remaining <- readIORef ref
509− if remaining <= maxToRead then
347+ when (remaining <= maxToRead) tryKeepAlive
513 Nothing -> tryKeepAlive
348 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
530flushEntireBody :: IO ByteString -> IO ()
350flushEntireBody :: IO ByteString -> IO ()
531flushEntireBody src =
351flushEntireBody src =
@@ -550,50 +370,26 @@ flushBody src =
550 | toRead' >= 0 -> loop toRead'
370 | toRead' >= 0 -> loop toRead'
551 | otherwise -> return False
371 | otherwise -> return False
553−wrappedRecv :: Connection -> T.Handle -> IORef Bool -> Int -> IO ByteString
373+connSource :: Connection -> T.Handle -> IORef Bool -> IO ByteString
554−wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
374+connSource Connection { connRecv = recv } th istatus = do
555 bs <- recv
375 bs <- recv
556 unless (S.null bs) $ do
376 unless (S.null bs) $ do
557 writeIORef istatus True
377 writeIORef istatus True
558− when (S.length bs >= slowlorisSize) $ T.tickle th
378+ when (S.length bs >= 2048) $ T.tickle th
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
572 return bs
379 return bs
574−-- | Set flag FileCloseOnExec flag on a socket (on Unix)
576-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
381-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
579setSocketCloseOnExec :: Socket -> IO ()
382setSocketCloseOnExec :: Socket -> IO ()
580#if WINDOWS
383#if WINDOWS
581setSocketCloseOnExec _ = return ()
384setSocketCloseOnExec _ = return ()
583−setSocketCloseOnExec socket = do
386+setSocketCloseOnExec socket =
584−#if MIN_VERSION_network(3,0,0)
387+ setFdOption (fromIntegral $ fdSocket socket) CloseOnExec True
585− fd <- fdSocket socket
587− let fd = fdSocket socket
589− F.setFileCloseOnExec $ fromIntegral fd
592−gracefulShutdown :: Settings -> Counter -> IO ()
390+gracefulShutdown :: Counter -> IO ()
593−gracefulShutdown set counter =
391+gracefulShutdown counter = do
594− case settingsGracefulShutdownTimeout set of
392+ -- To avoid race condition, we just use threadDelay, not MVar.
595− Nothing ->
393+ threadDelay 10000000
596− waitForZero counter
394+ noConnections <- isZero counter
597− (Just seconds) ->
395+ unless noConnections $ gracefulShutdown counter
598− void (timeout (seconds * microsPerSecond) (waitForZero counter))
599− where microsPerSecond = 1000000