@@ -1,101 +1,91 @@
1−{-# LANGUAGE BangPatterns #-}
21{-# LANGUAGE CPP #-}
32{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE PackageImports #-}
5−{-# LANGUAGE PatternGuards #-}
6−{-# LANGUAGE RecordWildCards #-}
73{-# LANGUAGE ScopedTypeVariables #-}
84{-# LANGUAGE TupleSections #-}
9−{-# LANGUAGE ViewPatterns #-}
105{-# OPTIONS_GHC -fno-warn-deprecations #-}
116
127module Network.Wai.Handler.Warp.Run where
138
14−import "iproute" Data.IP (toHostAddress, toHostAddress6)
159import Control.Arrow (first)
10+import Control.Concurrent (threadDelay)
1611import qualified Control.Concurrent as Conc (yield)
1712import Control.Exception as E
13+import Control.Monad (when, unless, void)
14+import Data.ByteString (ByteString)
1815import qualified Data.ByteString as S
1916import Data.Char (chr)
17+import Data.IP (toHostAddress, toHostAddress6)
2018import Data.IORef (IORef, newIORef, readIORef, writeIORef)
2119import Data.Streaming.Network (bindPortTCP)
22−import Foreign.C.Error (Errno(..), eCONNABORTED)
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(..))
26−#if MIN_VERSION_network(3,1,1)
27−import Network.Socket (gracefulClose)
28−#endif
20+import Network (sClose, Socket)
21+import Network.Socket (accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6))
2922import qualified Network.Socket.ByteString as Sock
3023import Network.Wai
31−import Network.Wai.Internal (ResponseReceived (ResponseReceived))
32−import System.Environment (lookupEnv)
33−import qualified System.TimeManager as T
34−import System.Timeout (timeout)
35−
24+import Network.Wai.HTTP2 (HTTP2Application, promoteApplication)
3625import Network.Wai.Handler.Warp.Buffer
3726import Network.Wai.Handler.Warp.Counter
3827import qualified Network.Wai.Handler.Warp.Date as D
3928import qualified Network.Wai.Handler.Warp.FdCache as F
40−import qualified Network.Wai.Handler.Warp.FileInfoCache as I
41−import Network.Wai.Handler.Warp.HTTP2 (http2)
42−import Network.Wai.Handler.Warp.HTTP2.Types (isHTTP2)
29+import Network.Wai.Handler.Warp.HTTP2 (http2, isHTTP2)
4330import Network.Wai.Handler.Warp.Header
44−import Network.Wai.Handler.Warp.Imports hiding (readInt)
4531import Network.Wai.Handler.Warp.ReadInt
4632import Network.Wai.Handler.Warp.Recv
4733import Network.Wai.Handler.Warp.Request
4834import Network.Wai.Handler.Warp.Response
4935import Network.Wai.Handler.Warp.SendFile
5036import Network.Wai.Handler.Warp.Settings
37+import qualified Network.Wai.Handler.Warp.Timeout as T
5138import 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)
5342
5443#if WINDOWS
5544import Network.Wai.Handler.Warp.Windows
5645#else
46+import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
5747import Network.Socket (fdSocket)
5848#endif
5949
6050-- | Creating 'Connection' for plain HTTP based on a given socket.
61−socketConnection :: Settings -> Socket -> IO Connection
62−#if MIN_VERSION_network(3,1,1)
63−socketConnection set s = do
64−#else
65−socketConnection _ s = do
66−#endif
51+socketConnection :: Socket -> IO Connection
52+socketConnection s = do
6753 bufferPool <- newBufferPool
6854 writeBuf <- allocateBuffer bufferSize
6955 let sendall = Sock.sendAll s
70− isH2 <- newIORef False -- HTTP/1.x
7156 return Connection {
7257 connSendMany = Sock.sendMany s
7358 , connSendAll = sendall
7459 , connSendFile = sendFile s writeBuf bufferSize sendall
75−#if MIN_VERSION_network(3,1,1)
76− , connClose = do
77− h2 <- readIORef isH2
78− let tm = if h2 then settingsGracefulCloseTimeout2 set
79− else settingsGracefulCloseTimeout1 set
80− if tm == 0 then
81− close s
82− else
83− gracefulClose s tm `E.catch` \(E.SomeException _) -> return ()
84−#else
85− , connClose = close s
86−#endif
87− , connFree = freeBuffer writeBuf
60+ , connClose = sClose s >> freeBuffer writeBuf
8861 , connRecv = receive s bufferPool
8962 , connRecvBuf = receiveBuf s
9063 , connWriteBuffer = writeBuf
9164 , connBufferSize = bufferSize
92− , connHTTP2 = isH2
9365 }
9466
67+#if __GLASGOW_HASKELL__ < 702
68+allowInterrupt :: IO ()
69+allowInterrupt = unblock $ return ()
70+#endif
71+
72+-- Composition over two arguments at once; used for runHTTP2\*.
73+(.:) :: (c -> d) -> (a -> b -> c) -> a -> b -> d
74+f .: g = curry $ f . uncurry g
75+
9576-- | Run an 'Application' on the given port.
9677-- This calls 'runSettings' with 'defaultSettings'.
9778run :: Port -> Application -> IO ()
98−run p = runSettings defaultSettings { settingsPort = p }
79+run port = runServe port . serveDefault
80+
81+-- | Serve an 'HTTP2Application' and an 'Application' together on the given
82+-- port.
83+runHTTP2 :: Port -> HTTP2Application -> Application -> IO ()
84+runHTTP2 port = runServe port .: serveHTTP2
85+
86+-- | The generalized form of 'run'.
87+runServe :: Port -> ServeConnection -> IO ()
88+runServe p = runServeSettings defaultSettings { settingsPort = p }
9989
10090-- | Run an 'Application' on the port present in the @PORT@
10191-- environment variable. Uses the 'Port' given when the variable is unset.
@@ -103,28 +93,44 @@ run p = runSettings defaultSettings { settingsPort = p }
10393--
10494-- Since 3.0.9
10595runEnv :: Port -> Application -> IO ()
106−runEnv p app = do
107− mp <- lookupEnv "PORT"
96+runEnv port = runServeEnv port . serveDefault
97+
98+-- | The HTTP\/2-aware form of 'runEnv'.
99+runHTTP2Env :: Port -> HTTP2Application -> Application -> IO ()
100+runHTTP2Env port = runServeEnv port .: serveHTTP2
101+
102+-- | The generalized form of 'runEnv'.
103+runServeEnv :: Port -> ServeConnection -> IO ()
104+runServeEnv p serveConn = do
105+ mp <- fmap (lookup "PORT") getEnvironment
108106
109− maybe (run p app) runReadPort mp
107+ maybe (runServe p serveConn) runReadPort mp
110108
111109 where
112110 runReadPort :: String -> IO ()
113111 runReadPort sp = case reads sp of
114− ((p', _):_) -> run p' app
112+ ((p', _):_) -> runServe p' serveConn
115113 _ -> fail $ "Invalid value in $PORT: " ++ sp
116114
117115-- | Run an 'Application' with the given 'Settings'.
118116-- This opens a listen socket on the port defined in 'Settings' and
119117-- calls 'runSettingsSocket'.
120118runSettings :: Settings -> Application -> IO ()
121−runSettings set app = withSocketsDo $
119+runSettings set = runServeSettings set . serveDefault
120+
121+-- | The HTTP\/2-aware form of 'runSettings'.
122+runHTTP2Settings :: Settings -> HTTP2Application -> Application -> IO ()
123+runHTTP2Settings set = runServeSettings set .: serveHTTP2
124+
125+-- | The generalized form of 'runSettings'.
126+runServeSettings :: Settings -> ServeConnection -> IO ()
127+runServeSettings set serveConn = withSocketsDo $
122128 bracket
123129 (bindPortTCP (settingsPort set) (settingsHost set))
124− close
130+ sClose
125131 (\socket -> do
126132 setSocketCloseOnExec socket
127− runSettingsSocket set socket app)
133+ runServeSettingsSocket set socket serveConn)
128134
129135-- | This installs a shutdown handler for the given socket and
130136-- calls 'runSettingsConnection' with the default connection setup action
@@ -138,9 +144,22 @@ runSettings set app = withSocketsDo $
138144-- Note that the 'settingsPort' will still be passed to 'Application's via the
139145-- 'serverPort' record.
140146runSettingsSocket :: Settings -> Socket -> Application -> IO ()
141−runSettingsSocket set socket app = do
147+runSettingsSocket set socket = runServeSettingsSocket set socket . serveDefault
148+
149+-- | The HTTP\/2-aware form of 'runSettingsSocket'.
150+runHTTP2SettingsSocket :: Settings
151+ -> Socket
152+ -> HTTP2Application
153+ -> Application
154+ -> IO ()
155+runHTTP2SettingsSocket set socket =
156+ runServeSettingsSocket set socket .: serveHTTP2
157+
158+-- | The generalized form of 'runSettingsSocket'.
159+runServeSettingsSocket :: Settings -> Socket -> ServeConnection -> IO ()
160+runServeSettingsSocket set socket serveConn = do
142161 settingsInstallShutdownHandler set closeListenSocket
143− runSettingsConnection set getConn app
162+ runServeSettingsConnection set getConn serveConn
144163 where
145164 getConn = do
146165#if WINDOWS
@@ -149,12 +168,10 @@ runSettingsSocket set socket app = do
149168 (s, sa) <- accept socket
150169#endif
151170 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
171+ conn <- socketConnection s
155172 return (conn, sa)
156173
157− closeListenSocket = close socket
174+ closeListenSocket = sClose socket
158175
159176-- | The connection setup action would be expensive. A good example
160177-- is initialization of TLS.
@@ -166,7 +183,16 @@ runSettingsSocket set socket app = do
166183--
167184-- Since 1.3.5
168185runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
169−runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMaker app
186+runSettingsConnection set getConn =
187+ runServeSettingsConnection set getConn . serveDefault
188+
189+-- | The generalized form of 'runSettingsConnection'.
190+runServeSettingsConnection :: Settings
191+ -> IO (Connection, SockAddr)
192+ -> ServeConnection
193+ -> IO ()
194+runServeSettingsConnection set getConn serveConn =
195+ runServeSettingsConnectionMaker set getConnMaker serveConn
170196 where
171197 getConnMaker = do
172198 (conn, sa) <- getConn
@@ -175,10 +201,18 @@ runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMa
175201-- | This modifies the connection maker so that it returns 'TCP' for 'Transport'
176202-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
177203runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
178−runSettingsConnectionMaker x y =
179− runSettingsConnectionMakerSecure x (toTCP <$> y)
204+runSettingsConnectionMaker set getConnMaker =
205+ runServeSettingsConnectionMaker set getConnMaker . serveDefault
206+
207+-- | The generalized form of 'runSettingsConnectionMaker'.
208+runServeSettingsConnectionMaker :: Settings
209+ -> IO (IO Connection, SockAddr)
210+ -> ServeConnection
211+ -> IO ()
212+runServeSettingsConnectionMaker x y =
213+ runServeSettingsConnectionMakerSecure x (go y)
180214 where
181− toTCP = first ((, TCP) <$>)
215+ go = fmap (first (fmap (, TCP)))
182216
183217----------------------------------------------------------------
184218
@@ -189,26 +223,28 @@ runSettingsConnectionMaker x y =
189223--
190224-- Since 2.1.4
191225runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
192−runSettingsConnectionMakerSecure set getConnMaker app = do
226+runSettingsConnectionMakerSecure set getConnMaker =
227+ runServeSettingsConnectionMakerSecure set getConnMaker . serveDefault
228+
229+-- | The generalized form of 'runSettingsConnectionMakerSecure'.
230+runServeSettingsConnectionMakerSecure :: Settings
231+ -> IO (IO (Connection, Transport), SockAddr)
232+ -> ServeConnection
233+ -> IO ()
234+runServeSettingsConnectionMakerSecure set getConnMaker serveConn = do
193235 settingsBeforeMainLoop set
194236 counter <- newCounter
195− withII $ acceptConnection set getConnMaker app counter
237+
238+ D.withDateCache $ \dc ->
239+ F.withFdCache fdCacheDurationInSeconds $ \fc ->
240+ withTimeoutManager $ \tm ->
241+ acceptConnection set getConnMaker serveConn dc fc tm counter
196242 where
197− withII action =
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
203− action ii
204−
205− !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
206− !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
207− !timeoutInSeconds = settingsTimeout set * 1000000
243+ fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
208244 withTimeoutManager f = case settingsManager set of
209245 Just tm -> f tm
210246 Nothing -> bracket
211− (T.initialize timeoutInSeconds)
247+ (T.initialize $ settingsTimeout set * 1000000)
212248 T.stopManager
213249 f
214250
@@ -227,21 +263,18 @@ runSettingsConnectionMakerSecure set getConnMaker app = do
227263-- Our approach is explained in the comments below.
228264acceptConnection :: Settings
229265 -> IO (IO (Connection, Transport), SockAddr)
230− -> Application
266+ -> ServeConnection
267+ -> D.DateCache
268+ -> Maybe F.MutableFdCache
269+ -> T.Manager
231270 -> Counter
232− -> InternalInfo
233271 -> IO ()
234−acceptConnection set getConnMaker app counter ii = do
272+acceptConnection set getConnMaker serveConn dc fc tm counter = do
235273 -- First mask all exceptions in acceptLoop. This is necessary to
236274 -- ensure that no async exception is throw between the call to
237275 -- acceptNewConnection and the registering of connClose.
238− --
239− -- acceptLoop can be broken by closing the listing socket.
240276 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
277+ gracefulShutdown counter
245278 where
246279 acceptLoop = do
247280 -- Allow async exceptions before receiving the next connection maker.
@@ -258,78 +291,95 @@ acceptConnection set getConnMaker app counter ii = do
258291 case mx of
259292 Nothing -> return ()
260293 Just (mkConn, addr) -> do
261− fork set mkConn addr app counter ii
294+ fork set mkConn addr serveConn dc fc tm counter
262295 acceptLoop
263296
264297 acceptNewConnection = do
265298 ex <- try getConnMaker
266299 case ex of
267300 Right x -> return $ Just x
268− Left e -> do
269− let eConnAborted = getErrno eCONNABORTED
270− getErrno (Errno cInt) = cInt
271− if ioe_errno e == Just eConnAborted
272− then acceptNewConnection
273− else do
274− settingsOnException set Nothing $ toException e
275− return Nothing
301+ Left e -> do
302+ settingsOnException set Nothing $ toException e
303+ if isFullErrorType (ioeGetErrorType e) then do
304+ -- "resource exhausted (Too many open files)" may
305+ -- happen by accept(). Wait a second hoping that
306+ -- resource will be available.
307+ threadDelay 1000000
308+ acceptNewConnection
309+ else
310+ -- Assuming the listen socket is closed.
311+ return Nothing
276312
277313-- Fork a new worker thread for this connection maker, and ask for a
278314-- function to unmask (i.e., allow async exceptions to be thrown).
279315fork :: Settings
280316 -> IO (Connection, Transport)
281317 -> SockAddr
282− -> Application
318+ -> ServeConnection
319+ -> D.DateCache
320+ -> Maybe F.MutableFdCache
321+ -> T.Manager
283322 -> Counter
284− -> InternalInfo
285323 -> IO ()
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) $
290− -- Run the connection maker to get a new connection, and ensure
291− -- that the connection is closed. If the mkConn call throws an
292− -- exception, we will leak the connection. If the mkConn call is
293− -- vulnerable to attacks (e.g., Slowloris), we do nothing to
294− -- protect the server. It is therefore vital that mkConn is well
295− -- vetted.
296− --
297− -- We grab the connection before registering timeouts since the
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)
301− where
302− cleanUp (conn, _) = connClose conn `finally` connFree conn
324+fork set mkConn addr serveConn dc fc tm counter = settingsFork set $ \ unmask ->
325+ -- Run the connection maker to get a new connection, and ensure
326+ -- that the connection is closed. If the mkConn call throws an
327+ -- exception, we will leak the connection. If the mkConn call is
328+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
329+ -- protect the server. It is therefore vital that mkConn is well
330+ -- vetted.
331+ --
332+ -- We grab the connection before registering timeouts since the
333+ -- timeouts will be useless during connection creation, due to the
334+ -- fact that async exceptions are still masked.
335+ bracket mkConn closeConn $ \(conn, transport) ->
303336
304337 -- We need to register a timeout handler for this thread, and
305338 -- cancel that handler as soon as we exit.
306− serve unmask (conn, transport) = bracket register cancel $ \th -> do
307− -- We now have fully registered a connection close handler in
308− -- the case of all exceptions, so it is safe to once again
309− -- allow async exceptions.
310− unmask .
311− -- Call the user-supplied code for connection open and
312− -- close events
313− bracket (onOpen addr) (onClose addr) $ \goingon ->
314− -- Actually serve this connection. bracket with closeConn
315− -- above ensures the connection is closed.
316− when goingon $ serveConnection conn ii th addr transport set app
317− where
318− register = T.registerKillThread (timeoutManager ii) (connClose conn)
319− cancel = T.cancel
339+ bracket (T.registerKillThread tm) T.cancel $ \th ->
340+
341+ let ii = InternalInfo th tm fc dc
342+ -- We now have fully registered a connection close handler
343+ -- in the case of all exceptions, so it is safe to one
344+ -- again allow async exceptions.
345+ in unmask .
346+ -- Call the user-supplied on exception code if any
347+ -- exceptions are thrown.
348+ handle (settingsOnException set Nothing) .
349+
350+ -- Call the user-supplied code for connection open and close events
351+ bracket (onOpen addr) (onClose addr) $ \goingon ->
352+
353+ -- Actually serve this connection.
354+ -- bracket with closeConn above ensures the connection is closed.
355+ when goingon $ serveConn conn ii addr transport set
356+ where
357+ closeConn (conn, _transport) = connClose conn
320358
321359 onOpen adr = increase counter >> settingsOnOpen set adr
322360 onClose adr _ = decrease counter >> settingsOnClose set adr
323361
324−serveConnection :: Connection
325− -> InternalInfo
326− -> T.Handle
327− -> SockAddr
328− -> Transport
329− -> Settings
330− -> Application
331− -> IO ()
332−serveConnection conn ii th origAddr transport settings app = do
362+-- The type of a function to serve a fully-prepared connection.
363+type ServeConnection = Connection
364+ -> InternalInfo
365+ -> SockAddr
366+ -> Transport
367+ -> Settings
368+ -> IO ()
369+
370+-- Serve an HTTP\/2-aware application, rejecting clients that attempt to use an
371+-- older protocol version.
372+serveHTTP2Only :: HTTP2Application -> ServeConnection
373+serveHTTP2Only = error "serveHTTP2Only not implemented"
374+
375+-- Serve an HTTP\/2-unaware Application to a connection over any HTTP version.
376+serveDefault :: Application -> ServeConnection
377+serveDefault app = serveHTTP2 (promoteApplication app) app
378+
379+-- Serve an HTTP\/2-aware application over HTTP\/2 or a backup 'Application'
380+-- over HTTP\/1.1 or HTTP\/1.
381+serveHTTP2 :: HTTP2Application -> Application -> ServeConnection
382+serveHTTP2 app2 app conn ii origAddr transport settings = do
333383 -- fixme: Upgrading to HTTP/2 should be supported.
334384 (h2,bs) <- if isHTTP2 transport then
335385 return (True, "")
@@ -339,39 +389,19 @@ serveConnection conn ii th origAddr transport settings app = do
339389 return (True, bs0)
340390 else
341391 return (False, bs0)
342− istatus <- newIORef False
343− if settingsHTTP2Enabled settings && h2 then do
344− rawRecvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
345− -- This thread becomes the sender in http2 library.
346− -- In the case of event source, one request comes and one
347− -- worker gets busy. But it is likely that the receiver does
348− -- not receive any data at all while the sender is sending
349− -- output data from the worker. It's not good enough to tickle
350− -- the time handler in the receiver only. So, we should tickle
351− -- the time handler in both the receiver and the sender.
352− let recvN = wrappedRecvN th istatus (settingsSlowlorisSize settings) rawRecvN
353− sendBS x = connSendAll conn x >> T.tickle th
392+ if h2 then do
393+ recvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
354394 -- fixme: origAddr
355− checkTLS
356− setConnHTTP2 conn True
357− http2 conn transport ii origAddr settings recvN sendBS app
395+ http2 conn ii origAddr transport settings recvN app2
358396 else do
397+ istatus <- newIORef False
359398 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
360399 writeIORef istatus True
361400 leftoverSource src bs
362401 addr <- getProxyProtocolAddr src
363− http1 True addr istatus src `E.catch` \e ->
364− case () of
365− ()
366− -- See comment below referencing
367− -- https://github.com/yesodweb/wai/issues/618
368− | Just NoKeepAliveRequest <- fromException e -> return ()
369− -- No valid request
370− | Just (BadFirstLine _) <- fromException e -> return ()
371− | otherwise -> do
372− _ <- sendErrorResponse (dummyreq addr) istatus e
373− throwIO e
374−
402+ http1 addr istatus src `E.catch` \e -> do
403+ sendErrorResponse addr istatus e
404+ throwIO (e :: SomeException)
375405 where
376406 getProxyProtocolAddr src =
377407 case settingsProxyProtocol settings of
@@ -413,38 +443,30 @@ serveConnection conn ii th origAddr transport settings app = do
413443
414444 decodeAscii = map (chr . fromEnum) . S.unpack
415445
416− shouldSendErrorResponse se
417− | Just ConnectionClosedByPeer <- fromException se = False
418− | otherwise = True
446+ th = threadHandle ii
419447
420− sendErrorResponse req istatus e = do
448+ sendErrorResponse addr istatus e = do
421449 status <- readIORef istatus
422− if shouldSendErrorResponse e && status
423− then do
424− sendResponse settings conn ii th req defaultIndexRequestHeader (return S.empty) (errorResponse e)
425− else return False
450+ when status $ void $
451+ sendResponse
452+ (settingsServerName settings)
453+ conn ii (dummyreq addr) defaultIndexRequestHeader (return S.empty) (errorResponse e)
426454
427455 dummyreq addr = defaultRequest { remoteHost = addr }
428456
429457 errorResponse e = settingsOnExceptionResponse settings e
430458
431− http1 firstRequest addr istatus src = do
432− (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
459+ http1 addr istatus src = do
460+ (req', mremainingRef, idxhdr, nextBodyFlush) <- recvRequest settings conn ii addr src
461+ let req = req' { isSecure = isTransportSecure transport }
433462 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
434463 `E.catch` \e -> do
464+ -- Call the user-supplied exception handlers, passing the request.
465+ sendErrorResponse addr istatus e
435466 settingsOnException settings (Just req) e
436467 -- Don't throw the error again to prevent calling settingsOnException twice.
437468 return False
438−
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
469+ when keepAlive $ http1 addr istatus src
448470
449471 processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
450472 -- Let the application run for as long as it wants
@@ -454,38 +476,32 @@ serveConnection conn ii th origAddr transport settings app = do
454476 -- creating the request, we need to make sure that we don't get
455477 -- an async exception before calling the ResponseSource.
456478 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
457− r <- E.try $ app req $ \res -> do
479+ _ <- app req $ \res -> do
458480 T.resume th
459481 -- FIXME consider forcing evaluation of the res here to
460482 -- send more meaningful error messages to the user.
461483 -- However, it may affect performance.
462484 writeIORef istatus False
463− keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
485+ keepAlive <- sendResponse
486+ (settingsServerName settings)
487+ conn ii req idxhdr (readSource src) res
464488 writeIORef keepAliveRef keepAlive
465489 return ResponseReceived
466− case r of
467− Right ResponseReceived -> return ()
468− Left e@(SomeException _)
469− | Just (ExceptionInsideResponseBody e') <- fromException e -> throwIO e'
470− | otherwise -> do
471− keepAlive <- sendErrorResponse req istatus e
472− settingsOnException settings (Just req) e
473− writeIORef keepAliveRef keepAlive
474−
475490 keepAlive <- readIORef keepAliveRef
476491
477492 -- We just send a Response and it takes a time to
478493 -- receive a Request again. If we immediately call recv,
479− -- it is likely to fail and cause the IO manager to do some work.
480− -- It is very costly, so we yield to another Haskell
494+ -- it is likely to fail and the IO manager works.
495+ -- It is very costly. So, we yield to another Haskell
481496 -- thread hoping that the next Request will arrive
482497 -- when this Haskell thread will be re-scheduled.
483498 -- This improves performance at least when
484499 -- the number of cores is small.
485500 Conc.yield
486501
487− if keepAlive
488− then
502+ if not keepAlive then
503+ return False
504+ else
489505 -- If there is an unknown or large amount of data to still be read
490506 -- from the request body, simple drop this connection instead of
491507 -- reading it all in to satisfy a keep-alive request.
@@ -511,21 +527,6 @@ serveConnection conn ii th origAddr transport settings app = do
511527 else
512528 return False
513529 Nothing -> tryKeepAlive
514− else
515− return False
516−
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
521−
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
525− where
526− einfo = H2.encodeInfo id 0
527− frame = H2.GoAwayFrame 0 etype debugmsg
528− bytestream = H2.encodeFrame einfo frame
529530
530531flushEntireBody :: IO ByteString -> IO ()
531532flushEntireBody src =
@@ -558,42 +559,14 @@ wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
558559 when (S.length bs >= slowlorisSize) $ T.tickle th
559560 return bs
560561
561−wrappedRecvN :: T.Handle -> IORef Bool -> Int -> (BufSize -> IO ByteString) -> (BufSize -> IO ByteString)
562−wrappedRecvN th istatus slowlorisSize readN bufsize = do
563− bs <- readN bufsize
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
572− return bs
573−
574−-- | Set flag FileCloseOnExec flag on a socket (on Unix)
575−--
576562-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
577−--
578−-- @since 3.2.17
579563setSocketCloseOnExec :: Socket -> IO ()
580564#if WINDOWS
581565setSocketCloseOnExec _ = return ()
582566#else
583−setSocketCloseOnExec socket = do
584−#if MIN_VERSION_network(3,0,0)
585− fd <- fdSocket socket
586−#else
587− let fd = fdSocket socket
588−#endif
589− F.setFileCloseOnExec $ fromIntegral fd
567+setSocketCloseOnExec socket =
568+ setFdOption (fromIntegral $ fdSocket socket) CloseOnExec True
590569#endif
591570
592−gracefulShutdown :: Settings -> Counter -> IO ()
593−gracefulShutdown set counter =
594− case settingsGracefulShutdownTimeout set of
595− Nothing ->
596− waitForZero counter
597− (Just seconds) ->
598− void (timeout (seconds * microsPerSecond) (waitForZero counter))
599− where microsPerSecond = 1000000
571+gracefulShutdown :: Counter -> IO ()
572+gracefulShutdown counter = waitForZero counter