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