@@ -1,85 +1,110 @@
1+{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE PackageImports #-}
5+{-# LANGUAGE PatternGuards #-}
6+{-# LANGUAGE RecordWildCards #-}
3{-# LANGUAGE ScopedTypeVariables #-}
7{-# LANGUAGE ScopedTypeVariables #-}
4{-# LANGUAGE TupleSections #-}
8{-# LANGUAGE TupleSections #-}
9+{-# LANGUAGE ViewPatterns #-}
5{-# OPTIONS_GHC -fno-warn-deprecations #-}
10{-# OPTIONS_GHC -fno-warn-deprecations #-}
7module Network.Wai.Handler.Warp.Run where
12module Network.Wai.Handler.Warp.Run where
14+import "iproute" Data.IP (toHostAddress, toHostAddress6)
9import Control.Arrow (first)
15import Control.Arrow (first)
10−import Control.Concurrent (threadDelay)
11import qualified Control.Concurrent as Conc (yield)
16import qualified Control.Concurrent as Conc (yield)
12import Control.Exception as E
17import Control.Exception as E
13−import Control.Monad (when, unless, void)
14−import Data.ByteString (ByteString)
15import qualified Data.ByteString as S
18import qualified Data.ByteString as S
16import Data.Char (chr)
19import Data.Char (chr)
17−import Data.IP (toHostAddress, toHostAddress6)
18import Data.IORef (IORef, newIORef, readIORef, writeIORef)
20import Data.IORef (IORef, newIORef, readIORef, writeIORef)
19import Data.Streaming.Network (bindPortTCP)
21import Data.Streaming.Network (bindPortTCP)
20−import Network (sClose, Socket)
22+import Foreign.C.Error (Errno(..), eCONNABORTED)
23+import GHC.IO.Exception (IOException(..))
24+import qualified Network.HTTP2 as H2
21−import Network.Socket (accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6))
25+import Network.Socket (Socket, close, accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6), setSocketOption, SocketOption(..))
26+#if MIN_VERSION_network(3,1,1)
27+import Network.Socket (gracefulClose)
22import qualified Network.Socket.ByteString as Sock
29import qualified Network.Socket.ByteString as Sock
23import Network.Wai
30import Network.Wai
31+import Network.Wai.Internal (ResponseReceived (ResponseReceived))
32+import System.Environment (lookupEnv)
33+import qualified System.TimeManager as T
34+import System.Timeout (timeout)
24import Network.Wai.Handler.Warp.Buffer
36import Network.Wai.Handler.Warp.Buffer
25import Network.Wai.Handler.Warp.Counter
37import Network.Wai.Handler.Warp.Counter
26import qualified Network.Wai.Handler.Warp.Date as D
38import qualified Network.Wai.Handler.Warp.Date as D
27import qualified Network.Wai.Handler.Warp.FdCache as F
39import qualified Network.Wai.Handler.Warp.FdCache as F
40+import qualified Network.Wai.Handler.Warp.FileInfoCache as I
41+import Network.Wai.Handler.Warp.HTTP2 (http2)
42+import Network.Wai.Handler.Warp.HTTP2.Types (isHTTP2)
28import Network.Wai.Handler.Warp.Header
43import Network.Wai.Handler.Warp.Header
44+import Network.Wai.Handler.Warp.Imports hiding (readInt)
29import Network.Wai.Handler.Warp.ReadInt
45import Network.Wai.Handler.Warp.ReadInt
30import Network.Wai.Handler.Warp.Recv
46import Network.Wai.Handler.Warp.Recv
31import Network.Wai.Handler.Warp.Request
47import Network.Wai.Handler.Warp.Request
32import Network.Wai.Handler.Warp.Response
48import Network.Wai.Handler.Warp.Response
33import Network.Wai.Handler.Warp.SendFile
49import Network.Wai.Handler.Warp.SendFile
34import Network.Wai.Handler.Warp.Settings
50import Network.Wai.Handler.Warp.Settings
35−import qualified Network.Wai.Handler.Warp.Timeout as T
36import Network.Wai.Handler.Warp.Types
51import Network.Wai.Handler.Warp.Types
37−import Network.Wai.Internal (ResponseReceived (ResponseReceived))
52+
38−import System.Environment (getEnvironment)
39−import System.IO.Error (isFullErrorType, ioeGetErrorType)
41#if WINDOWS
54#if WINDOWS
42import Network.Wai.Handler.Warp.Windows
55import Network.Wai.Handler.Warp.Windows
44−import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
45import Network.Socket (fdSocket)
57import Network.Socket (fdSocket)
48−-- | Default action value for 'Connection'.
60+-- | Creating 'Connection' for plain HTTP based on a given socket.
49−socketConnection :: Socket -> IO Connection
61+socketConnection :: Settings -> Socket -> IO Connection
62+#if MIN_VERSION_network(3,1,1)
63+socketConnection set s = do
50−socketConnection s = do
65+socketConnection _ s = do
51− readBuf <- allocateBuffer bufferSize
66+#endif
67+ bufferPool <- newBufferPool
52 writeBuf <- allocateBuffer bufferSize
68 writeBuf <- allocateBuffer bufferSize
69+ let sendall = Sock.sendAll s
70+ isH2 <- newIORef False -- HTTP/1.x
53 return Connection {
71 return Connection {
54 connSendMany = Sock.sendMany s
72 connSendMany = Sock.sendMany s
55− , connSendAll = Sock.sendAll s
73+ , connSendAll = sendall
56− , connSendFile = defaultSendFile s
74+ , connSendFile = sendFile s writeBuf bufferSize sendall
75+#if MIN_VERSION_network(3,1,1)
78+ let tm = if h2 then settingsGracefulCloseTimeout2 set
79+ else settingsGracefulCloseTimeout1 set
83+ gracefulClose s tm `E.catch` \(E.SomeException _) -> return ()
85+ , connClose = close s
57− , connClose = sClose s >> freeBuffer readBuf >> freeBuffer writeBuf
87+ , connFree = freeBuffer writeBuf
58− , connRecv = receive s readBuf bufferSize
88+ , connRecv = receive s bufferPool
59− , connReadBuffer = readBuf
89+ , connRecvBuf = receiveBuf s
60 , connWriteBuffer = writeBuf
90 , connWriteBuffer = writeBuf
61 , connBufferSize = bufferSize
91 , connBufferSize = bufferSize
62− , connSendFileOverride = Override s
92+ , connHTTP2 = isH2
65−#if __GLASGOW_HASKELL__ < 702
66−allowInterrupt :: IO ()
67−allowInterrupt = unblock $ return ()
70−-- | Run an 'Application' on the given port. This calls 'runSettings' with
95+-- | Run an 'Application' on the given port.
71−-- 'defaultSettings'.
96+-- This calls 'runSettings' with 'defaultSettings'.
72run :: Port -> Application -> IO ()
97run :: Port -> Application -> IO ()
73run p = runSettings defaultSettings { settingsPort = p }
98run p = runSettings defaultSettings { settingsPort = p }
75−-- | Run an 'Application' on the port present in the @PORT@ environment variable
100+-- | Run an 'Application' on the port present in the @PORT@
77−-- Uses the 'Port' given when the variable is unset.
101+-- environment variable. Uses the 'Port' given when the variable is unset.
102+-- This calls 'runSettings' with 'defaultSettings'.
79-- Since 3.0.9
104-- Since 3.0.9
80runEnv :: Port -> Application -> IO ()
105runEnv :: Port -> Application -> IO ()
81runEnv p app = do
106runEnv p app = do
82− mp <- fmap (lookup "PORT") getEnvironment
107+ mp <- lookupEnv "PORT"
84 maybe (run p app) runReadPort mp
109 maybe (run p app) runReadPort mp
@@ -90,24 +115,28 @@ runEnv p app = do
90 _ -> fail $ "Invalid value in $PORT: " ++ sp
115 _ -> fail $ "Invalid value in $PORT: " ++ sp
92-- | Run an 'Application' with the given 'Settings'.
117-- | Run an 'Application' with the given 'Settings'.
118+-- This opens a listen socket on the port defined in 'Settings' and
119+-- calls 'runSettingsSocket'.
93runSettings :: Settings -> Application -> IO ()
120runSettings :: Settings -> Application -> IO ()
94runSettings set app = withSocketsDo $
121runSettings set app = withSocketsDo $
96 (bindPortTCP (settingsPort set) (settingsHost set))
123 (bindPortTCP (settingsPort set) (settingsHost set))
98 (\socket -> do
125 (\socket -> do
99 setSocketCloseOnExec socket
126 setSocketCloseOnExec socket
100 runSettingsSocket set socket app)
127 runSettingsSocket set socket app)
102−-- | Same as 'runSettings', but uses a user-supplied socket instead of opening
129+-- | This installs a shutdown handler for the given socket and
103−-- one. This allows the user to provide, for example, Unix named socket, which
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.
135+-- The supplied socket can be a Unix named socket, which
104-- can be used when reverse HTTP proxying into your application.
136-- can be used when reverse HTTP proxying into your application.
106-- Note that the 'settingsPort' will still be passed to 'Application's via the
138-- Note that the 'settingsPort' will still be passed to 'Application's via the
107-- 'serverPort' record.
139-- 'serverPort' record.
109−-- When the listen socket in the second argument is closed, all live
110−-- connections are gracefully shut down.
111runSettingsSocket :: Settings -> Socket -> Application -> IO ()
140runSettingsSocket :: Settings -> Socket -> Application -> IO ()
112runSettingsSocket set socket app = do
141runSettingsSocket set socket app = do
113 settingsInstallShutdownHandler set closeListenSocket
142 settingsInstallShutdownHandler set closeListenSocket
@@ -120,15 +149,20 @@ runSettingsSocket set socket app = do
120 (s, sa) <- accept socket
149 (s, sa) <- accept socket
122 setSocketCloseOnExec s
151 setSocketCloseOnExec s
152+ -- NoDelay causes an error for AF_UNIX.
153+ setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
123− conn <- socketConnection s
154+ conn <- socketConnection set s
124 return (conn, sa)
155 return (conn, sa)
126− closeListenSocket = sClose socket
157+ closeListenSocket = close socket
128−-- | Allows you to provide a function which will return a 'Connection'. In
159+-- | The connection setup action would be expensive. A good example
129−-- cases where creating the @Connection@ can be expensive, this allows the
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.
130−-- expensive computations to be performed in a separate thread instead of the
164+-- This allows the expensive computations to be performed
131−-- main server loop.
165+-- in a separate worker thread instead of the main server loop.
133-- Since 1.3.5
167-- Since 1.3.5
134runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
168runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
@@ -138,41 +172,46 @@ runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMa
138 (conn, sa) <- getConn
172 (conn, sa) <- getConn
139 return (return conn, sa)
173 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'.
141runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
177runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
142runSettingsConnectionMaker x y =
178runSettingsConnectionMaker x y =
143− runSettingsConnectionMakerSecure x (go y)
179+ runSettingsConnectionMakerSecure x (toTCP <$> y)
145− go = fmap (first (fmap (, TCP)))
181+ toTCP = first ((, TCP) <$>)
147----------------------------------------------------------------
183----------------------------------------------------------------
149−-- | Allows you to provide a function which will return a function
185+-- | The core run function which takes 'Settings',
150−-- which will return 'Connection'.
186+-- a connection maker and 'Application'.
187+-- The connection maker can return a connection of either plain HTTP
152-- Since 2.1.4
190-- Since 2.1.4
153runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
191runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
154runSettingsConnectionMakerSecure set getConnMaker app = do
192runSettingsConnectionMakerSecure set getConnMaker app = do
155 settingsBeforeMainLoop set
193 settingsBeforeMainLoop set
156 counter <- newCounter
194 counter <- newCounter
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
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
163− fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
205+ !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
206+ !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
207+ !timeoutInSeconds = settingsTimeout set * 1000000
164 withTimeoutManager f = case settingsManager set of
208 withTimeoutManager f = case settingsManager set of
165 Just tm -> f tm
209 Just tm -> f tm
166 Nothing -> bracket
210 Nothing -> bracket
167− (T.initialize $ settingsTimeout set * 1000000)
211+ (T.initialize timeoutInSeconds)
168 T.stopManager
212 T.stopManager
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
176-- Note that there is a thorough discussion of the exception safety of the
215-- Note that there is a thorough discussion of the exception safety of the
177-- following code at: https://github.com/yesodweb/wai/issues/146
216-- following code at: https://github.com/yesodweb/wai/issues/146
@@ -189,17 +228,20 @@ onE set mreq e = case fromException e of
189acceptConnection :: Settings
228acceptConnection :: Settings
190 -> IO (IO (Connection, Transport), SockAddr)
229 -> IO (IO (Connection, Transport), SockAddr)
191 -> Application
230 -> Application
193− -> Maybe F.MutableFdCache
195 -> Counter
231 -> Counter
197−acceptConnection set getConnMaker app dc fc tm counter = do
234+acceptConnection set getConnMaker app counter ii = do
198 -- First mask all exceptions in acceptLoop. This is necessary to
235 -- First mask all exceptions in acceptLoop. This is necessary to
199 -- ensure that no async exception is throw between the call to
236 -- ensure that no async exception is throw between the call to
200 -- acceptNewConnection and the registering of connClose.
237 -- acceptNewConnection and the registering of connClose.
239+ -- acceptLoop can be broken by closing the listing socket.
201− void $ mask_ $ acceptLoop
240+ void $ mask_ acceptLoop
241+ -- In some cases, we want to stop Warp here without graceful shutdown.
242+ -- So, async exceptions are allowed here.
243+ -- That's why `finally` is not used.
202− gracefulShutdown counter
244+ gracefulShutdown set counter
204 acceptLoop = do
246 acceptLoop = do
205 -- Allow async exceptions before receiving the next connection maker.
247 -- Allow async exceptions before receiving the next connection maker.
@@ -216,24 +258,21 @@ acceptConnection set getConnMaker app dc fc tm counter = do
216 case mx of
258 case mx of
217 Nothing -> return ()
259 Nothing -> return ()
218 Just (mkConn, addr) -> do
260 Just (mkConn, addr) -> do
219− fork set mkConn addr app dc fc tm counter
261+ fork set mkConn addr app counter ii
220 acceptLoop
262 acceptLoop
222 acceptNewConnection = do
264 acceptNewConnection = do
223 ex <- try getConnMaker
265 ex <- try getConnMaker
224 case ex of
266 case ex of
225 Right x -> return $ Just x
267 Right x -> return $ Just x
226− Left e -> do
268+ Left e -> do
227− onE set Nothing $ toException e
269+ let eConnAborted = getErrno eCONNABORTED
228− if isFullErrorType (ioeGetErrorType e) then do
270+ getErrno (Errno cInt) = cInt
229− -- "resource exhausted (Too many open files)" may
271+ if ioe_errno e == Just eConnAborted
230− -- happen by accept(). Wait a second hoping that
231− -- resource will be available.
233− acceptNewConnection
272+ then acceptNewConnection
235− -- Assuming the listen socket is closed.
274+ settingsOnException set Nothing $ toException e
236− return Nothing
275+ return Nothing
238-- Fork a new worker thread for this connection maker, and ask for a
277-- Fork a new worker thread for this connection maker, and ask for a
239-- function to unmask (i.e., allow async exceptions to be thrown).
278-- function to unmask (i.e., allow async exceptions to be thrown).
@@ -241,64 +280,97 @@ fork :: Settings
241 -> IO (Connection, Transport)
280 -> IO (Connection, Transport)
242 -> SockAddr
281 -> SockAddr
243 -> Application
282 -> Application
245− -> Maybe F.MutableFdCache
247 -> Counter
283 -> Counter
249−fork set mkConn addr app dc fc tm counter = settingsFork set $ \ unmask ->
286+fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
287+ -- Call the user-supplied on exception code if any
288+ -- exceptions are thrown.
289+ handle (settingsOnException set Nothing) $
250− -- Run the connection maker to get a new connection, and ensure
290+ -- Run the connection maker to get a new connection, and ensure
251− -- that the connection is closed. If the mkConn call throws an
291+ -- that the connection is closed. If the mkConn call throws an
252− -- exception, we will leak the connection. If the mkConn call is
292+ -- exception, we will leak the connection. If the mkConn call is
253− -- vulnerable to attacks (e.g., Slowloris), we do nothing to
293+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
254− -- protect the server. It is therefore vital that mkConn is well
294+ -- protect the server. It is therefore vital that mkConn is well
255− -- vetted.
295+ -- vetted.
257− -- We grab the connection before registering timeouts since the
297+ -- We grab the connection before registering timeouts since the
258− -- timeouts will be useless during connection creation, due to the
298+ -- timeouts will be useless during connection creation, due to the
259− -- fact that async exceptions are still masked.
299+ -- fact that async exceptions are still masked.
260− bracket mkConn closeConn $ \(conn0, transport) ->
300+ bracket mkConn cleanUp (serve unmask)
302+ cleanUp (conn, _) = connClose conn `finally` connFree conn
262 -- We need to register a timeout handler for this thread, and
304 -- We need to register a timeout handler for this thread, and
263 -- cancel that handler as soon as we exit.
305 -- cancel that handler as soon as we exit.
264− bracket (T.registerKillThread tm) T.cancel $ \th ->
306+ serve unmask (conn, transport) = bracket register cancel $ \th -> do
266− let ii = InternalInfo th fc dc
267− conn = setSendFile conn0 fc
268− -- We now have fully registered a connection close handler
307+ -- We now have fully registered a connection close handler in
269− -- in the case of all exceptions, so it is safe to one
308+ -- the case of all exceptions, so it is safe to once again
270− -- again allow async exceptions.
309+ -- allow async exceptions.
271− in unmask .
310+ unmask .
272− -- Call the user-supplied on exception code if any
273− -- exceptions are thrown.
274− handle (onE set Nothing) .
276− -- Call the user-supplied code for connection open and close events
311+ -- Call the user-supplied code for connection open and
277− bracket (onOpen addr) (onClose addr) $ \goingon ->
313+ bracket (onOpen addr) (onClose addr) $ \goingon ->
279− -- Actually serve this connection.
314+ -- Actually serve this connection. bracket with closeConn
280− -- bracket with closeConn above ensures the connection is closed.
315+ -- above ensures the connection is closed.
281− when goingon $ serveConnection conn ii addr transport set app
316+ when goingon $ serveConnection conn ii th addr transport set app
283− closeConn (conn, _transport) = connClose conn
318+ register = T.registerKillThread (timeoutManager ii) (connClose conn)
285 onOpen adr = increase counter >> settingsOnOpen set adr
321 onOpen adr = increase counter >> settingsOnOpen set adr
286 onClose adr _ = decrease counter >> settingsOnClose set adr
322 onClose adr _ = decrease counter >> settingsOnClose set adr
288serveConnection :: Connection
324serveConnection :: Connection
289 -> InternalInfo
325 -> InternalInfo
290 -> SockAddr
327 -> SockAddr
291 -> Transport
328 -> Transport
292 -> Settings
329 -> Settings
293 -> Application
330 -> Application
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
337+ bs0 <- connRecv conn
338+ if S.length bs0 >= 4 && "PRI " `S.isPrefixOf` bs0 then
296 istatus <- newIORef False
342 istatus <- newIORef False
343+ if settingsHTTP2Enabled settings && h2 then do
344+ rawRecvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
345+ -- This thread becomes the sender in http2 library.
346+ -- In the case of event source, one request comes and one
347+ -- worker gets busy. But it is likely that the receiver does
348+ -- not receive any data at all while the sender is sending
349+ -- output data from the worker. It's not good enough to tickle
350+ -- the time handler in the receiver only. So, we should tickle
351+ -- the time handler in both the receiver and the sender.
352+ let recvN = wrappedRecvN th istatus (settingsSlowlorisSize settings) rawRecvN
353+ sendBS x = connSendAll conn x >> T.tickle th
356+ setConnHTTP2 conn True
357+ http2 conn transport ii origAddr settings recvN sendBS app
297− src <- mkSource (connSource conn th istatus)
359+ src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
360+ writeIORef istatus True
361+ leftoverSource src bs
298− addr <- getProxyProtocolAddr src
362+ addr <- getProxyProtocolAddr src
299− http1 addr istatus src `E.catch` \e -> do
363+ http1 True addr istatus src `E.catch` \e ->
366+ -- See comment below referencing
367+ -- https://github.com/yesodweb/wai/issues/618
368+ | Just NoKeepAliveRequest <- fromException e -> return ()
370+ | Just (BadFirstLine _) <- fromException e -> return ()
300− sendErrorResponse addr istatus e
372+ _ <- sendErrorResponse (dummyreq addr) istatus e
301− throwIO (e :: SomeException)
373+ throwIO e
304 getProxyProtocolAddr src =
376 getProxyProtocolAddr src =
@@ -341,32 +413,40 @@ serveConnection conn ii origAddr transport settings app = do
342 decodeAscii = map (chr . fromEnum) . S.unpack
414 decodeAscii = map (chr . fromEnum) . S.unpack
344− th = threadHandle ii
416+ shouldSendErrorResponse se
417+ | Just ConnectionClosedByPeer <- fromException se = False
346− sendErrorResponse addr istatus e = do
420+ sendErrorResponse req istatus e = do
347 status <- readIORef istatus
421 status <- readIORef istatus
348− when status $ void $
422+ if shouldSendErrorResponse e && status
349− sendResponse
423+ then do
350− (settingsServerName settings)
351− conn ii (dummyreq addr) defaultIndexRequestHeader (return S.empty) (errorResponse e)
424+ sendResponse settings conn ii th req defaultIndexRequestHeader (return S.empty) (errorResponse e)
353 dummyreq addr = defaultRequest { remoteHost = addr }
427 dummyreq addr = defaultRequest { remoteHost = addr }
355 errorResponse e = settingsOnExceptionResponse settings e
429 errorResponse e = settingsOnExceptionResponse settings e
357− http1 addr istatus src = do
431+ http1 firstRequest addr istatus src = do
358− (req', mremainingRef, idxhdr) <- recvRequest settings conn ii addr src
432+ (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
359− let req = req' { isSecure = isTransportSecure transport }
360− keepAlive <- processRequest istatus src req mremainingRef idxhdr
433+ keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
361 `E.catch` \e -> do
434 `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
435+ settingsOnException settings (Just req) e
365− -- Don't throw the error again to prevent calling onE twice.
436+ -- Don't throw the error again to prevent calling settingsOnException twice.
366 return False
437 return False
367− when keepAlive $ http1 addr istatus src
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
369− processRequest istatus src req mremainingRef idxhdr = do
449+ processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
370 -- Let the application run for as long as it wants
450 -- Let the application run for as long as it wants
371 T.pause th
451 T.pause th
@@ -374,44 +454,50 @@ serveConnection conn ii origAddr transport settings app = do
374 -- creating the request, we need to make sure that we don't get
454 -- creating the request, we need to make sure that we don't get
375 -- an async exception before calling the ResponseSource.
455 -- an async exception before calling the ResponseSource.
376 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
456 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
377− _ <- app req $ \res -> do
457+ r <- E.try $ app req $ \res -> do
378 T.resume th
458 T.resume th
379 -- FIXME consider forcing evaluation of the res here to
459 -- FIXME consider forcing evaluation of the res here to
380 -- send more meaningful error messages to the user.
460 -- send more meaningful error messages to the user.
381 -- However, it may affect performance.
461 -- However, it may affect performance.
382 writeIORef istatus False
462 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
386 writeIORef keepAliveRef keepAlive
464 writeIORef keepAliveRef keepAlive
387 return ResponseReceived
465 return ResponseReceived
467+ Right ResponseReceived -> return ()
468+ Left e@(SomeException _)
469+ | Just (ExceptionInsideResponseBody e') <- fromException e -> throwIO e'
471+ keepAlive <- sendErrorResponse req istatus e
472+ settingsOnException settings (Just req) e
473+ writeIORef keepAliveRef keepAlive
388 keepAlive <- readIORef keepAliveRef
475 keepAlive <- readIORef keepAliveRef
390 -- We just send a Response and it takes a time to
477 -- We just send a Response and it takes a time to
391 -- receive a Request again. If we immediately call recv,
478 -- receive a Request again. If we immediately call recv,
392− -- it is likely to fail and the IO manager works.
479+ -- it is likely to fail and cause the IO manager to do some work.
393− -- It is very costy. So, we yield to another Haskell
480+ -- It is very costly, so we yield to another Haskell
394− -- thread hoping that the next Request will arraive
481+ -- thread hoping that the next Request will arrive
395 -- when this Haskell thread will be re-scheduled.
482 -- when this Haskell thread will be re-scheduled.
396 -- This improves performance at least when
483 -- This improves performance at least when
397 -- the number of cores is small.
484 -- the number of cores is small.
398 Conc.yield
485 Conc.yield
400− if not keepAlive then
487+ if keepAlive
401− return False
488+ then
403 -- If there is an unknown or large amount of data to still be read
489 -- If there is an unknown or large amount of data to still be read
404 -- from the request body, simple drop this connection instead of
490 -- from the request body, simple drop this connection instead of
405 -- reading it all in to satisfy a keep-alive request.
491 -- reading it all in to satisfy a keep-alive request.
406 case settingsMaximumBodyFlush settings of
492 case settingsMaximumBodyFlush settings of
407 Nothing -> do
493 Nothing -> do
408− flushEntireBody (requestBody req)
494+ flushEntireBody nextBodyFlush
409 T.resume th
495 T.resume th
410 return True
496 return True
411 Just maxToRead -> do
497 Just maxToRead -> do
412 let tryKeepAlive = do
498 let tryKeepAlive = do
413 -- flush the rest of the request body
499 -- flush the rest of the request body
414− isComplete <- flushBody (requestBody req) maxToRead
500+ isComplete <- flushBody nextBodyFlush maxToRead
415 if isComplete then do
501 if isComplete then do
416 T.resume th
502 T.resume th
417 return True
503 return True
@@ -425,6 +511,21 @@ serveConnection conn ii origAddr transport settings app = do
426 return False
512 return False
427 Nothing -> tryKeepAlive
513 Nothing -> tryKeepAlive
517+ checkTLS = case transport of
518+ TCP -> return () -- direct
519+ tls -> unless (tls12orLater tls) $ goaway conn H2.InadequateSecurity "Weak TLS"
520+ tls12orLater tls = tlsMajorVersion tls == 3 && tlsMinorVersion tls >= 3
522+-- connClose must not be called here since Run:fork calls it
523+goaway :: Connection -> H2.ErrorCodeId -> ByteString -> IO ()
524+goaway Connection{..} etype debugmsg = connSendAll bytestream
526+ einfo = H2.encodeInfo id 0
527+ frame = H2.GoAwayFrame 0 etype debugmsg
528+ bytestream = H2.encodeFrame einfo frame
429flushEntireBody :: IO ByteString -> IO ()
530flushEntireBody :: IO ByteString -> IO ()
430flushEntireBody src =
531flushEntireBody src =
@@ -449,26 +550,50 @@ flushBody src =
449 | toRead' >= 0 -> loop toRead'
550 | toRead' >= 0 -> loop toRead'
450 | otherwise -> return False
551 | otherwise -> return False
452−connSource :: Connection -> T.Handle -> IORef Bool -> IO ByteString
553+wrappedRecv :: Connection -> T.Handle -> IORef Bool -> Int -> IO ByteString
453−connSource Connection { connRecv = recv } th istatus = do
554+wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
454 bs <- recv
555 bs <- recv
455 unless (S.null bs) $ do
556 unless (S.null bs) $ do
456 writeIORef istatus True
557 writeIORef istatus True
457− when (S.length bs >= 2048) $ T.tickle th
558+ when (S.length bs >= slowlorisSize) $ 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
458 return bs
572 return bs
574+-- | Set flag FileCloseOnExec flag on a socket (on Unix)
460-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
576-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
461setSocketCloseOnExec :: Socket -> IO ()
579setSocketCloseOnExec :: Socket -> IO ()
462#if WINDOWS
580#if WINDOWS
463setSocketCloseOnExec _ = return ()
581setSocketCloseOnExec _ = return ()
465−setSocketCloseOnExec socket =
583+setSocketCloseOnExec socket = do
466− setFdOption (fromIntegral $ fdSocket socket) CloseOnExec True
584+#if MIN_VERSION_network(3,0,0)
585+ fd <- fdSocket socket
587+ let fd = fdSocket socket
589+ F.setFileCloseOnExec $ fromIntegral fd
469−gracefulShutdown :: Counter -> IO ()
592+gracefulShutdown :: Settings -> Counter -> IO ()
470−gracefulShutdown counter = do
593+gracefulShutdown set counter =
471− -- To avoid race condition, we just use threadDelay, not MVar.
594+ case settingsGracefulShutdownTimeout set of
472− threadDelay 10000000
595+ Nothing ->
473− noConnections <- isZero counter
596+ waitForZero counter
474− unless noConnections $ gracefulShutdown counter
597+ (Just seconds) ->
598+ void (timeout (seconds * microsPerSecond) (waitForZero counter))
599+ where microsPerSecond = 1000000