@@ -1,95 +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
9−#if __GLASGOW_HASKELL__ < 709
14+import "iproute" Data.IP (toHostAddress, toHostAddress6)
10−import Control.Applicative ((<$>))
12import Control.Arrow (first)
15import Control.Arrow (first)
13−import Control.Concurrent (threadDelay)
14import qualified Control.Concurrent as Conc (yield)
16import qualified Control.Concurrent as Conc (yield)
15import Control.Exception as E
17import Control.Exception as E
16−import Control.Monad (when, unless, void)
17−import Data.ByteString (ByteString)
18import qualified Data.ByteString as S
18import qualified Data.ByteString as S
19import Data.Char (chr)
19import Data.Char (chr)
20−import Data.IP (toHostAddress, toHostAddress6)
21import Data.IORef (IORef, newIORef, readIORef, writeIORef)
20import Data.IORef (IORef, newIORef, readIORef, writeIORef)
22import Data.Streaming.Network (bindPortTCP)
21import Data.Streaming.Network (bindPortTCP)
23−import Network (sClose, Socket)
22+import Foreign.C.Error (Errno(..), eCONNABORTED)
23+import GHC.IO.Exception (IOException(..))
24+import qualified Network.HTTP2 as H2
24−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)
25import qualified Network.Socket.ByteString as Sock
29import qualified Network.Socket.ByteString as Sock
26import Network.Wai
30import Network.Wai
27−import Network.Wai.HTTP2 (HTTP2Application, promoteApplication)
31+import Network.Wai.Internal (ResponseReceived (ResponseReceived))
32+import System.Environment (lookupEnv)
33+import qualified System.TimeManager as T
34+import System.Timeout (timeout)
28import Network.Wai.Handler.Warp.Buffer
36import Network.Wai.Handler.Warp.Buffer
29import Network.Wai.Handler.Warp.Counter
37import Network.Wai.Handler.Warp.Counter
30import qualified Network.Wai.Handler.Warp.Date as D
38import qualified Network.Wai.Handler.Warp.Date as D
31import qualified Network.Wai.Handler.Warp.FdCache as F
39import qualified Network.Wai.Handler.Warp.FdCache as F
32import qualified Network.Wai.Handler.Warp.FileInfoCache as I
40import qualified Network.Wai.Handler.Warp.FileInfoCache as I
33−import Network.Wai.Handler.Warp.HTTP2 (http2, isHTTP2)
41+import Network.Wai.Handler.Warp.HTTP2 (http2)
42+import Network.Wai.Handler.Warp.HTTP2.Types (isHTTP2)
34import Network.Wai.Handler.Warp.Header
43import Network.Wai.Handler.Warp.Header
44+import Network.Wai.Handler.Warp.Imports hiding (readInt)
35import Network.Wai.Handler.Warp.ReadInt
45import Network.Wai.Handler.Warp.ReadInt
36import Network.Wai.Handler.Warp.Recv
46import Network.Wai.Handler.Warp.Recv
37import Network.Wai.Handler.Warp.Request
47import Network.Wai.Handler.Warp.Request
38import Network.Wai.Handler.Warp.Response
48import Network.Wai.Handler.Warp.Response
39import Network.Wai.Handler.Warp.SendFile
49import Network.Wai.Handler.Warp.SendFile
40import Network.Wai.Handler.Warp.Settings
50import Network.Wai.Handler.Warp.Settings
41−import qualified Network.Wai.Handler.Warp.Timeout as T
42import Network.Wai.Handler.Warp.Types
51import Network.Wai.Handler.Warp.Types
43−import Network.Wai.Internal (ResponseReceived (ResponseReceived))
52+
44−import System.Environment (getEnvironment)
45−import System.IO.Error (isFullErrorType, ioeGetErrorType)
47#if WINDOWS
54#if WINDOWS
48import Network.Wai.Handler.Warp.Windows
55import Network.Wai.Handler.Warp.Windows
50−import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
51import Network.Socket (fdSocket)
57import Network.Socket (fdSocket)
54-- | Creating 'Connection' for plain HTTP based on a given socket.
60-- | Creating 'Connection' for plain HTTP based on a given socket.
55−socketConnection :: Socket -> IO Connection
61+socketConnection :: Settings -> Socket -> IO Connection
62+#if MIN_VERSION_network(3,1,1)
63+socketConnection set s = do
56−socketConnection s = do
65+socketConnection _ s = do
57 bufferPool <- newBufferPool
67 bufferPool <- newBufferPool
58 writeBuf <- allocateBuffer bufferSize
68 writeBuf <- allocateBuffer bufferSize
59 let sendall = Sock.sendAll s
69 let sendall = Sock.sendAll s
70+ isH2 <- newIORef False -- HTTP/1.x
60 return Connection {
71 return Connection {
61 connSendMany = Sock.sendMany s
72 connSendMany = Sock.sendMany s
62 , connSendAll = sendall
73 , connSendAll = sendall
63 , 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
64− , connClose = sClose s >> freeBuffer writeBuf
87+ , connFree = freeBuffer writeBuf
65 , connRecv = receive s bufferPool
88 , connRecv = receive s bufferPool
66 , connRecvBuf = receiveBuf s
89 , connRecvBuf = receiveBuf s
67 , connWriteBuffer = writeBuf
90 , connWriteBuffer = writeBuf
68 , connBufferSize = bufferSize
91 , connBufferSize = bufferSize
71−#if __GLASGOW_HASKELL__ < 702
72−allowInterrupt :: IO ()
73−allowInterrupt = unblock $ return ()
76−-- Composition over two arguments at once; used for runHTTP2\*.
77−(.:) :: (c -> d) -> (a -> b -> c) -> a -> b -> d
78−f .: g = curry $ f . uncurry g
80-- | Run an 'Application' on the given port.
95-- | Run an 'Application' on the given port.
81-- This calls 'runSettings' with 'defaultSettings'.
96-- This calls 'runSettings' with 'defaultSettings'.
82run :: Port -> Application -> IO ()
97run :: Port -> Application -> IO ()
83−run port = runServe port . serveDefault
85−-- | Serve an 'HTTP2Application' and an 'Application' together on the given
87−runHTTP2 :: Port -> HTTP2Application -> Application -> IO ()
88−runHTTP2 port = runServe port .: serveHTTP2
90−-- | The generalized form of 'run'.
91−runServe :: Port -> ServeConnection -> IO ()
92−runServe p = runServeSettings defaultSettings { settingsPort = p }
98+run p = runSettings defaultSettings { settingsPort = p }
94-- | Run an 'Application' on the port present in the @PORT@
100-- | Run an 'Application' on the port present in the @PORT@
95-- environment variable. Uses the 'Port' given when the variable is unset.
101-- environment variable. Uses the 'Port' given when the variable is unset.
@@ -97,44 +103,28 @@ runServe p = runServeSettings defaultSettings { settingsPort = p }
98-- Since 3.0.9
104-- Since 3.0.9
99runEnv :: Port -> Application -> IO ()
105runEnv :: Port -> Application -> IO ()
100−runEnv port = runServeEnv port . serveDefault
106+runEnv p app = do
101−
107+ mp <- lookupEnv "PORT"
102−-- | The HTTP\/2-aware form of 'runEnv'.
103−runHTTP2Env :: Port -> HTTP2Application -> Application -> IO ()
104−runHTTP2Env port = runServeEnv port .: serveHTTP2
106−-- | The generalized form of 'runEnv'.
107−runServeEnv :: Port -> ServeConnection -> IO ()
108−runServeEnv p serveConn = do
109− mp <- lookup "PORT" <$> getEnvironment
111− maybe (runServe p serveConn) runReadPort mp
109+ maybe (run p app) runReadPort mp
114 runReadPort :: String -> IO ()
112 runReadPort :: String -> IO ()
115 runReadPort sp = case reads sp of
113 runReadPort sp = case reads sp of
116− ((p', _):_) -> runServe p' serveConn
114+ ((p', _):_) -> run p' app
117 _ -> fail $ "Invalid value in $PORT: " ++ sp
115 _ -> fail $ "Invalid value in $PORT: " ++ sp
119-- | Run an 'Application' with the given 'Settings'.
117-- | Run an 'Application' with the given 'Settings'.
120-- 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
121-- calls 'runSettingsSocket'.
119-- calls 'runSettingsSocket'.
122runSettings :: Settings -> Application -> IO ()
120runSettings :: Settings -> Application -> IO ()
123−runSettings set = runServeSettings set . serveDefault
121+runSettings set app = withSocketsDo $
125−-- | The HTTP\/2-aware form of 'runSettings'.
126−runHTTP2Settings :: Settings -> HTTP2Application -> Application -> IO ()
127−runHTTP2Settings set = runServeSettings set .: serveHTTP2
129−-- | The generalized form of 'runSettings'.
130−runServeSettings :: Settings -> ServeConnection -> IO ()
131−runServeSettings set serveConn = withSocketsDo $
133 (bindPortTCP (settingsPort set) (settingsHost set))
123 (bindPortTCP (settingsPort set) (settingsHost set))
135 (\socket -> do
125 (\socket -> do
136 setSocketCloseOnExec socket
126 setSocketCloseOnExec socket
137− runServeSettingsSocket set socket serveConn)
127+ runSettingsSocket set socket app)
139-- | This installs a shutdown handler for the given socket and
129-- | This installs a shutdown handler for the given socket and
140-- calls 'runSettingsConnection' with the default connection setup action
130-- calls 'runSettingsConnection' with the default connection setup action
@@ -148,22 +138,9 @@ runServeSettings set serveConn = withSocketsDo $
148-- 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
149-- 'serverPort' record.
139-- 'serverPort' record.
150runSettingsSocket :: Settings -> Socket -> Application -> IO ()
140runSettingsSocket :: Settings -> Socket -> Application -> IO ()
151−runSettingsSocket set socket = runServeSettingsSocket set socket . serveDefault
141+runSettingsSocket set socket app = do
153−-- | The HTTP\/2-aware form of 'runSettingsSocket'.
154−runHTTP2SettingsSocket :: Settings
159−runHTTP2SettingsSocket set socket =
160− runServeSettingsSocket set socket .: serveHTTP2
162−-- | The generalized form of 'runSettingsSocket'.
163−runServeSettingsSocket :: Settings -> Socket -> ServeConnection -> IO ()
164−runServeSettingsSocket set socket serveConn = do
165 settingsInstallShutdownHandler set closeListenSocket
142 settingsInstallShutdownHandler set closeListenSocket
166− runServeSettingsConnection set getConn serveConn
143+ runSettingsConnection set getConn app
168 getConn = do
145 getConn = do
169#if WINDOWS
146#if WINDOWS
@@ -172,10 +149,12 @@ runServeSettingsSocket set socket serveConn = do
172 (s, sa) <- accept socket
149 (s, sa) <- accept socket
174 setSocketCloseOnExec s
151 setSocketCloseOnExec s
152+ -- NoDelay causes an error for AF_UNIX.
153+ setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
175− conn <- socketConnection s
154+ conn <- socketConnection set s
176 return (conn, sa)
155 return (conn, sa)
178− closeListenSocket = sClose socket
157+ closeListenSocket = close socket
180-- | The connection setup action would be expensive. A good example
159-- | The connection setup action would be expensive. A good example
181-- is initialization of TLS.
160-- is initialization of TLS.
@@ -187,16 +166,7 @@ runServeSettingsSocket set socket serveConn = do
188-- Since 1.3.5
167-- Since 1.3.5
189runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
168runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
190−runSettingsConnection set getConn =
169+runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMaker app
191− runServeSettingsConnection set getConn . serveDefault
193−-- | The generalized form of 'runSettingsConnection'.
194−runServeSettingsConnection :: Settings
195− -> IO (Connection, SockAddr)
198−runServeSettingsConnection set getConn serveConn =
199− runServeSettingsConnectionMaker set getConnMaker serveConn
201 getConnMaker = do
171 getConnMaker = do
202 (conn, sa) <- getConn
172 (conn, sa) <- getConn
@@ -205,16 +175,8 @@ runServeSettingsConnection set getConn serveConn =
205-- | 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'
206-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
176-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
207runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
177runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
208−runSettingsConnectionMaker set getConnMaker =
178+runSettingsConnectionMaker x y =
209− runServeSettingsConnectionMaker set getConnMaker . serveDefault
179+ runSettingsConnectionMakerSecure x (toTCP <$> y)
211−-- | The generalized form of 'runSettingsConnectionMaker'.
212−runServeSettingsConnectionMaker :: Settings
213− -> IO (IO Connection, SockAddr)
216−runServeSettingsConnectionMaker x y =
217− runServeSettingsConnectionMakerSecure x (toTCP <$> y)
219 toTCP = first ((, TCP) <$>)
181 toTCP = first ((, TCP) <$>)
@@ -227,32 +189,26 @@ runServeSettingsConnectionMaker x y =
228-- Since 2.1.4
190-- Since 2.1.4
229runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
191runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
230−runSettingsConnectionMakerSecure set getConnMaker =
192+runSettingsConnectionMakerSecure set getConnMaker app = do
231− runServeSettingsConnectionMakerSecure set getConnMaker . serveDefault
233−-- | The generalized form of 'runSettingsConnectionMakerSecure'.
234−runServeSettingsConnectionMakerSecure :: Settings
235− -> IO (IO (Connection, Transport), SockAddr)
238−runServeSettingsConnectionMakerSecure set getConnMaker serveConn = do
239 settingsBeforeMainLoop set
193 settingsBeforeMainLoop set
240 counter <- newCounter
194 counter <- newCounter
241− withII $ acceptConnection set getConnMaker serveConn counter
195+ withII $ acceptConnection set getConnMaker app counter
243 withII action =
197 withII action =
198+ withTimeoutManager $ \tm ->
244 D.withDateCache $ \dc ->
199 D.withDateCache $ \dc ->
245− F.withFdCache fdCacheDurationInSeconds $ \fc ->
200+ F.withFdCache fdCacheDurationInSeconds $ \fdc ->
246− I.withFileInfoCache 10 $ \get -> -- fixme: hard-coding
201+ I.withFileInfoCache fdFileInfoDurationInSeconds $ \fic -> do
247− withTimeoutManager $ \tm -> do
248− let ii0 = InternalInfo undefined tm fc get dc -- fixme: undefined
202+ let ii = InternalInfo tm dc fdc fic
249− action ii0
203+ action ii
251− fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
205+ !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
206+ !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
207+ !timeoutInSeconds = settingsTimeout set * 1000000
252 withTimeoutManager f = case settingsManager set of
208 withTimeoutManager f = case settingsManager set of
253 Just tm -> f tm
209 Just tm -> f tm
254 Nothing -> bracket
210 Nothing -> bracket
255− (T.initialize $ settingsTimeout set * 1000000)
211+ (T.initialize timeoutInSeconds)
256 T.stopManager
212 T.stopManager
@@ -271,16 +227,21 @@ runServeSettingsConnectionMakerSecure set getConnMaker serveConn = do
271-- Our approach is explained in the comments below.
227-- Our approach is explained in the comments below.
272acceptConnection :: Settings
228acceptConnection :: Settings
273 -> IO (IO (Connection, Transport), SockAddr)
229 -> IO (IO (Connection, Transport), SockAddr)
274− -> ServeConnection
230+ -> Application
275 -> Counter
231 -> Counter
276 -> InternalInfo
232 -> InternalInfo
278−acceptConnection set getConnMaker serveConn counter ii0 = do
234+acceptConnection set getConnMaker app counter ii = do
279 -- First mask all exceptions in acceptLoop. This is necessary to
235 -- First mask all exceptions in acceptLoop. This is necessary to
280 -- ensure that no async exception is throw between the call to
236 -- ensure that no async exception is throw between the call to
281 -- acceptNewConnection and the registering of connClose.
237 -- acceptNewConnection and the registering of connClose.
239+ -- acceptLoop can be broken by closing the listing socket.
282 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.
283− gracefulShutdown counter
244+ gracefulShutdown set counter
285 acceptLoop = do
246 acceptLoop = do
286 -- Allow async exceptions before receiving the next connection maker.
247 -- Allow async exceptions before receiving the next connection maker.
@@ -297,88 +258,78 @@ acceptConnection set getConnMaker serveConn counter ii0 = do
297 case mx of
258 case mx of
298 Nothing -> return ()
259 Nothing -> return ()
299 Just (mkConn, addr) -> do
260 Just (mkConn, addr) -> do
300− fork set mkConn addr serveConn counter ii0
261+ fork set mkConn addr app counter ii
301 acceptLoop
262 acceptLoop
303 acceptNewConnection = do
264 acceptNewConnection = do
304 ex <- try getConnMaker
265 ex <- try getConnMaker
305 case ex of
266 case ex of
306 Right x -> return $ Just x
267 Right x -> return $ Just x
307− 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
308− settingsOnException set Nothing $ toException e
274+ settingsOnException set Nothing $ toException e
309− if isFullErrorType (ioeGetErrorType e) then do
310− -- "resource exhausted (Too many open files)" may
311− -- happen by accept(). Wait a second hoping that
312− -- resource will be available.
316− -- Assuming the listen socket is closed.
317− return Nothing
275+ return Nothing
319-- 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
320-- function to unmask (i.e., allow async exceptions to be thrown).
278-- function to unmask (i.e., allow async exceptions to be thrown).
321fork :: Settings
279fork :: Settings
322 -> IO (Connection, Transport)
280 -> IO (Connection, Transport)
323 -> SockAddr
281 -> SockAddr
324− -> ServeConnection
282+ -> Application
325 -> Counter
283 -> Counter
326 -> InternalInfo
284 -> InternalInfo
328−fork set mkConn addr serveConn counter ii0 = 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) $
329− -- Run the connection maker to get a new connection, and ensure
290+ -- Run the connection maker to get a new connection, and ensure
330− -- that the connection is closed. If the mkConn call throws an
291+ -- that the connection is closed. If the mkConn call throws an
331− -- exception, we will leak the connection. If the mkConn call is
292+ -- exception, we will leak the connection. If the mkConn call is
332− -- vulnerable to attacks (e.g., Slowloris), we do nothing to
293+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
333− -- protect the server. It is therefore vital that mkConn is well
294+ -- protect the server. It is therefore vital that mkConn is well
334− -- vetted.
295+ -- vetted.
336− -- We grab the connection before registering timeouts since the
297+ -- We grab the connection before registering timeouts since the
337− -- timeouts will be useless during connection creation, due to the
298+ -- timeouts will be useless during connection creation, due to the
338− -- fact that async exceptions are still masked.
299+ -- fact that async exceptions are still masked.
339− bracket mkConn closeConn $ \(conn, transport) ->
300+ bracket mkConn cleanUp (serve unmask)
302+ cleanUp (conn, _) = connClose conn `finally` connFree conn
341 -- We need to register a timeout handler for this thread, and
304 -- We need to register a timeout handler for this thread, and
342 -- cancel that handler as soon as we exit.
305 -- cancel that handler as soon as we exit.
343− bracket (T.registerKillThread (timeoutManager ii0)) T.cancel $ \th ->
306+ serve unmask (conn, transport) = bracket register cancel $ \th -> do
345− let ii = ii0 { threadHandle = th }
346− -- We now have fully registered a connection close handler
307+ -- We now have fully registered a connection close handler in
347− -- 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
348− -- again allow async exceptions.
309+ -- allow async exceptions.
349− in unmask .
310+ unmask .
350− -- Call the user-supplied on exception code if any
351− -- exceptions are thrown.
352− handle (settingsOnException set Nothing) .
354− -- Call the user-supplied code for connection open and close events
311+ -- Call the user-supplied code for connection open and
355− bracket (onOpen addr) (onClose addr) $ \goingon ->
313+ bracket (onOpen addr) (onClose addr) $ \goingon ->
357− -- Actually serve this connection.
314+ -- Actually serve this connection. bracket with closeConn
358− -- bracket with closeConn above ensures the connection is closed.
315+ -- above ensures the connection is closed.
359− when goingon $ serveConn conn ii addr transport set
316+ when goingon $ serveConnection conn ii th addr transport set app
361− closeConn (conn, _transport) = connClose conn
318+ register = T.registerKillThread (timeoutManager ii) (connClose conn)
363 onOpen adr = increase counter >> settingsOnOpen set adr
321 onOpen adr = increase counter >> settingsOnOpen set adr
364 onClose adr _ = decrease counter >> settingsOnClose set adr
322 onClose adr _ = decrease counter >> settingsOnClose set adr
366−-- The type of a function to serve a fully-prepared connection.
324+serveConnection :: Connection
367−type ServeConnection = Connection
368− -> InternalInfo
325+ -> InternalInfo
369− -> SockAddr
327+ -> SockAddr
370− -> Transport
328+ -> Transport
371− -> Settings
329+ -> Settings
372− -> IO ()
331+ -> IO ()
374−-- Serve an HTTP\/2-unaware Application to a connection over any HTTP version.
375−serveDefault :: Application -> ServeConnection
376−serveDefault app = serveHTTP2 (promoteApplication app) app
378−-- Serve an HTTP\/2-aware application over HTTP\/2 or a backup 'Application'
379−-- over HTTP\/1.1 or HTTP\/1.
380−serveHTTP2 :: HTTP2Application -> Application -> ServeConnection
381−serveHTTP2 app2 app conn ii origAddr transport settings = do
332+serveConnection conn ii th origAddr transport settings app = do
382 -- fixme: Upgrading to HTTP/2 should be supported.
333 -- fixme: Upgrading to HTTP/2 should be supported.
383 (h2,bs) <- if isHTTP2 transport then
334 (h2,bs) <- if isHTTP2 transport then
384 return (True, "")
335 return (True, "")
@@ -388,19 +339,39 @@ serveHTTP2 app2 app conn ii origAddr transport settings = do
388 return (True, bs0)
339 return (True, bs0)
390 return (False, bs0)
341 return (False, bs0)
342+ istatus <- newIORef False
391 if settingsHTTP2Enabled settings && h2 then do
343 if settingsHTTP2Enabled settings && h2 then do
392− 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
393 -- fixme: origAddr
354 -- fixme: origAddr
356+ setConnHTTP2 conn True
394− http2 conn ii origAddr transport settings recvN app2
357+ http2 conn transport ii origAddr settings recvN sendBS app
396− istatus <- newIORef False
397 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
359 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
398 writeIORef istatus True
360 writeIORef istatus True
399 leftoverSource src bs
361 leftoverSource src bs
400 addr <- getProxyProtocolAddr src
362 addr <- getProxyProtocolAddr src
401− 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 ()
402− sendErrorResponse addr istatus e
372+ _ <- sendErrorResponse (dummyreq addr) istatus e
403− throwIO (e :: SomeException)
373+ throwIO e
405 getProxyProtocolAddr src =
376 getProxyProtocolAddr src =
406 case settingsProxyProtocol settings of
377 case settingsProxyProtocol settings of
@@ -442,30 +413,38 @@ serveHTTP2 app2 app conn ii origAddr transport settings = do
443 decodeAscii = map (chr . fromEnum) . S.unpack
414 decodeAscii = map (chr . fromEnum) . S.unpack
445− th = threadHandle ii
416+ shouldSendErrorResponse se
417+ | Just ConnectionClosedByPeer <- fromException se = False
447− sendErrorResponse addr istatus e = do
420+ sendErrorResponse req istatus e = do
448 status <- readIORef istatus
421 status <- readIORef istatus
449− when status $ void $
422+ if shouldSendErrorResponse e && status
450− sendResponse
423+ then do
451− (settingsServerName settings)
452− conn ii (dummyreq addr) defaultIndexRequestHeader (return S.empty) (errorResponse e)
424+ sendResponse settings conn ii th req defaultIndexRequestHeader (return S.empty) (errorResponse e)
454 dummyreq addr = defaultRequest { remoteHost = addr }
427 dummyreq addr = defaultRequest { remoteHost = addr }
456 errorResponse e = settingsOnExceptionResponse settings e
429 errorResponse e = settingsOnExceptionResponse settings e
458− http1 addr istatus src = do
431+ http1 firstRequest addr istatus src = do
459− (req', mremainingRef, idxhdr, nextBodyFlush) <- recvRequest settings conn ii addr src
432+ (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
460− let req = req' { isSecure = isTransportSecure transport }
461 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
433 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
462 `E.catch` \e -> do
434 `E.catch` \e -> do
463− -- Call the user-supplied exception handlers, passing the request.
464− sendErrorResponse addr istatus e
465 settingsOnException settings (Just req) e
435 settingsOnException settings (Just req) e
466 -- Don't throw the error again to prevent calling settingsOnException twice.
436 -- Don't throw the error again to prevent calling settingsOnException twice.
467 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
468− when keepAlive $ http1 addr istatus src
447+ when keepAlive $ http1 False addr istatus src
470 processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
449 processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
471 -- Let the application run for as long as it wants
450 -- Let the application run for as long as it wants
@@ -475,32 +454,38 @@ serveHTTP2 app2 app conn ii origAddr transport settings = do
475 -- 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
476 -- an async exception before calling the ResponseSource.
455 -- an async exception before calling the ResponseSource.
477 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
456 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
478− _ <- app req $ \res -> do
457+ r <- E.try $ app req $ \res -> do
479 T.resume th
458 T.resume th
480 -- FIXME consider forcing evaluation of the res here to
459 -- FIXME consider forcing evaluation of the res here to
481 -- send more meaningful error messages to the user.
460 -- send more meaningful error messages to the user.
482 -- However, it may affect performance.
461 -- However, it may affect performance.
483 writeIORef istatus False
462 writeIORef istatus False
484− keepAlive <- sendResponse
485− (settingsServerName settings)
486− conn ii req idxhdr (readSource src) res
463+ keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
487 writeIORef keepAliveRef keepAlive
464 writeIORef keepAliveRef keepAlive
488 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
489 keepAlive <- readIORef keepAliveRef
475 keepAlive <- readIORef keepAliveRef
491 -- We just send a Response and it takes a time to
477 -- We just send a Response and it takes a time to
492 -- receive a Request again. If we immediately call recv,
478 -- receive a Request again. If we immediately call recv,
493− -- 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.
494− -- It is very costly. So, we yield to another Haskell
480+ -- It is very costly, so we yield to another Haskell
495 -- thread hoping that the next Request will arrive
481 -- thread hoping that the next Request will arrive
496 -- when this Haskell thread will be re-scheduled.
482 -- when this Haskell thread will be re-scheduled.
497 -- This improves performance at least when
483 -- This improves performance at least when
498 -- the number of cores is small.
484 -- the number of cores is small.
499 Conc.yield
485 Conc.yield
501− if not keepAlive then
487+ if keepAlive
502− return False
488+ then
504 -- 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
505 -- from the request body, simple drop this connection instead of
490 -- from the request body, simple drop this connection instead of
506 -- reading it all in to satisfy a keep-alive request.
491 -- reading it all in to satisfy a keep-alive request.
@@ -526,6 +511,21 @@ serveHTTP2 app2 app conn ii origAddr transport settings = do
527 return False
512 return False
528 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
530flushEntireBody :: IO ByteString -> IO ()
530flushEntireBody :: IO ByteString -> IO ()
531flushEntireBody src =
531flushEntireBody src =
@@ -558,14 +558,42 @@ wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
558 when (S.length bs >= slowlorisSize) $ T.tickle th
558 when (S.length bs >= slowlorisSize) $ T.tickle th
559 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)
561-- 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
562setSocketCloseOnExec :: Socket -> IO ()
579setSocketCloseOnExec :: Socket -> IO ()
563#if WINDOWS
580#if WINDOWS
564setSocketCloseOnExec _ = return ()
581setSocketCloseOnExec _ = return ()
566−setSocketCloseOnExec socket =
583+setSocketCloseOnExec socket = do
567− 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
570−gracefulShutdown :: Counter -> IO ()
592+gracefulShutdown :: Settings -> Counter -> IO ()
571−gracefulShutdown counter = waitForZero counter
593+gracefulShutdown set counter =
594+ case settingsGracefulShutdownTimeout set of
598+ void (timeout (seconds * microsPerSecond) (waitForZero counter))
599+ where microsPerSecond = 1000000