@@ -1,86 +1,101 @@
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
24−import Network.Wai.HTTP2 (Http2Application)
31+import Network.Wai.Internal (ResponseReceived (ResponseReceived))
32+import System.Environment (lookupEnv)
33+import qualified System.TimeManager as T
34+import System.Timeout (timeout)
25import Network.Wai.Handler.Warp.Buffer
36import Network.Wai.Handler.Warp.Buffer
26import Network.Wai.Handler.Warp.Counter
37import Network.Wai.Handler.Warp.Counter
27import qualified Network.Wai.Handler.Warp.Date as D
38import qualified Network.Wai.Handler.Warp.Date as D
28import 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
29−import Network.Wai.Handler.Warp.HTTP2 (http2, isHTTP2, promoteApplication)
41+import Network.Wai.Handler.Warp.HTTP2 (http2)
42+import Network.Wai.Handler.Warp.HTTP2.Types (isHTTP2)
30import Network.Wai.Handler.Warp.Header
43import Network.Wai.Handler.Warp.Header
44+import Network.Wai.Handler.Warp.Imports hiding (readInt)
31import Network.Wai.Handler.Warp.ReadInt
45import Network.Wai.Handler.Warp.ReadInt
32import Network.Wai.Handler.Warp.Recv
46import Network.Wai.Handler.Warp.Recv
33import Network.Wai.Handler.Warp.Request
47import Network.Wai.Handler.Warp.Request
34import Network.Wai.Handler.Warp.Response
48import Network.Wai.Handler.Warp.Response
35import Network.Wai.Handler.Warp.SendFile
49import Network.Wai.Handler.Warp.SendFile
36import Network.Wai.Handler.Warp.Settings
50import Network.Wai.Handler.Warp.Settings
37−import qualified Network.Wai.Handler.Warp.Timeout as T
38import Network.Wai.Handler.Warp.Types
51import Network.Wai.Handler.Warp.Types
39−import Network.Wai.Internal (ResponseReceived (ResponseReceived))
52+
40−import System.Environment (getEnvironment)
41−import System.IO.Error (isFullErrorType, ioeGetErrorType)
43#if WINDOWS
54#if WINDOWS
44import Network.Wai.Handler.Warp.Windows
55import Network.Wai.Handler.Warp.Windows
46−import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
47import Network.Socket (fdSocket)
57import Network.Socket (fdSocket)
50-- | Creating 'Connection' for plain HTTP based on a given socket.
60-- | Creating 'Connection' for plain HTTP based on a given socket.
51−socketConnection :: Socket -> IO Connection
61+socketConnection :: Settings -> Socket -> IO Connection
62+#if MIN_VERSION_network(3,1,1)
63+socketConnection set s = do
52−socketConnection s = do
65+socketConnection _ s = do
53 bufferPool <- newBufferPool
67 bufferPool <- newBufferPool
54 writeBuf <- allocateBuffer bufferSize
68 writeBuf <- allocateBuffer bufferSize
55 let sendall = Sock.sendAll s
69 let sendall = Sock.sendAll s
70+ isH2 <- newIORef False -- HTTP/1.x
56 return Connection {
71 return Connection {
57 connSendMany = Sock.sendMany s
72 connSendMany = Sock.sendMany s
58 , connSendAll = sendall
73 , connSendAll = sendall
59 , connSendFile = sendFile s writeBuf bufferSize sendall
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
60− , connClose = sClose s >> freeBuffer writeBuf
87+ , connFree = freeBuffer writeBuf
61 , connRecv = receive s bufferPool
88 , connRecv = receive s bufferPool
62 , connRecvBuf = receiveBuf s
89 , connRecvBuf = receiveBuf s
63 , connWriteBuffer = writeBuf
90 , connWriteBuffer = writeBuf
64 , connBufferSize = bufferSize
91 , connBufferSize = bufferSize
67−#if __GLASGOW_HASKELL__ < 702
68−allowInterrupt :: IO ()
69−allowInterrupt = unblock $ return ()
72−-- Used to duplicate the 'app' argument for all of the non-HTTP2 variants.
73−runWithPromotedApp :: (Http2Application -> Application -> a) -> Application -> a
74−runWithPromotedApp f = flip f <*> promoteApplication
76-- | Run an 'Application' on the given port.
95-- | Run an 'Application' on the given port.
77-- This calls 'runSettings' with 'defaultSettings'.
96-- This calls 'runSettings' with 'defaultSettings'.
78run :: Port -> Application -> IO ()
97run :: Port -> Application -> IO ()
79−run = runWithPromotedApp . runHttp2
81−-- | The HTTP/2-aware eqivalent of 'run'.
82−runHttp2 :: Port -> Http2Application -> Application -> IO ()
83−runHttp2 p = runHttp2Settings defaultSettings { settingsPort = p }
98+run p = runSettings defaultSettings { settingsPort = p }
85-- | Run an 'Application' on the port present in the @PORT@
100-- | Run an 'Application' on the port present in the @PORT@
86-- environment variable. Uses the 'Port' given when the variable is unset.
101-- environment variable. Uses the 'Port' given when the variable is unset.
@@ -88,36 +103,28 @@ runHttp2 p = runHttp2Settings defaultSettings { settingsPort = p }
89-- Since 3.0.9
104-- Since 3.0.9
90runEnv :: Port -> Application -> IO ()
105runEnv :: Port -> Application -> IO ()
91−runEnv = runWithPromotedApp . runHttp2Env
106+runEnv p app = do
92−
107+ mp <- lookupEnv "PORT"
93−-- | The HTTP/2-aware eqivalent of 'runEnv'.
94−runHttp2Env :: Port -> Http2Application -> Application -> IO ()
95−runHttp2Env p app2 app = do
96− mp <- fmap (lookup "PORT") getEnvironment
98 maybe (run p app) runReadPort mp
109 maybe (run p app) runReadPort mp
101 runReadPort :: String -> IO ()
112 runReadPort :: String -> IO ()
102 runReadPort sp = case reads sp of
113 runReadPort sp = case reads sp of
103− ((p', _):_) -> runHttp2 p' app2 app
114+ ((p', _):_) -> run p' app
104 _ -> fail $ "Invalid value in $PORT: " ++ sp
115 _ -> fail $ "Invalid value in $PORT: " ++ sp
106-- | Run an 'Application' with the given 'Settings'.
117-- | Run an 'Application' with the given 'Settings'.
107-- This opens a listen socket on the port defined in 'Settings' and
118-- This opens a listen socket on the port defined in 'Settings' and
108-- calls 'runSettingsSocket'.
119-- calls 'runSettingsSocket'.
109runSettings :: Settings -> Application -> IO ()
120runSettings :: Settings -> Application -> IO ()
110−runSettings = runWithPromotedApp . runHttp2Settings
112−-- | The HTTP/2-aware eqivalent of 'runSettings'.
113−runHttp2Settings :: Settings -> Http2Application -> Application -> IO ()
114−runHttp2Settings set app2 app = withSocketsDo $
121+runSettings set app = withSocketsDo $
116 (bindPortTCP (settingsPort set) (settingsHost set))
123 (bindPortTCP (settingsPort set) (settingsHost set))
118 (\socket -> do
125 (\socket -> do
119 setSocketCloseOnExec socket
126 setSocketCloseOnExec socket
120− runHttp2SettingsSocket set socket app2 app)
127+ runSettingsSocket set socket app)
122-- | This installs a shutdown handler for the given socket and
129-- | This installs a shutdown handler for the given socket and
123-- calls 'runSettingsConnection' with the default connection setup action
130-- calls 'runSettingsConnection' with the default connection setup action
@@ -131,14 +138,9 @@ runHttp2Settings set app2 app = withSocketsDo $
131-- 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
132-- 'serverPort' record.
139-- 'serverPort' record.
133runSettingsSocket :: Settings -> Socket -> Application -> IO ()
140runSettingsSocket :: Settings -> Socket -> Application -> IO ()
134−runSettingsSocket set socket = runWithPromotedApp $
141+runSettingsSocket set socket app = do
135− runHttp2SettingsSocket set socket
137−-- | The HTTP/2-aware eqivalent of 'runSettingsSocket'.
138−runHttp2SettingsSocket :: Settings -> Socket -> Http2Application -> Application -> IO ()
139−runHttp2SettingsSocket set socket app2 app = do
140 settingsInstallShutdownHandler set closeListenSocket
142 settingsInstallShutdownHandler set closeListenSocket
141− runHttp2SettingsConnection set getConn app2 app
143+ runSettingsConnection set getConn app
143 getConn = do
145 getConn = do
144#if WINDOWS
146#if WINDOWS
@@ -147,10 +149,12 @@ runHttp2SettingsSocket set socket app2 app = do
147 (s, sa) <- accept socket
149 (s, sa) <- accept socket
149 setSocketCloseOnExec s
151 setSocketCloseOnExec s
152+ -- NoDelay causes an error for AF_UNIX.
153+ setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
150− conn <- socketConnection s
154+ conn <- socketConnection set s
151 return (conn, sa)
155 return (conn, sa)
153− closeListenSocket = sClose socket
157+ closeListenSocket = close socket
155-- | The connection setup action would be expensive. A good example
159-- | The connection setup action would be expensive. A good example
156-- is initialization of TLS.
160-- is initialization of TLS.
@@ -162,13 +166,7 @@ runHttp2SettingsSocket set socket app2 app = do
163-- Since 1.3.5
167-- Since 1.3.5
164runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
168runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
165−runSettingsConnection set getConn = runWithPromotedApp $
169+runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMaker app
166− runHttp2SettingsConnection set getConn
168−-- | The HTTP/2-aware eqivalent of 'runSettingsConnection'.
169−runHttp2SettingsConnection :: Settings -> IO (Connection, SockAddr) -> Http2Application -> Application -> IO ()
170−runHttp2SettingsConnection set getConn app2 app =
171− runHttp2SettingsConnectionMaker set getConnMaker app2 app
173 getConnMaker = do
171 getConnMaker = do
174 (conn, sa) <- getConn
172 (conn, sa) <- getConn
@@ -177,15 +175,10 @@ runHttp2SettingsConnection set getConn app2 app =
177-- | This modifies the connection maker so that it returns 'TCP' for 'Transport'
175-- | This modifies the connection maker so that it returns 'TCP' for 'Transport'
178-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
176-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
179runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
177runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
180−runSettingsConnectionMaker x y = runWithPromotedApp $
178+runSettingsConnectionMaker x y =
181− runHttp2SettingsConnectionMaker x y
179+ runSettingsConnectionMakerSecure x (toTCP <$> y)
183−-- | The HTTP/2-aware eqivalent of 'runSettingsConnectionMaker'.
184−runHttp2SettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Http2Application -> Application -> IO ()
185−runHttp2SettingsConnectionMaker x y =
186− runHttp2SettingsConnectionMakerSecure x (go y)
188− go = fmap (first (fmap (, TCP)))
181+ toTCP = first ((, TCP) <$>)
190----------------------------------------------------------------
183----------------------------------------------------------------
@@ -196,25 +189,26 @@ runHttp2SettingsConnectionMaker x y =
197-- Since 2.1.4
190-- Since 2.1.4
198runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
191runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
199−runSettingsConnectionMakerSecure set getConnMaker = runWithPromotedApp $
192+runSettingsConnectionMakerSecure set getConnMaker app = do
200− runHttp2SettingsConnectionMakerSecure set getConnMaker
202−-- | The HTTP/2-aware eqivalent of 'runSettingsConnectionMakerSecure'.
203−runHttp2SettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Http2Application -> Application -> IO ()
204−runHttp2SettingsConnectionMakerSecure set getConnMaker app2 app = do
205 settingsBeforeMainLoop set
193 settingsBeforeMainLoop set
206 counter <- newCounter
194 counter <- newCounter
208− D.withDateCache $ \dc ->
209− F.withFdCache fdCacheDurationInSeconds $ \fc ->
210− withTimeoutManager $ \tm ->
211− acceptConnection set getConnMaker app2 app dc fc tm counter
195+ withII $ acceptConnection set getConnMaker app counter
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
213− fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
205+ !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
206+ !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
207+ !timeoutInSeconds = settingsTimeout set * 1000000
214 withTimeoutManager f = case settingsManager set of
208 withTimeoutManager f = case settingsManager set of
215 Just tm -> f tm
209 Just tm -> f tm
216 Nothing -> bracket
210 Nothing -> bracket
217− (T.initialize $ settingsTimeout set * 1000000)
211+ (T.initialize timeoutInSeconds)
218 T.stopManager
212 T.stopManager
@@ -233,19 +227,21 @@ runHttp2SettingsConnectionMakerSecure set getConnMaker app2 app = do
233-- Our approach is explained in the comments below.
227-- Our approach is explained in the comments below.
234acceptConnection :: Settings
228acceptConnection :: Settings
235 -> IO (IO (Connection, Transport), SockAddr)
229 -> IO (IO (Connection, Transport), SockAddr)
237 -> Application
230 -> Application
239− -> Maybe F.MutableFdCache
241 -> Counter
231 -> Counter
243−acceptConnection set getConnMaker app2 app dc fc tm counter = do
234+acceptConnection set getConnMaker app counter ii = do
244 -- First mask all exceptions in acceptLoop. This is necessary to
235 -- First mask all exceptions in acceptLoop. This is necessary to
245 -- ensure that no async exception is throw between the call to
236 -- ensure that no async exception is throw between the call to
246 -- acceptNewConnection and the registering of connClose.
237 -- acceptNewConnection and the registering of connClose.
239+ -- acceptLoop can be broken by closing the listing socket.
247 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.
248− gracefulShutdown counter
244+ gracefulShutdown set counter
250 acceptLoop = do
246 acceptLoop = do
251 -- Allow async exceptions before receiving the next connection maker.
247 -- Allow async exceptions before receiving the next connection maker.
@@ -262,84 +258,78 @@ acceptConnection set getConnMaker app2 app dc fc tm counter = do
262 case mx of
258 case mx of
263 Nothing -> return ()
259 Nothing -> return ()
264 Just (mkConn, addr) -> do
260 Just (mkConn, addr) -> do
265− fork set mkConn addr app2 app dc fc tm counter
261+ fork set mkConn addr app counter ii
266 acceptLoop
262 acceptLoop
268 acceptNewConnection = do
264 acceptNewConnection = do
269 ex <- try getConnMaker
265 ex <- try getConnMaker
270 case ex of
266 case ex of
271 Right x -> return $ Just x
267 Right x -> return $ Just x
272− Left e -> do
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− settingsOnException set Nothing $ toException e
274+ settingsOnException set Nothing $ toException e
274− if isFullErrorType (ioeGetErrorType e) then do
275− -- "resource exhausted (Too many open files)" may
276− -- happen by accept(). Wait a second hoping that
277− -- resource will be available.
281− -- Assuming the listen socket is closed.
282− return Nothing
275+ return Nothing
284-- 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
285-- function to unmask (i.e., allow async exceptions to be thrown).
278-- function to unmask (i.e., allow async exceptions to be thrown).
286fork :: Settings
279fork :: Settings
287 -> IO (Connection, Transport)
280 -> IO (Connection, Transport)
288 -> SockAddr
281 -> SockAddr
290 -> Application
282 -> Application
292− -> Maybe F.MutableFdCache
294 -> Counter
283 -> Counter
296−fork set mkConn addr app2 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) $
297− -- Run the connection maker to get a new connection, and ensure
290+ -- Run the connection maker to get a new connection, and ensure
298− -- that the connection is closed. If the mkConn call throws an
291+ -- that the connection is closed. If the mkConn call throws an
299− -- exception, we will leak the connection. If the mkConn call is
292+ -- exception, we will leak the connection. If the mkConn call is
300− -- vulnerable to attacks (e.g., Slowloris), we do nothing to
293+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
301− -- protect the server. It is therefore vital that mkConn is well
294+ -- protect the server. It is therefore vital that mkConn is well
302− -- vetted.
295+ -- vetted.
304− -- We grab the connection before registering timeouts since the
297+ -- We grab the connection before registering timeouts since the
305− -- timeouts will be useless during connection creation, due to the
298+ -- timeouts will be useless during connection creation, due to the
306− -- fact that async exceptions are still masked.
299+ -- fact that async exceptions are still masked.
307− bracket mkConn closeConn $ \(conn, transport) ->
300+ bracket mkConn cleanUp (serve unmask)
302+ cleanUp (conn, _) = connClose conn `finally` connFree conn
309 -- We need to register a timeout handler for this thread, and
304 -- We need to register a timeout handler for this thread, and
310 -- cancel that handler as soon as we exit.
305 -- cancel that handler as soon as we exit.
311− bracket (T.registerKillThread tm) T.cancel $ \th ->
306+ serve unmask (conn, transport) = bracket register cancel $ \th -> do
313− let ii = InternalInfo th tm fc dc
314− -- We now have fully registered a connection close handler
307+ -- We now have fully registered a connection close handler in
315− -- 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
316− -- again allow async exceptions.
309+ -- allow async exceptions.
317− in unmask .
310+ unmask .
318− -- Call the user-supplied on exception code if any
319− -- exceptions are thrown.
320− handle (settingsOnException set Nothing) .
322− -- Call the user-supplied code for connection open and close events
311+ -- Call the user-supplied code for connection open and
323− bracket (onOpen addr) (onClose addr) $ \goingon ->
313+ bracket (onOpen addr) (onClose addr) $ \goingon ->
325− -- Actually serve this connection.
314+ -- Actually serve this connection. bracket with closeConn
326− -- bracket with closeConn above ensures the connection is closed.
315+ -- above ensures the connection is closed.
327− when goingon $ serveConnection conn ii addr transport set app2 app
316+ when goingon $ serveConnection conn ii th addr transport set app
329− closeConn (conn, _transport) = connClose conn
318+ register = T.registerKillThread (timeoutManager ii) (connClose conn)
331 onOpen adr = increase counter >> settingsOnOpen set adr
321 onOpen adr = increase counter >> settingsOnOpen set adr
332 onClose adr _ = decrease counter >> settingsOnClose set adr
322 onClose adr _ = decrease counter >> settingsOnClose set adr
334serveConnection :: Connection
324serveConnection :: Connection
335 -> InternalInfo
325 -> InternalInfo
336 -> SockAddr
327 -> SockAddr
337 -> Transport
328 -> Transport
338 -> Settings
329 -> Settings
340 -> Application
330 -> Application
342−serveConnection conn ii origAddr transport settings app2 app = do
332+serveConnection conn ii th origAddr transport settings app = do
343 -- fixme: Upgrading to HTTP/2 should be supported.
333 -- fixme: Upgrading to HTTP/2 should be supported.
344 (h2,bs) <- if isHTTP2 transport then
334 (h2,bs) <- if isHTTP2 transport then
345 return (True, "")
335 return (True, "")
@@ -349,19 +339,39 @@ serveConnection conn ii origAddr transport settings app2 app = do
349 return (True, bs0)
339 return (True, bs0)
351 return (False, bs0)
341 return (False, bs0)
342+ istatus <- newIORef False
352− if h2 then do
343+ if settingsHTTP2Enabled settings && h2 then do
353− recvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
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
354 -- fixme: origAddr
356+ setConnHTTP2 conn True
355− http2 conn ii origAddr transport settings recvN app2
357+ http2 conn transport ii origAddr settings recvN sendBS app
357− istatus <- newIORef False
358 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
359 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
359 writeIORef istatus True
360 writeIORef istatus True
360 leftoverSource src bs
361 leftoverSource src bs
361 addr <- getProxyProtocolAddr src
362 addr <- getProxyProtocolAddr src
362− 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 ()
363− sendErrorResponse addr istatus e
372+ _ <- sendErrorResponse (dummyreq addr) istatus e
364− throwIO (e :: SomeException)
373+ throwIO e
366 getProxyProtocolAddr src =
376 getProxyProtocolAddr src =
367 case settingsProxyProtocol settings of
377 case settingsProxyProtocol settings of
@@ -403,30 +413,38 @@ serveConnection conn ii origAddr transport settings app2 app = do
404 decodeAscii = map (chr . fromEnum) . S.unpack
414 decodeAscii = map (chr . fromEnum) . S.unpack
406− th = threadHandle ii
416+ shouldSendErrorResponse se
417+ | Just ConnectionClosedByPeer <- fromException se = False
408− sendErrorResponse addr istatus e = do
420+ sendErrorResponse req istatus e = do
409 status <- readIORef istatus
421 status <- readIORef istatus
410− when status $ void $
422+ if shouldSendErrorResponse e && status
411− sendResponse
423+ then do
412− (settingsServerName settings)
413− conn ii (dummyreq addr) defaultIndexRequestHeader (return S.empty) (errorResponse e)
424+ sendResponse settings conn ii th req defaultIndexRequestHeader (return S.empty) (errorResponse e)
415 dummyreq addr = defaultRequest { remoteHost = addr }
427 dummyreq addr = defaultRequest { remoteHost = addr }
417 errorResponse e = settingsOnExceptionResponse settings e
429 errorResponse e = settingsOnExceptionResponse settings e
419− http1 addr istatus src = do
431+ http1 firstRequest addr istatus src = do
420− (req', mremainingRef, idxhdr, nextBodyFlush) <- recvRequest settings conn ii addr src
432+ (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
421− let req = req' { isSecure = isTransportSecure transport }
422 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
433 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
423 `E.catch` \e -> do
434 `E.catch` \e -> do
424− -- Call the user-supplied exception handlers, passing the request.
425− sendErrorResponse addr istatus e
426 settingsOnException settings (Just req) e
435 settingsOnException settings (Just req) e
427 -- Don't throw the error again to prevent calling settingsOnException twice.
436 -- Don't throw the error again to prevent calling settingsOnException twice.
428 return False
437 return False
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
429− when keepAlive $ http1 addr istatus src
447+ when keepAlive $ http1 False addr istatus src
431 processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
449 processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
432 -- Let the application run for as long as it wants
450 -- Let the application run for as long as it wants
@@ -436,32 +454,38 @@ serveConnection conn ii origAddr transport settings app2 app = do
436 -- 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
437 -- an async exception before calling the ResponseSource.
455 -- an async exception before calling the ResponseSource.
438 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
456 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
439− _ <- app req $ \res -> do
457+ r <- E.try $ app req $ \res -> do
440 T.resume th
458 T.resume th
441 -- FIXME consider forcing evaluation of the res here to
459 -- FIXME consider forcing evaluation of the res here to
442 -- send more meaningful error messages to the user.
460 -- send more meaningful error messages to the user.
443 -- However, it may affect performance.
461 -- However, it may affect performance.
444 writeIORef istatus False
462 writeIORef istatus False
445− keepAlive <- sendResponse
446− (settingsServerName settings)
447− conn ii req idxhdr (readSource src) res
463+ keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
448 writeIORef keepAliveRef keepAlive
464 writeIORef keepAliveRef keepAlive
449 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
450 keepAlive <- readIORef keepAliveRef
475 keepAlive <- readIORef keepAliveRef
452 -- We just send a Response and it takes a time to
477 -- We just send a Response and it takes a time to
453 -- receive a Request again. If we immediately call recv,
478 -- receive a Request again. If we immediately call recv,
454− -- 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.
455− -- It is very costly. So, we yield to another Haskell
480+ -- It is very costly, so we yield to another Haskell
456 -- thread hoping that the next Request will arrive
481 -- thread hoping that the next Request will arrive
457 -- when this Haskell thread will be re-scheduled.
482 -- when this Haskell thread will be re-scheduled.
458 -- This improves performance at least when
483 -- This improves performance at least when
459 -- the number of cores is small.
484 -- the number of cores is small.
460 Conc.yield
485 Conc.yield
462− if not keepAlive then
487+ if keepAlive
463− return False
488+ then
465 -- 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
466 -- from the request body, simple drop this connection instead of
490 -- from the request body, simple drop this connection instead of
467 -- reading it all in to satisfy a keep-alive request.
491 -- reading it all in to satisfy a keep-alive request.
@@ -487,6 +511,21 @@ serveConnection conn ii origAddr transport settings app2 app = do
488 return False
512 return False
489 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
491flushEntireBody :: IO ByteString -> IO ()
530flushEntireBody :: IO ByteString -> IO ()
492flushEntireBody src =
531flushEntireBody src =
@@ -519,14 +558,42 @@ wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
519 when (S.length bs >= slowlorisSize) $ T.tickle th
558 when (S.length bs >= slowlorisSize) $ T.tickle th
520 return bs
559 return bs
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
574+-- | Set flag FileCloseOnExec flag on a socket (on Unix)
522-- 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
523setSocketCloseOnExec :: Socket -> IO ()
579setSocketCloseOnExec :: Socket -> IO ()
524#if WINDOWS
580#if WINDOWS
525setSocketCloseOnExec _ = return ()
581setSocketCloseOnExec _ = return ()
527−setSocketCloseOnExec socket =
583+setSocketCloseOnExec socket = do
528− 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
531−gracefulShutdown :: Counter -> IO ()
592+gracefulShutdown :: Settings -> Counter -> IO ()
532−gracefulShutdown counter = waitForZero counter
593+gracefulShutdown set counter =
594+ case settingsGracefulShutdownTimeout set of
598+ void (timeout (seconds * microsPerSecond) (waitForZero counter))
599+ where microsPerSecond = 1000000