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