on ce607dd help sign in
.azure/azure-linux-template.yml+28−10
since splitsnapshots
unifiedsplit
@@ -5,6 +5,16 @@ jobs:
5 vmImage: ${{ parameters.vmImage }}
5 vmImage: ${{ parameters.vmImage }}
6 strategy:
6 strategy:
7 matrix:
7 matrix:
8+ stack-def:
9+ BUILD: stack
10+ stack-lts-6:
11+ BUILD: stack
12+ STACK_YAML: stack-lts-6.yaml
13+ ARGS: "--resolver lts-6"
14+ stack-lts-9:
15+ BUILD: stack
16+ STACK_YAML: stack-lts-9.yaml
17+ ARGS: "--resolver lts-9"
8 stack-lts-11:
18 stack-lts-11:
9 BUILD: stack
19 BUILD: stack
10 STACK_YAML: stack-lts-11.yaml
20 STACK_YAML: stack-lts-11.yaml
@@ -13,13 +23,17 @@ jobs:
13 BUILD: stack
23 BUILD: stack
14 STACK_YAML: stack-lts-12.yaml
24 STACK_YAML: stack-lts-12.yaml
15 ARGS: "--resolver lts-12"
25 ARGS: "--resolver lts-12"
16− stack-lts-14:
26+ stack-lts-13:
17 BUILD: stack
27 BUILD: stack
18− ARGS: "--resolver lts-14"
28+ ARGS: "--resolver lts-13"
19− stack-nightly:
29+ cabal-7.10.3:
20− BUILD: stack
30+ BUILD: cabal
21− STACK_YAML: stack-nightly.yaml
31+ GHCVER: 7.10.3
22− ARGS: "--resolver nightly"
32+ CABALVER: 1.22
33+ cabal-8.0.2:
34+ BUILD: cabal
35+ GHCVER: 8.0.2
36+ CABALVER: 1.24
23 cabal-8.2.2:
37 cabal-8.2.2:
24 BUILD: cabal
38 BUILD: cabal
25 GHCVER: 8.4.4
39 GHCVER: 8.4.4
@@ -28,9 +42,9 @@ jobs:
28 BUILD: cabal
42 BUILD: cabal
29 GHCVER: 8.4.4
43 GHCVER: 8.4.4
30 CABALVER: 2.2
44 CABALVER: 2.2
31− cabal-8.6.5:
45+ cabal-8.6.4:
32 BUILD: cabal
46 BUILD: cabal
33− GHCVER: 8.6.5
47+ GHCVER: 8.6.4
34 CABALVER: 2.4
48 CABALVER: 2.4
35 maxParallel: 6
49 maxParallel: 6
36 steps:
50 steps:
@@ -70,7 +84,7 @@ jobs:
70 for dir in $PACKAGES
84 for dir in $PACKAGES
71 do
85 do
72 cd $dir
86 cd $dir
73− cabal check || [ "$CABALVER" == "1.22" ] # https://github.com/yesodweb/wai/pull/754#issuecomment-504866279
87+ cabal check || [ "$CABALVER" == "1.16" ]
74 cabal sdist
88 cabal sdist
75 PKGVER=$(cabal info . | awk '{print $2;exit}')
89 PKGVER=$(cabal info . | awk '{print $2;exit}')
76 SRC_TGZ=$PKGVER.tar.gz
90 SRC_TGZ=$PKGVER.tar.gz
@@ -79,7 +93,11 @@ jobs:
79 cd "$PKGVER"
93 cd "$PKGVER"
80 cabal configure --enable-tests --ghc-options -O0
94 cabal configure --enable-tests --ghc-options -O0
81 cabal build
95 cabal build
96+ if [ "$CABALVER" = "1.16" ] || [ "$CABALVER" = "1.18" ]; then
97+ cabal test
98+ else
82− cabal test --show-details=streaming
99+ cabal test --show-details=streaming
100+ fi
83 cd $ORIGDIR
101 cd $ORIGDIR
84 done
102 done
85 ;;
103 ;;
.azure/azure-osx-template.yml+12−2
@@ -5,6 +5,16 @@ jobs:
5 vmImage: ${{ parameters.vmImage }}
5 vmImage: ${{ parameters.vmImage }}
6 strategy:
6 strategy:
7 matrix:
7 matrix:
8+ stack-def:
9+ BUILD: stack
10+ stack-lts-6:
11+ BUILD: stack
12+ STACK_YAML: stack-lts-6.yaml
13+ ARGS: "--resolver lts-6"
14+ stack-lts-9:
15+ BUILD: stack
16+ STACK_YAML: stack-lts-9.yaml
17+ ARGS: "--resolver lts-9"
8 stack-lts-11:
18 stack-lts-11:
9 BUILD: stack
19 BUILD: stack
10 STACK_YAML: stack-lts-11.yaml
20 STACK_YAML: stack-lts-11.yaml
@@ -13,9 +23,9 @@ jobs:
13 BUILD: stack
23 BUILD: stack
14 STACK_YAML: stack-lts-12.yaml
24 STACK_YAML: stack-lts-12.yaml
15 ARGS: "--resolver lts-12"
25 ARGS: "--resolver lts-12"
16− stack-lts-14:
26+ stack-lts-13:
17 BUILD: stack
27 BUILD: stack
18− ARGS: "--resolver lts-14"
28+ ARGS: "--resolver lts-13"
19 maxParallel: 3
29 maxParallel: 3
20 steps:
30 steps:
21 - script: |
31 - script: |
.azure/azure-windows-template.yml+3−4
@@ -5,9 +5,9 @@ jobs:
5 vmImage: ${{ parameters.vmImage }}
5 vmImage: ${{ parameters.vmImage }}
6 strategy:
6 strategy:
7 matrix:
7 matrix:
8− stack-lts-14:
8+ stack-lts-13:
9 BUILD: stack
9 BUILD: stack
10− ARGS: "--resolver lts-14"
10+ ARGS: "--resolver lts-13"
11 maxParallel: 3
11 maxParallel: 3
12 steps:
12 steps:
13 - bash: |
13 - bash: |
@@ -16,8 +16,7 @@ jobs:
16 unzip -o /usr/bin/stack.zip -d /usr/bin/
16 unzip -o /usr/bin/stack.zip -d /usr/bin/
17 stack setup $ARGS > /dev/null
17 stack setup $ARGS > /dev/null
18 stack --install-ghc $ARGS test --bench --only-dependencies
18 stack --install-ghc $ARGS test --bench --only-dependencies
19− stack $ARGS test --bench --no-run-benchmarks --no-run-tests
19+ stack $ARGS test --bench --no-run-benchmarks
20− stack $ARGS test --bench --no-run-benchmarks --jobs 1 # non-parallel test execution
21 env:
20 env:
22 OS_NAME: ${{ parameters.os }}
21 OS_NAME: ${{ parameters.os }}
23 displayName: 'Installation ${{parameters.os}} & Test'
22 displayName: 'Installation ${{parameters.os}} & Test'
.gitignore−1
@@ -9,4 +9,3 @@ tarballs/
9cabal.sandbox.config
9cabal.sandbox.config
10.stack-work/
10.stack-work/
11*~
11*~
12−stack*.yaml.lock
auto-update/ChangeLog.md−10
@@ -1,15 +1,5 @@
1# ChangeLog for auto-update
1# ChangeLog for auto-update
2
2
3−## 0.1.6
4−
5−* Add control of activation on leading vs. trailing edges for Control.Debounce
6− [#756](https://github.com/yesodweb/wai/pull/756)
7−
8−## 0.1.5
9−
10−* Using the Strict and StrictData language extensions for GHC >8.
11− [#752](https://github.com/yesodweb/wai/pull/752)
12−
13## 0.1.4.1
3## 0.1.4.1
14
4
15* [#693](https://github.com/yesodweb/wai/pull/693):
5* [#693](https://github.com/yesodweb/wai/pull/693):
auto-update/Control/Debounce.hs+53−19
@@ -11,7 +11,6 @@
11-- printString <- 'mkDebounce' 'defaultDebounceSettings'
11-- printString <- 'mkDebounce' 'defaultDebounceSettings'
12-- { 'debounceAction' = putStrLn "Running action"
12-- { 'debounceAction' = putStrLn "Running action"
13-- , 'debounceFreq' = 5000000 -- 5 seconds
13-- , 'debounceFreq' = 5000000 -- 5 seconds
14−-- , 'debounceEdge' = 'DI.trailingEdge' -- Trigger on the trailing edge
15-- }
14-- }
16-- @
15-- @
17--
16--
@@ -26,35 +25,70 @@
26-- @since 0.1.2
25-- @since 0.1.2
27module Control.Debounce
26module Control.Debounce
28 ( -- * Type
27 ( -- * Type
29− DI.DebounceSettings
28+ DebounceSettings
30 , defaultDebounceSettings
29 , defaultDebounceSettings
31 -- * Accessors
30 -- * Accessors
32− , DI.debounceFreq
31+ , debounceFreq
33− , DI.debounceAction
32+ , debounceAction
34− , DI.debounceEdge
35− , DI.leadingEdge
36− , DI.trailingEdge
37 -- * Creation
33 -- * Creation
38 , mkDebounce
34 , mkDebounce
39 ) where
35 ) where
40
36
41−import Control.Concurrent (newEmptyMVar, threadDelay)
37+import Control.Concurrent (forkIO, threadDelay)
42−import qualified Control.Debounce.Internal as DI
38+import Control.Concurrent.MVar (newEmptyMVar, takeMVar, tryPutMVar)
39+import Control.Exception (SomeException, handle, mask_)
40+import Control.Monad (forever, void)
41+
42+-- | Settings to control how debouncing should work.
43+--
44+-- This should be constructed using 'defaultDebounceSettings' and record
45+-- update syntax, e.g.:
46+--
47+-- @
48+-- let settings = 'defaultDebounceSettings' { 'debounceAction' = flushLog }
49+-- @
50+--
51+-- @since 0.1.2
52+data DebounceSettings = DebounceSettings
53+ { debounceFreq :: Int
54+ -- ^ Microseconds lag required between subsequence calls to the debounced
55+ -- action.
56+ --
57+ -- Default: 1 second (1000000)
58+ --
59+ -- @since 0.1.2
60+ , debounceAction :: IO ()
61+ -- ^ Action to be performed.
62+ --
63+ -- Note: all exceptions thrown by this action will be silently discarded.
64+ --
65+ -- Default: does nothing.
66+ --
67+ -- @since 0.1.2
68+ }
43
69
44-- | Default value for creating a 'DebounceSettings'.
70-- | Default value for creating a 'DebounceSettings'.
45--
71--
46-- @since 0.1.2
72-- @since 0.1.2
47−defaultDebounceSettings :: DI.DebounceSettings
73+defaultDebounceSettings :: DebounceSettings
48−defaultDebounceSettings = DI.DebounceSettings
74+defaultDebounceSettings = DebounceSettings
49− { DI.debounceFreq = 1000000
75+ { debounceFreq = 1000000
50− , DI.debounceAction = return ()
76+ , debounceAction = return ()
51− , DI.debounceEdge = DI.leadingEdge
52 }
77 }
53
78
54−-- | Generate an action which will trigger the debounced action to be performed.
79+-- | Generate an action which will trigger the debounced action to be
80+-- performed. The action will either be performed immediately, or after the
81+-- current cooldown period has expired.
55--
82--
56-- @since 0.1.2
83-- @since 0.1.2
57−mkDebounce :: DI.DebounceSettings -> IO (IO ())
84+mkDebounce :: DebounceSettings -> IO (IO ())
58−mkDebounce settings = do
85+mkDebounce (DebounceSettings freq action) = do
59− baton <- newEmptyMVar
86+ baton <- newEmptyMVar
60− DI.mkDebounceInternal baton threadDelay settings
87+ mask_ $ void $ forkIO $ forever $ do
88+ takeMVar baton
89+ ignoreExc action
90+ threadDelay freq
91+ return $ void $ tryPutMVar baton ()
92+
93+ignoreExc :: IO () -> IO ()
94+ignoreExc = handle $ \(_ :: SomeException) -> return ()
auto-update/Control/Debounce/Internal.hsdeleted−98
@@ -1,98 +0,0 @@
1−{-# LANGUAGE ScopedTypeVariables #-}
2−
3−-- | Unstable API which exposes internals for testing.
4−module Control.Debounce.Internal (
5− DebounceSettings(..)
6− , DebounceEdge(..)
7− , leadingEdge
8− , trailingEdge
9− , mkDebounceInternal
10− ) where
11−
12−import Control.Concurrent (forkIO)
13−import Control.Concurrent.MVar (takeMVar, tryPutMVar, tryTakeMVar, MVar)
14−import Control.Exception (SomeException, handle, mask_)
15−import Control.Monad (forever, void)
16−
17−-- | Settings to control how debouncing should work.
18−--
19−-- This should be constructed using 'defaultDebounceSettings' and record
20−-- update syntax, e.g.:
21−--
22−-- @
23−-- let settings = 'defaultDebounceSettings' { 'debounceAction' = flushLog }
24−-- @
25−--
26−-- @since 0.1.2
27−data DebounceSettings = DebounceSettings
28− { debounceFreq :: Int
29− -- ^ Length of the debounce timeout period in microseconds.
30− --
31− -- Default: 1 second (1000000)
32− --
33− -- @since 0.1.2
34− , debounceAction :: IO ()
35− -- ^ Action to be performed.
36− --
37− -- Note: all exceptions thrown by this action will be silently discarded.
38− --
39− -- Default: does nothing.
40− --
41− -- @since 0.1.2
42− , debounceEdge :: DebounceEdge
43− -- ^ Whether to perform the action on the leading edge or trailing edge of
44− -- the timeout.
45− --
46− -- Default: 'trailingEdge'.
47− --
48− -- @since 0.1.6
49− }
50−
51−-- | Setting to control whether the action happens at the leading and/or trailing
52−-- edge of the timeout.
53−--
54−-- @since 0.1.6
55−data DebounceEdge =
56− Leading
57− -- ^ Perform the action immediately, and then begin a cooldown period.
58− -- If the trigger happens again during the cooldown, wait until the end of the cooldown
59− -- and then perform the action again, then enter a new cooldown period.
60− | Trailing
61− -- ^ Start a cooldown period and perform the action when the period ends. If another trigger
62− -- happens during the cooldown, it has no effect.
63− deriving (Show, Eq)
64−
65−
66−-- | Perform the action immediately, and then begin a cooldown period.
67−-- If the trigger happens again during the cooldown, wait until the end of the cooldown
68−-- and then perform the action again, then enter a new cooldown period.
69−--
70−-- @since 0.1.6
71−leadingEdge :: DebounceEdge
72−leadingEdge = Leading
73−
74−-- | Start a cooldown period and perform the action when the period ends. If another trigger
75−-- happens during the cooldown, it has no effect.
76−--
77−-- @since 0.1.6
78−trailingEdge :: DebounceEdge
79−trailingEdge = Trailing
80−
81−mkDebounceInternal :: MVar () -> (Int -> IO ()) -> DebounceSettings -> IO (IO ())
82−mkDebounceInternal baton delayFn (DebounceSettings freq action edge) = do
83− mask_ $ void $ forkIO $ forever $ do
84− takeMVar baton
85− case edge of
86− Leading -> do
87− ignoreExc action
88− delayFn freq
89− Trailing -> do
90− delayFn freq
91− -- Empty the baton of any other activations during the interval
92− void $ tryTakeMVar baton
93− ignoreExc action
94−
95− return $ void $ tryPutMVar baton ()
96−
97−ignoreExc :: IO () -> IO ()
98−ignoreExc = handle $ \(_ :: SomeException) -> return ()
auto-update/auto-update.cabal+9−11
@@ -1,5 +1,5 @@
1name: auto-update
1name: auto-update
2−version: 0.1.6
2+version: 0.1.4.1
3synopsis: Efficiently run periodic, on-demand actions
3synopsis: Efficiently run periodic, on-demand actions
4description: API docs and the README are available at <http://www.stackage.org/package/auto-update>.
4description: API docs and the README are available at <http://www.stackage.org/package/auto-update>.
5homepage: https://github.com/yesodweb/wai
5homepage: https://github.com/yesodweb/wai
@@ -17,7 +17,6 @@ library
17 ghc-options: -Wall
17 ghc-options: -Wall
18 exposed-modules: Control.AutoUpdate
18 exposed-modules: Control.AutoUpdate
19 Control.Debounce
19 Control.Debounce
20− Control.Debounce.Internal
21 Control.Reaper
20 Control.Reaper
22 other-modules: Control.AutoUpdate.Util
21 other-modules: Control.AutoUpdate.Util
23 build-depends: base >= 4 && < 5
22 build-depends: base >= 4 && < 5
@@ -27,12 +26,11 @@ library
27
26
28-- Test suite is currently not robust enough, gives too many false negatives.
27-- Test suite is currently not robust enough, gives too many false negatives.
29
28
30−test-suite spec
29+-- test-suite spec
31− main-is: Spec.hs
30+-- main-is: Spec.hs
32− other-modules: Control.AutoUpdateSpec
31+-- other-modules: Control.AutoUpdateSpec
33− Control.DebounceSpec
34− Control.ReaperSpec
32+-- Control.ReaperSpec
35− hs-source-dirs: test
33+-- hs-source-dirs: test
36− type: exitcode-stdio-1.0
34+-- type: exitcode-stdio-1.0
37− build-depends: base, auto-update, exceptions, hspec, retry, HUnit
35+-- build-depends: base, auto-update, hspec
38− default-language: Haskell2010
36+-- default-language: Haskell2010
auto-update/test/Control/AutoUpdateSpec.hs+25−26
@@ -1,35 +1,34 @@
1module Control.AutoUpdateSpec (spec) where
1module Control.AutoUpdateSpec (spec) where
2
2
3−import Control.AutoUpdate
4−import Control.Concurrent (threadDelay)
5−import Control.Monad (replicateM_, forM_)
6−import Data.IORef
7import Test.Hspec
3import Test.Hspec
8import Test.Hspec.QuickCheck
4import Test.Hspec.QuickCheck
5+import Data.IORef
6+import Control.Concurrent (threadDelay)
7+import Control.Monad (replicateM_, forM_)
8+import Control.AutoUpdate
9
9
10spec :: Spec
10spec :: Spec
11−spec = return ()
11+spec = do
12− -- do
13− -- prop "incrementer" $ \st' -> do
12+ prop "incrementer" $ \st' -> do
14− -- let st = abs st' `mod` 10000
13+ let st = abs st' `mod` 10000
15− -- ref <- newIORef 0
14+ ref <- newIORef 0
16− -- next <- mkAutoUpdate defaultUpdateSettings
15+ next <- mkAutoUpdate defaultUpdateSettings
17− -- { updateAction = atomicModifyIORef ref $ \i ->
16+ { updateAction = atomicModifyIORef ref $ \i ->
18− -- let i' = succ i in i' `seq` (i', i')
17+ let i' = succ i in i' `seq` (i', i')
19− -- , updateSpawnThreshold = st
18+ , updateSpawnThreshold = st
20− -- , updateFreq = 10000
19+ , updateFreq = 10000
21− -- }
20+ }
22
21
23− -- forM_ [1..st + 1] $ \i -> do
22+ forM_ [1..st + 1] $ \i -> do
24− -- j <- next
23+ j <- next
25− -- j `shouldBe` i
24+ j `shouldBe` i
26
25
27− -- replicateM_ 50 $ do
26+ replicateM_ 50 $ do
28− -- i <- next
27+ i <- next
29− -- i `shouldBe` st + 2
28+ i `shouldBe` st + 2
30
29
31− -- threadDelay 60000
30+ threadDelay 60000
32− -- last1 <- readIORef ref
31+ last1 <- readIORef ref
33− -- threadDelay 20000
32+ threadDelay 20000
34− -- last2 <- readIORef ref
33+ last2 <- readIORef ref
35− -- last2 `shouldBe` last1
34+ last2 `shouldBe` last1
auto-update/test/Control/DebounceSpec.hsdeleted−120
@@ -1,120 +0,0 @@
1−{-# LANGUAGE ScopedTypeVariables #-}
2−module Control.DebounceSpec (spec) where
3−
4−import Control.Concurrent
5−import Control.Debounce
6−import qualified Control.Debounce.Internal as DI
7−import Control.Monad
8−import Control.Monad.Catch
9−import Control.Retry
10−import Data.IORef
11−import Test.HUnit.Lang
12−import Test.Hspec
13−
14−spec :: Spec
15−spec = describe "mkDebounce" $ do
16− describe "Leading edge" $ do
17− it "works for a single event" $ do
18− (ref, debounced, baton, returnFromWait) <- getDebounce leadingEdge
19−
20− debounced
21− waitUntil 5 $ readIORef ref >>= (`shouldBe` 1)
22−
23− returnFromWait
24− pause
25− readIORef ref >>= (`shouldBe` 1)
26−
27− -- Try another round
28− debounced
29− waitUntil 5 $ readIORef ref >>= (`shouldBe` 2)
30−
31− returnFromWait
32− pause
33− readIORef ref >>= (`shouldBe` 2)
34−
35− it "works for multiple events" $ do
36− (ref, debounced, baton, returnFromWait) <- getDebounce leadingEdge
37−
38− debounced
39− waitForBatonToBeTaken baton
40− debounced
41− pause
42− waitUntil 5 $ readIORef ref >>= (`shouldBe` 1)
43−
44− returnFromWait
45− pause
46− readIORef ref >>= (`shouldBe` 2)
47−
48− describe "Trailing edge" $ do
49− it "works for a single event" $ do
50− (ref, debounced, baton, returnFromWait) <- getDebounce trailingEdge
51−
52− debounced
53− pause
54− waitUntil 5 $ readIORef ref >>= (`shouldBe` 0)
55−
56− returnFromWait
57− waitUntil 5 $ readIORef ref >>= (`shouldBe` 1)
58−
59− -- Try another round
60− debounced
61− pause
62− waitUntil 5 $ readIORef ref >>= (`shouldBe` 1)
63−
64− returnFromWait
65− waitUntil 5 $ readIORef ref >>= (`shouldBe` 2)
66−
67− it "works for multiple events" $ do
68− (ref, debounced, baton, returnFromWait) <- getDebounce trailingEdge
69−
70− debounced
71− waitForBatonToBeTaken baton
72− debounced
73− pause
74− waitUntil 5 $ readIORef ref >>= (`shouldBe` 0)
75−
76− returnFromWait
77− waitUntil 5 $ readIORef ref >>= (`shouldBe` 1)
78−
79−
80−-- | Make a controllable delay function
81−getWaitAction :: IO (p -> IO (), IO ())
82−getWaitAction = do
83− waitVar <- newEmptyMVar
84− let waitAction _ = takeMVar waitVar
85− let returnFromWait = putMVar waitVar ()
86− return (waitAction, returnFromWait)
87−
88−-- | Get a debounce system with access to the internals for testing
89−getDebounce :: DI.DebounceEdge -> IO (IORef Int, IO (), MVar (), IO ())
90−getDebounce edge = do
91− ref :: IORef Int <- newIORef 0
92− let action = modifyIORef ref (+ 1)
93−
94− (waitAction, returnFromWait) <- getWaitAction
95−
96− baton <- newEmptyMVar
97−
98− debounced <- DI.mkDebounceInternal baton waitAction defaultDebounceSettings {
99− debounceFreq = 5000000 -- unused
100− , debounceAction = action
101− , debounceEdge = edge
102− }
103−
104− return (ref, debounced, baton, returnFromWait)
105−
106−-- | Pause briefly (100ms)
107−pause :: IO ()
108−pause = threadDelay 100000
109−
110−waitForBatonToBeTaken :: MVar () -> IO ()
111−waitForBatonToBeTaken baton = waitUntil 5 $ tryReadMVar baton >>= (`shouldBe` Nothing)
112−
113−-- | Wait up to n seconds for an action to complete without throwing an HUnitFailure
114−waitUntil :: Int -> IO a -> IO ()
115−waitUntil n action = recovering policy [handler] (\_status -> void action)
116− where policy = constantDelay 1000 `mappend` limitRetries (n * 1000) -- 1ms * n * 1000 tries = n seconds
117− handler _status = Handler (\(HUnitFailure {}) -> return True)
118−
119−main :: IO ()
120−main = hspec spec
auto-update/test/Control/ReaperSpec.hs+27−29
@@ -1,39 +1,37 @@
1module Control.ReaperSpec (spec) where
1module Control.ReaperSpec (spec) where
2
2
3−import Control.Concurrent
4import Control.Reaper
3import Control.Reaper
5−import Data.IORef
4+import Control.Concurrent
6import Test.Hspec
5import Test.Hspec
7import Test.Hspec.QuickCheck
6import Test.Hspec.QuickCheck
7+import Data.IORef
8
8
9+type Item = (Int, IORef Int)
9
10
10−spec :: Spec
11+action = mkListAction $ \(i, ref) -> do
11−spec = return ()
12+ modifyIORef ref succ
12−-- prop "works" $ \is -> do
13+ return $ if i > 1
13−-- reaper <- mkReaper defaultReaperSettings
14+ then Just (pred i, ref)
14−-- { reaperAction = action
15+ else Nothing
15−-- , reaperDelay = 1000
16−-- }
17−
18−-- let mkTestCase i = do
19−-- ref <- newIORef 0
20−-- let expected = (abs i `mod` 10) + 1
21−-- reaperAdd reaper (expected, ref)
22−-- return (expected, ref)
23−-- testCases <- mapM mkTestCase is
24
16
25−-- let test (expected, ref) = do
17+spec :: Spec
26−-- actual <- readIORef ref
18+spec = prop "works" $ \is -> do
27−-- actual `shouldBe` (expected :: Int)
19+ reaper <- mkReaper defaultReaperSettings
28−-- threadDelay 100000
20+ { reaperAction = action
29−-- mapM_ test testCases
21+ , reaperDelay = 1000
30−-- [] <- reaperRead reaper
22+ }
31−-- return ()
32
23
33−-- type Item = (Int, IORef Int)
24+ let mkTestCase i = do
25+ ref <- newIORef 0
26+ let expected = (abs i `mod` 10) + 1
27+ reaperAdd reaper (expected, ref)
28+ return (expected, ref)
29+ testCases <- mapM mkTestCase is
34
30
35−-- action = mkListAction $ \(i, ref) -> do
31+ let test (expected, ref) = do
36−-- modifyIORef ref succ
32+ actual <- readIORef ref
33+ actual `shouldBe` (expected :: Int)
34+ threadDelay 100000
35+ mapM_ test testCases
36+ [] <- reaperRead reaper
37−-- return $ if i > 1
37+ return ()
38−-- then Just (pred i, ref)
39−-- else Nothing
stack-lts-11.yaml+6−5
@@ -15,13 +15,14 @@ flags:
15 build-example: true
15 build-example: true
16extra-deps:
16extra-deps:
17- streaming-commons-0.2.1.0@sha256:163af02944f374f316e35257c1afbffefd2c2852a85a151d1ea0ad22152cf28d,4990
17- streaming-commons-0.2.1.0@sha256:163af02944f374f316e35257c1afbffefd2c2852a85a151d1ea0ad22152cf28d,4990
18−- http2-2.0.0
19−- network-byte-order-0.1.1.0
20−- tls-1.5.3
21−- tls-session-manager-0.0.4
22−- x509-1.7.5
23nix:
18nix:
24 enable: false
19 enable: false
25 packages:
20 packages:
26 - fcgi
21 - fcgi
27 - zlib
22 - zlib
23+image:
24+ containers:
25+ - base: "fpco/pid1"
26+ name: "yesodweb/warp"
27+ executables:
28+ - warp
stack-lts-12.yaml+6−6
@@ -18,9 +18,9 @@ nix:
18 packages:
18 packages:
19 - fcgi
19 - fcgi
20 - zlib
20 - zlib
21−extra-deps:
21+image:
22−- http2-2.0.0
22+ containers:
23−- network-byte-order-0.1.1.0
23+ - base: "fpco/pid1"
24−- tls-1.5.3
24+ name: "yesodweb/warp"
25−- tls-session-manager-0.0.4
25+ executables:
26−- x509-1.7.5
26+ - warp
stack-lts-6.yamlnew file+33
@@ -0,0 +1,33 @@
1+resolver: lts-6.35
2+packages:
3+- ./auto-update
4+- ./mime-types
5+- ./wai
6+- ./wai-extra
7+- ./warp
8+- ./warp-tls
9+- ./wai-app-static
10+- ./wai-websockets
11+- ./wai-conduit
12+- ./time-manager
13+extra-deps:
14+- bsb-http-chunked-0.0.0.2@sha256:0571ef33ec5530104503d32eaf24f2d7c221f350e5fc475a6dd8e84311bc0ca1,1792
15+- streaming-commons-0.2.1.0@sha256:163af02944f374f316e35257c1afbffefd2c2852a85a151d1ea0ad22152cf28d,4990
16+- tls-session-manager-0.0.0.2@sha256:e3d3f8a026196df46746a19d3d7d31211b2fca3aefed9074e951b2dcc1b8833c,872
17+- wai-logger-2.3.2@sha256:7f5dbc72c0753bd3e0e73f8f542d9d159d1d70f8ff3a3ec16d0b74b500534fc6,1572
18+- gauge-0.2.3@sha256:ce41cb66ebf730a5050181db0338b1a4b3f76ac71331bf5070089bcd4352ff46,3777
19+- psqueues-0.2.7.0@sha256:189970837d0aae01f48cd2a8aac6ce314191939e118cc0488aee1fb12da1956a,4757
20+- basement-0.0.7@rev:0
21+- http-client-0.5.13.1@rev:0
22+- http-types-0.12.3@rev:0
23+nix:
24+ enable: false
25+ packages:
26+ - fcgi
27+ - zlib
28+image:
29+ containers:
30+ - base: "fpco/pid1"
31+ name: "yesodweb/warp"
32+ executables:
33+ - warp
stack-lts-9.yamlnew file+29
@@ -0,0 +1,29 @@
1+resolver: lts-9.21
2+packages:
3+- ./auto-update
4+- ./mime-types
5+- ./wai
6+- ./wai-extra
7+- ./warp
8+- ./warp-tls
9+- ./wai-app-static
10+- ./wai-websockets
11+- ./wai-conduit
12+- ./time-manager
13+extra-deps:
14+- bsb-http-chunked-0.0.0.2@sha256:0571ef33ec5530104503d32eaf24f2d7c221f350e5fc475a6dd8e84311bc0ca1,1792
15+- streaming-commons-0.2.1.0@sha256:163af02944f374f316e35257c1afbffefd2c2852a85a151d1ea0ad22152cf28d,4990
16+- wai-logger-2.3.2@sha256:7f5dbc72c0753bd3e0e73f8f542d9d159d1d70f8ff3a3ec16d0b74b500534fc6,1572
17+- http-client-0.5.13.1@rev:0
18+- http-types-0.12.3@rev:0
19+nix:
20+ enable: false
21+ packages:
22+ - fcgi
23+ - zlib
24+image:
25+ containers:
26+ - base: "fpco/pid1"
27+ name: "yesodweb/warp"
28+ executables:
29+ - warp
stack-nightly.yamldeleted−20
@@ -1,20 +0,0 @@
1−resolver: nightly-2020-01-08
2−packages:
3−- ./auto-update
4−- ./mime-types
5−- ./wai
6−- ./wai-extra
7−- ./warp
8−- ./warp-tls
9−- ./wai-app-static
10−- ./wai-websockets
11−- ./wai-conduit
12−- ./time-manager
13−flags:
14− wai-extra:
15− build-example: true
16−nix:
17− enable: false
18− packages:
19− - fcgi
20− - zlib
stack.yaml+7−6
@@ -1,4 +1,4 @@
1−resolver: lts-14.22
1+resolver: lts-13.14
2packages:
2packages:
3- ./auto-update
3- ./auto-update
4- ./mime-types
4- ./mime-types
@@ -18,8 +18,9 @@ nix:
18 packages:
18 packages:
19 - fcgi
19 - fcgi
20 - zlib
20 - zlib
21−extra-deps:
21+image:
22−- http2-2.0.0
22+ containers:
23−- network-byte-order-0.1.1.0
23+ - base: "fpco/pid1"
24−- tls-1.5.3
24+ name: "yesodweb/warp"
25−- tls-session-manager-0.0.4
25+ executables:
26+ - warp
wai-app-static/ChangeLog.md−10
@@ -1,13 +1,3 @@
1−# wai-app-static changelog
2−
3−## 3.1.7.1
4−
5−* Update the test suite too
6−
7−## 3.1.7
8−
9−* Use 302 instead of 301 redirect, to avoid caching the presence of an index.html file
10−
11## 3.1.6.3
1## 3.1.6.3
12
2
13* The executable warp obeys `-h` option properly for host
3* The executable warp obeys `-h` option properly for host
wai-app-static/Network/Wai/Application/Static.hs+8−10
@@ -164,13 +164,11 @@ serveFile StaticSettings {..} req file
164 -- Didn't match, but we have a hash value. Send the file contents
164 -- Didn't match, but we have a hash value. Send the file contents
165 -- with an ETag header.
165 -- with an ETag header.
166 --
166 --
167− -- RFC7232 (HTTP 1.1):
167+ -- Note: It would be arguably better to next check
168− -- > A recipient MUST ignore If-Modified-Since if the request contains an
168+ -- if-modified-since and return a 304 if that indicates a match as
169− -- > If-None-Match header field; the condition in If-None-Match is
169+ -- well. However, the circumstances under which such a situation
170− -- > considered to be a more accurate replacement for the condition in
170+ -- could arise would be very anomolous, and should likely warrant a
171− -- > If-Modified-Since, and the two are only combined for the sake of
171+ -- new file being sent anyway.
172− -- > interoperating with older intermediaries that might not implement
173− -- > If-None-Match.
174 (Just hash, _) -> respond [("ETag", hash)]
172 (Just hash, _) -> respond [("ETag", hash)]
175
173
176 -- No hash value available, fall back to last modified support.
174 -- No hash value available, fall back to last modified support.
@@ -245,7 +243,7 @@ staticAppPieces ss rawPieces req sendResponse = liftIO $ do
245 response :: StaticResponse -> IO W.ResponseReceived
243 response :: StaticResponse -> IO W.ResponseReceived
246 response (FileResponse file ch) = do
244 response (FileResponse file ch) = do
247 mimetype <- ssGetMimeType ss file
245 mimetype <- ssGetMimeType ss file
248− -- let filesize = fileGetSize file
246+ let filesize = fileGetSize file
249 let headers = ("Content-Type", mimetype)
247 let headers = ("Content-Type", mimetype)
250 -- Let Warp provide the content-length, since it takes
248 -- Let Warp provide the content-length, since it takes
251 -- range requests into account
249 -- range requests into account
@@ -269,13 +267,13 @@ staticAppPieces ss rawPieces req sendResponse = liftIO $ do
269 Just hash -> replace "etag" (Just hash) (W.queryString req)
267 Just hash -> replace "etag" (Just hash) (W.queryString req)
270 Nothing -> remove "etag" (W.queryString req)
268 Nothing -> remove "etag" (W.queryString req)
271
269
272− sendResponse $ W.responseLBS H.status302
270+ sendResponse $ W.responseLBS H.status301
273 [ ("Content-Type", "text/plain")
271 [ ("Content-Type", "text/plain")
274 , ("Location", S8.append loc $ H.renderQuery True qString)
272 , ("Location", S8.append loc $ H.renderQuery True qString)
275 ] "Redirect"
273 ] "Redirect"
276
274
277 response (RawRedirect path) =
275 response (RawRedirect path) =
278− sendResponse $ W.responseLBS H.status302
276+ sendResponse $ W.responseLBS H.status301
279 [ ("Content-Type", "text/plain")
277 [ ("Content-Type", "text/plain")
280 , ("Location", path)
278 , ("Location", path)
281 ] "Redirect"
279 ] "Redirect"
wai-app-static/WaiAppStatic/CmdLine.hs−1
@@ -39,7 +39,6 @@ data Args = Args
39 }
39 }
40
40
41#if MIN_VERSION_optparse_applicative(0, 10, 0)
41#if MIN_VERSION_optparse_applicative(0, 10, 0)
42−option' :: Mod OptionFields Int -> Parser Int
43option' = option auto
42option' = option auto
44#else
43#else
45option' = option
44option' = option
wai-app-static/WaiAppStatic/Listing.hs+1−1
@@ -64,7 +64,7 @@ defaultListing pieces (Folder contents) = do
64
64
65 -- Add a link to the root of the tree
65 -- Add a link to the root of the tree
66 showFolder' :: Bool -> Pieces -> H.Html
66 showFolder' :: Bool -> Pieces -> H.Html
67− showFolder' hasTrailingSlash pieces' = showFolder hasTrailingSlash (unsafeToPiece "root" : pieces')
67+ showFolder' hasTrailingSlash pieces = showFolder hasTrailingSlash (unsafeToPiece "root" : pieces)
68
68
69 showFolder :: Bool -> Pieces -> H.Html
69 showFolder :: Bool -> Pieces -> H.Html
70 showFolder _ [] = "/" -- won't happen
70 showFolder _ [] = "/" -- won't happen
wai-app-static/WaiAppStatic/Storage/Embedded/TH.hs+1
@@ -7,6 +7,7 @@ module WaiAppStatic.Storage.Embedded.TH(
7
7
8import Data.ByteString.Builder.Extra (byteStringInsert)
8import Data.ByteString.Builder.Extra (byteStringInsert)
9import Codec.Compression.GZip (compress)
9import Codec.Compression.GZip (compress)
10+import Control.Applicative
10import Data.ByteString.Unsafe (unsafePackAddressLen)
11import Data.ByteString.Unsafe (unsafePackAddressLen)
11import Data.Either (lefts, rights)
12import Data.Either (lefts, rights)
12import GHC.Exts (Int(..))
13import GHC.Exts (Int(..))
wai-app-static/WaiAppStatic/Types.hs−2
@@ -59,8 +59,6 @@ toPieces :: [Text] -> Maybe Pieces
59toPieces = mapM toPiece
59toPieces = mapM toPiece
60
60
61-- | Request coming from a user. Corresponds to @pathInfo@.
61-- | Request coming from a user. Corresponds to @pathInfo@.
62−--
63−-- The root path is the empty list.
64type Pieces = [Piece]
62type Pieces = [Piece]
65
63
66-- | Values for the max-age component of the cache-control response header.
64-- | Values for the max-age component of the cache-control response header.
wai-app-static/test/WaiAppStaticTest.hs+9−9
@@ -57,22 +57,22 @@ spec = do
57 assertStatus 200 =<<
57 assertStatus 200 =<<
58 request (setRawPathInfo defRequest path)
58 request (setRawPathInfo defRequest path)
59
59
60− it "404 for non-existent files" $ webApp $
60+ it "404 for non-existant files" $ webApp $
61 assertStatus 404 =<<
61 assertStatus 404 =<<
62 request (setRawPathInfo defRequest "doesNotExist")
62 request (setRawPathInfo defRequest "doesNotExist")
63
63
64− it "302 redirect when multiple slashes" $ webApp $ do
64+ it "301 redirect when multiple slashes" $ webApp $ do
65 req <- request (setRawPathInfo defRequest "a//b/c")
65 req <- request (setRawPathInfo defRequest "a//b/c")
66− assertStatus 302 req
66+ assertStatus 301 req
67 assertHeader "Location" "../../a/b/c" req
67 assertHeader "Location" "../../a/b/c" req
68
68
69 let absoluteApp = flip runSession $ staticApp $ (defaultWebAppSettings "test") {
69 let absoluteApp = flip runSession $ staticApp $ (defaultWebAppSettings "test") {
70 ssMkRedirect = \_ u -> S8.append "http://www.example.com" u
70 ssMkRedirect = \_ u -> S8.append "http://www.example.com" u
71 }
71 }
72− it "302 redirect when multiple slashes" $ absoluteApp $
72+ it "301 redirect when multiple slashes" $ absoluteApp $
73 flip mapM_ ["/a//b/c", "a//b/c"] $ \path -> do
73 flip mapM_ ["/a//b/c", "a//b/c"] $ \path -> do
74 req <- request (setRawPathInfo defRequest path)
74 req <- request (setRawPathInfo defRequest path)
75− assertStatus 302 req
75+ assertStatus 301 req
76 assertHeader "Location" "http://www.example.com/a/b/c" req
76 assertHeader "Location" "http://www.example.com/a/b/c" req
77
77
78 describe "webApp when requesting a static asset" $ do
78 describe "webApp when requesting a static asset" $ do
@@ -131,10 +131,10 @@ spec = do
131 assertStatus 304 req
131 assertStatus 304 req
132 assertNoHeader "Cache-Control" req
132 assertNoHeader "Cache-Control" req
133
133
134− context "302 redirect to add a trailing slash on directories if missing" $ do
134+ context "301 redirect to add a trailing slash on directories if missing" $ do
135 it "works at the root" $ fileServerApp $ do
135 it "works at the root" $ fileServerApp $ do
136 req <- request (setRawPathInfo defRequest "/a")
136 req <- request (setRawPathInfo defRequest "/a")
137− assertStatus 302 req
137+ assertStatus 301 req
138 assertHeader "Location" "/a/" req
138 assertHeader "Location" "/a/" req
139
139
140 it "works when an index.html is delivered" $ do
140 it "works when an index.html is delivered" $ do
@@ -144,7 +144,7 @@ spec = do
144 inTempDirectory $ fileServerAppWithSettings settings $ do
144 inTempDirectory $ fileServerAppWithSettings settings $ do
145 liftIO $ touch "foo/index.html"
145 liftIO $ touch "foo/index.html"
146 req <- request (setRawPathInfo defRequest "/foo")
146 req <- request (setRawPathInfo defRequest "/foo")
147− assertStatus 302 req
147+ assertStatus 301 req
148 assertHeader "Location" "/foo/" req
148 assertHeader "Location" "/foo/" req
149
149
150 let urlMapApp = flip runSession $ \req send ->
150 let urlMapApp = flip runSession $ \req send ->
@@ -158,7 +158,7 @@ spec = do
158 "urlMapApp: only works at subPath"
158 "urlMapApp: only works at subPath"
159 it "works with subpath at the root of the file server" $ urlMapApp $ do
159 it "works with subpath at the root of the file server" $ urlMapApp $ do
160 req <- request (setRawPathInfo defRequest "/subPath")
160 req <- request (setRawPathInfo defRequest "/subPath")
161− assertStatus 302 req
161+ assertStatus 301 req
162 assertHeader "Location" "/subPath/" req
162 assertHeader "Location" "/subPath/" req
163
163
164 context "with defaultWebAppSettings" $ do
164 context "with defaultWebAppSettings" $ do
wai-app-static/wai-app-static.cabal+2−2
@@ -1,5 +1,5 @@
1name: wai-app-static
1name: wai-app-static
2−version: 3.1.7.1
2+version: 3.1.6.3
3license: MIT
3license: MIT
4license-file: LICENSE
4license-file: LICENSE
5author: Michael Snoyman <michael@snoyman.com>
5author: Michael Snoyman <michael@snoyman.com>
@@ -49,7 +49,7 @@ library
49 , filepath
49 , filepath
50 , wai-extra >= 3.0 && < 3.1
50 , wai-extra >= 3.0 && < 3.1
51 , optparse-applicative >= 0.7
51 , optparse-applicative >= 0.7
52− , warp >= 3.0.11 && < 3.4
52+ , warp >= 3.0.11 && < 3.3
53
53
54 exposed-modules: Network.Wai.Application.Static
54 exposed-modules: Network.Wai.Application.Static
55 WaiAppStatic.Storage.Filesystem
55 WaiAppStatic.Storage.Filesystem
wai-conduit/Network/Wai/Conduit.hs+6−5
@@ -17,16 +17,17 @@ import qualified Data.ByteString as S
17import Control.Monad (unless)
17import Control.Monad (unless)
18import Network.HTTP.Types
18import Network.HTTP.Types
19import Data.ByteString.Builder (Builder)
19import Data.ByteString.Builder (Builder)
20+import Data.IORef
20import qualified Data.Conduit.List as CL
21import qualified Data.Conduit.List as CL
21
22
22-- | Stream the request body.
23-- | Stream the request body.
23--
24--
24-- Since 3.0.0
25-- Since 3.0.0
25−sourceRequestBody :: MonadIO m => Request -> ConduitT () ByteString m ()
26+sourceRequestBody :: MonadIO m => Request -> Source m ByteString
26sourceRequestBody req =
27sourceRequestBody req =
27 loop
28 loop
28 where
29 where
29− go = liftIO (getRequestBodyChunk req)
30+ go = liftIO (requestBody req)
30
31
31 loop = do
32 loop = do
32 bs <- go
33 bs <- go
@@ -37,9 +38,9 @@ sourceRequestBody req =
37-- | Create an HTTP response out of a @Source@.
38-- | Create an HTTP response out of a @Source@.
38--
39--
39-- Since 3.0.0
40-- Since 3.0.0
40−responseSource :: Status -> ResponseHeaders -> ConduitT () (Flush Builder) IO () -> Response
41+responseSource :: Status -> ResponseHeaders -> Source IO (Flush Builder) -> Response
41responseSource s hs src = responseStream s hs $ \send flush ->
42responseSource s hs src = responseStream s hs $ \send flush ->
42− runConduit $ src .| CL.mapM_ (\mbuilder ->
43+ src $$ CL.mapM_ (\mbuilder ->
43 case mbuilder of
44 case mbuilder of
44 Chunk b -> send b
45 Chunk b -> send b
45 Flush -> flush)
46 Flush -> flush)
@@ -49,7 +50,7 @@ responseSource s hs src = responseStream s hs $ \send flush ->
49--
50--
50-- Since 3.0.0
51-- Since 3.0.0
51responseRawSource :: (MonadIO m, MonadIO n)
52responseRawSource :: (MonadIO m, MonadIO n)
52− => (ConduitT () ByteString m () -> ConduitT ByteString Void n () -> IO ())
53+ => (Source m ByteString -> Sink ByteString n () -> IO ())
53 -> Response
54 -> Response
54 -> Response
55 -> Response
55responseRawSource app =
56responseRawSource app =
wai-extra/ChangeLog.md−21
@@ -1,26 +1,5 @@
1# Changelog for wai-extra
1# Changelog for wai-extra
2
2
3−## 3.0.29.1
4−
5−* Fix `Network.Wai.Test.request` always sending an empty request body [#794](https://github.com/yesodweb/wai/pull/794)
6−
7−## 3.0.29
8−
9−* Export `Network.Wai.EventSource.eventStreamAppRaw` [#786](https://github.com/yesodweb/wai/pull/786)
10−
11−## 3.0.28
12−
13−* Add `Network.Wai.EventSource.eventStreamAppRaw` [#767](https://github.com/yesodweb/wai/pull/767)
14−
15−## 3.0.27
16−
17−* Add custom request log formatter which includes response headers [#762](https://github.com/yesodweb/wai/pull/762)
18−
19−## 3.0.26.1
20−
21−* When available, supply the response size to custom loggers
22− [#757](https://github.com/yesodweb/wai/pull/757)
23−
24## 3.0.26
3## 3.0.26
25
4
26* Throw 413 for too large payload
5* Throw 413 for too large payload
wai-extra/Network/Wai/EventSource.hs+1−19
@@ -5,14 +5,11 @@
5 headers:
5 headers:
6
6
7 > [ ("X-Accel-Buffering", "no"), ("Cache-Control", "no-cache")]
7 > [ ("X-Accel-Buffering", "no"), ("Cache-Control", "no-cache")]
8−
9− There is a small example using these functions in the @example@ directory.
10-}
8-}
11module Network.Wai.EventSource (
9module Network.Wai.EventSource (
12 ServerEvent(..),
10 ServerEvent(..),
13 eventSourceAppChan,
11 eventSourceAppChan,
14− eventSourceAppIO,
12+ eventSourceAppIO
15− eventStreamAppRaw
16 ) where
13 ) where
17
14
18import Data.Function (fix)
15import Data.Function (fix)
@@ -42,18 +39,3 @@ eventSourceAppIO src _ sendResponse =
42 case eventToBuilder se of
39 case eventToBuilder se of
43 Nothing -> return ()
40 Nothing -> return ()
44 Just b -> sendChunk b >> flush >> loop
41 Just b -> sendChunk b >> flush >> loop
45−
46−-- | Make a new WAI EventSource application with a handler that emits events.
47−--
48−-- @since 3.0.28
49−eventStreamAppRaw :: ((ServerEvent -> IO()) -> IO () -> IO ()) -> Application
50−eventStreamAppRaw handler _ sendResponse =
51− sendResponse $ responseStream
52− status200
53− [(hContentType, "text/event-stream")]
54− $ \sendChunk flush -> handler (sendEvent sendChunk) flush
55− where
56− sendEvent sendChunk event =
57− case eventToBuilder event of
58− Nothing -> return ()
59− Just b -> sendChunk b
wai-extra/Network/Wai/EventSource/EventStream.hs+1−1
@@ -1,5 +1,5 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2−{- code adapted by Mathias Billman originally from Chris Smith https://github.com/cdsmith/gloss-web -}
2+{- code adapted by Mathias Billman originaly from Chris Smith https://github.com/cdsmith/gloss-web -}
3
3
4{-|
4{-|
5 Internal module, usually you don't need to use it.
5 Internal module, usually you don't need to use it.
wai-extra/Network/Wai/Middleware/Gzip.hs−3
@@ -89,9 +89,6 @@ defaultCheckMime bs =
89-- if gzip is supported.
89-- if gzip is supported.
90--
90--
91-- File responses will be compressed according to the 'GzipFiles' setting.
91-- File responses will be compressed according to the 'GzipFiles' setting.
92−--
93−-- Will only be applied based on the 'gzipCheckMime' setting. For default
94−-- behavior, see 'defaultCheckMime'.
95gzip :: GzipSettings -> Middleware
92gzip :: GzipSettings -> Middleware
96gzip set app env sendResponse = app env $ \res ->
93gzip set app env sendResponse = app env $ \res ->
97 case res of
94 case res of
wai-extra/Network/Wai/Middleware/RequestLogger.hs+10−60
@@ -14,7 +14,6 @@ module Network.Wai.Middleware.RequestLogger
14 , OutputFormat (..)
14 , OutputFormat (..)
15 , OutputFormatter
15 , OutputFormatter
16 , OutputFormatterWithDetails
16 , OutputFormatterWithDetails
17− , OutputFormatterWithDetailsAndHeaders
18 , Destination (..)
17 , Destination (..)
19 , Callback
18 , Callback
20 , IPAddrSource (..)
19 , IPAddrSource (..)
@@ -50,42 +49,14 @@ import Network.Wai.Middleware.RequestLogger.Internal
50import Network.Wai.Header (contentLength)
49import Network.Wai.Header (contentLength)
51import Data.Text.Encoding (decodeUtf8')
50import Data.Text.Encoding (decodeUtf8')
52
51
53−data OutputFormat
54− = Apache IPAddrSource
52+data OutputFormat = Apache IPAddrSource
55− | Detailed Bool -- ^ use colors?
53+ | Detailed Bool -- ^ use colors?
56− | CustomOutputFormat OutputFormatter
54+ | CustomOutputFormat OutputFormatter
57− | CustomOutputFormatWithDetails OutputFormatterWithDetails
55+ | CustomOutputFormatWithDetails OutputFormatterWithDetails
58− | CustomOutputFormatWithDetailsAndHeaders OutputFormatterWithDetailsAndHeaders
59
56
60type OutputFormatter = ZonedDate -> Request -> Status -> Maybe Integer -> LogStr
57type OutputFormatter = ZonedDate -> Request -> Status -> Maybe Integer -> LogStr
61−
62−type OutputFormatterWithDetails
58+type OutputFormatterWithDetails =
63− = ZonedDate
59+ ZonedDate -> Request -> Status -> Maybe Integer -> NominalDiffTime -> [S8.ByteString] -> B.Builder -> LogStr
64− -> Request
65− -> Status
66− -> Maybe Integer
67− -> NominalDiffTime
68− -> [S8.ByteString]
69− -> B.Builder
70− -> LogStr
71−
72−-- | Same as @OutputFormatterWithDetails@ but with response headers included
73−--
74−-- This is useful if you wish to include arbitrary application data in your
75−-- logs, e.g., an authenticated user ID, which you would set in a response
76−-- header in your application and retrieve in the log formatter.
77−--
78−-- @since 3.0.27
79−type OutputFormatterWithDetailsAndHeaders
80− = ZonedDate -- ^ When the log message was generated
81− -> Request -- ^ The WAI request
82− -> Status -- ^ HTTP status code
83− -> Maybe Integer -- ^ Response size
84− -> NominalDiffTime -- ^ Duration of the request
85− -> [S8.ByteString] -- ^ The request body
86− -> B.Builder -- ^ Raw response
87− -> [Header] -- ^ The response headers
88− -> LogStr
89
60
90data Destination = Handle Handle
61data Destination = Handle Handle
91 | Logger LoggerSet
62 | Logger LoggerSet
@@ -137,9 +108,6 @@ mkRequestLogger RequestLoggerSettings{..} = do
137 CustomOutputFormatWithDetails formatter -> do
108 CustomOutputFormatWithDetails formatter -> do
138 getdate <- getDateGetter flusher
109 getdate <- getDateGetter flusher
139 return $ customMiddlewareWithDetails callbackAndFlush getdate formatter
110 return $ customMiddlewareWithDetails callbackAndFlush getdate formatter
140− CustomOutputFormatWithDetailsAndHeaders formatter -> do
141− getdate <- getDateGetter flusher
142− return $ customMiddlewareWithDetailsAndHeaders callbackAndFlush getdate formatter
143
111
144apacheMiddleware :: ApacheLoggerActions -> Middleware
112apacheMiddleware :: ApacheLoggerActions -> Middleware
145apacheMiddleware ala app req sendResponse = app req $ \res -> do
113apacheMiddleware ala app req sendResponse = app req $ \res -> do
@@ -150,8 +118,8 @@ apacheMiddleware ala app req sendResponse = app req $ \res -> do
150customMiddleware :: Callback -> IO ZonedDate -> OutputFormatter -> Middleware
118customMiddleware :: Callback -> IO ZonedDate -> OutputFormatter -> Middleware
151customMiddleware cb getdate formatter app req sendResponse = app req $ \res -> do
119customMiddleware cb getdate formatter app req sendResponse = app req $ \res -> do
152 date <- liftIO getdate
120 date <- liftIO getdate
153− let msize = contentLength (responseHeaders res)
121+ -- We use Nothing for the response size since we generally don't know it
154− liftIO $ cb $ formatter date req (responseStatus res) msize
122+ liftIO $ cb $ formatter date req (responseStatus res) Nothing
155 sendResponse res
123 sendResponse res
156
124
157customMiddlewareWithDetails :: Callback -> IO ZonedDate -> OutputFormatterWithDetails -> Middleware
125customMiddlewareWithDetails :: Callback -> IO ZonedDate -> OutputFormatterWithDetails -> Middleware
@@ -161,33 +129,15 @@ customMiddlewareWithDetails cb getdate formatter app req sendResponse = do
161 app req' $ \res -> do
129 app req' $ \res -> do
162 t1 <- getCurrentTime
130 t1 <- getCurrentTime
163 date <- liftIO getdate
131 date <- liftIO getdate
164− let msize = contentLength (responseHeaders res)
132+ -- We use Nothing for the response size since we generally don't know it
165 builderIO <- newIORef $ B.byteString ""
133 builderIO <- newIORef $ B.byteString ""
166 res' <- recordChunks builderIO res
134 res' <- recordChunks builderIO res
167 rspRcv <- sendResponse res'
135 rspRcv <- sendResponse res'
168 _ <- liftIO . cb .
136 _ <- liftIO . cb .
169− formatter date req' (responseStatus res') msize (t1 `diffUTCTime` t0) reqBody =<<
137+ formatter date req' (responseStatus res') Nothing (t1 `diffUTCTime` t0) reqBody =<<
170 readIORef builderIO
138 readIORef builderIO
171 return rspRcv
139 return rspRcv
172
140
173−customMiddlewareWithDetailsAndHeaders :: Callback -> IO ZonedDate -> OutputFormatterWithDetailsAndHeaders -> Middleware
174−customMiddlewareWithDetailsAndHeaders cb getdate formatter app req sendResponse = do
175− (req', reqBody) <- getRequestBody req
176− t0 <- getCurrentTime
177− app req' $ \res -> do
178− t1 <- getCurrentTime
179− date <- liftIO getdate
180− let msize = contentLength (responseHeaders res)
181− builderIO <- newIORef $ B.byteString ""
182− res' <- recordChunks builderIO res
183− rspRcv <- sendResponse res'
184− _ <- do
185− rawResponse <- readIORef builderIO
186− let status = responseStatus res'
187− duration = t1 `diffUTCTime` t0
188− resHeaders = responseHeaders res'
189− liftIO . cb $ formatter date req' status msize duration reqBody rawResponse resHeaders
190− return rspRcv
191-- | Production request logger middleware.
141-- | Production request logger middleware.
192--
142--
193-- This uses the 'Apache' logging format, and takes IP addresses for clients from
143-- This uses the 'Apache' logging format, and takes IP addresses for clients from
wai-extra/Network/Wai/Middleware/RequestLogger/JSON.hs+1−34
@@ -1,10 +1,7 @@
1{-# LANGUAGE RecordWildCards #-}
1{-# LANGUAGE RecordWildCards #-}
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3
3
4−module Network.Wai.Middleware.RequestLogger.JSON
4+module Network.Wai.Middleware.RequestLogger.JSON (formatAsJSON) where
5− ( formatAsJSON
6− , formatAsJSONWithHeaders
7− ) where
8
5
9import qualified Data.ByteString.Builder as BB (toLazyByteString)
6import qualified Data.ByteString.Builder as BB (toLazyByteString)
10import Data.ByteString.Lazy (toStrict)
7import Data.ByteString.Lazy (toStrict)
@@ -43,30 +40,6 @@ formatAsJSON date req status responseSize duration reqBody response =
43 , "time" .= decodeUtf8With lenientDecode date
40 , "time" .= decodeUtf8With lenientDecode date
44 ]) <> "\n"
41 ]) <> "\n"
45
42
46−-- | Same as @formatAsJSON@ but with response headers included
47−--
48−-- This is useful for passing arbitrary data from your application out to the
49−-- WAI layer for it to be logged, but you may need to be careful to
50−-- subsequently redact any headers which may contain sensitive data.
51−--
52−-- @since 3.0.27
53−formatAsJSONWithHeaders :: OutputFormatterWithDetailsAndHeaders
54−formatAsJSONWithHeaders date req status resSize duration reqBody res resHeaders =
55− toLogStr (encode $
56− object
57− [ "request" .= requestToJSON duration req reqBody
58− , "response" .= object
59− [ "status" .= statusCode status
60− , "size" .= resSize
61− , "headers" .= responseHeadersToJSON resHeaders
62− , "body" .=
63− if statusCode status >= 400
64− then Just . decodeUtf8With lenientDecode . toStrict . BB.toLazyByteString $ res
65− else Nothing
66− ]
67− , "time" .= decodeUtf8With lenientDecode date
68− ]) <> "\n"
69−
70word32ToHostAddress :: Word32 -> Text
43word32ToHostAddress :: Word32 -> Text
71word32ToHostAddress = T.intercalate "." . map (T.pack . show) . fromIPv4 . fromHostAddress
44word32ToHostAddress = T.intercalate "." . map (T.pack . show) . fromIPv4 . fromHostAddress
72
45
@@ -117,12 +90,6 @@ requestHeadersToJSON = toJSON . map hToJ where
117 hToJ ("Cookie", _) = toJSON ("Cookie" :: Text, "-RDCT-" :: Text)
90 hToJ ("Cookie", _) = toJSON ("Cookie" :: Text, "-RDCT-" :: Text)
118 hToJ hd = headerToJSON hd
91 hToJ hd = headerToJSON hd
119
92
120−responseHeadersToJSON :: [Header] -> Value
121−responseHeadersToJSON = toJSON . map hToJ where
122− -- Redact cookies
123− hToJ ("Set-Cookie", _) = toJSON ("Set-Cookie" :: Text, "-RDCT-" :: Text)
124− hToJ hd = headerToJSON hd
125−
126headerToJSON :: Header -> Value
93headerToJSON :: Header -> Value
127headerToJSON (headerName, header) = toJSON (decodeUtf8With lenientDecode . original $ headerName, decodeUtf8With lenientDecode header)
94headerToJSON (headerName, header) = toJSON (decodeUtf8With lenientDecode . original $ headerName, decodeUtf8With lenientDecode header)
128
95
wai-extra/Network/Wai/Middleware/Rewrite.hs+1−1
@@ -169,7 +169,7 @@ import Control.Applicative
169--
169--
170-- as the following example demonstrates.
170-- as the following example demonstrates.
171--
171--
172−-- Old versions of the library could only handle path pieces, not queries.
172+-- Old versions of the libary could only handle path pieces, not queries.
173-- This could have been supplied to 'rewritePure'.
173-- This could have been supplied to 'rewritePure'.
174--
174--
175-- @
175-- @
wai-extra/Network/Wai/Test.hs+14−22
@@ -99,10 +99,6 @@ runSession session app = ST.evalStateT (runReaderT session app) initState
99data SRequest = SRequest
99data SRequest = SRequest
100 { simpleRequest :: Request
100 { simpleRequest :: Request
101 , simpleRequestBody :: L.ByteString
101 , simpleRequestBody :: L.ByteString
102− -- ^ Request body that will override the one set in 'simpleRequest'.
103− --
104− -- This is usually simpler than setting the body as a stateful IO-action
105− -- in 'simpleRequest'.
106 }
102 }
107data SResponse = SResponse
103data SResponse = SResponse
108 { simpleStatus :: H.Status
104 { simpleStatus :: H.Status
@@ -110,16 +106,8 @@ data SResponse = SResponse
110 , simpleBody :: L.ByteString
106 , simpleBody :: L.ByteString
111 }
107 }
112 deriving (Show, Eq)
108 deriving (Show, Eq)
113−
114request :: Request -> Session SResponse
109request :: Request -> Session SResponse
115−request req = do
110+request = srequest . flip SRequest L.empty
116− app <- ask
117− req' <- addCookiesToRequest req
118− response <- liftIO $ do
119− ref <- newIORef $ error "runResponse gave no result"
120− ResponseReceived <- app req' (runResponse ref)
121− readIORef ref
122− extractSetCookieFromSResponse response
123
111
124-- | Set whole path (request path + query string).
112-- | Set whole path (request path + query string).
125setPath :: Request -> S8.ByteString -> Request
113setPath :: Request -> S8.ByteString -> Request
@@ -178,18 +166,22 @@ extractSetCookieFromSResponse response = do
178 (Map.fromList [(Cookie.setCookieName c, c) | c <- newClientCookies ]))
166 (Map.fromList [(Cookie.setCookieName c, c) | c <- newClientCookies ]))
179 return response
167 return response
180
168
181−-- | Similar to 'request', but allows setting the request body as a plain
182−-- 'L.ByteString'.
183srequest :: SRequest -> Session SResponse
169srequest :: SRequest -> Session SResponse
184srequest (SRequest req bod) = do
170srequest (SRequest req bod) = do
171+ app <- ask
185 refChunks <- liftIO $ newIORef $ L.toChunks bod
172 refChunks <- liftIO $ newIORef $ L.toChunks bod
186− request $
187− req
173+ let req' = req
188− { requestBody = atomicModifyIORef refChunks $ \bss ->
174+ { requestBody = atomicModifyIORef refChunks $ \bss ->
189− case bss of
175+ case bss of
190− [] -> ([], S.empty)
176+ [] -> ([], S.empty)
191− x:y -> (y, x)
177+ x:y -> (y, x)
192− }
178+ }
179+ req'' <- addCookiesToRequest req'
180+ response <- liftIO $ do
181+ ref <- newIORef $ error "runResponse gave no result"
182+ ResponseReceived <- app req'' (runResponse ref)
183+ readIORef ref
184+ extractSetCookieFromSResponse response
193
185
194runResponse :: IORef SResponse -> Response -> IO ResponseReceived
186runResponse :: IORef SResponse -> Response -> IO ResponseReceived
195runResponse ref res = do
187runResponse ref res = do
wai-extra/example/Main.hs−11
@@ -37,17 +37,6 @@ eventIO = do
37 Nothing
37 Nothing
38 [string8 . show $ time]
38 [string8 . show $ time]
39
39
40−eventRaw :: (ServerEvent -> IO ()) -> IO () -> IO ()
41−eventRaw = handle 0
42− where
43− handle counter emit flush = do
44− threadDelay 1000000
45− _ <- emit $ ServerEvent (Just $ string8 "raw")
46− Nothing
47− [string8 . show $ counter]
48− _ <- flush
49− handle (counter + 1) emit flush
50−
51main :: IO ()
40main :: IO ()
52main = do
41main = do
53 chan <- newChan
42 chan <- newChan
wai-extra/test/Network/Wai/TestSpec.hs+11−41
@@ -3,8 +3,6 @@ module Network.Wai.TestSpec (main, spec) where
3
3
4import Control.Monad (void)
4import Control.Monad (void)
5
5
6−import qualified Data.IORef as IORef
7−
8import qualified Data.Text.Encoding as TE
6import qualified Data.Text.Encoding as TE
9
7
10import Data.Time.Calendar (fromGregorian)
8import Data.Time.Calendar (fromGregorian)
@@ -55,53 +53,25 @@ spec = do
55 it "sets rawQueryString to empty string" $ do
53 it "sets rawQueryString to empty string" $ do
56 rawQueryString (setPath defaultRequest "/foo/bar/baz") `shouldBe` ""
54 rawQueryString (setPath defaultRequest "/foo/bar/baz") `shouldBe` ""
57
55
58− describe "srequest" $ do
59−
60− let echoApp req respond = do
61− reqBody <- L8.fromStrict <$> getRequestBodyChunk req
62− let reqHeaders = requestHeaders req
63− respond $
64− responseLBS
65− status200
66− reqHeaders
67− reqBody
68−
69− it "returns the response body of an echo app" $ do
70− sresp <- flip runSession echoApp $
71− srequest $ SRequest defaultRequest "request body"
72− simpleBody sresp `shouldBe` "request body"
73−
74 describe "request" $ do
56 describe "request" $ do
75
57
76− let echoApp req respond = do
58+ let simpleApp _req respond =
77− reqBody <- L8.fromStrict <$> getRequestBodyChunk req
78− let reqHeaders = requestHeaders req
79 respond $
59 respond $
80 responseLBS
60 responseLBS
81 status200
61 status200
82− reqHeaders
62+ [("foo", "bar")]
83− reqBody
63+ "simple"
84
64
85− it "returns the status code of an echo app on default request" $ do
65+ it "returns the status code of a simple app on default request" $ do
86− sresp <- runSession (request defaultRequest) echoApp
66+ sresp <- runSession (request defaultRequest) simpleApp
87 simpleStatus sresp `shouldBe` status200
67 simpleStatus sresp `shouldBe` status200
88
68
89− it "returns the response body of an echo app" $ do
69+ it "returns the response body of a simple app on default request" $ do
90− bodyRef <- IORef.newIORef "request body"
91− let getBodyChunk = IORef.atomicModifyIORef bodyRef $ \leftover -> ("", leftover)
92− sresp <- flip runSession echoApp $
93− request $
94− defaultRequest
70+ sresp <- runSession (request defaultRequest) simpleApp
95− { requestBody = getBodyChunk
96− }
97− simpleBody sresp `shouldBe` "request body"
71+ simpleBody sresp `shouldBe` "simple"
98−
72+
99− it "returns the response headers of an echo app" $ do
73+ it "returns the response headers of a simple app on default request" $ do
100− sresp <- flip runSession echoApp $
101− request $
102− defaultRequest
74+ sresp <- runSession (request defaultRequest) simpleApp
103− { requestHeaders = [("foo", "bar")]
104− }
105 simpleHeaders sresp `shouldBe` [("foo", "bar")]
75 simpleHeaders sresp `shouldBe` [("foo", "bar")]
106
76
107 let cookieApp req respond =
77 let cookieApp req respond =
wai-extra/wai-extra.cabal+4−4
@@ -1,5 +1,5 @@
1Name: wai-extra
1Name: wai-extra
2−Version: 3.0.29.1
2+Version: 3.0.26
3Synopsis: Provides some basic WAI handlers and middleware.
3Synopsis: Provides some basic WAI handlers and middleware.
4description:
4description:
5 Provides basic WAI handler and middleware functionality:
5 Provides basic WAI handler and middleware functionality:
@@ -87,7 +87,7 @@ flag build-example
87 default: False
87 default: False
88
88
89Library
89Library
90− Build-Depends: base >= 4.8 && < 5
90+ Build-Depends: base >= 4.6 && < 5
91 , bytestring >= 0.10.4
91 , bytestring >= 0.10.4
92 , wai >= 3.0.3.0 && < 3.3
92 , wai >= 3.0.3.0 && < 3.3
93 , old-locale >= 1.0.0.2 && < 1.1
93 , old-locale >= 1.0.0.2 && < 1.1
@@ -99,8 +99,8 @@ Library
99 , text >= 0.7
99 , text >= 0.7
100 , case-insensitive >= 0.2
100 , case-insensitive >= 0.2
101 , data-default-class
101 , data-default-class
102− , fast-logger >= 2.4.5
102+ , fast-logger >= 2.4.5 && < 2.5
103− , wai-logger >= 2.3.2
103+ , wai-logger >= 2.3.2 && < 2.4
104 , ansi-terminal
104 , ansi-terminal
105 , resourcet >= 0.4.6 && < 1.3
105 , resourcet >= 0.4.6 && < 1.3
106 , void >= 0.5
106 , void >= 0.5
wai-http2-extra/Network/Wai/Middleware/Push/Referer.hs+2−4
@@ -120,12 +120,10 @@ pushOnReferer settings@Settings{..} app req sendResponse = do
120 when (isNothing mauth
120 when (isNothing mauth
121 || requestHeaderHost req == mauth) $ do
121 || requestHeaderHost req == mauth) $ do
122 when (path /= refPath) $ do -- just in case
122 when (path /= refPath) $ do -- just in case
123− let !path' = BS.copy path
124− !refPath' = BS.copy refPath
125− mpp <- makePushPromise refPath' path' file
123+ mpp <- makePushPromise refPath path file
126 case mpp of
124 case mpp of
127 Nothing -> return ()
125 Nothing -> return ()
128− Just pp -> reaperAdd reaper (refPath',pp)
126+ Just pp -> reaperAdd reaper (refPath,pp)
129 ps -> do
127 ps -> do
130 let !h2d = defaultHTTP2Data { http2dataPushPromise = ps}
128 let !h2d = defaultHTTP2Data { http2dataPushPromise = ps}
131 setHTTP2Data req (Just h2d)
129 setHTTP2Data req (Just h2d)
wai-http2-extra/wai-http2-extra.cabal+2−9
@@ -1,5 +1,5 @@
1Name: wai-http2-extra
1Name: wai-http2-extra
2−Version: 0.1.2
2+Version: 0.1.0
3Synopsis: WAI utilities for HTTP/2
3Synopsis: WAI utilities for HTTP/2
4License: MIT
4License: MIT
5License-file: LICENSE
5License-file: LICENSE
@@ -8,7 +8,7 @@ Maintainer: kazu@iij.ad.jp
8Homepage: http://github.com/yesodweb/wai
8Homepage: http://github.com/yesodweb/wai
9Category: Web
9Category: Web
10Build-Type: Simple
10Build-Type: Simple
11−Cabal-Version: >=1.10
11+Cabal-Version: >=1.8
12Stability: Stable
12Stability: Stable
13Description: WAI utilities for HTTP/2
13Description: WAI utilities for HTTP/2
14
14
@@ -24,9 +24,6 @@ Library
24 Exposed-modules: Network.Wai.Middleware.Push.Referer
24 Exposed-modules: Network.Wai.Middleware.Push.Referer
25 Other-modules: Network.Wai.Middleware.Push.Referer.LimitMultiMap
25 Other-modules: Network.Wai.Middleware.Push.Referer.LimitMultiMap
26 Ghc-Options: -Wall
26 Ghc-Options: -Wall
27− if impl(ghc >= 8)
28− default-extensions: Strict StrictData
29− default-language: Haskell2010
30
27
31Test-Suite doctest
28Test-Suite doctest
32 Type: exitcode-stdio-1.0
29 Type: exitcode-stdio-1.0
@@ -35,10 +32,6 @@ Test-Suite doctest
35 Main-Is: doctests.hs
32 Main-Is: doctests.hs
36 Build-Depends: base
33 Build-Depends: base
37 , doctest >= 0.10.1
34 , doctest >= 0.10.1
38− if impl(ghc >= 8)
39− default-extensions: Strict StrictData
40− default-language: Haskell2010
41−
42Source-Repository head
35Source-Repository head
43 Type: git
36 Type: git
44 Location: git://github.com/yesodweb/wai.git
37 Location: git://github.com/yesodweb/wai.git
wai-websockets/server.lhs+1−7
@@ -8,8 +8,6 @@ this example, keep the [reference](http://jaspervdj.be/websockets/reference)
8nearby to check out the functions we use.
8nearby to check out the functions we use.
9
9
10> {-# LANGUAGE OverloadedStrings, TemplateHaskell #-}
10> {-# LANGUAGE OverloadedStrings, TemplateHaskell #-}
11−> {-# LANGUAGE CPP #-}
12−> {-# OPTIONS_GHC -Wno-unused-top-binds #-} -- for numClients
13> import Data.Char (isPunctuation, isSpace)
11> import Data.Char (isPunctuation, isSpace)
14> import Data.Monoid (mappend)
12> import Data.Monoid (mappend)
15> import Data.Text (Text)
13> import Data.Text (Text)
@@ -101,13 +99,9 @@ stays alive on some browsers.
101
99
102> application state pending = do
100> application state pending = do
103> conn <- WS.acceptRequest pending
101> conn <- WS.acceptRequest pending
104−#if __GLASGOW_HASKELL__ >= 806
105−> WS.withPingThread conn 30 (return ()) $ do
106−#else
107> WS.forkPingThread conn 30
102> WS.forkPingThread conn 30
108−#endif
109
103
110−When a client is successfully connected, we read the first message. This should
104+When a client is succesfully connected, we read the first message. This should
111be in the format of "Hi! I am Jasper", where Jasper is the requested username.
105be in the format of "Hi! I am Jasper", where Jasper is the requested username.
112
106
113> msg <- WS.receiveData conn
107> msg <- WS.receiveData conn
wai-websockets/wai-websockets.cabal−1
@@ -45,7 +45,6 @@ Executable wai-websockets-example
45 , text
45 , text
46 , file-embed
46 , file-embed
47 , http-types
47 , http-types
48− other-modules: Network.Wai.Handler.WebSockets
49 else
48 else
50 buildable: False
49 buildable: False
51
50
wai/ChangeLog.md−6
@@ -1,9 +1,3 @@
1−# ChangeLog for wai
2−
3−## 3.2.2.1
4−
5−* Fix missing reexport of `getRequestBodyChunk` [#753](https://github.com/yesodweb/wai/issues/753)
6−
7## 3.2.2
1## 3.2.2
8
2
9* Deprecate `requestBody` in favor of the more clearly named `getRequestBodyChunk`. [#726](https://github.com/yesodweb/wai/pull/726)
3* Deprecate `requestBody` in favor of the more clearly named `getRequestBodyChunk`. [#726](https://github.com/yesodweb/wai/pull/726)
wai/Network/Wai.hs−1
@@ -53,7 +53,6 @@ module Network.Wai
53 , remoteHost
53 , remoteHost
54 , pathInfo
54 , pathInfo
55 , queryString
55 , queryString
56− , getRequestBodyChunk
57 , requestBody
56 , requestBody
58 , vault
57 , vault
59 , requestBodyLength
58 , requestBodyLength
wai/wai.cabal+2−1
@@ -1,5 +1,5 @@
1Name: wai
1Name: wai
2−Version: 3.2.2.1
2+Version: 3.2.2
3Synopsis: Web Application Interface.
3Synopsis: Web Application Interface.
4Description: Provides a common protocol for communication between web applications and web servers.
4Description: Provides a common protocol for communication between web applications and web servers.
5 .
5 .
@@ -25,6 +25,7 @@ Library
25 , network >= 2.2.1.5
25 , network >= 2.2.1.5
26 , http-types >= 0.7
26 , http-types >= 0.7
27 , text >= 0.7
27 , text >= 0.7
28+ , transformers >= 0.0
28 , vault >= 0.3 && < 0.4
29 , vault >= 0.3 && < 0.4
29 Exposed-modules: Network.Wai
30 Exposed-modules: Network.Wai
30 Network.Wai.Internal
31 Network.Wai.Internal
warp-tls/ChangeLog.md−27
@@ -1,30 +1,3 @@
1−## 3.2.11
2−
3−* Ignoring an exception from shutdown (gracefulClose).
4−
5−## 3.2.10
6−
7−* Passing client certificate, if any, to Warp
8− [#783](https://github.com/yesodweb/wai/pull/783)
9−
10−## 3.2.9
11−
12−* Cooperating setGracefulCloseTimeout1 and setGracefulCloseTimeout2 of Warp.
13− [#782](https://github.com/yesodweb/wai/pull/782)
14−
15−## 3.2.8
16−
17−* Using gracefullClose of network 3.1.1 or later if available.
18−
19−## 3.2.7
20−
21−* Relaxing version constraint.
22−
23−## 3.2.6
24−
25−* Using the Strict and StrictData language extensions for GHC >8.
26− [#752](https://github.com/yesodweb/wai/pull/752)
27−
28## 3.2.5
1## 3.2.5
29
2
30* When tls 1.5.0 is available, TLS 1.3 is automatically supported.
3* When tls 1.5.0 is available, TLS 1.3 is automatically supported.
warp-tls/Network/Wai/Handler/WarpTLS.hs+15−27
@@ -53,9 +53,6 @@ import qualified Data.IORef as I
53import Data.Streaming.Network (bindPortTCP, safeRecv)
53import Data.Streaming.Network (bindPortTCP, safeRecv)
54import Data.Typeable (Typeable)
54import Data.Typeable (Typeable)
55import Network.Socket (Socket, close, withSocketsDo, SockAddr, accept)
55import Network.Socket (Socket, close, withSocketsDo, SockAddr, accept)
56−#if MIN_VERSION_network(3,1,1)
57−import Network.Socket (gracefulClose)
58−#endif
59import Network.Socket.ByteString (sendAll)
56import Network.Socket.ByteString (sendAll)
60import qualified Network.TLS as TLS
57import qualified Network.TLS as TLS
61import qualified Crypto.PubKey.DH as DH
58import qualified Crypto.PubKey.DH as DH
@@ -281,7 +278,7 @@ runTLSSocket' :: TLSSettings -> Settings -> TLS.Credential -> TLS.SessionManager
281runTLSSocket' tlsset@TLSSettings{..} set credential mgr sock app =
278runTLSSocket' tlsset@TLSSettings{..} set credential mgr sock app =
282 runSettingsConnectionMakerSecure set get app
279 runSettingsConnectionMakerSecure set get app
283 where
280 where
284− get = getter tlsset set sock params
281+ get = getter tlsset sock params
285 params = def { -- TLS.ServerParams
282 params = def { -- TLS.ServerParams
286 TLS.serverWantClientCert = tlsWantClientCert
283 TLS.serverWantClientCert = tlsWantClientCert
287 , TLS.serverCACertificates = []
284 , TLS.serverCACertificates = []
@@ -322,55 +319,49 @@ alpn xs
322
319
323----------------------------------------------------------------
320----------------------------------------------------------------
324
321
325−getter :: TLS.TLSParams params => TLSSettings -> Settings -> Socket -> params -> IO (IO (Connection, Transport), SockAddr)
322+getter :: TLS.TLSParams params => TLSSettings -> Socket -> params -> IO (IO (Connection, Transport), SockAddr)
326−getter tlsset@TLSSettings{..} set sock params = do
323+getter tlsset@TLSSettings{..} sock params = do
327#if WINDOWS
324#if WINDOWS
328 (s, sa) <- windowsThreadBlockHack $ accept sock
325 (s, sa) <- windowsThreadBlockHack $ accept sock
329#else
326#else
330 (s, sa) <- accept sock
327 (s, sa) <- accept sock
331#endif
328#endif
332 setSocketCloseOnExec s
329 setSocketCloseOnExec s
333− return (mkConn tlsset set s params, sa)
330+ return (mkConn tlsset s params, sa)
334
331
335−mkConn :: TLS.TLSParams params => TLSSettings -> Settings -> Socket -> params -> IO (Connection, Transport)
332+mkConn :: TLS.TLSParams params => TLSSettings -> Socket -> params -> IO (Connection, Transport)
336−mkConn tlsset set s params = switch `onException` close s
333+mkConn tlsset s params = switch `onException` close s
337 where
334 where
338 switch = do
335 switch = do
339 firstBS <- safeRecv s 4096
336 firstBS <- safeRecv s 4096
340 if not (S.null firstBS) && S.head firstBS == 0x16 then
337 if not (S.null firstBS) && S.head firstBS == 0x16 then
341− httpOverTls tlsset set s firstBS params
338+ httpOverTls tlsset s firstBS params
342 else
339 else
343− plainHTTP tlsset set s firstBS
340+ plainHTTP tlsset s firstBS
344
341
345----------------------------------------------------------------
342----------------------------------------------------------------
346
343
347−httpOverTls :: TLS.TLSParams params => TLSSettings -> Settings -> Socket -> S.ByteString -> params -> IO (Connection, Transport)
344+httpOverTls :: TLS.TLSParams params => TLSSettings -> Socket -> S.ByteString -> params -> IO (Connection, Transport)
348−httpOverTls TLSSettings{..} _set s bs0 params = do
345+httpOverTls TLSSettings{..} s bs0 params = do
349 recvN <- makePlainReceiveN s bs0
346 recvN <- makePlainReceiveN s bs0
350 ctx <- TLS.contextNew (backend recvN) params
347 ctx <- TLS.contextNew (backend recvN) params
351 TLS.contextHookSetLogging ctx tlsLogging
348 TLS.contextHookSetLogging ctx tlsLogging
352 TLS.handshake ctx
349 TLS.handshake ctx
353− h2 <- (== Just "h2") <$> TLS.getNegotiatedProtocol ctx
354− isH2 <- I.newIORef h2
355 writeBuf <- allocateBuffer bufferSize
350 writeBuf <- allocateBuffer bufferSize
356 -- Creating a cache for leftover input data.
351 -- Creating a cache for leftover input data.
357 ref <- I.newIORef ""
352 ref <- I.newIORef ""
358 tls <- getTLSinfo ctx
353 tls <- getTLSinfo ctx
359− return (conn ctx writeBuf ref isH2, tls)
354+ return (conn ctx writeBuf ref, tls)
360 where
355 where
361 backend recvN = TLS.Backend {
356 backend recvN = TLS.Backend {
362 TLS.backendFlush = return ()
357 TLS.backendFlush = return ()
363−#if MIN_VERSION_network(3,1,1)
364− , TLS.backendClose = gracefulClose s 5000 `E.catch` \(SomeException _) -> return ()
365−#else
366 , TLS.backendClose = close s
358 , TLS.backendClose = close s
367−#endif
368 , TLS.backendSend = sendAll' s
359 , TLS.backendSend = sendAll' s
369 , TLS.backendRecv = recvN
360 , TLS.backendRecv = recvN
370 }
361 }
371 sendAll' sock bs = sendAll sock bs `E.catch` \(SomeException _) ->
362 sendAll' sock bs = sendAll sock bs `E.catch` \(SomeException _) ->
372 throwIO ConnectionClosedByPeer
363 throwIO ConnectionClosedByPeer
373− conn ctx writeBuf ref isH2 = Connection {
364+ conn ctx writeBuf ref = Connection {
374 connSendMany = TLS.sendData ctx . L.fromChunks
365 connSendMany = TLS.sendData ctx . L.fromChunks
375 , connSendAll = sendall
366 , connSendAll = sendall
376 , connSendFile = sendfile
367 , connSendFile = sendfile
@@ -380,7 +371,6 @@ httpOverTls TLSSettings{..} _set s bs0 params = do
380 , connRecvBuf = recvBuf ref
371 , connRecvBuf = recvBuf ref
381 , connWriteBuffer = writeBuf
372 , connWriteBuffer = writeBuf
382 , connBufferSize = bufferSize
373 , connBufferSize = bufferSize
383− , connHTTP2 = isH2
384 }
374 }
385 where
375 where
386 sendall = TLS.sendData ctx . L.fromChunks . return
376 sendall = TLS.sendData ctx . L.fromChunks . return
@@ -468,13 +458,11 @@ getTLSinfo ctx = do
468#if MIN_VERSION_tls(1,5,0)
458#if MIN_VERSION_tls(1,5,0)
469 TLS.TLS13 -> (3,4)
459 TLS.TLS13 -> (3,4)
470#endif
460#endif
471− clientCert <- TLS.getClientCertificateChain ctx
472 return TLS {
461 return TLS {
473 tlsMajorVersion = major
462 tlsMajorVersion = major
474 , tlsMinorVersion = minor
463 , tlsMinorVersion = minor
475 , tlsNegotiatedProtocol = proto
464 , tlsNegotiatedProtocol = proto
476 , tlsChiperID = TLS.cipherID infoCipher
465 , tlsChiperID = TLS.cipherID infoCipher
477− , tlsClientCertificate = clientCert
478 }
466 }
479
467
480tryIO :: IO a -> IO (Either IOException a)
468tryIO :: IO a -> IO (Either IOException a)
@@ -482,10 +470,10 @@ tryIO = try
482
470
483----------------------------------------------------------------
471----------------------------------------------------------------
484
472
485−plainHTTP :: TLSSettings -> Settings -> Socket -> S.ByteString -> IO (Connection, Transport)
473+plainHTTP :: TLSSettings -> Socket -> S.ByteString -> IO (Connection, Transport)
486−plainHTTP TLSSettings{..} set s bs0 = case onInsecure of
474+plainHTTP TLSSettings{..} s bs0 = case onInsecure of
487 AllowInsecure -> do
475 AllowInsecure -> do
488− conn' <- socketConnection set s
476+ conn' <- socketConnection s
489 cachedRef <- I.newIORef bs0
477 cachedRef <- I.newIORef bs0
490 let conn'' = conn'
478 let conn'' = conn'
491 { connRecv = recvPlain cachedRef (connRecv conn')
479 { connRecv = recvPlain cachedRef (connRecv conn')
warp-tls/warp-tls.cabal+5−5
@@ -1,5 +1,5 @@
1Name: warp-tls
1Name: warp-tls
2−Version: 3.2.11
2+Version: 3.2.5
3Synopsis: HTTP over TLS support for Warp via the TLS package
3Synopsis: HTTP over TLS support for Warp via the TLS package
4License: MIT
4License: MIT
5License-file: LICENSE
5License-file: LICENSE
@@ -18,16 +18,16 @@ description: SSLv1 and SSLv2 are obsoleted by IETF.
18extra-source-files: ChangeLog.md README.md
18extra-source-files: ChangeLog.md README.md
19
19
20Library
20Library
21− Build-Depends: base >= 4.10 && < 5
21+ Build-Depends: base >= 4.8 && < 5
22 , bytestring >= 0.9
22 , bytestring >= 0.9
23 , wai >= 3.2 && < 3.3
23 , wai >= 3.2 && < 3.3
24− , warp >= 3.3.6 && < 3.4
24+ , warp >= 3.2.17 && < 3.3
25 , data-default-class >= 0.0.1
25 , data-default-class >= 0.0.1
26− , tls >= 1.5.3
26+ , tls >= 1.3.10
27 , cryptonite >= 0.12
27 , cryptonite >= 0.12
28 , network >= 2.2.1
28 , network >= 2.2.1
29 , streaming-commons
29 , streaming-commons
30− , tls-session-manager >= 0.0.4
30+ , tls-session-manager >= 0.0.0.1
31 Exposed-modules: Network.Wai.Handler.WarpTLS
31 Exposed-modules: Network.Wai.Handler.WarpTLS
32 ghc-options: -Wall
32 ghc-options: -Wall
33 if os(windows)
33 if os(windows)
warp/ChangeLog.md−66
@@ -1,69 +1,3 @@
1−## 3.3.9
2−
3−* Don't insert Last-Modified: if exists.
4− [#791](https://github.com/yesodweb/wai/pull/791)
5−
6−## 3.3.8
7−
8−* Maximum header size is configurable.
9− [#781](https://github.com/yesodweb/wai/pull/781)
10−* Ignoring an exception from shutdown (gracefulClose).
11−
12−## 3.3.7
13−
14−* InvalidArgument (Bad file descriptor) is ignored in `receive`.
15− [#787](https://github.com/yesodweb/wai/pull/787)
16−
17−## 3.3.6
18−
19−* Fixing a bug of thread killed in the case of event source with
20− HTTP/2 (fixing #692 and #785)
21−* New APIs: clientCertificate to get client's certificate
22− [#783](https://github.com/yesodweb/wai/pull/783)
23−
24−## 3.3.5
25−
26−* New APIs: setGracefulCloseTimeout1 and setGracefulCloseTimeout2.
27− For HTTP/1.x, connections are closed immediately by default.
28− gracefullClose is used for HTTP/2 by default.
29− [#782](https://github.com/yesodweb/wai/pull/782)
30−
31−## 3.3.4
32−
33−* Setting isSecure of HTTP/2 correctly.
34−
35−## 3.3.3
36−
37−* Calling setOnException in HTTP/2.
38− [#771](https://github.com/yesodweb/wai/pull/771)
39−
40−## 3.3.2
41−
42−* Fixing a bug of HTTP/2 without fd cache.
43−
44−## 3.3.1
45−
46−* Using gracefullClose of network 3.1.1 or later if available.
47−* If the first line of an HTTP request is really invalid,
48− don't send an error response
49−
50−## 3.3.0
51−
52−* Switching from the original implementation to HTTP/2 server library.
53− [#754](https://github.com/yesodweb/wai/pull/754)
54−* Breaking change: The type of `http2dataTrailers` is now
55− `HTTP2Data -> TrailersMaker`.
56−
57−## 3.2.28
58−
59−* Using the Strict and StrictData language extensions for GHC >8.
60− [#752](https://github.com/yesodweb/wai/pull/752)
61−* System.TimeManager is now in a separate package: time-manager.
62− [#750](https://github.com/yesodweb/wai/pull/750)
63−* Fixing a bug of ALPN.
64−* Introducing the half closed state for HTTP/2.
65− [#717](https://github.com/yesodweb/wai/pull/717)
66−
67## 3.2.27
1## 3.2.27
68
2
69* Internally, use `lookupEnv` instead of `getEnvironment` to get the
3* Internally, use `lookupEnv` instead of `getEnvironment` to get the
warp/Network/Wai/Handler/Warp.hs+1−51
@@ -72,9 +72,6 @@ module Network.Wai.Handler.Warp (
72 , setLogger
72 , setLogger
73 , setServerPushLogger
73 , setServerPushLogger
74 , setGracefulShutdownTimeout
74 , setGracefulShutdownTimeout
75− , setGracefulCloseTimeout1
76− , setGracefulCloseTimeout2
77− , setMaxTotalHeaderLength
78 -- ** Getters
75 -- ** Getters
79 , getPort
76 , getPort
80 , getHost
77 , getHost
@@ -82,8 +79,6 @@ module Network.Wai.Handler.Warp (
82 , getOnClose
79 , getOnClose
83 , getOnException
80 , getOnException
84 , getGracefulShutdownTimeout
81 , getGracefulShutdownTimeout
85− , getGracefulCloseTimeout1
86− , getGracefulCloseTimeout2
87 -- ** Exception handler
82 -- ** Exception handler
88 , defaultOnException
83 , defaultOnException
89 , defaultShouldDisplayException
84 , defaultShouldDisplayException
@@ -98,7 +93,6 @@ module Network.Wai.Handler.Warp (
98 , pauseTimeout
93 , pauseTimeout
99 , FileInfo(..)
94 , FileInfo(..)
100 , getFileInfo
95 , getFileInfo
101− , clientCertificate
102 , withApplication
96 , withApplication
103 , withApplicationSettings
97 , withApplicationSettings
104 , testWithApplication
98 , testWithApplication
@@ -127,7 +121,6 @@ module Network.Wai.Handler.Warp (
127import Control.Exception (SomeException, throwIO)
121import Control.Exception (SomeException, throwIO)
128import Data.Streaming.Network (HostPreference)
122import Data.Streaming.Network (HostPreference)
129import qualified Data.Vault.Lazy as Vault
123import qualified Data.Vault.Lazy as Vault
130−import Data.X509
131import qualified Network.HTTP.Types as H
124import qualified Network.HTTP.Types as H
132import Network.Socket (SockAddr)
125import Network.Socket (SockAddr)
133import Network.Wai (Request, Response, vault)
126import Network.Wai (Request, Response, vault)
@@ -385,7 +378,7 @@ setProxyProtocolRequired y = y { settingsProxyProtocol = ProxyProtocolRequired }
385--
378--
386-- WARNING: This is contrary to the PROXY protocol specification and
379-- WARNING: This is contrary to the PROXY protocol specification and
387-- using it can indicate a security problem with your
380-- using it can indicate a security problem with your
388−-- architecture if the web server is directly accessible
381+-- architecture if the web server is directly accessable
389-- to the public, since it would allow easy IP address
382-- to the public, since it would allow easy IP address
390-- spoofing. However, it can be useful in some cases,
383-- spoofing. However, it can be useful in some cases,
391-- such as if a load balancer health check uses regular
384-- such as if a load balancer health check uses regular
@@ -437,13 +430,6 @@ setGracefulShutdownTimeout :: Maybe Int
437 -> Settings -> Settings
430 -> Settings -> Settings
438setGracefulShutdownTimeout time y = y { settingsGracefulShutdownTimeout = time }
431setGracefulShutdownTimeout time y = y { settingsGracefulShutdownTimeout = time }
439
432
440−-- | Set the maximum header size that Warp will tolerate when using HTTP/1.x.
441−--
442−-- Since 3.3.8
443−setMaxTotalHeaderLength :: Int -> Settings -> Settings
444−setMaxTotalHeaderLength maxTotalHeaderLength settings = settings
445− { settingsMaxTotalHeaderLength = maxTotalHeaderLength }
446−
447-- | Explicitly pause the slowloris timeout.
433-- | Explicitly pause the slowloris timeout.
448--
434--
449-- This is useful for cases where you partially consume a request body. For
435-- This is useful for cases where you partially consume a request body. For
@@ -471,39 +457,3 @@ pauseTimeout = fromMaybe (return ()) . Vault.lookup pauseTimeoutKey . vault
471-- Since 3.1.10
457-- Since 3.1.10
472getFileInfo :: Request -> FilePath -> IO FileInfo
458getFileInfo :: Request -> FilePath -> IO FileInfo
473getFileInfo = fromMaybe (\_ -> throwIO (userError "getFileInfo")) . Vault.lookup getFileInfoKey . vault
459getFileInfo = fromMaybe (\_ -> throwIO (userError "getFileInfo")) . Vault.lookup getFileInfoKey . vault
474−
475−-- | A timeout to limit the time (in milliseconds) waiting for
476−-- FIN for HTTP/1.x. 0 means uses immediate close.
477−-- Default: 0.
478−--
479−-- Since 3.3.5
480−setGracefulCloseTimeout1 :: Int -> Settings -> Settings
481−setGracefulCloseTimeout1 x y = y { settingsGracefulCloseTimeout1 = x }
482−
483−-- | A timeout to limit the time (in milliseconds) waiting for
484−-- FIN for HTTP/1.x. 0 means uses immediate close.
485−--
486−-- Since 3.3.5
487−getGracefulCloseTimeout1 :: Settings -> Int
488−getGracefulCloseTimeout1 = settingsGracefulCloseTimeout1
489−
490−-- | A timeout to limit the time (in milliseconds) waiting for
491−-- FIN for HTTP/2. 0 means uses immediate close.
492−-- Default: 2000.
493−--
494−-- Since 3.3.5
495−setGracefulCloseTimeout2 :: Int -> Settings -> Settings
496−setGracefulCloseTimeout2 x y = y { settingsGracefulCloseTimeout2 = x }
497−
498−-- | A timeout to limit the time (in milliseconds) waiting for
499−-- FIN for HTTP/2. 0 means uses immediate close.
500−--
501−-- Since 3.3.5
502−getGracefulCloseTimeout2 :: Settings -> Int
503−getGracefulCloseTimeout2 = settingsGracefulCloseTimeout2
504−
505−-- | Getting information of client certificate.
506−--
507−-- Since 3.3.5
508−clientCertificate :: Request -> Maybe CertificateChain
509−clientCertificate = join . Vault.lookup getClientCertificateKey . vault
warp/Network/Wai/Handler/Warp/File.hs+4−7
@@ -34,15 +34,12 @@ data RspFileInfo = WithoutBody H.Status
34----------------------------------------------------------------
34----------------------------------------------------------------
35
35
36conditionalRequest :: I.FileInfo
36conditionalRequest :: I.FileInfo
37− -> H.ResponseHeaders
37+ -> H.ResponseHeaders -> IndexedHeader
38− -> IndexedHeader -- ^ Response
39− -> IndexedHeader -- ^ Request
40 -> RspFileInfo
38 -> RspFileInfo
41−conditionalRequest finfo hs0 rspidx reqidx = case condition of
39+conditionalRequest finfo hs0 reqidx = case condition of
42 nobody@(WithoutBody _) -> nobody
40 nobody@(WithoutBody _) -> nobody
43− WithBody s _ off len -> let !hs1 = addContentHeaders hs0 off len size
44− !hasLM = isJust $ rspidx ! fromEnum ResLastModified
45− !hs = [ (H.hLastModified,date) | not hasLM ] ++ hs1
41+ WithBody s _ off len -> let !hs = (H.hLastModified,date) :
42+ addContentHeaders hs0 off len size
46 in WithBody s hs off len
43 in WithBody s hs off len
47 where
44 where
48 !mtime = I.fileInfoTime finfo
45 !mtime = I.fileInfoTime finfo
warp/Network/Wai/Handler/Warp/HTTP2.hs+54−70
@@ -1,85 +1,69 @@
1−{-# LANGUAGE RecordWildCards #-}
2−{-# LANGUAGE BangPatterns #-}
3{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE PatternGuards #-}
2+{-# LANGUAGE RecordWildCards #-}
5−{-# LANGUAGE ScopedTypeVariables #-}
6
3
7−module Network.Wai.Handler.Warp.HTTP2 (http2) where
4+module Network.Wai.Handler.Warp.HTTP2 (isHTTP2, http2) where
8
5
9−import qualified Data.IORef as I
6+import Control.Concurrent (forkIO, killThread)
10import qualified Control.Exception as E
7import qualified Control.Exception as E
11−import qualified Network.HTTP2.Server as H2
8+import Network.HTTP2
12import Network.Socket (SockAddr)
9import Network.Socket (SockAddr)
13import Network.Wai
10import Network.Wai
14−import Network.Wai.Internal (ResponseReceived(..))
15−import qualified System.TimeManager as T
16
11
17−import Network.Wai.Handler.Warp.HTTP2.File
12+import Network.Wai.Handler.Warp.HTTP2.EncodeFrame
13+import Network.Wai.Handler.Warp.HTTP2.Manager
18−import Network.Wai.Handler.Warp.HTTP2.PushPromise
14+import Network.Wai.Handler.Warp.HTTP2.Receiver
19import Network.Wai.Handler.Warp.HTTP2.Request
15import Network.Wai.Handler.Warp.HTTP2.Request
20−import Network.Wai.Handler.Warp.HTTP2.Response
16+import Network.Wai.Handler.Warp.HTTP2.Sender
17+import Network.Wai.Handler.Warp.HTTP2.Types
18+import Network.Wai.Handler.Warp.HTTP2.Worker
21import Network.Wai.Handler.Warp.Imports
19import Network.Wai.Handler.Warp.Imports
22−import qualified Network.Wai.Handler.Warp.Settings as S
20+import qualified Network.Wai.Handler.Warp.Settings as S (Settings)
23import Network.Wai.Handler.Warp.Types
21import Network.Wai.Handler.Warp.Types
24
22
25----------------------------------------------------------------
23----------------------------------------------------------------
26
24
27−http2 :: Connection -> Transport -> InternalInfo -> SockAddr -> S.Settings -> (BufSize -> IO ByteString) -> (ByteString -> IO ()) -> Application -> IO ()
25+http2 :: Connection -> InternalInfo -> SockAddr -> Transport -> S.Settings -> (BufSize -> IO ByteString) -> Application -> IO ()
28−http2 conn transport ii addr settings readN send app =
26+http2 conn ii addr transport settings readN app = do
29− H2.run conf http2server
27+ checkTLS
28+ ok <- checkPreface
29+ when ok $ do
30+ ctx <- newContext
31+ -- Workers, worker manager and timer manager
32+ mgr <- start settings
33+ let responder = response settings ctx mgr
34+ action = worker ctx settings app responder
35+ setAction mgr action
36+ -- The number of workers is 3.
37+ -- This was carefully chosen based on a lot of benchmarks.
38+ -- If it is 1, we cannot avoid head-of-line blocking.
39+ -- If it is large, huge memory is consumed and many
40+ -- context switches happen.
41+ replicateM_ 3 $ spawnAction mgr
42+ -- Receiver
43+ let mkreq = mkRequest ii settings addr
44+ tid <- forkIO $ frameReceiver ctx ii mkreq readN
45+ -- Sender
46+ -- frameSender is the main thread because it ensures to send
47+ -- a goway frame.
48+ frameSender ctx conn settings mgr `E.finally` do
49+ clearContext ctx
50+ stop mgr
51+ killThread tid
30 where
52 where
31− conf = H2.Config {
53+ checkTLS = case transport of
32− confWriteBuffer = connWriteBuffer conn
54+ TCP -> return () -- direct
33− , confBufferSize = connBufferSize conn
55+ tls -> unless (tls12orLater tls) $ goaway conn InadequateSecurity "Weak TLS"
34− , confSendAll = send
56+ tls12orLater tls = tlsMajorVersion tls == 3 && tlsMinorVersion tls >= 3
35− , confReadN = readN
57+ checkPreface = do
36− , confPositionReadMaker = pReadMaker ii
58+ preface <- readN connectionPrefaceLength
37− }
59+ if connectionPreface /= preface then do
38−
60+ goaway conn ProtocolError "Preface mismatch"
39− http2server h2req aux response = do
61+ return False
40− req <- toWAIRequest h2req aux
62+ else
41− ref <- I.newIORef Nothing
42− eResponseReceived <- E.try $ app req $ \rsp -> do
43− h2rsp <- fromResponse settings ii req rsp
44− pps <- fromPushPromises ii req
45− I.writeIORef ref $ Just (h2rsp, pps)
46− _ <- response h2rsp pps
47− return ResponseReceived
48− case eResponseReceived of
49− Right ResponseReceived -> do
50− Just (h2rsp, pps) <- I.readIORef ref
51− logResponse h2rsp req
52− mapM_ (logPushPromise req) pps
53− Left e@(E.SomeException _)
54− -- killed by the local worker manager
55− | Just E.ThreadKilled <- E.fromException e -> return ()
56− -- killed by the local timeout manager
57− | Just T.TimeoutThread <- E.fromException e -> return ()
58− | otherwise -> do
59− S.settingsOnException settings (Just req) e
60− let ersp = S.settingsOnExceptionResponse settings e
61− h2rsp' <- fromResponse settings ii req ersp
62− _ <- response h2rsp' []
63− logResponse h2rsp' req
64− return ()
63+ return True
65
64
66− toWAIRequest h2req aux = toRequest ii settings addr hdr bdylen bdy th transport
65+-- connClose must not be called here since Run:fork calls it
67− where
66+goaway :: Connection -> ErrorCodeId -> ByteString -> IO ()
68− !hdr = H2.requestHeaders h2req
67+goaway Connection{..} etype debugmsg = connSendAll bytestream
69− !bdy = H2.getRequestBodyChunk h2req
68+ where
70− !bdylen = H2.requestBodySize h2req
69+ bytestream = goawayFrame 0 etype debugmsg
71− !th = H2.auxTimeHandle aux
72−
73− logResponse h2rsp req = logger req st msiz
74− where
75− !logger = S.settingsLogger settings
76− !st = H2.responseStatus h2rsp
77− !msiz = fromIntegral <$> H2.responseBodySize h2rsp
78−
79− logPushPromise req pp = logger req path siz
80− where
81− !logger = S.settingsServerPushLogger settings
82− !path = H2.promiseRequestPath pp
83− !siz = case H2.responseBodySize $ H2.promiseResponse pp of
84− Nothing -> 0
85− Just s -> fromIntegral s
warp/Network/Wai/Handler/Warp/HTTP2/EncodeFrame.hsnew file+34
@@ -0,0 +1,34 @@
1+module Network.Wai.Handler.Warp.HTTP2.EncodeFrame where
2+
3+import Network.HTTP2
4+
5+import Network.Wai.Handler.Warp.Imports
6+
7+----------------------------------------------------------------
8+
9+goawayFrame :: StreamId -> ErrorCodeId -> ByteString -> ByteString
10+goawayFrame sid etype debugmsg = encodeFrame einfo frame
11+ where
12+ einfo = encodeInfo id 0
13+ frame = GoAwayFrame sid etype debugmsg
14+
15+resetFrame :: ErrorCodeId -> StreamId -> ByteString
16+resetFrame etype sid = encodeFrame einfo frame
17+ where
18+ einfo = encodeInfo id sid
19+ frame = RSTStreamFrame etype
20+
21+settingsFrame :: (FrameFlags -> FrameFlags) -> SettingsList -> ByteString
22+settingsFrame func alist = encodeFrame einfo $ SettingsFrame alist
23+ where
24+ einfo = encodeInfo func 0
25+
26+pingFrame :: ByteString -> ByteString
27+pingFrame bs = encodeFrame einfo $ PingFrame bs
28+ where
29+ einfo = encodeInfo setAck 0
30+
31+windowUpdateFrame :: StreamId -> WindowSize -> ByteString
32+windowUpdateFrame sid winsiz = encodeFrame einfo $ WindowUpdateFrame winsiz
33+ where
34+ einfo = encodeInfo id sid
warp/Network/Wai/Handler/Warp/HTTP2/File.hs+150−23
@@ -1,30 +1,157 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+{-# LANGUAGE BangPatterns #-}
2
4
3−module Network.Wai.Handler.Warp.HTTP2.File where
5+module Network.Wai.Handler.Warp.HTTP2.File (
6+ RspFileInfo(..)
7+ , conditionalRequest
8+ , addContentHeadersForFilePart
9+ , H.parseByteRanges
10+ ) where
4
11
5−import Network.HTTP2.Server
12+import qualified Data.ByteString.Char8 as C8 (pack)
13+import Network.HPACK
14+import Network.HPACK.Token
15+import Network.HTTP.Date
16+import qualified Network.HTTP.Types as H
17+import Network.Wai
6
18
19+import qualified Network.Wai.Handler.Warp.FileInfoCache as I
20+import Network.Wai.Handler.Warp.Imports
7−import Network.Wai.Handler.Warp.Types
21+import Network.Wai.Handler.Warp.PackInt
8
22
9−#ifdef WINDOWS
23+-- $setup
10−pReadMaker :: InternalInfo -> PositionReadMaker
24+-- >>> import Test.QuickCheck
11−pReadMaker _ = defaultPositionReadMaker
12−#else
13−import Network.Wai.Handler.Warp.FdCache
14−import Network.Wai.Handler.Warp.SendFile (positionRead)
15
25
16−pReadMaker :: InternalInfo -> PositionReadMaker
26+----------------------------------------------------------------
17−pReadMaker ii path = do
27+
18− (mfd, refresh) <- getFd ii path
28+data RspFileInfo = WithoutBody !H.Status
19− case mfd of
29+ | WithBody !H.Status !TokenHeaderList !Integer !Integer
20− Just fd -> return (pread fd, Refresher refresh)
30+ deriving (Eq,Show)
21− Nothing -> do
31+
22− fd <- openFile path
32+----------------------------------------------------------------
23− return (pread fd, Closer $ closeFile fd)
33+
34+conditionalRequest :: I.FileInfo
35+ -> TokenHeaderList -- Response
36+ -> ValueTable -- Request
37+ -> RspFileInfo
38+conditionalRequest (I.FileInfo _ size mtime date) ths0 reqtbl = case condition of
39+ nobody@(WithoutBody _) -> nobody
40+ WithBody s _ off len -> let !hs = (tokenLastModified,date) :
41+ addContentHeaders ths0 off len size
42+ in WithBody s hs off len
43+ where
44+ !mcondition = ifmodified reqtbl size mtime
45+ <|> ifunmodified reqtbl size mtime
46+ <|> ifrange reqtbl size mtime
47+ !condition = fromMaybe (unconditional reqtbl size) mcondition
48+
49+----------------------------------------------------------------
50+
51+{-# INLINE ifModifiedSince #-}
52+ifModifiedSince :: ValueTable -> Maybe HTTPDate
53+ifModifiedSince reqtbl = getHeaderValue tokenIfModifiedSince reqtbl >>= parseHTTPDate
54+
55+{-# INLINE ifUnmodifiedSince #-}
56+ifUnmodifiedSince :: ValueTable -> Maybe HTTPDate
57+ifUnmodifiedSince reqtbl = getHeaderValue tokenIfUnmodifiedSince reqtbl >>= parseHTTPDate
58+
59+{-# INLINE ifRange #-}
60+ifRange :: ValueTable -> Maybe HTTPDate
61+ifRange reqtbl = getHeaderValue tokenIfRange reqtbl >>= parseHTTPDate
62+
63+----------------------------------------------------------------
64+
65+{-# INLINE ifmodified #-}
66+ifmodified :: ValueTable -> Integer -> HTTPDate -> Maybe RspFileInfo
67+ifmodified reqtbl size mtime = do
68+ date <- ifModifiedSince reqtbl
69+ return $ if date /= mtime
70+ then unconditional reqtbl size
71+ else WithoutBody H.notModified304
72+
73+{-# INLINE ifunmodified #-}
74+ifunmodified :: ValueTable -> Integer -> HTTPDate -> Maybe RspFileInfo
75+ifunmodified reqtbl size mtime = do
76+ date <- ifUnmodifiedSince reqtbl
77+ return $ if date == mtime
78+ then unconditional reqtbl size
79+ else WithoutBody H.preconditionFailed412
80+
81+{-# INLINE ifrange #-}
82+ifrange :: ValueTable -> Integer -> HTTPDate -> Maybe RspFileInfo
83+ifrange reqtbl size mtime = do
84+ date <- ifRange reqtbl
85+ rng <- getHeaderValue tokenRange reqtbl
86+ return $ if date == mtime
87+ then parseRange rng size
88+ else WithBody H.ok200 [] 0 size
89+
90+{-# INLINE unconditional #-}
91+unconditional :: ValueTable -> Integer -> RspFileInfo
92+unconditional reqtbl size = case getHeaderValue tokenRange reqtbl of
93+ Nothing -> WithBody H.ok200 [] 0 size
94+ Just rng -> parseRange rng size
95+
96+----------------------------------------------------------------
97+
98+{-# INLINE parseRange #-}
99+parseRange :: ByteString -> Integer -> RspFileInfo
100+parseRange rng size = case H.parseByteRanges rng of
101+ Nothing -> WithoutBody H.requestedRangeNotSatisfiable416
102+ Just [] -> WithoutBody H.requestedRangeNotSatisfiable416
103+ Just (r:_) -> let (!beg, !end) = checkRange r size
104+ !len = end - beg + 1
105+ s = if beg == 0 && end == size - 1 then
106+ H.ok200
107+ else
108+ H.partialContent206
109+ in WithBody s [] beg len
110+
111+{-# INLINE checkRange #-}
112+checkRange :: H.ByteRange -> Integer -> (Integer, Integer)
113+checkRange (H.ByteRangeFrom beg) size = (beg, size - 1)
114+checkRange (H.ByteRangeFromTo beg end) size = (beg, min (size - 1) end)
115+checkRange (H.ByteRangeSuffix count) size = (max 0 (size - count), size - 1)
116+
117+----------------------------------------------------------------
118+
119+{-# INLINE contentRangeHeader #-}
120+-- | @contentRangeHeader beg end total@ constructs a Content-Range 'H.Header'
121+-- for the range specified.
122+contentRangeHeader :: Integer -> Integer -> Integer -> TokenHeader
123+contentRangeHeader beg end total = (tokenContentRange, range)
124+ where
125+ range = C8.pack
126+ -- building with ShowS
127+ $ 'b' : 'y': 't' : 'e' : 's' : ' '
128+ : (if beg > end then ('*':) else
129+ showInt beg
130+ . ('-' :)
131+ . showInt end)
132+ ( '/'
133+ : showInt total "")
134+
135+{-# INLINE addContentHeaders #-}
136+addContentHeaders :: TokenHeaderList -> Integer -> Integer -> Integer -> TokenHeaderList
137+addContentHeaders ths off len size
138+ | len == size = ths'
139+ | otherwise = let !ctrng = contentRangeHeader off (off + len - 1) size
140+ in ctrng:ths'
141+ where
142+ !lengthBS = packIntegral len
143+ !ths' = (tokenContentLength, lengthBS) : (tokenAcceptRanges,"bytes") : ths
144+
145+{-# INLINE addContentHeadersForFilePart #-}
146+-- |
147+--
148+-- >>> addContentHeadersForFilePart [] (FilePart 2 10 16)
149+-- [(Token {ix = 20, shouldBeIndexed = True, isPseudo = False, tokenKey = "Content-Range"},"bytes 2-11/16"),(Token {ix = 18, shouldBeIndexed = False, isPseudo = False, tokenKey = "Content-Length"},"10"),(Token {ix = 8, shouldBeIndexed = True, isPseudo = False, tokenKey = "Accept-Ranges"},"bytes")]
150+-- >>> addContentHeadersForFilePart [] (FilePart 0 16 16)
151+-- [(Token {ix = 18, shouldBeIndexed = False, isPseudo = False, tokenKey = "Content-Length"},"16"),(Token {ix = 8, shouldBeIndexed = True, isPseudo = False, tokenKey = "Accept-Ranges"},"bytes")]
152+addContentHeadersForFilePart :: TokenHeaderList -> FilePart -> TokenHeaderList
153+addContentHeadersForFilePart hs part = addContentHeaders hs off len size
24 where
154 where
25− pread :: Fd -> PositionRead
155+ off = filePartOffset part
26− pread fd off bytes buf = fromIntegral <$> positionRead fd buf bytes' off'
156+ len = filePartByteCount part
27− where
157+ size = filePartFileSize part
28− bytes' = fromIntegral bytes
29− off' = fromIntegral off
30−#endif
warp/Network/Wai/Handler/Warp/HTTP2/HPACK.hsnew file+130
@@ -0,0 +1,130 @@
1+{-# LANGUAGE OverloadedStrings, BangPatterns #-}
2+{-# LANGUAGE NamedFieldPuns, RecordWildCards #-}
3+
4+module Network.Wai.Handler.Warp.HTTP2.HPACK (
5+ hpackEncodeHeader
6+ , hpackEncodeHeaderLoop
7+ , hpackDecodeHeader
8+ , just
9+ , fixHeaders
10+ , addHeader -- testing
11+ , deleteUnnecessaryHeaders
12+ ) where
13+
14+import qualified Control.Exception as E
15+import Network.HPACK hiding (Buffer)
16+import Network.HPACK.Token
17+import Network.HTTP2
18+
19+import Network.Wai.Handler.Warp.HTTP2.Types
20+import Network.Wai.Handler.Warp.Imports
21+import Network.Wai.Handler.Warp.PackInt
22+import qualified Network.Wai.Handler.Warp.Settings as S
23+import Network.Wai.Handler.Warp.Types
24+
25+-- $setup
26+-- >>> :set -XOverloadedStrings
27+
28+----------------------------------------------------------------
29+
30+{-# INLINE addHeader #-}
31+addHeader :: Token -> ByteString -> ValueTable -> TokenHeaderList -> TokenHeaderList
32+addHeader t "" _ ths
33+ | t == tokenServer = filter ((/= tokenServer) . fst) ths
34+addHeader t v tbl ths = case getHeaderValue t tbl of
35+ Nothing -> (t,v) : ths
36+ _ -> ths
37+
38+fixHeaders :: Context
39+ -> Rspn
40+ -> InternalInfo
41+ -> S.Settings
42+ -> IO TokenHeaderList
43+fixHeaders Context{..} rspn ii settings = do
44+ date <- getDate ii
45+ let !s = rspnStatus rspn
46+ !status = packStatus s
47+ !defServer = S.settingsServerName settings
48+ (!ths0,tbl) = rspnHeaders rspn
49+ !ths1 = addHeader tokenServer defServer tbl ths0
50+ !ths2 = addHeader tokenDate date tbl ths1
51+ !ths3 = (tokenStatus, status) : ths2
52+ !ths4 = deleteUnnecessaryHeaders ths3 tbl
53+ return ths4
54+
55+deleteUnnecessaryHeaders :: TokenHeaderList -> ValueTable -> TokenHeaderList
56+deleteUnnecessaryHeaders htl0 tbl0 = loop headersToBeRemoved htl0
57+ where
58+ loop [] thl = thl
59+ loop (t:ts) thl = case getHeaderValue t tbl0 of
60+ Nothing -> thl
61+ _ -> let !thl' = filter ((/= t) . fst) thl
62+ in loop ts thl'
63+
64+headersToBeRemoved :: [Token]
65+headersToBeRemoved = [ tokenConnection
66+ , tokenTransferEncoding
67+ -- Keep-Alive:
68+ -- Proxy-Connection:
69+ -- Upgrade:
70+ ]
71+
72+----------------------------------------------------------------
73+
74+strategy :: EncodeStrategy
75+strategy = EncodeStrategy { compressionAlgo = Linear, useHuffman = False }
76+
77+-- Set-Cookie: contains only one cookie value.
78+-- So, we don't need to split it.
79+hpackEncodeHeader :: Context -> Buffer -> BufSize
80+ -> TokenHeaderList
81+ -> IO (TokenHeaderList, Int)
82+hpackEncodeHeader Context{..} buf siz ths =
83+ encodeTokenHeader buf siz strategy True encodeDynamicTable ths
84+
85+hpackEncodeHeaderLoop :: Context -> Buffer -> BufSize
86+ -> TokenHeaderList
87+ -> IO (TokenHeaderList, Int)
88+hpackEncodeHeaderLoop Context{..} buf siz hs =
89+ encodeTokenHeader buf siz strategy False encodeDynamicTable hs
90+
91+----------------------------------------------------------------
92+
93+hpackDecodeHeader :: HeaderBlockFragment -> Context -> IO (TokenHeaderList, ValueTable)
94+hpackDecodeHeader hdrblk Context{..} = do
95+ tbl@(_,vt) <- decodeTokenHeader decodeDynamicTable hdrblk `E.catch` handl
96+ unless (checkRequestHeader vt) $
97+ E.throwIO $ ConnectionError ProtocolError "the header key is illegal"
98+ return tbl
99+ where
100+ handl IllegalHeaderName =
101+ E.throwIO $ ConnectionError ProtocolError "the header key is illegal"
102+ handl _ =
103+ E.throwIO $ ConnectionError CompressionError "cannot decompress the header"
104+
105+{-# INLINE checkRequestHeader #-}
106+checkRequestHeader :: ValueTable -> Bool
107+checkRequestHeader reqvt
108+ | just mMethod (== "CONNECT") = isNothing mPath && isNothing mScheme
109+ | isJust mStatus = False
110+ | isNothing mMethod = False
111+ | isNothing mScheme = False
112+ | isNothing mPath = False
113+ | mPath == Just "" = False
114+ | isJust mConnection = False
115+ | just mTE (/= "trailers") = False
116+ | otherwise = True
117+ where
118+ mStatus = getHeaderValue tokenStatus reqvt
119+ mScheme = getHeaderValue tokenScheme reqvt
120+ mPath = getHeaderValue tokenPath reqvt
121+ mMethod = getHeaderValue tokenMethod reqvt
122+ mConnection = getHeaderValue tokenConnection reqvt
123+ mTE = getHeaderValue tokenTE reqvt
124+
125+{-# INLINE just #-}
126+just :: Maybe a -> (a -> Bool) -> Bool
127+just Nothing _ = False
128+just (Just x) p
129+ | p x = True
130+ | otherwise = False
warp/Network/Wai/Handler/Warp/HTTP2/Manager.hsnew file+95
@@ -0,0 +1,95 @@
1+{-# LANGUAGE CPP, BangPatterns #-}
2+
3+-- | A thread pool manager.
4+-- The manager has responsibility to spawn and kill
5+-- worker threads.
6+module Network.Wai.Handler.Warp.HTTP2.Manager (
7+ Manager
8+ , start
9+ , setAction
10+ , stop
11+ , spawnAction
12+ , addMyId
13+ , deleteMyId
14+ ) where
15+
16+import Control.Concurrent
17+import Control.Concurrent.STM
18+import Data.Foldable
19+import Data.IORef
20+import Data.Set (Set)
21+import qualified Data.Set as Set
22+import qualified System.TimeManager as T
23+
24+import Network.Wai.Handler.Warp.Imports
25+import Network.Wai.Handler.Warp.Settings
26+
27+----------------------------------------------------------------
28+
29+type Action = T.Manager -> IO ()
30+
31+data Command = Stop | Spawn | Add ThreadId | Delete ThreadId
32+
33+data Manager = Manager (TQueue Command) (IORef Action)
34+
35+-- | Starting a thread pool manager.
36+-- Its action is initially set to 'return ()' and should be set
37+-- by 'setAction'. This allows that the action can include
38+-- the manager itself.
39+start :: Settings -> IO Manager
40+start set = do
41+ q <- newTQueueIO
42+ ref <- newIORef (\_ -> return ())
43+ timmgr <- T.initialize $ settingsTimeout set * 1000000
44+ void $ forkIO $ go q Set.empty ref timmgr
45+ return $ Manager q ref
46+ where
47+ go q !tset0 ref timmgr = do
48+ x <- atomically $ readTQueue q
49+ case x of
50+ Stop -> kill tset0 >> T.killManager timmgr
51+ Spawn -> next tset0
52+ Add newtid -> let !tset = add newtid tset0
53+ in go q tset ref timmgr
54+ Delete oldtid -> let !tset = del oldtid tset0
55+ in go q tset ref timmgr
56+ where
57+ next tset = do
58+ action <- readIORef ref
59+ newtid <- forkIO (action timmgr)
60+ let !tset' = add newtid tset
61+ go q tset' ref timmgr
62+
63+setAction :: Manager -> Action -> IO ()
64+setAction (Manager _ ref) action = writeIORef ref action
65+
66+stop :: Manager -> IO ()
67+stop (Manager q _) = atomically $ writeTQueue q Stop
68+
69+spawnAction :: Manager -> IO ()
70+spawnAction (Manager q _) = atomically $ writeTQueue q Spawn
71+
72+addMyId :: Manager -> IO ()
73+addMyId (Manager q _) = do
74+ tid <- myThreadId
75+ atomically $ writeTQueue q $ Add tid
76+
77+deleteMyId :: Manager -> IO ()
78+deleteMyId (Manager q _) = do
79+ tid <- myThreadId
80+ atomically $ writeTQueue q $ Delete tid
81+
82+----------------------------------------------------------------
83+
84+add :: ThreadId -> Set ThreadId -> Set ThreadId
85+add tid set = set'
86+ where
87+ !set' = Set.insert tid set
88+
89+del :: ThreadId -> Set ThreadId -> Set ThreadId
90+del tid set = set'
91+ where
92+ !set' = Set.delete tid set
93+
94+kill :: Set ThreadId -> IO ()
95+kill set = traverse_ killThread set
warp/Network/Wai/Handler/Warp/HTTP2/PushPromise.hsdeleted−36
@@ -1,36 +0,0 @@
1−{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE RecordWildCards #-}
3−{-# LANGUAGE ScopedTypeVariables #-}
4−
5−module Network.Wai.Handler.Warp.HTTP2.PushPromise where
6−
7−import qualified Control.Exception as E
8−import qualified Network.HTTP.Types as H
9−import qualified Network.HTTP2.Server as H2
10−
11−import Network.Wai
12−import Network.Wai.Handler.Warp.FileInfoCache
13−import Network.Wai.Handler.Warp.HTTP2.Request (getHTTP2Data)
14−import Network.Wai.Handler.Warp.HTTP2.Types
15−import Network.Wai.Handler.Warp.Imports
16−import Network.Wai.Handler.Warp.Types
17−
18−fromPushPromises :: InternalInfo -> Request -> IO [H2.PushPromise]
19−fromPushPromises ii req = do
20− mh2data <- getHTTP2Data req
21− let pp = case mh2data of
22− Nothing -> []
23− Just h2data -> http2dataPushPromise h2data
24− catMaybes <$> mapM (fromPushPromise ii) pp
25−
26−fromPushPromise :: InternalInfo -> PushPromise -> IO (Maybe H2.PushPromise)
27−fromPushPromise ii (PushPromise path file rsphdr w) = do
28− efinfo <- E.try $ getFileInfo ii file
29− case efinfo of
30− Left (_ex :: E.IOException) -> return Nothing
31− Right finfo -> do
32− let !siz = fromIntegral $ fileInfoSize finfo
33− !fileSpec = H2.FileSpec file 0 siz
34− !rsp = H2.responseFile H.ok200 rsphdr fileSpec
35− !pp = H2.pushPromise path rsp w
36− return $ Just pp
warp/Network/Wai/Handler/Warp/HTTP2/Receiver.hsnew file+418
@@ -0,0 +1,418 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+{-# LANGUAGE NamedFieldPuns #-}
3+{-# LANGUAGE BangPatterns #-}
4+{-# LANGUAGE CPP #-}
5+{-# LANGUAGE PatternGuards #-}
6+
7+module Network.Wai.Handler.Warp.HTTP2.Receiver (frameReceiver) where
8+
9+import Control.Concurrent
10+import Control.Concurrent.STM
11+import qualified Control.Exception as E
12+import qualified Data.ByteString as BS
13+import qualified Data.ByteString.Char8 as C8
14+import Data.IORef
15+import Network.HPACK
16+import Network.HPACK.Token
17+import Network.HTTP2
18+import Network.HTTP2.Priority (toPrecedence, delete, prepare)
19+
20+import Network.Wai.Handler.Warp.HTTP2.EncodeFrame
21+import Network.Wai.Handler.Warp.HTTP2.HPACK
22+import Network.Wai.Handler.Warp.HTTP2.Request
23+import Network.Wai.Handler.Warp.HTTP2.Types
24+import Network.Wai.Handler.Warp.Imports hiding (delete, insert, readInt)
25+import Network.Wai.Handler.Warp.ReadInt
26+import Network.Wai.Handler.Warp.Types
27+
28+----------------------------------------------------------------
29+
30+frameReceiver :: Context -> InternalInfo -> MkReq -> (BufSize -> IO ByteString) -> IO ()
31+frameReceiver ctx ii mkreq recvN = loop 0 `E.catch` sendGoaway
32+ where
33+ Context{ http2settings
34+ , streamTable
35+ , concurrency
36+ , continued
37+ , clientStreamId
38+ , inputQ
39+ , controlQ
40+ } = ctx
41+ sendGoaway e
42+ | Just (ConnectionError err msg) <- E.fromException e = do
43+ csid <- readIORef clientStreamId
44+ let !frame = goawayFrame csid err msg
45+ enqueueControl controlQ $ CGoaway frame
46+ | otherwise = return ()
47+
48+ sendReset err sid = do
49+ let !frame = resetFrame err sid
50+ enqueueControl controlQ $ CFrame frame
51+
52+ loop :: Int -> IO ()
53+ loop !n
54+ | n == 6 = do
55+ yield
56+ loop 0
57+ | otherwise = do
58+ hd <- recvN frameHeaderLength
59+ if BS.null hd then
60+ enqueueControl controlQ CFinish
61+ else do
62+ cont <- processStreamGuardingError $ decodeFrameHeader hd
63+ when cont $ loop (n + 1)
64+
65+ processStreamGuardingError (fid, FrameHeader{streamId})
66+ | isResponse streamId &&
67+ (fid `notElem` [FramePriority,FrameRSTStream,FrameWindowUpdate]) =
68+ E.throwIO $ ConnectionError ProtocolError "stream id should be odd"
69+ processStreamGuardingError (FrameUnknown _, FrameHeader{payloadLength}) = do
70+ mx <- readIORef continued
71+ case mx of
72+ Nothing -> do
73+ -- ignoring unknown frame
74+ consume payloadLength
75+ return True
76+ Just _ -> E.throwIO $ ConnectionError ProtocolError "unknown frame"
77+ processStreamGuardingError (FramePushPromise, _) =
78+ E.throwIO $ ConnectionError ProtocolError "push promise is not allowed"
79+ processStreamGuardingError typhdr@(ftyp, header@FrameHeader{payloadLength}) = do
80+ settings <- readIORef http2settings
81+ case checkFrameHeader settings typhdr of
82+ Left h2err -> case h2err of
83+ StreamError err sid -> do
84+ sendReset err sid
85+ consume payloadLength
86+ return True
87+ connErr -> E.throwIO connErr
88+ Right _ -> do
89+ ex <- E.try $ controlOrStream ftyp header
90+ case ex of
91+ Left (StreamError err sid) -> do
92+ sendReset err sid
93+ return True
94+ Left connErr -> E.throw connErr
95+ Right cont -> return cont
96+
97+ controlOrStream ftyp header@FrameHeader{streamId, payloadLength}
98+ | isControl streamId = do
99+ pl <- recvN payloadLength
100+ control ftyp header pl ctx
101+ | otherwise = do
102+ checkContinued
103+ !mstrm <- getStream
104+ pl <- recvN payloadLength
105+ case mstrm of
106+ Nothing -> do
107+ -- for h2spec only
108+ when (ftyp == FramePriority) $ do
109+ PriorityFrame newpri <- guardIt $ decodePriorityFrame header pl
110+ checkPriority newpri streamId
111+ return True -- just ignore this frame
112+ Just strm@Stream{streamPrecedence} -> do
113+ state <- readStreamState strm
114+ state' <- stream ftyp header pl ctx state strm
115+ case state' of
116+ Open (NoBody tbl@(_,reqvt) pri) -> do
117+ resetContinued
118+ let mcl = readInt <$> getHeaderValue tokenContentLength reqvt
119+ when (just mcl (/= (0 :: Int))) $
120+ E.throwIO $ StreamError ProtocolError streamId
121+ writeIORef streamPrecedence $ toPrecedence pri
122+ halfClosedRemote ctx strm
123+ !req <- mkreq tbl (Just 0, return "")
124+ atomically $ writeTQueue inputQ $ Input strm req reqvt ii
125+ Open (HasBody tbl@(_,reqvt) pri) -> do
126+ resetContinued
127+ q <- newTQueueIO
128+ let !mcl = readInt <$> getHeaderValue tokenContentLength reqvt
129+ writeIORef streamPrecedence $ toPrecedence pri
130+ bodyLength <- newIORef 0
131+ setStreamState ctx strm $ Open (Body q mcl bodyLength)
132+ readQ <- newReadBody q
133+ bodySource <- mkSource readQ
134+ !req <- mkreq tbl (mcl, readSource bodySource)
135+ atomically $ writeTQueue inputQ $ Input strm req reqvt ii
136+ s@(Open Continued{}) -> do
137+ setContinued
138+ setStreamState ctx strm s
139+ HalfClosedRemote -> do
140+ resetContinued
141+ halfClosedRemote ctx strm
142+ s -> do -- Idle, Open Body, Closed
143+ resetContinued
144+ setStreamState ctx strm s
145+ return True
146+ where
147+ setContinued = writeIORef continued (Just streamId)
148+ resetContinued = writeIORef continued Nothing
149+ checkContinued = do
150+ mx <- readIORef continued
151+ case mx of
152+ Nothing -> return ()
153+ Just sid
154+ | sid == streamId && ftyp == FrameContinuation -> return ()
155+ | otherwise -> E.throwIO $ ConnectionError ProtocolError "continuation frame must follow"
156+ getStream = do
157+ mstrm0 <- search streamTable streamId
158+ case mstrm0 of
159+ js@(Just strm0) -> do
160+ when (ftyp == FrameHeaders) $ do
161+ st <- readStreamState strm0
162+ when (isHalfClosedRemote st) $ E.throwIO $ ConnectionError StreamClosed "header must not be sent to half or fully closed stream"
163+ -- Priority made an idele stream
164+ when (isIdle st) $ opened ctx strm0
165+ return js
166+ Nothing
167+ | isResponse streamId -> return Nothing
168+ | otherwise -> do
169+ csid <- readIORef clientStreamId
170+ if streamId <= csid then -- consider the stream closed
171+ if ftyp `elem` [FrameWindowUpdate, FrameRSTStream, FramePriority] then
172+ return Nothing -- will be ignored
173+ else
174+ E.throwIO $ ConnectionError ProtocolError "stream identifier must not decrease"
175+ else do -- consider the stream idle
176+ when (ftyp `notElem` [FrameHeaders,FramePriority]) $
177+ E.throwIO $ ConnectionError ProtocolError $ "this frame is not allowed in an idle stream: " `BS.append` C8.pack (show ftyp)
178+ when (ftyp == FrameHeaders) $ do
179+ writeIORef clientStreamId streamId
180+ cnt <- readIORef concurrency
181+ -- Checking the limitation of concurrency
182+ when (cnt >= maxConcurrency) $
183+ E.throwIO $ StreamError RefusedStream streamId
184+ ws <- initialWindowSize <$> readIORef http2settings
185+ newstrm <- newStream streamId (fromIntegral ws)
186+ when (ftyp == FrameHeaders) $ opened ctx newstrm
187+ insert streamTable streamId newstrm
188+ return $ Just newstrm
189+
190+ consume = void . recvN
191+
192+maxConcurrency :: Int
193+maxConcurrency = recommendedConcurrency
194+
195+initialFrame :: ByteString
196+initialFrame = settingsFrame id [(SettingsMaxConcurrentStreams,maxConcurrency)]
197+
198+----------------------------------------------------------------
199+
200+control :: FrameTypeId -> FrameHeader -> ByteString -> Context -> IO Bool
201+control FrameSettings header@FrameHeader{flags} bs Context{http2settings, controlQ, firstSettings, streamTable} = do
202+ SettingsFrame alist <- guardIt $ decodeSettingsFrame header bs
203+ case checkSettingsList alist of
204+ Just x -> E.throwIO x
205+ Nothing -> return ()
206+ -- HTTP/2 Setting from a browser
207+ unless (testAck flags) $ do
208+ oldws <- initialWindowSize <$> readIORef http2settings
209+ modifyIORef' http2settings $ \old -> updateSettings old alist
210+ newws <- initialWindowSize <$> readIORef http2settings
211+ let diff = newws - oldws
212+ when (diff /= 0) $ updateAllStreamWindow (+ diff) streamTable
213+ let !frame = settingsFrame setAck []
214+ sent <- readIORef firstSettings
215+ let !setframe
216+ | sent = CSettings frame alist
217+ | otherwise = CSettings0 initialFrame frame alist
218+ unless sent $ writeIORef firstSettings True
219+ enqueueControl controlQ setframe
220+ return True
221+
222+control FramePing FrameHeader{flags} bs Context{controlQ} =
223+ if testAck flags then
224+ return True -- just ignore
225+ else do
226+ let !frame = pingFrame bs
227+ enqueueControl controlQ $ CFrame frame
228+ return True
229+
230+control FrameGoAway _ _ Context{controlQ} = do
231+ enqueueControl controlQ CFinish
232+ return False
233+
234+control FrameWindowUpdate header bs Context{connectionWindow} = do
235+ WindowUpdateFrame n <- guardIt $ decodeWindowUpdateFrame header bs
236+ !w <- atomically $ do
237+ w0 <- readTVar connectionWindow
238+ let !w1 = w0 + n
239+ writeTVar connectionWindow w1
240+ return w1
241+ when (isWindowOverflow w) $ E.throwIO $ ConnectionError FlowControlError "control window should be less than 2^31"
242+ return True
243+
244+control _ _ _ _ =
245+ -- must not reach here
246+ return False
247+
248+----------------------------------------------------------------
249+
250+{-# INLINE guardIt #-}
251+guardIt :: Either HTTP2Error a -> IO a
252+guardIt x = case x of
253+ Left err -> E.throwIO err
254+ Right frame -> return frame
255+
256+
257+{-# INLINE checkPriority #-}
258+checkPriority :: Priority -> StreamId -> IO ()
259+checkPriority p me
260+ | dep == me = E.throwIO $ StreamError ProtocolError me
261+ | otherwise = return ()
262+ where
263+ dep = streamDependency p
264+
265+stream :: FrameTypeId -> FrameHeader -> ByteString -> Context -> StreamState -> Stream -> IO StreamState
266+stream FrameHeaders header@FrameHeader{flags} bs ctx (Open JustOpened) Stream{streamNumber} = do
267+ HeadersFrame mp frag <- guardIt $ decodeHeadersFrame header bs
268+ pri <- case mp of
269+ Nothing -> return defaultPriority
270+ Just p -> do
271+ checkPriority p streamNumber
272+ return p
273+ let !endOfStream = testEndStream flags
274+ !endOfHeader = testEndHeader flags
275+ if endOfHeader then do
276+ tbl <- hpackDecodeHeader frag ctx -- fixme
277+ return $ if endOfStream then
278+ Open (NoBody tbl pri)
279+ else
280+ Open (HasBody tbl pri)
281+ else do
282+ let !siz = BS.length frag
283+ return $ Open $ Continued [frag] siz 1 endOfStream pri
284+
285+stream FrameHeaders header@FrameHeader{flags} bs _ (Open (Body q _ _)) _ = do
286+ -- trailer is not supported.
287+ -- let's read and ignore it.
288+ HeadersFrame _ _ <- guardIt $ decodeHeadersFrame header bs
289+ let !endOfStream = testEndStream flags
290+ if endOfStream then do
291+ atomically $ writeTQueue q ""
292+ return HalfClosedRemote
293+ else
294+ -- we don't support continuation here.
295+ E.throwIO $ ConnectionError ProtocolError "continuation in trailer is not supported"
296+
297+-- ignore data-frame except for flow-control when we're done locally
298+stream FrameData
299+ FrameHeader{flags,payloadLength}
300+ _bs
301+ Context{controlQ} s@(HalfClosedLocal _)
302+ Stream{streamNumber} = do
303+ let !endOfStream = testEndStream flags
304+ when (payloadLength /= 0) $ do
305+ let !frame1 = windowUpdateFrame 0 payloadLength
306+ !frame2 = windowUpdateFrame streamNumber payloadLength
307+ !frame = frame1 `BS.append` frame2
308+ enqueueControl controlQ $ CFrame frame
309+ if endOfStream then do
310+ return HalfClosedRemote
311+ else
312+ return s
313+
314+stream FrameData
315+ header@FrameHeader{flags,payloadLength,streamId}
316+ bs
317+ Context{controlQ} s@(Open (Body q mcl bodyLength))
318+ Stream{streamNumber} = do
319+ DataFrame body <- guardIt $ decodeDataFrame header bs
320+ let !endOfStream = testEndStream flags
321+ len0 <- readIORef bodyLength
322+ let !len = len0 + payloadLength
323+ writeIORef bodyLength len
324+ when (payloadLength /= 0) $ do
325+ let !frame1 = windowUpdateFrame 0 payloadLength
326+ !frame2 = windowUpdateFrame streamNumber payloadLength
327+ !frame = frame1 `BS.append` frame2
328+ enqueueControl controlQ $ CFrame frame
329+ atomically $ writeTQueue q body
330+ if endOfStream then do
331+ case mcl of
332+ Nothing -> return ()
333+ Just cl -> when (cl /= len) $ E.throwIO $ StreamError ProtocolError streamId
334+ atomically $ writeTQueue q ""
335+ return HalfClosedRemote
336+ else
337+ return s
338+
339+stream FrameContinuation FrameHeader{flags} frag ctx (Open (Continued rfrags siz n endOfStream pri)) _ = do
340+ let !endOfHeader = testEndHeader flags
341+ !rfrags' = frag : rfrags
342+ !siz' = siz + BS.length frag
343+ !n' = n + 1
344+ when (siz' > 51200) $ -- fixme: hard coding: 50K
345+ E.throwIO $ ConnectionError EnhanceYourCalm "Header is too big"
346+ when (n' > 10) $ -- fixme: hard coding
347+ E.throwIO $ ConnectionError EnhanceYourCalm "Header is too fragmented"
348+ if endOfHeader then do
349+ let !hdrblk = BS.concat $ reverse rfrags'
350+ tbl <- hpackDecodeHeader hdrblk ctx
351+ return $ if endOfStream then
352+ Open (NoBody tbl pri)
353+ else
354+ Open (HasBody tbl pri)
355+ else
356+ return $ Open $ Continued rfrags' siz' n' endOfStream pri
357+
358+stream FrameWindowUpdate header@FrameHeader{streamId} bs _ s Stream{streamWindow} = do
359+ WindowUpdateFrame n <- guardIt $ decodeWindowUpdateFrame header bs
360+ !w <- atomically $ do
361+ w0 <- readTVar streamWindow
362+ let !w1 = w0 + n
363+ writeTVar streamWindow w1
364+ return w1
365+ when (isWindowOverflow w) $
366+ E.throwIO $ StreamError FlowControlError streamId
367+ return s
368+
369+stream FrameRSTStream header bs ctx _ strm = do
370+ RSTStreamFrame e <- guardIt $ decoderstStreamFrame header bs
371+ let !cc = Reset e
372+ closed ctx strm cc
373+ return $ Closed cc -- will be written to streamState again
374+
375+stream FramePriority header bs Context{outputQ,priorityTreeSize} s Stream{streamNumber,streamPrecedence} = do
376+ PriorityFrame newpri <- guardIt $ decodePriorityFrame header bs
377+ checkPriority newpri streamNumber
378+ oldpre <- readIORef streamPrecedence
379+ let !newpre = toPrecedence newpri
380+ writeIORef streamPrecedence newpre
381+ if isIdle s then do
382+ n <- atomicModifyIORef' priorityTreeSize (\x -> (x+1,x+1))
383+ -- fixme hard coding
384+ when (n >= 20) $ E.throwIO $ ConnectionError EnhanceYourCalm "too many idle priority frames"
385+ prepare outputQ streamNumber newpri
386+ else do
387+ mx <- delete outputQ streamNumber oldpre
388+ case mx of
389+ Nothing -> return ()
390+ Just out -> enqueueOutput outputQ out
391+ return s
392+
393+-- this ordering is important
394+stream FrameContinuation _ _ _ _ _ = E.throwIO $ ConnectionError ProtocolError "continue frame cannot come here"
395+stream _ _ _ _ (Open Continued{}) _ = E.throwIO $ ConnectionError ProtocolError "an illegal frame follows header/continuation frames"
396+-- Ignore frames to streams we have just reset, per section 5.1.
397+stream _ _ _ _ st@(Closed (ResetByMe _)) _ = return st
398+stream FrameData FrameHeader{streamId} _ _ _ _ = E.throwIO $ StreamError StreamClosed streamId
399+stream _ FrameHeader{streamId} _ _ _ _ = E.throwIO $ StreamError ProtocolError streamId
400+
401+----------------------------------------------------------------
402+
403+{-# INLINE newReadBody #-}
404+newReadBody :: TQueue ByteString -> IO (IO ByteString)
405+newReadBody q = do
406+ ref <- newIORef False
407+ return $ readBody q ref
408+
409+{-# INLINE readBody #-}
410+readBody :: TQueue ByteString -> IORef Bool -> IO ByteString
411+readBody q ref = do
412+ eof <- readIORef ref
413+ if eof then
414+ return ""
415+ else do
416+ bs <- atomically $ readTQueue q
417+ when (bs == "") $ writeIORef ref True
418+ return bs
warp/Network/Wai/Handler/Warp/HTTP2/Request.hs+13−17
@@ -1,7 +1,9 @@
1+{-# LANGUAGE CPP #-}
1{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE BangPatterns #-}
2
3
3module Network.Wai.Handler.Warp.HTTP2.Request (
4module Network.Wai.Handler.Warp.HTTP2.Request (
4− toRequest
5+ mkRequest
6+ , MkReq
5 , getHTTP2Data
7 , getHTTP2Data
6 , setHTTP2Data
8 , setHTTP2Data
7 , modifyHTTP2Data
9 , modifyHTTP2Data
@@ -18,37 +20,34 @@ import Network.Socket (SockAddr)
18import Network.Wai
20import Network.Wai
19import Network.Wai.Internal (Request(..))
21import Network.Wai.Internal (Request(..))
20import System.IO.Unsafe (unsafePerformIO)
22import System.IO.Unsafe (unsafePerformIO)
21−import qualified System.TimeManager as T
22
23
23import Network.Wai.Handler.Warp.HTTP2.Types
24import Network.Wai.Handler.Warp.HTTP2.Types
24import Network.Wai.Handler.Warp.Imports
25import Network.Wai.Handler.Warp.Imports
25−import Network.Wai.Handler.Warp.Request (getFileInfoKey, pauseTimeoutKey, getClientCertificateKey)
26+import Network.Wai.Handler.Warp.Request (getFileInfoKey)
26import qualified Network.Wai.Handler.Warp.Settings as S (Settings, settingsNoParsePath)
27import qualified Network.Wai.Handler.Warp.Settings as S (Settings, settingsNoParsePath)
27import Network.Wai.Handler.Warp.Types
28import Network.Wai.Handler.Warp.Types
28
29
29−type ToReq = (TokenHeaderList,ValueTable) -> Maybe Int -> IO ByteString -> T.Handle -> Transport -> IO Request
30+type MkReq = (TokenHeaderList,ValueTable) -> (Maybe Int,IO ByteString) -> IO (Request)
30
31
31−----------------------------------------------------------------
32−
33−toRequest :: InternalInfo -> S.Settings -> SockAddr -> ToReq
32+mkRequest :: InternalInfo -> S.Settings -> SockAddr -> MkReq
34−toRequest ii settings addr ht bodylen body th transport = do
33+mkRequest ii1 settings addr (reqths,reqvt) (bodylen,body) = do
35 ref <- newIORef Nothing
34 ref <- newIORef Nothing
36− toRequest' ii settings addr ref ht bodylen body th transport
35+ mkRequest' ii1 settings addr ref (reqths,reqvt) (bodylen,body)
37
36
38−toRequest' :: InternalInfo -> S.Settings -> SockAddr
37+mkRequest' :: InternalInfo -> S.Settings -> SockAddr
39 -> IORef (Maybe HTTP2Data)
38 -> IORef (Maybe HTTP2Data)
40− -> ToReq
39+ -> MkReq
41−toRequest' ii settings addr ref (reqths,reqvt) bodylen body th transport = return req
40+mkRequest' ii settings addr ref (reqths,reqvt) (bodylen,body) = return req
42 where
41 where
43 !req = Request {
42 !req = Request {
44 requestMethod = colonMethod
43 requestMethod = colonMethod
45− , httpVersion = H.http20
44+ , httpVersion = http2ver
46 , rawPathInfo = rawPath
45 , rawPathInfo = rawPath
47 , pathInfo = H.decodePathSegments path
46 , pathInfo = H.decodePathSegments path
48 , rawQueryString = query
47 , rawQueryString = query
49 , queryString = H.parseQuery query
48 , queryString = H.parseQuery query
50 , requestHeaders = headers
49 , requestHeaders = headers
51− , isSecure = isTransportSecure transport
50+ , isSecure = True
52 , remoteHost = addr
51 , remoteHost = addr
53 , requestBody = body
52 , requestBody = body
54 , vault = vaultValue
53 , vault = vaultValue
@@ -77,13 +76,10 @@ toRequest' ii settings addr ref (reqths,reqvt) bodylen body th transport = retur
77 (unparsedPath,query) = C8.break (=='?') $ fromJust (mPath <|> mAuth)
76 (unparsedPath,query) = C8.break (=='?') $ fromJust (mPath <|> mAuth)
78 !path = H.extractPath unparsedPath
77 !path = H.extractPath unparsedPath
79 !rawPath = if S.settingsNoParsePath settings then unparsedPath else path
78 !rawPath = if S.settingsNoParsePath settings then unparsedPath else path
80− -- fixme: pauseTimeout. th is not available here.
81 !vaultValue = Vault.insert getFileInfoKey (getFileInfo ii)
79 !vaultValue = Vault.insert getFileInfoKey (getFileInfo ii)
82 $ Vault.insert getHTTP2DataKey (readIORef ref)
80 $ Vault.insert getHTTP2DataKey (readIORef ref)
83 $ Vault.insert setHTTP2DataKey (writeIORef ref)
81 $ Vault.insert setHTTP2DataKey (writeIORef ref)
84 $ Vault.insert modifyHTTP2DataKey (modifyIORef' ref)
82 $ Vault.insert modifyHTTP2DataKey (modifyIORef' ref)
85− $ Vault.insert pauseTimeoutKey (T.pause th)
86− $ Vault.insert getClientCertificateKey (tlsClientCertificate transport)
87 Vault.empty
83 Vault.empty
88
84
89getHTTP2DataKey :: Vault.Key (IO (Maybe HTTP2Data))
85getHTTP2DataKey :: Vault.Key (IO (Maybe HTTP2Data))
warp/Network/Wai/Handler/Warp/HTTP2/Response.hsdeleted−127
@@ -1,127 +0,0 @@
1−{-# LANGUAGE OverloadedStrings #-}
2−{-# LANGUAGE RecordWildCards #-}
3−{-# LANGUAGE BangPatterns #-}
4−{-# LANGUAGE ScopedTypeVariables #-}
5−
6−module Network.Wai.Handler.Warp.HTTP2.Response (
7− fromResponse
8− ) where
9−
10−import qualified Control.Exception as E
11−import qualified Data.ByteString.Builder as BB
12−import qualified Network.HTTP.Types as H
13−import qualified Network.HTTP2.Server as H2
14−import Network.Wai hiding (responseFile, responseBuilder, responseStream)
15−import Network.Wai.Internal (Response(..))
16−
17−import Network.Wai.Handler.Warp.File
18−import Network.Wai.Handler.Warp.HTTP2.Request (getHTTP2Data)
19−import Network.Wai.Handler.Warp.HTTP2.Types
20−import Network.Wai.Handler.Warp.Header
21−import qualified Network.Wai.Handler.Warp.Response as R
22−import qualified Network.Wai.Handler.Warp.Settings as S
23−import Network.Wai.Handler.Warp.Types
24−
25−----------------------------------------------------------------
26−
27−fromResponse :: S.Settings -> InternalInfo -> Request -> Response -> IO H2.Response
28−fromResponse settings ii req rsp = do
29− date <- getDate ii
30− h2rsp <- case rsp of
31− ResponseFile st rsphdr path mpart -> do
32− let rsphdr' = add date svr rsphdr
33− responseFile st rsphdr' isHead path mpart ii reqhdr
34− ResponseBuilder st rsphdr builder -> do
35− let rsphdr' = add date svr rsphdr
36− return $ responseBuilder st rsphdr' isHead builder
37− ResponseStream st rsphdr strmbdy -> do
38− let rsphdr' = add date svr rsphdr
39− return $ responseStream st rsphdr' isHead strmbdy
40− _ -> error "ResponseRaw is not supported in HTTP/2"
41− mh2data <- getHTTP2Data req
42− case mh2data of
43− Nothing -> return h2rsp
44− Just h2data -> do
45− let !trailers = http2dataTrailers h2data
46− return $ H2.setResponseTrailersMaker h2rsp trailers
47− where
48− !isHead = requestMethod req == H.methodHead
49− !reqhdr = requestHeaders req
50− !svr = S.settingsServerName settings
51− add date server rsphdr = (H.hDate, date) : (H.hServer, server) : rsphdr
52− -- fixme: not adding svr if already exists
53−
54−----------------------------------------------------------------
55−
56−responseFile :: H.Status -> H.ResponseHeaders -> Bool
57− -> FilePath -> Maybe FilePart -> InternalInfo -> H.RequestHeaders
58− -> IO H2.Response
59−responseFile st rsphdr _ _ _ _ _
60− | noBody st = return $ responseNoBody st rsphdr
61−
62−responseFile st rsphdr isHead path (Just fp) _ _ =
63− return $ responseFile2XX st rsphdr isHead fileSpec
64− where
65− !off' = fromIntegral $ filePartOffset fp
66− !bytes' = fromIntegral $ filePartByteCount fp
67− !fileSpec = H2.FileSpec path off' bytes'
68−
69−responseFile _ rsphdr isHead path Nothing ii reqhdr = do
70− efinfo <- E.try $ getFileInfo ii path
71− case efinfo of
72− Left (_ex :: E.IOException) -> return $ response404 rsphdr
73− Right finfo -> do
74− let reqidx = indexRequestHeader reqhdr
75− rspidx = indexResponseHeader rsphdr
76− case conditionalRequest finfo rsphdr rspidx reqidx of
77− WithoutBody s -> return $ responseNoBody s rsphdr
78− WithBody s rsphdr' off bytes -> do
79− let !off' = fromIntegral off
80− !bytes' = fromIntegral bytes
81− !fileSpec = H2.FileSpec path off' bytes'
82− return $ responseFile2XX s rsphdr' isHead fileSpec
83−
84−----------------------------------------------------------------
85−
86−responseFile2XX :: H.Status -> H.ResponseHeaders -> Bool -> H2.FileSpec -> H2.Response
87−responseFile2XX st rsphdr isHead fileSpec
88− | isHead = responseNoBody st rsphdr
89− | otherwise = H2.responseFile st rsphdr fileSpec
90−
91−----------------------------------------------------------------
92−
93−responseBuilder :: H.Status -> H.ResponseHeaders -> Bool
94− -> BB.Builder
95− -> H2.Response
96−responseBuilder st rsphdr isHead builder
97− | noBody st = responseNoBody st rsphdr
98− | isHead = responseNoBody st rsphdr
99− | otherwise = H2.responseBuilder st rsphdr builder
100−
101−----------------------------------------------------------------
102−
103−responseStream :: H.Status -> H.ResponseHeaders -> Bool
104− -> StreamingBody
105− -> H2.Response
106−responseStream st rsphdr isHead strmbdy
107− | noBody st = responseNoBody st rsphdr
108− | isHead = responseNoBody st rsphdr
109− | otherwise = H2.responseStreaming st rsphdr strmbdy
110−
111−----------------------------------------------------------------
112−
113−responseNoBody :: H.Status -> H.ResponseHeaders -> H2.Response
114−responseNoBody st rsphdr = H2.responseNoBody st rsphdr
115−
116−----------------------------------------------------------------
117−
118−response404 :: H.ResponseHeaders -> H2.Response
119−response404 rsphdr = H2.responseBuilder H.notFound404 rsphdr' body
120− where
121− !rsphdr' = R.replaceHeader H.hContentType "text/plain; charset=utf-8" rsphdr
122− !body = BB.byteString "File not found"
123−
124−----------------------------------------------------------------
125−
126−noBody :: H.Status -> Bool
127−noBody = not . R.hasBody
warp/Network/Wai/Handler/Warp/HTTP2/Sender.hsnew file+536
@@ -0,0 +1,536 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+{-# LANGUAGE BangPatterns, CPP #-}
3+{-# LANGUAGE NamedFieldPuns #-}
4+
5+module Network.Wai.Handler.Warp.HTTP2.Sender (frameSender) where
6+
7+import Control.Concurrent.STM
8+import qualified Control.Exception as E
9+import qualified Data.ByteString as BS
10+import Data.ByteString.Builder (Builder)
11+import qualified Data.ByteString.Builder.Extra as B
12+import Data.IORef
13+import Foreign.Ptr (Ptr, plusPtr)
14+import Foreign.Storable (poke)
15+import Network.HPACK (setLimitForEncoding, toHeaderTable)
16+import Network.HTTP2
17+import Network.HTTP2.Priority (isEmptySTM, dequeueSTM, Precedence)
18+import Network.Wai
19+
20+#ifdef WINDOWS
21+import qualified System.IO as IO
22+#else
23+import Network.Wai.Handler.Warp.FdCache
24+import Network.Wai.Handler.Warp.SendFile (positionRead)
25+import qualified System.TimeManager as T
26+#endif
27+
28+import Network.Wai.Handler.Warp.Buffer
29+import Network.Wai.Handler.Warp.HTTP2.EncodeFrame
30+import Network.Wai.Handler.Warp.HTTP2.HPACK
31+import Network.Wai.Handler.Warp.HTTP2.Manager (Manager)
32+import Network.Wai.Handler.Warp.HTTP2.Types
33+import Network.Wai.Handler.Warp.Imports hiding (readInt)
34+import qualified Network.Wai.Handler.Warp.Settings as S
35+import Network.Wai.Handler.Warp.Types
36+
37+----------------------------------------------------------------
38+
39+data Leftover = LZero
40+ | LOne B.BufferWriter
41+ | LTwo ByteString B.BufferWriter
42+
43+----------------------------------------------------------------
44+
45+{-# INLINE getStreamWindowSize #-}
46+getStreamWindowSize :: Stream -> IO WindowSize
47+getStreamWindowSize Stream{streamWindow} = atomically $ readTVar streamWindow
48+
49+{-# INLINE waitStreamWindowSize #-}
50+waitStreamWindowSize :: Stream -> IO ()
51+waitStreamWindowSize Stream{streamWindow} = atomically $ do
52+ w <- readTVar streamWindow
53+ check (w > 0)
54+
55+{-# INLINE waitStreaming #-}
56+waitStreaming :: TBQueue a -> IO ()
57+waitStreaming tbq = atomically $ do
58+ isEmpty <- isEmptyTBQueue tbq
59+ check (not isEmpty)
60+
61+data Switch = C Control
62+ | O (StreamId,Precedence,Output)
63+ | Flush
64+
65+frameSender :: Context -> Connection -> S.Settings -> Manager -> IO ()
66+frameSender ctx@Context{outputQ,controlQ,connectionWindow,encodeDynamicTable}
67+ conn@Connection{connWriteBuffer,connBufferSize,connSendAll}
68+ settings mgr = loop 0 `E.catch` ignore
69+ where
70+ dequeue off = do
71+ isEmpty <- isEmptyTQueue controlQ
72+ if isEmpty then do
73+ w <- readTVar connectionWindow
74+ check (w > 0)
75+ emp <- isEmptySTM outputQ
76+ if emp then
77+ if off /= 0 then return Flush else retry
78+ else
79+ O <$> dequeueSTM outputQ
80+ else
81+ C <$> readTQueue controlQ
82+
83+ loop off = do
84+ x <- atomically $ dequeue off
85+ case x of
86+ C ctl -> do
87+ when (off /= 0) $ flushN off
88+ off' <- control ctl off
89+ when (off' >= 0) $ loop off'
90+ O (_,pre,out) -> do
91+ let strm = outputStream out
92+ writeIORef (streamPrecedence strm) pre
93+ off' <- outputOrEnqueueAgain out off
94+ case off' of
95+ 0 -> loop 0
96+ _ | off' > 15872 -> flushN off' >> loop 0 -- fixme: hard-coding
97+ | otherwise -> loop off'
98+ Flush -> flushN off >> loop 0
99+
100+ control CFinish _ = return (-1)
101+ control (CGoaway frame) _ = connSendAll frame >> return (-1)
102+ control (CFrame frame) _ = connSendAll frame >> return 0
103+ control (CSettings frame alist) _ = do
104+ connSendAll frame
105+ setLimit alist
106+ return 0
107+ control (CSettings0 frame1 frame2 alist) off = do -- off == 0, just in case
108+ let !buf = connWriteBuffer `plusPtr` off
109+ !off' = off + BS.length frame1 + BS.length frame2
110+ buf' <- copy buf frame1
111+ void $ copy buf' frame2
112+ setLimit alist
113+ return off'
114+
115+ {-# INLINE setLimit #-}
116+ setLimit alist = case lookup SettingsHeaderTableSize alist of
117+ Nothing -> return ()
118+ Just siz -> setLimitForEncoding siz encodeDynamicTable
119+
120+ output out@(Output strm _ _ tell getH2D (ONext curr)) off0 lim = do
121+ -- Data frame payload
122+ let !buf = connWriteBuffer `plusPtr` off0
123+ !siz = connBufferSize - off0
124+ Next datPayloadLen mnext <- curr buf siz lim
125+ off <- fillDataHeader strm off0 datPayloadLen mnext tell getH2D
126+ maybeEnqueueNext out mnext
127+ return off
128+
129+ output out@(Output strm rspn ii tell getH2D ORspn) off0 lim = do
130+ -- Header frame and Continuation frame
131+ let !sid = streamNumber strm
132+ !endOfStream = case rspn of
133+ RspnNobody _ _ -> True
134+ _ -> False
135+ ths <- fixHeaders ctx rspn ii settings
136+ kvlen <- headerContinue sid ths endOfStream off0
137+ off <- sendHeadersIfNecessary $ off0 + frameHeaderLength + kvlen
138+ case rspn of
139+ RspnNobody _ _ -> do
140+ halfClosedLocal ctx strm Finished
141+ return off
142+ RspnFile _ _ path mpart -> do
143+ -- Data frame payload
144+ let payloadOff = off + frameHeaderLength
145+ Next datPayloadLen mnext <-
146+ fillFileBodyGetNext conn ii payloadOff lim path mpart
147+ off' <- fillDataHeader strm off datPayloadLen mnext tell getH2D
148+ maybeEnqueueNext out mnext
149+ return off'
150+ RspnBuilder _ _ builder -> do
151+ -- Data frame payload
152+ let payloadOff = off + frameHeaderLength
153+ Next datPayloadLen mnext <-
154+ fillBuilderBodyGetNext conn ii payloadOff lim builder
155+ off' <- fillDataHeader strm off datPayloadLen mnext tell getH2D
156+ maybeEnqueueNext out mnext
157+ return off'
158+ RspnStreaming _ _ tbq -> do
159+ let payloadOff = off + frameHeaderLength
160+ Next datPayloadLen mnext <-
161+ fillStreamBodyGetNext conn payloadOff lim tbq strm
162+ off' <- fillDataHeader strm off datPayloadLen mnext tell getH2D
163+ maybeEnqueueNext out mnext
164+ return off'
165+
166+ output out@(Output strm _ _ _ _ (OPush ths pid)) off0 lim = do
167+ -- Creating a push promise header
168+ -- Frame id should be associated stream id from the client.
169+ let !sid = streamNumber strm
170+ len <- pushPromise pid sid ths off0
171+ off <- sendHeadersIfNecessary $ off0 + frameHeaderLength + len
172+ output out{ outputType = ORspn } off lim
173+
174+ output _ _ _ = undefined -- never reach
175+
176+ outputOrEnqueueAgain out off = E.handle resetStream $ do
177+ state <- readStreamState strm
178+ if isHalfClosedLocal state then
179+ return off
180+ else case out of
181+ Output _ _ _ wait _ OWait -> do
182+ -- Checking if all push are done.
183+ let out' = out {
184+ outputHook = return ()
185+ , outputType = ORspn
186+ }
187+ forkAndEnqueueWhenReady wait outputQ out' mgr
188+ return off
189+ _ -> case mtbq of
190+ Just tbq -> checkStreaming tbq
191+ _ -> checkStreamWindowSize
192+ where
193+ strm = outputStream out
194+ mtbq = outputMaybeTBQueue out
195+ checkStreaming tbq = do
196+ isEmpty <- atomically $ isEmptyTBQueue tbq
197+ if isEmpty then do
198+ forkAndEnqueueWhenReady (waitStreaming tbq) outputQ out mgr
199+ return off
200+ else
201+ checkStreamWindowSize
202+ checkStreamWindowSize = do
203+ sws <- getStreamWindowSize strm
204+ if sws == 0 then do
205+ forkAndEnqueueWhenReady (waitStreamWindowSize strm) outputQ out mgr
206+ return off
207+ else do
208+ cws <- atomically $ readTVar connectionWindow -- not 0
209+ let !lim = min cws sws
210+ output out off lim
211+ resetStream e = do
212+ closed ctx strm (ResetByMe e)
213+ let !rst = resetFrame InternalError $ streamNumber strm
214+ enqueueControl controlQ $ CFrame rst
215+ return off
216+
217+ {-# INLINE flushN #-}
218+ -- Flush the connection buffer to the socket, where the first 'n' bytes of
219+ -- the buffer are filled.
220+ flushN :: Int -> IO ()
221+ flushN n = bufferIO connWriteBuffer n connSendAll
222+
223+ headerContinue sid ths endOfStream off = do
224+ let !offkv = off + frameHeaderLength
225+ let !bufkv = connWriteBuffer `plusPtr` offkv
226+ !limkv = connBufferSize - offkv
227+ (hs,kvlen) <- hpackEncodeHeader ctx bufkv limkv ths
228+ let flag0 = case hs of
229+ [] -> setEndHeader defaultFlags
230+ _ -> defaultFlags
231+ flag = if endOfStream then setEndStream flag0 else flag0
232+ let buf = connWriteBuffer `plusPtr` off
233+ fillFrameHeader FrameHeaders kvlen sid flag buf
234+ continue sid kvlen hs
235+
236+ !bufHeaderPayload = connWriteBuffer `plusPtr` frameHeaderLength
237+ !headerPayloadLim = connBufferSize - frameHeaderLength
238+
239+ continue _ kvlen [] = return kvlen
240+ continue sid kvlen ths = do
241+ flushN $ kvlen + frameHeaderLength
242+ -- Now off is 0
243+ (ths', kvlen') <- hpackEncodeHeaderLoop ctx bufHeaderPayload headerPayloadLim ths
244+ when (ths == ths') $ E.throwIO $ ConnectionError CompressionError "cannot compress the header"
245+ let flag = case ths' of
246+ [] -> setEndHeader defaultFlags
247+ _ -> defaultFlags
248+ fillFrameHeader FrameContinuation kvlen' sid flag connWriteBuffer
249+ continue sid kvlen' ths'
250+
251+ {-# INLINE maybeEnqueueNext #-}
252+ -- Re-enqueue the stream in the output queue.
253+ maybeEnqueueNext :: Output -> Maybe DynaNext -> IO ()
254+ maybeEnqueueNext _ Nothing = return ()
255+ maybeEnqueueNext out (Just next) = enqueueOutput outputQ out'
256+ where
257+ !out' = out { outputType = ONext next }
258+
259+ {-# INLINE sendHeadersIfNecessary #-}
260+ -- Send headers if there is not room for a 1-byte data frame, and return
261+ -- the offset of the next frame's first header byte.
262+ sendHeadersIfNecessary off
263+ -- True if the connection buffer has room for a 1-byte data frame.
264+ | off + frameHeaderLength < connBufferSize = return off
265+ | otherwise = do
266+ flushN off
267+ return 0
268+
269+ fillDataHeader strm@Stream{streamWindow,streamNumber}
270+ off datPayloadLen mnext tell getH2D = do
271+ -- Data frame header
272+ mh2d <- getH2D
273+ let (!trailers,!noTrailers) = case http2dataTrailers <$> mh2d of
274+ Nothing -> ([], True)
275+ Just ts -> (ts, null ts)
276+ !buf = connWriteBuffer `plusPtr` off
277+ !off' = off + frameHeaderLength + datPayloadLen
278+ !noMoreBody = isNothing mnext
279+ flag | noMoreBody && noTrailers = setEndStream defaultFlags
280+ | otherwise = defaultFlags
281+ fillFrameHeader FrameData datPayloadLen streamNumber flag buf
282+ off'' <- handleEndOfBody noMoreBody off' noTrailers trailers
283+ atomically $ modifyTVar' connectionWindow (subtract datPayloadLen)
284+ atomically $ modifyTVar' streamWindow (subtract datPayloadLen)
285+ return off''
286+ where
287+ handleTrailers True off0 _ = return off0
288+ handleTrailers _ off0 trailers = do
289+ (ths,_) <- toHeaderTable trailers
290+ kvlen <- headerContinue streamNumber ths True off0
291+ sendHeadersIfNecessary $ off0 + frameHeaderLength + kvlen
292+ handleEndOfBody True off0 noTrailers trailers = do
293+ off1 <- handleTrailers noTrailers off0 trailers
294+ void tell
295+ halfClosedLocal ctx strm Finished
296+ return off1
297+ handleEndOfBody False off0 _ _ = return off0
298+
299+
300+ pushPromise pid sid ths off = do
301+ let !offsid = off + frameHeaderLength
302+ !bufsid = connWriteBuffer `plusPtr` offsid
303+ poke32 bufsid $ fromIntegral sid
304+ let !offkv = offsid + 4
305+ !bufkv = connWriteBuffer `plusPtr` offkv
306+ !limkv = connBufferSize - offkv
307+ (_,kvlen) <- hpackEncodeHeader ctx bufkv limkv ths
308+ let !flag = setEndHeader defaultFlags -- No EndStream flag
309+ !buf = connWriteBuffer `plusPtr` off
310+ !len = kvlen + 4
311+ fillFrameHeader FramePushPromise len pid flag buf
312+ return len
313+
314+ {-# INLINE fillFrameHeader #-}
315+ fillFrameHeader ftyp len sid flag buf = encodeFrameHeaderBuf ftyp hinfo buf
316+ where
317+ hinfo = FrameHeader len flag sid
318+
319+ {-# INLINE ignore #-}
320+ ignore :: E.SomeException -> IO ()
321+ ignore _ = return ()
322+
323+----------------------------------------------------------------
324+
325+{-
326+ResponseFile Status ResponseHeaders FilePath (Maybe FilePart)
327+ResponseBuilder Status ResponseHeaders Builder
328+ResponseStream Status ResponseHeaders StreamingBody
329+ResponseRaw (IO ByteString -> (ByteString -> IO ()) -> IO ()) Response
330+-}
331+
332+fillBuilderBodyGetNext :: Connection -> InternalInfo -> Int -> WindowSize -> Builder -> IO Next
333+fillBuilderBodyGetNext Connection{connWriteBuffer,connBufferSize}
334+ _ off lim bb = do
335+ let datBuf = connWriteBuffer `plusPtr` off
336+ room = min (connBufferSize - off) lim
337+ (len, signal) <- B.runBuilder bb datBuf room
338+ return $ nextForBuilder len signal
339+
340+fillFileBodyGetNext :: Connection -> InternalInfo -> Int -> WindowSize -> FilePath -> Maybe FilePart -> IO Next
341+#ifdef WINDOWS
342+fillFileBodyGetNext Connection{connWriteBuffer,connBufferSize}
343+ _ off lim path mpart = do
344+ let datBuf = connWriteBuffer `plusPtr` off
345+ room = min (connBufferSize - off) lim
346+ (start, bytes) <- fileStartEnd path mpart
347+ -- fixme: how to close Handle? GC does it at this moment.
348+ hdl <- IO.openBinaryFile path IO.ReadMode
349+ IO.hSeek hdl IO.AbsoluteSeek start
350+ len <- IO.hGetBufSome hdl datBuf (mini room bytes)
351+ let bytes' = bytes - fromIntegral len
352+ -- fixme: connWriteBuffer connBufferSize
353+ return $ nextForFile len hdl bytes' (return ())
354+#else
355+fillFileBodyGetNext Connection{connWriteBuffer,connBufferSize}
356+ ii off lim path mpart = do
357+ (mfd, refresh') <- getFd ii path
358+ (fd, refresh) <- case mfd of
359+ Nothing -> do
360+ fd' <- openFile path
361+ th <- T.register (timeoutManager ii) (closeFile fd')
362+ return (fd', T.tickle th)
363+ Just fd -> return (fd, refresh')
364+ let datBuf = connWriteBuffer `plusPtr` off
365+ room = min (connBufferSize - off) lim
366+ (start, bytes) <- fileStartEnd path mpart
367+ len <- positionRead fd datBuf (mini room bytes) start
368+ refresh
369+ let len' = fromIntegral len
370+ return $ nextForFile len fd (start + len') (bytes - len') refresh
371+#endif
372+
373+fileStartEnd :: FilePath -> Maybe FilePart -> IO (Integer, Integer)
374+fileStartEnd _ (Just part) =
375+ return (filePartOffset part, filePartByteCount part)
376+fileStartEnd _ _ = error "fileStartEnd"
377+
378+----------------------------------------------------------------
379+
380+fillStreamBodyGetNext :: Connection -> Int -> WindowSize -> TBQueue Sequence -> Stream -> IO Next
381+fillStreamBodyGetNext Connection{connWriteBuffer,connBufferSize}
382+ off lim sq strm = do
383+ let datBuf = connWriteBuffer `plusPtr` off
384+ room = min (connBufferSize - off) lim
385+ (leftover, cont, len) <- runStreamBuilder datBuf room sq
386+ return $ nextForStream sq strm leftover cont len
387+
388+----------------------------------------------------------------
389+
390+fillBufBuilder :: Leftover -> DynaNext
391+fillBufBuilder leftover buf0 siz0 lim = do
392+ let payloadBuf = buf0 `plusPtr` frameHeaderLength
393+ room = min (siz0 - frameHeaderLength) lim
394+ case leftover of
395+ LZero -> error "fillBufBuilder: LZero"
396+ LOne writer -> do
397+ (len, signal) <- writer payloadBuf room
398+ getNext len signal
399+ LTwo bs writer
400+ | BS.length bs <= room -> do
401+ buf1 <- copy payloadBuf bs
402+ let len1 = BS.length bs
403+ (len2, signal) <- writer buf1 (room - len1)
404+ getNext (len1 + len2) signal
405+ | otherwise -> do
406+ let (bs1,bs2) = BS.splitAt room bs
407+ void $ copy payloadBuf bs1
408+ getNext room (B.Chunk bs2 writer)
409+ where
410+ getNext l s = return $ nextForBuilder l s
411+
412+nextForBuilder :: BytesFilled -> B.Next -> Next
413+nextForBuilder len B.Done
414+ = Next len Nothing
415+nextForBuilder len (B.More _ writer)
416+ = Next len $ Just (fillBufBuilder (LOne writer))
417+nextForBuilder len (B.Chunk bs writer)
418+ = Next len $ Just (fillBufBuilder (LTwo bs writer))
419+
420+----------------------------------------------------------------
421+
422+runStreamBuilder :: Buffer -> BufSize -> TBQueue Sequence
423+ -> IO (Leftover, Bool, BytesFilled)
424+runStreamBuilder buf0 room0 sq = loop buf0 room0 0
425+ where
426+ loop !buf !room !total = do
427+ mbuilder <- atomically $ tryReadTBQueue sq
428+ case mbuilder of
429+ Nothing -> return (LZero, True, total)
430+ Just (SBuilder builder) -> do
431+ (len, signal) <- B.runBuilder builder buf room
432+ let !total' = total + len
433+ case signal of
434+ B.Done -> loop (buf `plusPtr` len) (room - len) total'
435+ B.More _ writer -> return (LOne writer, True, total')
436+ B.Chunk bs writer -> return (LTwo bs writer, True, total')
437+ Just SFlush -> return (LZero, True, total)
438+ Just SFinish -> return (LZero, False, total)
439+
440+fillBufStream :: Leftover -> TBQueue Sequence -> Stream -> DynaNext
441+fillBufStream leftover0 sq strm buf0 siz0 lim0 = do
442+ let payloadBuf = buf0 `plusPtr` frameHeaderLength
443+ room0 = min (siz0 - frameHeaderLength) lim0
444+ case leftover0 of
445+ LZero -> do
446+ (leftover, cont, len) <- runStreamBuilder payloadBuf room0 sq
447+ getNext leftover cont len
448+ LOne writer -> write writer payloadBuf room0 0
449+ LTwo bs writer
450+ | BS.length bs <= room0 -> do
451+ buf1 <- copy payloadBuf bs
452+ let len = BS.length bs
453+ write writer buf1 (room0 - len) len
454+ | otherwise -> do
455+ let (bs1,bs2) = BS.splitAt room0 bs
456+ void $ copy payloadBuf bs1
457+ getNext (LTwo bs2 writer) True room0
458+ where
459+ getNext l b r = return $ nextForStream sq strm l b r
460+ write writer1 buf room sofar = do
461+ (len, signal) <- writer1 buf room
462+ case signal of
463+ B.Done -> do
464+ (leftover, cont, extra) <- runStreamBuilder (buf `plusPtr` len) (room - len) sq
465+ let !total = sofar + len + extra
466+ getNext leftover cont total
467+ B.More _ writer -> do
468+ let !total = sofar + len
469+ getNext (LOne writer) True total
470+ B.Chunk bs writer -> do
471+ let !total = sofar + len
472+ getNext (LTwo bs writer) True total
473+
474+nextForStream :: TBQueue Sequence -> Stream
475+ -> Leftover -> Bool -> BytesFilled
476+ -> Next
477+nextForStream _ _ _ False len = Next len Nothing
478+nextForStream sq strm leftOrZero True len =
479+ Next len $ Just (fillBufStream leftOrZero sq strm)
480+
481+----------------------------------------------------------------
482+
483+#ifdef WINDOWS
484+fillBufFile :: IO.Handle -> Integer -> IO () -> DynaNext
485+fillBufFile h bytes refresh buf siz lim = do
486+ let payloadBuf = buf `plusPtr` frameHeaderLength
487+ room = min (siz - frameHeaderLength) lim
488+ len <- IO.hGetBufSome h payloadBuf room
489+ refresh
490+ let bytes' = bytes - fromIntegral len
491+ return $ nextForFile len h bytes' refresh
492+
493+nextForFile :: BytesFilled -> IO.Handle -> Integer -> IO () -> Next
494+nextForFile 0 _ _ _ = Next 0 Nothing
495+nextForFile len _ 0 _ = Next len Nothing
496+nextForFile len h bytes refresh =
497+ Next len $ Just (fillBufFile h bytes refresh)
498+#else
499+fillBufFile :: Fd -> Integer -> Integer -> IO () -> DynaNext
500+fillBufFile fd start bytes refresh buf siz lim = do
501+ let payloadBuf = buf `plusPtr` frameHeaderLength
502+ room = min (siz - frameHeaderLength) lim
503+ len <- positionRead fd payloadBuf (mini room bytes) start
504+ let len' = fromIntegral len
505+ refresh
506+ return $ nextForFile len fd (start + len') (bytes - len') refresh
507+
508+nextForFile :: BytesFilled -> Fd -> Integer -> Integer -> IO () -> Next
509+nextForFile 0 _ _ _ _ = Next 0 Nothing
510+nextForFile len _ _ 0 _ = Next len Nothing
511+nextForFile len fd start bytes refresh =
512+ Next len $ Just (fillBufFile fd start bytes refresh)
513+#endif
514+
515+{-# INLINE mini #-}
516+mini :: Int -> Integer -> Int
517+mini i n
518+ | fromIntegral i < n = i
519+ | otherwise = fromIntegral n
520+
521+
522+----------------------------------------------------------------
523+
524+poke32 :: Ptr Word8 -> Word32 -> IO ()
525+poke32 ptr i = do
526+ poke ptr w0
527+ poke8 ptr 1 w1
528+ poke8 ptr 2 w2
529+ poke8 ptr 3 w3
530+ where
531+ w0 = fromIntegral ((i `shiftR` 24) .&. 0xff)
532+ w1 = fromIntegral ((i `shiftR` 16) .&. 0xff)
533+ w2 = fromIntegral ((i `shiftR` 8) .&. 0xff)
534+ w3 = fromIntegral (i .&. 0xff)
535+ poke8 :: Ptr Word8 -> Int -> Word8 -> IO ()
536+ poke8 ptr0 n w = poke (ptr0 `plusPtr` n) w
warp/Network/Wai/Handler/Warp/HTTP2/Types.hs+305−12
@@ -1,19 +1,32 @@
1−{-# LANGUAGE NamedFieldPuns #-}
1+{-# LANGUAGE OverloadedStrings, CPP #-}
2−{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
2+{-# LANGUAGE NamedFieldPuns, RecordWildCards #-}
3+{-# LANGUAGE BangPatterns #-}
4
4
5module Network.Wai.Handler.Warp.HTTP2.Types where
5module Network.Wai.Handler.Warp.HTTP2.Types where
6
6
7+import Control.Concurrent (forkIO)
8+import Control.Concurrent.STM
9+import Control.Exception (SomeException, bracket)
7import qualified Data.ByteString as BS
10import qualified Data.ByteString as BS
11+import Data.ByteString.Builder (Builder)
12+import Data.IORef
13+import Data.IntMap.Strict (IntMap, IntMap)
14+import qualified Data.IntMap.Strict as M
15+import Network.HPACK hiding (Buffer)
8import qualified Network.HTTP.Types as H
16import qualified Network.HTTP.Types as H
9import Network.HTTP2
17import Network.HTTP2
10−import qualified Network.HTTP2.Server as H2
18+import Network.HTTP2.Priority
19+import Network.Wai (Request, FilePart)
11
20
21+import Network.Wai.Handler.Warp.HTTP2.Manager
12import Network.Wai.Handler.Warp.Imports
22import Network.Wai.Handler.Warp.Imports
13import Network.Wai.Handler.Warp.Types
23import Network.Wai.Handler.Warp.Types
14
24
15----------------------------------------------------------------
25----------------------------------------------------------------
16
26
27+http2ver :: H.HttpVersion
28+http2ver = H.HttpVersion 2 0
29+
17isHTTP2 :: Transport -> Bool
30isHTTP2 :: Transport -> Bool
18isHTTP2 TCP = False
31isHTTP2 TCP = False
19isHTTP2 tls = useHTTP2
32isHTTP2 tls = useHTTP2
@@ -24,6 +37,290 @@ isHTTP2 tls = useHTTP2
24
37
25----------------------------------------------------------------
38----------------------------------------------------------------
26
39
40+data Input = Input Stream Request ValueTable InternalInfo
41+
42+----------------------------------------------------------------
43+
44+type DynaNext = Buffer -> BufSize -> WindowSize -> IO Next
45+
46+type BytesFilled = Int
47+
48+data Next = Next !BytesFilled (Maybe DynaNext)
49+
50+data Rspn = RspnNobody H.Status (TokenHeaderList, ValueTable)
51+ | RspnStreaming H.Status (TokenHeaderList, ValueTable) (TBQueue Sequence)
52+ | RspnBuilder H.Status (TokenHeaderList, ValueTable) Builder
53+ | RspnFile H.Status (TokenHeaderList, ValueTable) FilePath (Maybe FilePart)
54+
55+rspnStatus :: Rspn -> H.Status
56+rspnStatus (RspnNobody s _) = s
57+rspnStatus (RspnStreaming s _ _) = s
58+rspnStatus (RspnBuilder s _ _) = s
59+rspnStatus (RspnFile s _ _ _ ) = s
60+
61+rspnHeaders :: Rspn -> (TokenHeaderList, ValueTable)
62+rspnHeaders (RspnNobody _ t) = t
63+rspnHeaders (RspnStreaming _ t _) = t
64+rspnHeaders (RspnBuilder _ t _) = t
65+rspnHeaders (RspnFile _ t _ _ ) = t
66+
67+data Output = Output {
68+ outputStream :: !Stream
69+ , outputRspn :: !Rspn
70+ , outputII :: !InternalInfo
71+ , outputHook :: IO () -- OPush: wait for done, O*: telling done
72+ , outputH2Data :: IO (Maybe HTTP2Data)
73+ , outputType :: !OutputType
74+ }
75+
76+data OutputType = ORspn
77+ | OWait
78+ | OPush !TokenHeaderList !StreamId -- associated stream id from client
79+ | ONext !DynaNext
80+
81+outputMaybeTBQueue :: Output -> Maybe (TBQueue Sequence)
82+outputMaybeTBQueue (Output _ (RspnStreaming _ _ tbq) _ _ _ _) = Just tbq
83+outputMaybeTBQueue _ = Nothing
84+
85+data Control = CFinish
86+ | CGoaway !ByteString
87+ | CFrame !ByteString
88+ | CSettings !ByteString !SettingsList
89+ | CSettings0 !ByteString !ByteString !SettingsList
90+
91+----------------------------------------------------------------
92+
93+data Sequence = SFinish
94+ | SFlush
95+ | SBuilder Builder
96+
97+----------------------------------------------------------------
98+
99+-- | The context for HTTP/2 connection.
100+data Context = Context {
101+ -- HTTP/2 settings received from a browser
102+ http2settings :: !(IORef Settings)
103+ , firstSettings :: !(IORef Bool)
104+ , streamTable :: !StreamTable
105+ , concurrency :: !(IORef Int)
106+ , priorityTreeSize :: !(IORef Int)
107+ -- | RFC 7540 says "Other frames (from any stream) MUST NOT
108+ -- occur between the HEADERS frame and any CONTINUATION
109+ -- frames that might follow". This field is used to implement
110+ -- this requirement.
111+ , continued :: !(IORef (Maybe StreamId))
112+ , clientStreamId :: !(IORef StreamId)
113+ , serverStreamId :: !(IORef StreamId)
114+ , inputQ :: !(TQueue Input)
115+ , outputQ :: !(PriorityTree Output)
116+ , controlQ :: !(TQueue Control)
117+ , encodeDynamicTable :: !DynamicTable
118+ , decodeDynamicTable :: !DynamicTable
119+ -- the connection window for data from a server to a browser.
120+ , connectionWindow :: !(TVar WindowSize)
121+ }
122+
123+----------------------------------------------------------------
124+
125+newContext :: IO Context
126+newContext = Context <$> newIORef defaultSettings
127+ <*> newIORef False
128+ <*> newStreamTable
129+ <*> newIORef 0
130+ <*> newIORef 0
131+ <*> newIORef Nothing
132+ <*> newIORef 0
133+ <*> newIORef 0
134+ <*> newTQueueIO
135+ <*> newPriorityTree
136+ <*> newTQueueIO
137+ <*> newDynamicTableForEncoding defaultDynamicTableSize
138+ <*> newDynamicTableForDecoding defaultDynamicTableSize 4096
139+ <*> newTVarIO defaultInitialWindowSize
140+
141+clearContext :: Context -> IO ()
142+clearContext _ctx = return ()
143+
144+----------------------------------------------------------------
145+
146+data OpenState =
147+ JustOpened
148+ | Continued [HeaderBlockFragment]
149+ !Int -- Total size
150+ !Int -- The number of continuation frames
151+ !Bool -- End of stream
152+ !Priority
153+ | NoBody (TokenHeaderList,ValueTable) !Priority
154+ | HasBody (TokenHeaderList,ValueTable) !Priority
155+ | Body !(TQueue ByteString)
156+ !(Maybe Int) -- received Content-Length
157+ -- compared the body length for error checking
158+ !(IORef Int) -- actual body length
159+
160+data ClosedCode = Finished
161+ | Killed
162+ | Reset !ErrorCodeId
163+ | ResetByMe SomeException
164+ deriving Show
165+
166+data StreamState =
167+ Idle
168+ | Open !OpenState
169+ | HalfClosedRemote
170+ | HalfClosedLocal !ClosedCode
171+ | Closed !ClosedCode
172+ | Reserved
173+
174+isIdle :: StreamState -> Bool
175+isIdle Idle = True
176+isIdle _ = False
177+
178+isOpen :: StreamState -> Bool
179+isOpen Open{} = True
180+isOpen _ = False
181+
182+isHalfClosedRemote :: StreamState -> Bool
183+isHalfClosedRemote HalfClosedRemote = True
184+isHalfClosedRemote (Closed _) = True
185+isHalfClosedRemote _ = False
186+
187+isHalfClosedLocal :: StreamState -> Bool
188+isHalfClosedLocal (HalfClosedLocal _) = True
189+isHalfClosedLocal (Closed _) = True
190+isHalfClosedLocal _ = False
191+
192+isClosed :: StreamState -> Bool
193+isClosed Closed{} = True
194+isClosed _ = False
195+
196+instance Show StreamState where
197+ show Idle = "Idle"
198+ show Open{} = "Open"
199+ show HalfClosedRemote = "HalfClosedRemote"
200+ show (HalfClosedLocal e) = "HalfClosedLocal: " ++ show e
201+ show (Closed e) = "Closed: " ++ show e
202+ show Reserved = "Reserved"
203+
204+----------------------------------------------------------------
205+
206+data Stream = Stream {
207+ streamNumber :: !StreamId
208+ , streamState :: !(IORef StreamState)
209+ , streamWindow :: !(TVar WindowSize)
210+ , streamPrecedence :: !(IORef Precedence)
211+ }
212+
213+instance Show Stream where
214+ show s = show (streamNumber s)
215+
216+newStream :: StreamId -> WindowSize -> IO Stream
217+newStream sid win = Stream sid <$> newIORef Idle
218+ <*> newTVarIO win
219+ <*> newIORef defaultPrecedence
220+
221+newPushStream :: Context -> WindowSize -> Precedence -> IO Stream
222+newPushStream Context{serverStreamId} win pre = do
223+ sid <- atomicModifyIORef' serverStreamId inc2
224+ Stream sid <$> newIORef Reserved
225+ <*> newTVarIO win
226+ <*> newIORef pre
227+ where
228+ inc2 x = let !x' = x + 2 in (x', x')
229+
230+----------------------------------------------------------------
231+
232+{-# INLINE readStreamState #-}
233+readStreamState :: Stream -> IO StreamState
234+readStreamState Stream{streamState} =
235+ readIORef streamState
236+
237+{-# INLINE setStreamState #-}
238+setStreamState :: Context -> Stream -> StreamState -> IO ()
239+setStreamState _ Stream{streamState} val = writeIORef streamState val
240+
241+opened :: Context -> Stream -> IO ()
242+opened ctx@Context{concurrency} strm = do
243+ atomicModifyIORef' concurrency (\x -> (x+1,()))
244+ setStreamState ctx strm (Open JustOpened)
245+
246+halfClosedRemote :: Context -> Stream -> IO ()
247+halfClosedRemote ctx stream@Stream{streamState} = do
248+ !closingCode <- atomicModifyIORef streamState closeHalf
249+ case closingCode of
250+ Nothing -> return ()
251+ Just cc -> closed ctx stream cc
252+ where
253+ closeHalf :: StreamState -> (StreamState, Maybe ClosedCode)
254+ closeHalf x@(Closed _) = (x, Nothing)
255+ closeHalf (HalfClosedLocal cc) = (Closed cc, Just cc)
256+ closeHalf _ = (HalfClosedRemote, Nothing)
257+
258+halfClosedLocal :: Context -> Stream -> ClosedCode -> IO ()
259+halfClosedLocal ctx stream@Stream{streamState} cc = do
260+ shouldFinalize <- atomicModifyIORef streamState closeHalf
261+ when shouldFinalize $
262+ closed ctx stream cc
263+ where
264+ closeHalf :: StreamState -> (StreamState, Bool)
265+ closeHalf x@(Closed _) = (x, False)
266+ closeHalf HalfClosedRemote = (Closed cc, True)
267+ closeHalf _ = (HalfClosedLocal cc, False)
268+
269+closed :: Context -> Stream -> ClosedCode -> IO ()
270+closed ctx@Context{concurrency,streamTable} strm@Stream{streamNumber} cc = do
271+ remove streamTable streamNumber
272+ -- TODO: prevent double-counting
273+ atomicModifyIORef' concurrency (\x -> (x-1,()))
274+ setStreamState ctx strm (Closed cc) -- anyway
275+
276+----------------------------------------------------------------
277+
278+newtype StreamTable = StreamTable (IORef (IntMap Stream))
279+
280+newStreamTable :: IO StreamTable
281+newStreamTable = StreamTable <$> newIORef M.empty
282+
283+insert :: StreamTable -> M.Key -> Stream -> IO ()
284+insert (StreamTable ref) k v = atomicModifyIORef' ref $ \m ->
285+ let !m' = M.insert k v m
286+ in (m', ())
287+
288+remove :: StreamTable -> M.Key -> IO ()
289+remove (StreamTable ref) k = atomicModifyIORef' ref $ \m ->
290+ let !m' = M.delete k m
291+ in (m', ())
292+
293+search :: StreamTable -> M.Key -> IO (Maybe Stream)
294+search (StreamTable ref) k = M.lookup k <$> readIORef ref
295+
296+updateAllStreamWindow :: (WindowSize -> WindowSize) -> StreamTable -> IO ()
297+updateAllStreamWindow adst (StreamTable ref) = do
298+ strms <- M.elems <$> readIORef ref
299+ forM_ strms $ \strm -> atomically $ modifyTVar (streamWindow strm) adst
300+
301+{-# INLINE forkAndEnqueueWhenReady #-}
302+forkAndEnqueueWhenReady :: IO () -> PriorityTree Output -> Output -> Manager -> IO ()
303+forkAndEnqueueWhenReady wait outQ out mgr = bracket setup teardown $ \_ ->
304+ void . forkIO $ do
305+ wait
306+ enqueueOutput outQ out
307+ where
308+ setup = addMyId mgr
309+ teardown _ = deleteMyId mgr
310+
311+{-# INLINE enqueueOutput #-}
312+enqueueOutput :: PriorityTree Output -> Output -> IO ()
313+enqueueOutput outQ out = do
314+ let Stream{..} = outputStream out
315+ pre <- readIORef streamPrecedence
316+ enqueue outQ streamNumber pre out
317+
318+{-# INLINE enqueueControl #-}
319+enqueueControl :: TQueue Control -> Control -> IO ()
320+enqueueControl ctlQ ctl = atomically $ writeTQueue ctlQ ctl
321+
322+----------------------------------------------------------------
323+
27-- | HTTP/2 specific data.
324-- | HTTP/2 specific data.
28--
325--
29-- Since: 3.2.7
326-- Since: 3.2.7
@@ -32,21 +329,17 @@ data HTTP2Data = HTTP2Data {
32 --
329 --
33 -- Since: 3.2.7
330 -- Since: 3.2.7
34 http2dataPushPromise :: [PushPromise]
331 http2dataPushPromise :: [PushPromise]
35− -- | Accessor for 'H2.TrailersMaker' in 'HTTP2Data'.
36− --
37− -- Since: 3.2.8 but the type changed in 3.3.0
332+ -- Since: 3.2.8
38− , http2dataTrailers :: H2.TrailersMaker
333+ , http2dataTrailers :: H.ResponseHeaders
39− }
334+ } deriving (Eq,Show)
40
335
41-- | Default HTTP/2 specific data.
336-- | Default HTTP/2 specific data.
42--
337--
43-- Since: 3.2.7
338-- Since: 3.2.7
44defaultHTTP2Data :: HTTP2Data
339defaultHTTP2Data :: HTTP2Data
45−defaultHTTP2Data = HTTP2Data [] H2.defaultTrailersMaker
340+defaultHTTP2Data = HTTP2Data [] []
46
341
47-- | HTTP/2 push promise or sever push.
342-- | HTTP/2 push promise or sever push.
48−-- This allows files only for backward-compatibility
49−-- while the HTTP/2 library supports other types.
50--
343--
51-- Since: 3.2.7
344-- Since: 3.2.7
52data PushPromise = PushPromise {
345data PushPromise = PushPromise {
warp/Network/Wai/Handler/Warp/HTTP2/Worker.hsnew file+331
@@ -0,0 +1,331 @@
1+{-# LANGUAGE NamedFieldPuns #-}
2+{-# LANGUAGE PatternGuards #-}
3+{-# LANGUAGE CPP #-}
4+{-# LANGUAGE ScopedTypeVariables #-}
5+{-# LANGUAGE OverloadedStrings #-}
6+{-# LANGUAGE BangPatterns #-}
7+
8+module Network.Wai.Handler.Warp.HTTP2.Worker (
9+ Responder
10+ , response
11+ , worker
12+ ) where
13+
14+import Control.Concurrent.STM
15+import Control.Exception (SomeException(..), AsyncException(..))
16+import qualified Control.Exception as E
17+import Data.ByteString.Builder (byteString)
18+import Data.IORef
19+import qualified Data.Vault.Lazy as Vault
20+import Network.HPACK
21+import Network.HPACK.Token
22+import qualified Network.HTTP.Types as H
23+import Network.HTTP2
24+import Network.HTTP2.Priority
25+import Network.Wai
26+import Network.Wai.Internal (Response(..), ResponseReceived(..), ResponseReceived(..), getRequestBodyChunk)
27+import qualified System.TimeManager as T
28+
29+import Network.Wai.Handler.Warp.FileInfoCache
30+import Network.Wai.Handler.Warp.HTTP2.EncodeFrame
31+import Network.Wai.Handler.Warp.HTTP2.File
32+import Network.Wai.Handler.Warp.HTTP2.Manager
33+import Network.Wai.Handler.Warp.HTTP2.Request
34+import Network.Wai.Handler.Warp.HTTP2.Types
35+import Network.Wai.Handler.Warp.Imports hiding (insert)
36+import Network.Wai.Handler.Warp.Request (pauseTimeoutKey)
37+import qualified Network.Wai.Handler.Warp.Response as R
38+import qualified Network.Wai.Handler.Warp.Settings as S
39+import Network.Wai.Handler.Warp.Types
40+
41+----------------------------------------------------------------
42+
43+-- | The wai definition is 'type Application = Request -> (Response -> IO ResponseReceived) -> IO ResponseReceived'.
44+-- This type implements the second argument (Response -> IO ResponseReceived)
45+-- with extra arguments.
46+type Responder = InternalInfo
47+ -> T.Handle
48+ -> ValueTable -- for Request
49+ -> ThreadContinue
50+ -> Stream
51+ -> Request
52+ -> Response
53+ -> IO ResponseReceived
54+
55+pushStream :: Context -> S.Settings
56+ -> StreamId -> ValueTable -> Request -> InternalInfo
57+ -> Maybe HTTP2Data
58+ -> IO (OutputType, IO ())
59+pushStream _ _ _ _ _ _ Nothing = return (ORspn, return ())
60+pushStream ctx@Context{http2settings,outputQ,streamTable}
61+ settings pid reqvt req ii (Just h2d)
62+ | len == 0 = return (ORspn, return ())
63+ | otherwise = do
64+ pushable <- enablePush <$> readIORef http2settings
65+ if pushable then do
66+ tvar <- newTVarIO 0
67+ lim <- push tvar pps0 0
68+ if lim == 0 then
69+ return (ORspn, return ())
70+ else
71+ return (OWait, waiter lim tvar)
72+ else
73+ return (ORspn, return ())
74+ where
75+ !pps0 = http2dataPushPromise h2d
76+ !len = length pps0
77+ !pushLogger = S.settingsServerPushLogger settings
78+ increment tvar = atomically $ modifyTVar' tvar (+1)
79+ waiter lim tvar = atomically $ do
80+ n <- readTVar tvar
81+ check (n >= lim)
82+ !h2data = getHTTP2Data req
83+ push _ [] !n = return (n :: Int)
84+ push tvar (pp:pps) !n = do
85+ let !file = promisedFile pp
86+ efinfo <- E.try $ getFileInfo ii file
87+ case efinfo of
88+ Left (_ex :: E.IOException) -> push tvar pps n
89+ Right (FileInfo _ size _ date) -> do
90+ ws <- initialWindowSize <$> readIORef http2settings
91+ let !w = promisedWeight pp
92+ !pri = defaultPriority { weight = w }
93+ !pre = toPrecedence pri
94+ strm <- newPushStream ctx ws pre
95+ let !sid = streamNumber strm
96+ insert streamTable sid strm
97+ (ths0, vt) <- toHeaderTable (promisedResponseHeaders pp)
98+ let !scheme = fromJust $ getHeaderValue tokenScheme reqvt
99+ -- fixme: this value can be Nothing
100+ !auth = fromJust (getHeaderValue tokenHost reqvt
101+ <|> getHeaderValue tokenAuthority reqvt)
102+ !path = promisedPath pp
103+ !promisedRequest = [(tokenMethod, H.methodGet)
104+ ,(tokenScheme, scheme)
105+ ,(tokenAuthority, auth)
106+ ,(tokenPath, path)]
107+ !part = FilePart 0 size size
108+ !rsp = RspnFile H.ok200 (ths,vt) file (Just part)
109+ !ths = (tokenLastModified,date) :
110+ addContentHeadersForFilePart ths0 part
111+ pushLogger req path size
112+ let !ot = OPush promisedRequest pid
113+ !out = Output strm rsp ii (increment tvar) h2data ot
114+ enqueueOutput outputQ out
115+ push tvar pps (n + 1)
116+
117+
118+-- | This function is passed to workers.
119+-- They also pass 'Response's from 'Application's to this function.
120+-- This function enqueues commands for the HTTP/2 sender.
121+response :: S.Settings -> Context -> Manager -> Responder
122+response settings ctx@Context{outputQ} mgr ii th reqvt tconf strm req rsp = E.handle (E.throwIO . ExceptionInsideResponseBody) $ case rsp of
123+ ResponseStream s0 hs0 strmbdy
124+ | noBody s0 -> responseNoBody s0 hs0
125+ | isHead -> responseNoBody s0 hs0
126+ | otherwise -> getHTTP2Data req
127+ >>= pushStream ctx settings sid reqvt req ii
128+ >>= responseStreaming s0 hs0 strmbdy
129+ ResponseBuilder s0 hs0 b
130+ | noBody s0 -> responseNoBody s0 hs0
131+ | isHead -> responseNoBody s0 hs0
132+ | otherwise -> getHTTP2Data req
133+ >>= pushStream ctx settings sid reqvt req ii
134+ >>= responseBuilderBody s0 hs0 b
135+ ResponseFile s0 hs0 p mp
136+ | noBody s0 -> responseNoBody s0 hs0
137+ | otherwise -> getHTTP2Data req
138+ >>= pushStream ctx settings sid reqvt req ii
139+ >>= responseFileXXX s0 hs0 p mp
140+ ResponseRaw _ _ -> error "HTTP/2 does not support ResponseRaw"
141+ where
142+ noBody = not . R.hasBody
143+ !isHead = requestMethod req == H.methodHead
144+ !logger = S.settingsLogger settings
145+ sid = streamNumber strm
146+ !h2data = getHTTP2Data req
147+
148+ -- Ideally, log messages should be written when responses are
149+ -- actually sent. But there is no way to keep good memory usage
150+ -- (resist to Request leak) and throughput. By compromise,
151+ -- log message are written here even the window size of streams
152+ -- is 0.
153+
154+ responseNoBody s hs0 = toHeaderTable hs0 >>= responseNoBody' s
155+
156+ responseNoBody' s tbl = do
157+ logger req s Nothing
158+ setThreadContinue tconf True
159+ let !rspn = RspnNobody s tbl
160+ !out = Output strm rspn ii (return ()) h2data ORspn
161+ enqueueOutput outputQ out
162+ return ResponseReceived
163+
164+ responseBuilderBody s hs0 bdy (rspnOrWait,tell) = do
165+ logger req s Nothing
166+ setThreadContinue tconf True
167+ tbl <- toHeaderTable hs0
168+ let !rspn = RspnBuilder s tbl bdy
169+ !out = Output strm rspn ii tell h2data rspnOrWait
170+ enqueueOutput outputQ out
171+ return ResponseReceived
172+
173+ responseFileXXX _ hs0 path Nothing aux = do
174+ efinfo <- E.try $ getFileInfo ii path
175+ case efinfo of
176+ Left (_ex :: E.IOException) -> response404 hs0
177+ Right finfo -> do
178+ (rspths0,vt) <- toHeaderTable hs0
179+ case conditionalRequest finfo rspths0 reqvt of
180+ WithoutBody s -> responseNoBody s hs0
181+ WithBody s rspths beg len -> responseFile2XX s (rspths,vt) path (Just (FilePart beg len (fileInfoSize finfo))) aux
182+
183+ responseFileXXX s0 hs0 path mpart aux = do
184+ tbl <- toHeaderTable hs0
185+ responseFile2XX s0 tbl path mpart aux
186+
187+ responseFile2XX s tbl path mpart (rspnOrWait,tell)
188+ | isHead = do
189+ logger req s Nothing
190+ responseNoBody' s tbl
191+ | otherwise = do
192+ logger req s (filePartByteCount <$> mpart)
193+ setThreadContinue tconf True
194+ let !rspn = RspnFile s tbl path mpart
195+ !out = Output strm rspn ii tell h2data rspnOrWait
196+ enqueueOutput outputQ out
197+ return ResponseReceived
198+
199+ response404 hs0 = responseBuilderBody s hs body (ORspn, return ())
200+ where
201+ s = H.notFound404
202+ hs = R.replaceHeader H.hContentType "text/plain; charset=utf-8" hs0
203+ body = byteString "File not found"
204+
205+ responseStreaming s0 hs0 strmbdy (rspnOrWait,tell) = do
206+ logger req s0 Nothing
207+ -- We must not exit this WAI application.
208+ -- If the application exits, streaming would be also closed.
209+ -- So, this work occupies this thread.
210+ --
211+ -- We need to increase the number of workers.
212+ spawnAction mgr
213+ -- After this work, this thread stops to decease
214+ -- the number of workers.
215+ setThreadContinue tconf False
216+ -- Since 'StreamingBody' is loop, we cannot control it.
217+ -- So, let's serialize 'Builder' with a designated queue.
218+ tbq <- newTBQueueIO 10 -- fixme: hard coding: 10
219+ tbl <- toHeaderTable hs0
220+ let !rspn = RspnStreaming s0 tbl tbq
221+ !out = Output strm rspn ii tell h2data rspnOrWait
222+ enqueueOutput outputQ out
223+ let push b = do
224+ T.pause th
225+ atomically $ writeTBQueue tbq (SBuilder b)
226+ T.resume th
227+ flush = atomically $ writeTBQueue tbq SFlush
228+ _ <- strmbdy push flush
229+ atomically $ writeTBQueue tbq SFinish
230+ deleteMyId mgr
231+ return ResponseReceived
232+
233+worker :: Context -> S.Settings -> Application -> Responder -> T.Manager -> IO ()
234+worker ctx@Context{inputQ,controlQ} set app responder tm = do
235+ sinfo <- newStreamInfo
236+ tcont <- newThreadContinue
237+ let timeoutAction = return () -- cannot close the shared connection
238+ E.bracket (T.registerKillThread tm timeoutAction) T.cancel $ go sinfo tcont
239+ where
240+ go sinfo tcont th = do
241+ setThreadContinue tcont True
242+ ex <- E.try $ do
243+ T.pause th
244+ inp@(Input strm req reqvt ii) <- atomically $ readTQueue inputQ
245+ setStreamInfo sinfo inp
246+ T.resume th
247+ T.tickle th
248+ let !body = getRequestBodyChunk req
249+ !body' = do
250+ T.pause th
251+ bs <- body
252+ T.resume th
253+ return bs
254+ !vaultValue = Vault.insert pauseTimeoutKey (T.pause th) $ vault req
255+ !req' = req { vault = vaultValue, requestBody = body' }
256+ mr <- E.try $ app req' $ responder ii th reqvt tcont strm req'
257+ case mr of
258+ Right ok -> return ok
259+ Left e@(SomeException _)
260+ | Just (ExceptionInsideResponseBody e') <- E.fromException e -> E.throwIO e'
261+ | otherwise -> responder ii th reqvt tcont strm req' (S.settingsOnExceptionResponse set e)
262+ cont1 <- case ex of
263+ Right ResponseReceived -> return True
264+ Left e@(SomeException _)
265+ -- killed by the local worker manager
266+ | Just ThreadKilled <- E.fromException e -> return False
267+ -- killed by the local timeout manager
268+ | Just T.TimeoutThread <- E.fromException e -> do
269+ cleanup sinfo Nothing
270+ return True
271+ | otherwise -> do
272+ cleanup sinfo $ Just e
273+ return True
274+ cont2 <- getThreadContinue tcont
275+ clearStreamInfo sinfo
276+ when (cont1 && cont2) $ go sinfo tcont th
277+ cleanup sinfo me = do
278+ minp <- getStreamInfo sinfo
279+ case minp of
280+ Nothing -> return ()
281+ Just (Input strm req _reqvt _ii) -> do
282+ closed ctx strm Killed
283+ let !frame = resetFrame InternalError (streamNumber strm)
284+ enqueueControl controlQ $ CFrame frame
285+ case me of
286+ Nothing -> return ()
287+ Just e -> S.settingsOnException set (Just req) e
288+
289+----------------------------------------------------------------
290+
291+-- | It would nice if responders could return values to workers.
292+-- Unfortunately, 'ResponseReceived' is already defined in WAI 2.0.
293+-- It is not wise to change this type.
294+-- So, a reference is shared by a responder and its worker.
295+-- The reference refers a value of this type as a return value.
296+-- If 'True', the worker continue to serve requests.
297+-- Otherwise, the worker get finished.
298+newtype ThreadContinue = ThreadContinue (IORef Bool)
299+
300+{-# INLINE newThreadContinue #-}
301+newThreadContinue :: IO ThreadContinue
302+newThreadContinue = ThreadContinue <$> newIORef True
303+
304+{-# INLINE setThreadContinue #-}
305+setThreadContinue :: ThreadContinue -> Bool -> IO ()
306+setThreadContinue (ThreadContinue ref) x = writeIORef ref x
307+
308+{-# INLINE getThreadContinue #-}
309+getThreadContinue :: ThreadContinue -> IO Bool
310+getThreadContinue (ThreadContinue ref) = readIORef ref
311+
312+----------------------------------------------------------------
313+
314+-- | The type to store enough information for 'settingsOnException'.
315+newtype StreamInfo = StreamInfo (IORef (Maybe Input))
316+
317+{-# INLINE newStreamInfo #-}
318+newStreamInfo :: IO StreamInfo
319+newStreamInfo = StreamInfo <$> newIORef Nothing
320+
321+{-# INLINE clearStreamInfo #-}
322+clearStreamInfo :: StreamInfo -> IO ()
323+clearStreamInfo (StreamInfo ref) = writeIORef ref Nothing
324+
325+{-# INLINE setStreamInfo #-}
326+setStreamInfo :: StreamInfo -> Input -> IO ()
327+setStreamInfo (StreamInfo ref) inp = writeIORef ref $ Just inp
328+
329+{-# INLINE getStreamInfo #-}
330+getStreamInfo :: StreamInfo -> IO (Maybe Input)
331+getStreamInfo (StreamInfo ref) = readIORef ref
warp/Network/Wai/Handler/Warp/Header.hs−2
@@ -69,7 +69,6 @@ indexResponseHeader hdr = traverseHeader hdr responseMaxIndex responseKeyIndex
69data ResponseHeaderIndex = ResContentLength
69data ResponseHeaderIndex = ResContentLength
70 | ResServer
70 | ResServer
71 | ResDate
71 | ResDate
72− | ResLastModified
73 deriving (Enum,Bounded)
72 deriving (Enum,Bounded)
74
73
75-- | The size for 'IndexedHeader' for HTTP Response.
74-- | The size for 'IndexedHeader' for HTTP Response.
@@ -80,7 +79,6 @@ responseKeyIndex :: HeaderName -> Int
80responseKeyIndex hn = case BS.length bs of
79responseKeyIndex hn = case BS.length bs of
81 4 -> if bs == "date" then fromEnum ResDate else -1
80 4 -> if bs == "date" then fromEnum ResDate else -1
82 6 -> if bs == "server" then fromEnum ResServer else -1
81 6 -> if bs == "server" then fromEnum ResServer else -1
83− 13 -> if bs == "last-modified" then fromEnum ResLastModified else -1
84 14 -> if bs == "content-length" then fromEnum ResContentLength else -1
82 14 -> if bs == "content-length" then fromEnum ResContentLength else -1
85 _ -> -1
83 _ -> -1
86 where
84 where
warp/Network/Wai/Handler/Warp/Recv.hs+4−25
@@ -17,14 +17,7 @@ import Foreign.C.Types
17import Foreign.ForeignPtr (withForeignPtr)
17import Foreign.ForeignPtr (withForeignPtr)
18import Foreign.Ptr (Ptr, castPtr, plusPtr)
18import Foreign.Ptr (Ptr, castPtr, plusPtr)
19import GHC.Conc (threadWaitRead)
19import GHC.Conc (threadWaitRead)
20−import qualified GHC.IO.Exception as E
21−import Network.Socket (Socket)
20+import Network.Socket (Socket, fdSocket)
22−import qualified System.IO.Error as E
23−#if MIN_VERSION_network(3,1,0)
24−import Network.Socket (withFdSocket)
25−#else
26−import Network.Socket (fdSocket)
27−#endif
28import System.Posix.Types (Fd(..))
21import System.Posix.Types (Fd(..))
29
22
30import Network.Wai.Handler.Warp.Buffer
23import Network.Wai.Handler.Warp.Buffer
@@ -96,31 +89,19 @@ spell init0 siz0 recv recvBuf
96 siz' = siz - len
89 siz' = siz - len
97 loop bss' siz'
90 loop bss' siz'
98
91
99−-- The timeout manager may close the socket.
100−-- In that case, an error of "Bad file descriptor" occurs.
101−-- We ignores it because we expect TimeoutThread.
102receive :: Socket -> BufferPool -> Recv
92receive :: Socket -> BufferPool -> Recv
103−receive sock pool = E.handle handler $ withBufferPool pool $ \ (ptr, size) -> do
93+receive sock pool = withBufferPool pool $ \ (ptr, size) -> do
104−#if MIN_VERSION_network(3,1,0)
94+#if MIN_VERSION_network(3,0,0)
105− withFdSocket sock $ \fd -> do
106−#elif MIN_VERSION_network(3,0,0)
107 fd <- fdSocket sock
95 fd <- fdSocket sock
108#else
96#else
109 let fd = fdSocket sock
97 let fd = fdSocket sock
110#endif
98#endif
111 let size' = fromIntegral size
99 let size' = fromIntegral size
112 fromIntegral <$> receiveloop fd ptr size'
100 fromIntegral <$> receiveloop fd ptr size'
113− where
114− handler :: E.IOException -> IO ByteString
115− handler e
116− | E.ioeGetErrorType e == E.InvalidArgument = return ""
117− | otherwise = E.throwIO e
118
101
119receiveBuf :: Socket -> RecvBuf
102receiveBuf :: Socket -> RecvBuf
120receiveBuf sock buf0 siz0 = do
103receiveBuf sock buf0 siz0 = do
121−#if MIN_VERSION_network(3,1,0)
104+#if MIN_VERSION_network(3,0,0)
122− withFdSocket sock $ \fd -> do
123−#elif MIN_VERSION_network(3,0,0)
124 fd <- fdSocket sock
105 fd <- fdSocket sock
125#else
106#else
126 let fd = fdSocket sock
107 let fd = fdSocket sock
@@ -153,8 +134,6 @@ receiveloop sock ptr size = do
153 else
134 else
154 return bytes
135 return bytes
155
136
156−#ifndef mingw32_HOST_OS
157-- fixme: the type of the return value
137-- fixme: the type of the return value
158foreign import ccall unsafe "recv"
138foreign import ccall unsafe "recv"
159 c_recv :: CInt -> Ptr CChar -> CSize -> CInt -> IO CInt
139 c_recv :: CInt -> Ptr CChar -> CSize -> CInt -> IO CInt
160−#endif
warp/Network/Wai/Handler/Warp/Request.hs+19−21
@@ -9,7 +9,6 @@ module Network.Wai.Handler.Warp.Request (
9 , headerLines
9 , headerLines
10 , pauseTimeoutKey
10 , pauseTimeoutKey
11 , getFileInfoKey
11 , getFileInfoKey
12− , getClientCertificateKey
13 , NoKeepAliveRequest (..)
12 , NoKeepAliveRequest (..)
14 ) where
13 ) where
15
14
@@ -22,7 +21,6 @@ import qualified Data.CaseInsensitive as CI
22import qualified Data.IORef as I
21import qualified Data.IORef as I
23import Data.Typeable (Typeable)
22import Data.Typeable (Typeable)
24import qualified Data.Vault.Lazy as Vault
23import qualified Data.Vault.Lazy as Vault
25−import Data.X509
26import qualified Network.HTTP.Types as H
24import qualified Network.HTTP.Types as H
27import Network.Socket (SockAddr)
25import Network.Socket (SockAddr)
28import Network.Wai
26import Network.Wai
@@ -38,7 +36,13 @@ import Network.Wai.Handler.Warp.Header
38import Network.Wai.Handler.Warp.Imports hiding (readInt, lines)
36import Network.Wai.Handler.Warp.Imports hiding (readInt, lines)
39import Network.Wai.Handler.Warp.ReadInt
37import Network.Wai.Handler.Warp.ReadInt
40import Network.Wai.Handler.Warp.RequestHeader
38import Network.Wai.Handler.Warp.RequestHeader
41−import Network.Wai.Handler.Warp.Settings (Settings, settingsNoParsePath, settingsMaxTotalHeaderLength)
39+import Network.Wai.Handler.Warp.Settings (Settings, settingsNoParsePath)
40+
41+----------------------------------------------------------------
42+
43+-- FIXME come up with good values here
44+maxTotalHeaderLength :: Int
45+maxTotalHeaderLength = 50 * 1024
42
46
43----------------------------------------------------------------
47----------------------------------------------------------------
44
48
@@ -51,7 +55,6 @@ recvRequest :: Bool -- ^ first request on this connection?
51 -> Timeout.Handle
55 -> Timeout.Handle
52 -> SockAddr -- ^ Peer's address.
56 -> SockAddr -- ^ Peer's address.
53 -> Source -- ^ Where HTTP request comes from.
57 -> Source -- ^ Where HTTP request comes from.
54− -> Transport
55 -> IO (Request
58 -> IO (Request
56 ,Maybe (I.IORef Int)
59 ,Maybe (I.IORef Int)
57 ,IndexedHeader
60 ,IndexedHeader
@@ -61,8 +64,8 @@ recvRequest :: Bool -- ^ first request on this connection?
61 -- 'IndexedHeader' of HTTP request for internal use,
64 -- 'IndexedHeader' of HTTP request for internal use,
62 -- Body producing action used for flushing the request body
65 -- Body producing action used for flushing the request body
63
66
64−recvRequest firstRequest settings conn ii th addr src transport = do
67+recvRequest firstRequest settings conn ii th addr src = do
65− hdrlines <- headerLines (settingsMaxTotalHeaderLength settings) firstRequest src
68+ hdrlines <- headerLines firstRequest src
66 (method, unparsedPath, path, query, httpversion, hdr) <- parseHeaderLines hdrlines
69 (method, unparsedPath, path, query, httpversion, hdr) <- parseHeaderLines hdrlines
67 let idxhdr = indexRequestHeader hdr
70 let idxhdr = indexRequestHeader hdr
68 expect = idxhdr ! fromEnum ReqExpect
71 expect = idxhdr ! fromEnum ReqExpect
@@ -72,7 +75,6 @@ recvRequest firstRequest settings conn ii th addr src transport = do
72 rawPath = if settingsNoParsePath settings then unparsedPath else path
75 rawPath = if settingsNoParsePath settings then unparsedPath else path
73 vaultValue = Vault.insert pauseTimeoutKey (Timeout.pause th)
76 vaultValue = Vault.insert pauseTimeoutKey (Timeout.pause th)
74 $ Vault.insert getFileInfoKey (getFileInfo ii)
77 $ Vault.insert getFileInfoKey (getFileInfo ii)
75− $ Vault.insert getClientCertificateKey (tlsClientCertificate transport)
76 Vault.empty
78 Vault.empty
77 (rbody, remainingRef, bodyLength) <- bodyAndSource src cl te
79 (rbody, remainingRef, bodyLength) <- bodyAndSource src cl te
78 -- body producing function which will produce '100-continue', if needed
80 -- body producing function which will produce '100-continue', if needed
@@ -87,7 +89,7 @@ recvRequest firstRequest settings conn ii th addr src transport = do
87 , rawQueryString = query
89 , rawQueryString = query
88 , queryString = H.parseQuery query
90 , queryString = H.parseQuery query
89 , requestHeaders = hdr
91 , requestHeaders = hdr
90− , isSecure = isTransportSecure transport
92+ , isSecure = False
91 , remoteHost = addr
93 , remoteHost = addr
92 , requestBody = rbody'
94 , requestBody = rbody'
93 , vault = vaultValue
95 , vault = vaultValue
@@ -101,8 +103,8 @@ recvRequest firstRequest settings conn ii th addr src transport = do
101
103
102----------------------------------------------------------------
104----------------------------------------------------------------
103
105
104−headerLines :: Int -> Bool -> Source -> IO [ByteString]
106+headerLines :: Bool -> Source -> IO [ByteString]
105−headerLines maxTotalHeaderLength firstRequest src = do
107+headerLines firstRequest src = do
106 bs <- readSource src
108 bs <- readSource src
107 if S.null bs
109 if S.null bs
108 -- When we're working on a keep-alive connection and trying to
110 -- When we're working on a keep-alive connection and trying to
@@ -110,7 +112,7 @@ headerLines maxTotalHeaderLength firstRequest src = do
110 -- lack of data as a real exception. See the http1 function in
112 -- lack of data as a real exception. See the http1 function in
111 -- the Run module for more details.
113 -- the Run module for more details.
112 then if firstRequest then throwIO ConnectionClosedByPeer else throwIO NoKeepAliveRequest
114 then if firstRequest then throwIO ConnectionClosedByPeer else throwIO NoKeepAliveRequest
113− else push maxTotalHeaderLength src (THStatus 0 id id) bs
115+ else push src (THStatus 0 id id) bs
114
116
115data NoKeepAliveRequest = NoKeepAliveRequest
117data NoKeepAliveRequest = NoKeepAliveRequest
116 deriving (Show, Typeable)
118 deriving (Show, Typeable)
@@ -220,8 +222,8 @@ close :: Sink ByteString IO a
220close = throwIO IncompleteHeaders
222close = throwIO IncompleteHeaders
221-}
223-}
222
224
223−push :: Int -> Source -> THStatus -> ByteString -> IO [ByteString]
225+push :: Source -> THStatus -> ByteString -> IO [ByteString]
224−push maxTotalHeaderLength src (THStatus len lines prepend) bs'
226+push src (THStatus len lines prepend) bs'
225 -- Too many bytes
227 -- Too many bytes
226 | len > maxTotalHeaderLength = throwIO OverLargeHeader
228 | len > maxTotalHeaderLength = throwIO OverLargeHeader
227 | otherwise = push' mnl
229 | otherwise = push' mnl
@@ -249,13 +251,13 @@ push maxTotalHeaderLength src (THStatus len lines prepend) bs'
249 push' Nothing = do
251 push' Nothing = do
250 bst <- readSource' src
252 bst <- readSource' src
251 when (S.null bst) $ throwIO IncompleteHeaders
253 when (S.null bst) $ throwIO IncompleteHeaders
252− push maxTotalHeaderLength src status bst
254+ push src status bst
253 where
255 where
254 len' = len + bsLen
256 len' = len + bsLen
255 prepend' = S.append bs
257 prepend' = S.append bs
256 status = THStatus len' lines prepend'
258 status = THStatus len' lines prepend'
257 -- Found a newline, but next line continues as a multiline header
259 -- Found a newline, but next line continues as a multiline header
258− push' (Just (end, True)) = push maxTotalHeaderLength src status rest
260+ push' (Just (end, True)) = push src status rest
259 where
261 where
260 rest = S.drop (end + 1) bs
262 rest = S.drop (end + 1) bs
261 prepend' = S.append (SU.unsafeTake (checkCR bs end) bs)
263 prepend' = S.append (SU.unsafeTake (checkCR bs end) bs)
@@ -274,12 +276,12 @@ push maxTotalHeaderLength src (THStatus len lines prepend) bs'
274 in if start < bsLen then
276 in if start < bsLen then
275 -- more bytes in this chunk, push again
277 -- more bytes in this chunk, push again
276 let bs'' = SU.unsafeDrop start bs
278 let bs'' = SU.unsafeDrop start bs
277− in push maxTotalHeaderLength src status bs''
279+ in push src status bs''
278 else do
280 else do
279 -- no more bytes in this chunk, ask for more
281 -- no more bytes in this chunk, ask for more
280 bst <- readSource' src
282 bst <- readSource' src
281 when (S.null bs) $ throwIO IncompleteHeaders
283 when (S.null bs) $ throwIO IncompleteHeaders
282− push maxTotalHeaderLength src status bst
284+ push src status bst
283 where
285 where
284 start = end + 1 -- start of next chunk
286 start = end + 1 -- start of next chunk
285 line = SU.unsafeTake (checkCR bs end) bs
287 line = SU.unsafeTake (checkCR bs end) bs
@@ -297,7 +299,3 @@ pauseTimeoutKey = unsafePerformIO Vault.newKey
297getFileInfoKey :: Vault.Key (FilePath -> IO FileInfo)
299getFileInfoKey :: Vault.Key (FilePath -> IO FileInfo)
298getFileInfoKey = unsafePerformIO Vault.newKey
300getFileInfoKey = unsafePerformIO Vault.newKey
299{-# NOINLINE getFileInfoKey #-}
301{-# NOINLINE getFileInfoKey #-}
300−
301−getClientCertificateKey :: Vault.Key (Maybe CertificateChain)
302−getClientCertificateKey = unsafePerformIO Vault.newKey
303−{-# NOINLINE getClientCertificateKey #-}
warp/Network/Wai/Handler/Warp/Response.hs+16−19
@@ -116,14 +116,14 @@ sendResponse settings conn ii th req reqidxhdr src response = do
116 -- and status, the response to HEAD is processed here.
116 -- and status, the response to HEAD is processed here.
117 --
117 --
118 -- See definition of rsp below for proper body stripping.
118 -- See definition of rsp below for proper body stripping.
119− (ms, mlen) <- sendRsp conn ii ver s hs rspidxhdr rsp
119+ (ms, mlen) <- sendRsp conn ii ver s hs rsp
120 case ms of
120 case ms of
121 Nothing -> return ()
121 Nothing -> return ()
122 Just realStatus -> logger req realStatus mlen
122 Just realStatus -> logger req realStatus mlen
123 T.tickle th
123 T.tickle th
124 return ret
124 return ret
125 else do
125 else do
126− _ <- sendRsp conn ii ver s hs rspidxhdr RspNoBody
126+ _ <- sendRsp conn ii ver s hs RspNoBody
127 logger req s Nothing
127 logger req s Nothing
128 T.tickle th
128 T.tickle th
129 return isPersist
129 return isPersist
@@ -196,13 +196,12 @@ sendRsp :: Connection
196 -> H.HttpVersion
196 -> H.HttpVersion
197 -> H.Status
197 -> H.Status
198 -> H.ResponseHeaders
198 -> H.ResponseHeaders
199− -> IndexedHeader -- Response
200 -> Rsp
199 -> Rsp
201 -> IO (Maybe H.Status, Maybe Integer)
200 -> IO (Maybe H.Status, Maybe Integer)
202
201
203----------------------------------------------------------------
202----------------------------------------------------------------
204
203
205−sendRsp conn _ ver s hs _ RspNoBody = do
204+sendRsp conn _ ver s hs RspNoBody = do
206 -- Not adding Content-Length.
205 -- Not adding Content-Length.
207 -- User agents treats it as Content-Length: 0.
206 -- User agents treats it as Content-Length: 0.
208 composeHeader ver s hs >>= connSendAll conn
207 composeHeader ver s hs >>= connSendAll conn
@@ -210,7 +209,7 @@ sendRsp conn _ ver s hs _ RspNoBody = do
210
209
211----------------------------------------------------------------
210----------------------------------------------------------------
212
211
213−sendRsp conn _ ver s hs _ (RspBuilder body needsChunked) = do
212+sendRsp conn _ ver s hs (RspBuilder body needsChunked) = do
214 header <- composeHeaderBuilder ver s hs needsChunked
213 header <- composeHeaderBuilder ver s hs needsChunked
215 let hdrBdy
214 let hdrBdy
216 | needsChunked = header <> chunkedTransferEncoding body
215 | needsChunked = header <> chunkedTransferEncoding body
@@ -223,7 +222,7 @@ sendRsp conn _ ver s hs _ (RspBuilder body needsChunked) = do
223
222
224----------------------------------------------------------------
223----------------------------------------------------------------
225
224
226−sendRsp conn _ ver s hs _ (RspStream streamingBody needsChunked th) = do
225+sendRsp conn _ ver s hs (RspStream streamingBody needsChunked th) = do
227 header <- composeHeaderBuilder ver s hs needsChunked
226 header <- composeHeaderBuilder ver s hs needsChunked
228 (recv, finish) <- newByteStringBuilderRecv $ reuseBufferStrategy
227 (recv, finish) <- newByteStringBuilderRecv $ reuseBufferStrategy
229 $ toBuilderBuffer (connWriteBuffer conn) (connBufferSize conn)
228 $ toBuilderBuffer (connWriteBuffer conn) (connBufferSize conn)
@@ -247,7 +246,7 @@ sendRsp conn _ ver s hs _ (RspStream streamingBody needsChunked th) = do
247
246
248----------------------------------------------------------------
247----------------------------------------------------------------
249
248
250−sendRsp conn _ _ _ _ _ (RspRaw withApp src tickle) = do
249+sendRsp conn _ _ _ _ (RspRaw withApp src tickle) = do
251 withApp recv send
250 withApp recv send
252 return (Nothing, Nothing)
251 return (Nothing, Nothing)
253 where
252 where
@@ -261,8 +260,8 @@ sendRsp conn _ _ _ _ _ (RspRaw withApp src tickle) = do
261
260
262-- Sophisticated WAI applications.
261-- Sophisticated WAI applications.
263-- We respect s0. s0 MUST be a proper value.
262-- We respect s0. s0 MUST be a proper value.
264−sendRsp conn ii ver s0 hs0 rspidxhdr (RspFile path (Just part) _ isHead hook) =
263+sendRsp conn ii ver s0 hs0 (RspFile path (Just part) _ isHead hook) =
265− sendRspFile2XX conn ii ver s0 hs rspidxhdr path beg len isHead hook
264+ sendRspFile2XX conn ii ver s0 hs path beg len isHead hook
266 where
265 where
267 beg = filePartOffset part
266 beg = filePartOffset part
268 len = filePartByteCount part
267 len = filePartByteCount part
@@ -272,17 +271,17 @@ sendRsp conn ii ver s0 hs0 rspidxhdr (RspFile path (Just part) _ isHead hook) =
272
271
273-- Simple WAI applications.
272-- Simple WAI applications.
274-- Status is ignored
273-- Status is ignored
275−sendRsp conn ii ver _ hs0 rspidxhdr (RspFile path Nothing reqidxhdr isHead hook) = do
274+sendRsp conn ii ver _ hs0 (RspFile path Nothing idxhdr isHead hook) = do
276 efinfo <- E.try $ getFileInfo ii path
275 efinfo <- E.try $ getFileInfo ii path
277 case efinfo of
276 case efinfo of
278 Left (_ex :: E.IOException) ->
277 Left (_ex :: E.IOException) ->
279#ifdef WARP_DEBUG
278#ifdef WARP_DEBUG
280 print _ex >>
279 print _ex >>
281#endif
280#endif
282− sendRspFile404 conn ii ver hs0 rspidxhdr
281+ sendRspFile404 conn ii ver hs0
283− Right finfo -> case conditionalRequest finfo hs0 rspidxhdr reqidxhdr of
282+ Right finfo -> case conditionalRequest finfo hs0 idxhdr of
284− WithoutBody s -> sendRsp conn ii ver s hs0 rspidxhdr RspNoBody
283+ WithoutBody s -> sendRsp conn ii ver s hs0 RspNoBody
285− WithBody s hs beg len -> sendRspFile2XX conn ii ver s hs rspidxhdr path beg len isHead hook
284+ WithBody s hs beg len -> sendRspFile2XX conn ii ver s hs path beg len isHead hook
286
285
287----------------------------------------------------------------
286----------------------------------------------------------------
288
287
@@ -291,15 +290,14 @@ sendRspFile2XX :: Connection
291 -> H.HttpVersion
290 -> H.HttpVersion
292 -> H.Status
291 -> H.Status
293 -> H.ResponseHeaders
292 -> H.ResponseHeaders
294− -> IndexedHeader
295 -> FilePath
293 -> FilePath
296 -> Integer
294 -> Integer
297 -> Integer
295 -> Integer
298 -> Bool
296 -> Bool
299 -> IO ()
297 -> IO ()
300 -> IO (Maybe H.Status, Maybe Integer)
298 -> IO (Maybe H.Status, Maybe Integer)
301−sendRspFile2XX conn ii ver s hs rspidxhdr path beg len isHead hook
299+sendRspFile2XX conn ii ver s hs path beg len isHead hook
302− | isHead = sendRsp conn ii ver s hs rspidxhdr RspNoBody
300+ | isHead = sendRsp conn ii ver s hs RspNoBody
303 | otherwise = do
301 | otherwise = do
304 lheader <- composeHeader ver s hs
302 lheader <- composeHeader ver s hs
305 (mfd, fresher) <- getFd ii path
303 (mfd, fresher) <- getFd ii path
@@ -312,9 +310,8 @@ sendRspFile404 :: Connection
312 -> InternalInfo
310 -> InternalInfo
313 -> H.HttpVersion
311 -> H.HttpVersion
314 -> H.ResponseHeaders
312 -> H.ResponseHeaders
315− -> IndexedHeader
316 -> IO (Maybe H.Status, Maybe Integer)
313 -> IO (Maybe H.Status, Maybe Integer)
317−sendRspFile404 conn ii ver hs0 rspidxhdr = sendRsp conn ii ver s hs rspidxhdr (RspBuilder body True)
314+sendRspFile404 conn ii ver hs0 = sendRsp conn ii ver s hs (RspBuilder body True)
318 where
315 where
319 s = H.notFound404
316 s = H.notFound404
320 hs = replaceHeader H.hContentType "text/plain; charset=utf-8" hs0
317 hs = replaceHeader H.hContentType "text/plain; charset=utf-8" hs0
warp/Network/Wai/Handler/Warp/Run.hs+34−71
@@ -3,10 +3,8 @@
3{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE PackageImports #-}
4{-# LANGUAGE PackageImports #-}
5{-# LANGUAGE PatternGuards #-}
5{-# LANGUAGE PatternGuards #-}
6−{-# LANGUAGE RecordWildCards #-}
7{-# LANGUAGE ScopedTypeVariables #-}
6{-# LANGUAGE ScopedTypeVariables #-}
8{-# LANGUAGE TupleSections #-}
7{-# LANGUAGE TupleSections #-}
9−{-# LANGUAGE ViewPatterns #-}
10{-# OPTIONS_GHC -fno-warn-deprecations #-}
8{-# OPTIONS_GHC -fno-warn-deprecations #-}
11
9
12module Network.Wai.Handler.Warp.Run where
10module Network.Wai.Handler.Warp.Run where
@@ -17,29 +15,24 @@ import qualified Control.Concurrent as Conc (yield)
17import Control.Exception as E
15import Control.Exception as E
18import qualified Data.ByteString as S
16import qualified Data.ByteString as S
19import Data.Char (chr)
17import Data.Char (chr)
20−import Data.IORef (IORef, newIORef, readIORef, writeIORef)
18+import Data.IORef (IORef, newIORef, readIORef, writeIORef, atomicModifyIORef')
21import Data.Streaming.Network (bindPortTCP)
19import Data.Streaming.Network (bindPortTCP)
22import Foreign.C.Error (Errno(..), eCONNABORTED)
20import Foreign.C.Error (Errno(..), eCONNABORTED)
23import GHC.IO.Exception (IOException(..))
21import GHC.IO.Exception (IOException(..))
24−import qualified Network.HTTP2 as H2
25import Network.Socket (Socket, close, accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6), setSocketOption, SocketOption(..))
22import 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
29import qualified Network.Socket.ByteString as Sock
23import qualified Network.Socket.ByteString as Sock
30import Network.Wai
24import Network.Wai
31import Network.Wai.Internal (ResponseReceived (ResponseReceived))
25import Network.Wai.Internal (ResponseReceived (ResponseReceived))
32import System.Environment (lookupEnv)
26import System.Environment (lookupEnv)
33−import qualified System.TimeManager as T
34import System.Timeout (timeout)
27import System.Timeout (timeout)
28+import qualified System.TimeManager as T
35
29
36import Network.Wai.Handler.Warp.Buffer
30import Network.Wai.Handler.Warp.Buffer
37import Network.Wai.Handler.Warp.Counter
31import Network.Wai.Handler.Warp.Counter
38import qualified Network.Wai.Handler.Warp.Date as D
32import qualified Network.Wai.Handler.Warp.Date as D
39import qualified Network.Wai.Handler.Warp.FdCache as F
33import qualified Network.Wai.Handler.Warp.FdCache as F
40import qualified Network.Wai.Handler.Warp.FileInfoCache as I
34import qualified Network.Wai.Handler.Warp.FileInfoCache as I
41−import Network.Wai.Handler.Warp.HTTP2 (http2)
35+import Network.Wai.Handler.Warp.HTTP2 (http2, isHTTP2)
42−import Network.Wai.Handler.Warp.HTTP2.Types (isHTTP2)
43import Network.Wai.Handler.Warp.Header
36import Network.Wai.Handler.Warp.Header
44import Network.Wai.Handler.Warp.Imports hiding (readInt)
37import Network.Wai.Handler.Warp.Imports hiding (readInt)
45import Network.Wai.Handler.Warp.ReadInt
38import Network.Wai.Handler.Warp.ReadInt
@@ -58,38 +51,21 @@ import Network.Socket (fdSocket)
58#endif
51#endif
59
52
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
64−#else
65−socketConnection _ s = do
55+socketConnection s = do
66−#endif
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)
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
63 , connClose = close s
86−#endif
87 , connFree = freeBuffer writeBuf
64 , connFree = freeBuffer writeBuf
88 , connRecv = receive s bufferPool
65 , connRecv = receive s bufferPool
89 , connRecvBuf = receiveBuf s
66 , connRecvBuf = receiveBuf s
90 , connWriteBuffer = writeBuf
67 , connWriteBuffer = writeBuf
91 , connBufferSize = bufferSize
68 , connBufferSize = bufferSize
92− , connHTTP2 = isH2
93 }
69 }
94
70
95-- | Run an 'Application' on the given port.
71-- | Run an 'Application' on the given port.
@@ -151,7 +127,7 @@ runSettingsSocket set socket app = do
151 setSocketCloseOnExec s
127 setSocketCloseOnExec s
152 -- NoDelay causes an error for AF_UNIX.
128 -- NoDelay causes an error for AF_UNIX.
153 setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
129 setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
154− conn <- socketConnection set s
130+ conn <- socketConnection s
155 return (conn, sa)
131 return (conn, sa)
156
132
157 closeListenSocket = close socket
133 closeListenSocket = close socket
@@ -286,7 +262,10 @@ fork :: Settings
286fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
262fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
287 -- Call the user-supplied on exception code if any
263 -- Call the user-supplied on exception code if any
288 -- exceptions are thrown.
264 -- exceptions are thrown.
289− handle (settingsOnException set Nothing) $
265+ handle (settingsOnException set Nothing) .
266+ -- Allocate a new IORef indicating whether the connection has been
267+ -- closed, to avoid double-freeing a connection
268+ withClosedRef $ \ref ->
290 -- Run the connection maker to get a new connection, and ensure
269 -- Run the connection maker to get a new connection, and ensure
291 -- that the connection is closed. If the mkConn call throws an
270 -- that the connection is closed. If the mkConn call throws an
292 -- exception, we will leak the connection. If the mkConn call is
271 -- exception, we will leak the connection. If the mkConn call is
@@ -297,13 +276,21 @@ fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
297 -- We grab the connection before registering timeouts since the
276 -- We grab the connection before registering timeouts since the
298 -- timeouts will be useless during connection creation, due to the
277 -- timeouts will be useless during connection creation, due to the
299 -- fact that async exceptions are still masked.
278 -- fact that async exceptions are still masked.
300− bracket mkConn cleanUp (serve unmask)
279+ bracket mkConn (cleanUp ref) (serve unmask ref)
301 where
280 where
281+ withClosedRef inner = newIORef False >>= inner
282+
283+ closeConn ref conn = do
284+ isClosed <- atomicModifyIORef' ref $ \x -> (True, x)
285+ unless isClosed $ connClose conn
286+
302− cleanUp (conn, _) = connClose conn `finally` connFree conn
287+ cleanUp ref (conn, _) = closeConn ref conn `finally` connFree conn
303
288
304 -- We need to register a timeout handler for this thread, and
289 -- We need to register a timeout handler for this thread, and
305− -- cancel that handler as soon as we exit.
290+ -- cancel that handler as soon as we exit. We additionally close
291+ -- the connection immediately in case the child thread catches the
292+ -- async exception or performs some long-running cleanup action.
306− serve unmask (conn, transport) = bracket register cancel $ \th -> do
293+ serve unmask ref (conn, transport) = bracket register cancel $ \th -> do
307 -- We now have fully registered a connection close handler in
294 -- We now have fully registered a connection close handler in
308 -- the case of all exceptions, so it is safe to once again
295 -- the case of all exceptions, so it is safe to once again
309 -- allow async exceptions.
296 -- allow async exceptions.
@@ -315,7 +302,8 @@ fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
315 -- above ensures the connection is closed.
302 -- above ensures the connection is closed.
316 when goingon $ serveConnection conn ii th addr transport set app
303 when goingon $ serveConnection conn ii th addr transport set app
317 where
304 where
318− register = T.registerKillThread (timeoutManager ii) (connClose conn)
305+ register = T.registerKillThread (timeoutManager ii)
306+ (closeConn ref conn)
319 cancel = T.cancel
307 cancel = T.cancel
320
308
321 onOpen adr = increase counter >> settingsOnOpen set adr
309 onOpen adr = increase counter >> settingsOnOpen set adr
@@ -342,35 +330,22 @@ serveConnection conn ii th origAddr transport settings app = do
342 istatus <- newIORef False
330 istatus <- newIORef False
343 if settingsHTTP2Enabled settings && h2 then do
331 if settingsHTTP2Enabled settings && h2 then do
344 rawRecvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
332 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
333 let recvN = wrappedRecvN th istatus (settingsSlowlorisSize settings) rawRecvN
353− sendBS x = connSendAll conn x >> T.tickle th
354 -- fixme: origAddr
334 -- fixme: origAddr
355− checkTLS
356− setConnHTTP2 conn True
357− http2 conn transport ii origAddr settings recvN sendBS app
335+ http2 conn ii origAddr transport settings recvN app
358 else do
336 else do
359 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
337 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
360 writeIORef istatus True
338 writeIORef istatus True
361 leftoverSource src bs
339 leftoverSource src bs
362 addr <- getProxyProtocolAddr src
340 addr <- getProxyProtocolAddr src
363 http1 True addr istatus src `E.catch` \e ->
341 http1 True addr istatus src `E.catch` \e ->
364− case () of
342+ case fromException e of
365− ()
366− -- See comment below referencing
343+ -- See comment below referencing
367− -- https://github.com/yesodweb/wai/issues/618
344+ -- https://github.com/yesodweb/wai/issues/618
368− | Just NoKeepAliveRequest <- fromException e -> return ()
345+ Just NoKeepAliveRequest -> return ()
369− -- No valid request
346+ Nothing -> do
370− | Just (BadFirstLine _) <- fromException e -> return ()
371− | otherwise -> do
372− _ <- sendErrorResponse (dummyreq addr) istatus e
347+ _ <- sendErrorResponse (dummyreq addr) istatus e
373− throwIO e
348+ throwIO e
374
349
375 where
350 where
376 getProxyProtocolAddr src =
351 getProxyProtocolAddr src =
@@ -429,7 +404,8 @@ serveConnection conn ii th origAddr transport settings app = do
429 errorResponse e = settingsOnExceptionResponse settings e
404 errorResponse e = settingsOnExceptionResponse settings e
430
405
431 http1 firstRequest addr istatus src = do
406 http1 firstRequest addr istatus src = do
432− (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
407+ (req', mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src
408+ let req = req' { isSecure = isTransportSecure transport }
433 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
409 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
434 `E.catch` \e -> do
410 `E.catch` \e -> do
435 settingsOnException settings (Just req) e
411 settingsOnException settings (Just req) e
@@ -514,19 +490,6 @@ serveConnection conn ii th origAddr transport settings app = do
514 else
490 else
515 return False
491 return False
516
492
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
529−
530flushEntireBody :: IO ByteString -> IO ()
493flushEntireBody :: IO ByteString -> IO ()
531flushEntireBody src =
494flushEntireBody src =
532 loop
495 loop
warp/Network/Wai/Handler/Warp/Settings.hs+5−31
@@ -76,13 +76,6 @@ data Settings = Settings
76 --
76 --
77 -- Since 2.0.3
77 -- Since 2.0.3
78 , settingsInstallShutdownHandler :: IO () -> IO ()
78 , settingsInstallShutdownHandler :: IO () -> IO ()
79− -- ^ An action to install a handler (e.g. Unix signal handler)
80− -- to close a listen socket.
81− -- The first argument is an action to close the listen socket.
82− --
83− -- Default: no action
84− --
85− -- Since 3.0.1
86 , settingsServerName :: ByteString
79 , settingsServerName :: ByteString
87 -- ^ Default server name if application does not set one.
80 -- ^ Default server name if application does not set one.
88 --
81 --
@@ -94,44 +87,28 @@ data Settings = Settings
94 , settingsProxyProtocol :: ProxyProtocol
87 , settingsProxyProtocol :: ProxyProtocol
95 -- ^ Specify usage of the PROXY protocol.
88 -- ^ Specify usage of the PROXY protocol.
96 --
89 --
97− -- Since 3.0.5
90+ -- Since 3.0.5.
98 , settingsSlowlorisSize :: Int
91 , settingsSlowlorisSize :: Int
99 -- ^ Size of bytes read to prevent Slowloris protection. Default value: 2048
92 -- ^ Size of bytes read to prevent Slowloris protection. Default value: 2048
100 --
93 --
101− -- Since 3.1.2
94+ -- Since 3.1.2.
102 , settingsHTTP2Enabled :: Bool
95 , settingsHTTP2Enabled :: Bool
103 -- ^ Whether to enable HTTP2 ALPN/upgrades. Default: True
96 -- ^ Whether to enable HTTP2 ALPN/upgrades. Default: True
104 --
97 --
105− -- Since 3.1.7
98+ -- Since 3.1.7.
106 , settingsLogger :: Request -> H.Status -> Maybe Integer -> IO ()
99 , settingsLogger :: Request -> H.Status -> Maybe Integer -> IO ()
107 -- ^ A log function. Default: no action.
100 -- ^ A log function. Default: no action.
108 --
101 --
109− -- Since 3.1.10
102+ -- Since 3.X.X.
110 , settingsServerPushLogger :: Request -> ByteString -> Integer -> IO ()
103 , settingsServerPushLogger :: Request -> ByteString -> Integer -> IO ()
111 -- ^ A HTTP/2 server push log function. Default: no action.
104 -- ^ A HTTP/2 server push log function. Default: no action.
112 --
105 --
113− -- Since 3.2.7
106+ -- Since 3.X.X.
114 , settingsGracefulShutdownTimeout :: Maybe Int
107 , settingsGracefulShutdownTimeout :: Maybe Int
115 -- ^ An optional timeout to limit the time (in seconds) waiting for
108 -- ^ An optional timeout to limit the time (in seconds) waiting for
116 -- a graceful shutdown of the web server.
109 -- a graceful shutdown of the web server.
117 --
110 --
118 -- Since 3.2.8
111 -- Since 3.2.8
119− , settingsGracefulCloseTimeout1 :: Int
120− -- ^ A timeout to limit the time (in milliseconds) waiting for
121− -- FIN for HTTP/1.x. 0 means uses immediate close.
122− -- Default: 0.
123− --
124− -- Since 3.3.5
125− , settingsGracefulCloseTimeout2 :: Int
126− -- ^ A timeout to limit the time (in milliseconds) waiting for
127− -- FIN for HTTP/2. 0 means uses immediate close.
128− -- Default: 2000.
129− --
130− -- Since 3.3.5
131− , settingsMaxTotalHeaderLength :: Int
132− -- ^ Determines the maximum header size that Warp will tolerate when using HTTP/1.x.
133− --
134− -- Since 3.3.8
135 }
112 }
136
113
137-- | Specify usage of the PROXY protocol.
114-- | Specify usage of the PROXY protocol.
@@ -168,9 +145,6 @@ defaultSettings = Settings
168 , settingsLogger = \_ _ _ -> return ()
145 , settingsLogger = \_ _ _ -> return ()
169 , settingsServerPushLogger = \_ _ _ -> return ()
146 , settingsServerPushLogger = \_ _ _ -> return ()
170 , settingsGracefulShutdownTimeout = Nothing
147 , settingsGracefulShutdownTimeout = Nothing
171− , settingsGracefulCloseTimeout1 = 0
172− , settingsGracefulCloseTimeout2 = 2000
173− , settingsMaxTotalHeaderLength = 50 * 1024
174 }
148 }
175
149
176-- | Apply the logic provided by 'defaultOnException' to determine if an
150-- | Apply the logic provided by 'defaultOnException' to determine if an
warp/Network/Wai/Handler/Warp/Types.hs−10
@@ -8,7 +8,6 @@ import Control.Exception
8import qualified Data.ByteString as S
8import qualified Data.ByteString as S
9import Data.IORef (IORef, readIORef, writeIORef, newIORef)
9import Data.IORef (IORef, readIORef, writeIORef, newIORef)
10import Data.Typeable (Typeable)
10import Data.Typeable (Typeable)
11−import Data.X509
12import Foreign.Ptr (Ptr)
11import Foreign.Ptr (Ptr)
13import System.Posix.Types (Fd)
12import System.Posix.Types (Fd)
14import qualified System.TimeManager as T
13import qualified System.TimeManager as T
@@ -123,16 +122,8 @@ data Connection = Connection {
123 , connWriteBuffer :: Buffer
122 , connWriteBuffer :: Buffer
124 -- | The size of the write buffer.
123 -- | The size of the write buffer.
125 , connBufferSize :: BufSize
124 , connBufferSize :: BufSize
126− -- | Is this connection HTTP/2?
127− , connHTTP2 :: IORef Bool
128 }
125 }
129
126
130−getConnHTTP2 :: Connection -> IO Bool
131−getConnHTTP2 conn = readIORef (connHTTP2 conn)
132−
133−setConnHTTP2 :: Connection -> Bool -> IO ()
134−setConnHTTP2 conn b = writeIORef (connHTTP2 conn) b
135−
136----------------------------------------------------------------
127----------------------------------------------------------------
137
128
138data InternalInfo = InternalInfo {
129data InternalInfo = InternalInfo {
@@ -180,7 +171,6 @@ data Transport = TCP -- ^ Plain channel: TCP
180 , tlsMinorVersion :: Int
171 , tlsMinorVersion :: Int
181 , tlsNegotiatedProtocol :: Maybe ByteString -- ^ The result of Application Layer Protocol Negociation in RFC 7301
172 , tlsNegotiatedProtocol :: Maybe ByteString -- ^ The result of Application Layer Protocol Negociation in RFC 7301
182 , tlsChiperID :: Word16
173 , tlsChiperID :: Word16
183− , tlsClientCertificate :: Maybe CertificateChain
184 } -- ^ Encrypted channel: TLS or SSL
174 } -- ^ Encrypted channel: TLS or SSL
185
175
186isTransportSecure :: Transport -> Bool
176isTransportSecure :: Transport -> Bool
warp/test/FileSpec.hs+1−1
@@ -21,7 +21,7 @@ testFileRange desc reqhs file ans = it desc $ do
21 let WithBody s hs off len = ans
21 let WithBody s hs off len = ans
22 hs' = ("Last-Modified",fileInfoDate finfo) : hs
22 hs' = ("Last-Modified",fileInfoDate finfo) : hs
23 ans' = WithBody s hs' off len
23 ans' = WithBody s hs' off len
24− conditionalRequest finfo [] (indexResponseHeader hs) (indexRequestHeader reqhs) `shouldBe` ans'
24+ conditionalRequest finfo [] (indexRequestHeader reqhs) `shouldBe` ans'
25
25
26spec :: Spec
26spec :: Spec
27spec = do
27spec = do
warp/test/RequestSpec.hs+7−11
@@ -7,7 +7,6 @@ module RequestSpec (main, spec) where
7import Network.Wai.Handler.Warp.File (parseByteRanges)
7import Network.Wai.Handler.Warp.File (parseByteRanges)
8import Network.Wai.Handler.Warp.Request
8import Network.Wai.Handler.Warp.Request
9import Network.Wai.Handler.Warp.Types
9import Network.Wai.Handler.Warp.Types
10−import Network.Wai.Handler.Warp.Settings (settingsMaxTotalHeaderLength, defaultSettings)
11import Test.Hspec
10import Test.Hspec
12import Test.Hspec.QuickCheck
11import Test.Hspec.QuickCheck
13import qualified Data.ByteString as S
12import qualified Data.ByteString as S
@@ -18,9 +17,6 @@ import Data.IORef
18main :: IO ()
17main :: IO ()
19main = hspec spec
18main = hspec spec
20
19
21−defaultMaxTotalHeaderLength :: Int
22−defaultMaxTotalHeaderLength = settingsMaxTotalHeaderLength defaultSettings
23−
24spec :: Spec
20spec :: Spec
25spec = do
21spec = do
26 describe "headerLines" $ do
22 describe "headerLines" $ do
@@ -67,29 +63,29 @@ spec = do
67 describe "headerLines" $ do
63 describe "headerLines" $ do
68 it "can handle a nomarl case" $ do
64 it "can handle a nomarl case" $ do
69 src <- mkSourceFunc ["Status: 200\r\nContent-Type: text/plain\r\n\r\n"] >>= mkSource
65 src <- mkSourceFunc ["Status: 200\r\nContent-Type: text/plain\r\n\r\n"] >>= mkSource
70− x <- headerLines defaultMaxTotalHeaderLength True src
66+ x <- headerLines True src
71 x `shouldBe` ["Status: 200", "Content-Type: text/plain"]
67 x `shouldBe` ["Status: 200", "Content-Type: text/plain"]
72
68
73 it "can handle a nasty case (1)" $ do
69 it "can handle a nasty case (1)" $ do
74 src <- mkSourceFunc ["Status: 200", "\r\nContent-Type: text/plain", "\r\n\r\n"] >>= mkSource
70 src <- mkSourceFunc ["Status: 200", "\r\nContent-Type: text/plain", "\r\n\r\n"] >>= mkSource
75− x <- headerLines defaultMaxTotalHeaderLength True src
71+ x <- headerLines True src
76 x `shouldBe` ["Status: 200", "Content-Type: text/plain"]
72 x `shouldBe` ["Status: 200", "Content-Type: text/plain"]
77
73
78 it "can handle a nasty case (1)" $ do
74 it "can handle a nasty case (1)" $ do
79 src <- mkSourceFunc ["Status: 200", "\r", "\nContent-Type: text/plain", "\r", "\n\r\n"] >>= mkSource
75 src <- mkSourceFunc ["Status: 200", "\r", "\nContent-Type: text/plain", "\r", "\n\r\n"] >>= mkSource
80− x <- headerLines defaultMaxTotalHeaderLength True src
76+ x <- headerLines True src
81 x `shouldBe` ["Status: 200", "Content-Type: text/plain"]
77 x `shouldBe` ["Status: 200", "Content-Type: text/plain"]
82
78
83 it "can handle a nasty case (1)" $ do
79 it "can handle a nasty case (1)" $ do
84 src <- mkSourceFunc ["Status: 200", "\r", "\n", "Content-Type: text/plain", "\r", "\n", "\r", "\n"] >>= mkSource
80 src <- mkSourceFunc ["Status: 200", "\r", "\n", "Content-Type: text/plain", "\r", "\n", "\r", "\n"] >>= mkSource
85− x <- headerLines defaultMaxTotalHeaderLength True src
81+ x <- headerLines True src
86 x `shouldBe` ["Status: 200", "Content-Type: text/plain"]
82 x `shouldBe` ["Status: 200", "Content-Type: text/plain"]
87
83
88 it "can handle an illegal case (1)" $ do
84 it "can handle an illegal case (1)" $ do
89 src <- mkSourceFunc ["\nStatus:", "\n 200", "\nContent-Type: text/plain", "\r\n\r\n"] >>= mkSource
85 src <- mkSourceFunc ["\nStatus:", "\n 200", "\nContent-Type: text/plain", "\r\n\r\n"] >>= mkSource
90− x <- headerLines defaultMaxTotalHeaderLength True src
86+ x <- headerLines True src
91 x `shouldBe` []
87 x `shouldBe` []
92− y <- headerLines defaultMaxTotalHeaderLength True src
88+ y <- headerLines True src
93 y `shouldBe` ["Status: 200", "Content-Type: text/plain"]
89 y `shouldBe` ["Status: 200", "Content-Type: text/plain"]
94
90
95 where
91 where
@@ -115,7 +111,7 @@ headerLinesList' orig = do
115 writeIORef ref z
111 writeIORef ref z
116 return y
112 return y
117 src' <- mkSource src
113 src' <- mkSource src
118− res <- headerLines defaultMaxTotalHeaderLength True src'
114+ res <- headerLines True src'
119 return (res, src')
115 return (res, src')
120
116
121consumeLen :: Int -> Source -> IO S8.ByteString
117consumeLen :: Int -> Source -> IO S8.ByteString
warp/test/ResponseHeaderSpec.hs+33
@@ -7,6 +7,9 @@ import qualified Network.HTTP.Types as H
7import Network.Wai.Handler.Warp.ResponseHeader
7import Network.Wai.Handler.Warp.ResponseHeader
8import Network.Wai.Handler.Warp.Response
8import Network.Wai.Handler.Warp.Response
9import Network.Wai.Handler.Warp.Header
9import Network.Wai.Handler.Warp.Header
10+import Network.Wai.Handler.Warp.HTTP2.HPACK
11+import Network.HPACK
12+import Network.HPACK.Token
10import Test.Hspec
13import Test.Hspec
11
14
12main :: IO ()
15main :: IO ()
@@ -34,6 +37,36 @@ spec = do
34 let hdrs = [("Server","MyServer")]
37 let hdrs = [("Server","MyServer")]
35 rspidxhdr = indexResponseHeader hdrs
38 rspidxhdr = indexResponseHeader hdrs
36 addServer "" rspidxhdr hdrs `shouldBe` []
39 addServer "" rspidxhdr hdrs `shouldBe` []
40+ describe "addHeader" $ do
41+ it "adds Server if not exist" $ do
42+ let v = "MyServer"
43+ hdrs = []
44+ hdrs1 = [("Server",v)]
45+ (thl, vt) <- toHeaderTable hdrs
46+ (thl1, _) <- toHeaderTable hdrs1
47+ addHeader tokenServer v vt thl `shouldBe` thl1
48+ it "does not add Server if exists" $ do
49+ let v = "MyServer2"
50+ hdrs = [("Server","MyServer")]
51+ (thl, vt) <- toHeaderTable hdrs
52+ addHeader tokenServer v vt thl `shouldBe` thl
53+ it "does not add Server if empty" $ do
54+ let v = ""
55+ hdrs = []
56+ (thl, vt) <- toHeaderTable hdrs
57+ addHeader tokenServer v vt thl `shouldBe` thl
58+ it "deletes Server" $ do
59+ let v = ""
60+ hdrs = [("Server","MyServer")]
61+ hdrs1 = []
62+ (thl, vt) <- toHeaderTable hdrs
63+ (thl1, _) <- toHeaderTable hdrs1
64+ addHeader tokenServer v vt thl `shouldBe` thl1
65+ it "keeps Server" $ do
66+ let v = ""
67+ hdrs = [("Server","MyServer"),("Content-Type","Text/HTML")]
68+ (thl, vt) <- toHeaderTable hdrs
69+ addHeader tokenContentType v vt thl `shouldBe` thl
37
70
38headers :: H.ResponseHeaders
71headers :: H.ResponseHeaders
39headers = [
72headers = [
warp/test/ResponseSpec.hs+15−11
@@ -10,7 +10,7 @@ import Network.HTTP.Types
10import Network.Wai hiding (responseHeaders)
10import Network.Wai hiding (responseHeaders)
11import Network.Wai.Handler.Warp
11import Network.Wai.Handler.Warp
12import Network.Wai.Handler.Warp.Response
12import Network.Wai.Handler.Warp.Response
13−import RunSpec (withApp, msWrite, msRead, withMySocket)
13+import RunSpec (withApp, msClose, msWrite, msRead, connectTo)
14import Test.Hspec
14import Test.Hspec
15
15
16main :: IO ()
16main :: IO ()
@@ -20,13 +20,15 @@ testRange :: S.ByteString -- ^ range value
20 -> String -- ^ expected output
20 -> String -- ^ expected output
21 -> Maybe String -- ^ expected content-range value
21 -> Maybe String -- ^ expected content-range value
22 -> Spec
22 -> Spec
23−testRange range out crange = it title $ withApp defaultSettings app $ withMySocket $ \ms -> do
23+testRange range out crange = it title $ withApp defaultSettings app $ \port -> do
24+ handle <- connectTo port
24− msWrite ms "GET / HTTP/1.0\r\n"
25+ msWrite handle "GET / HTTP/1.0\r\n"
25− msWrite ms "Range: bytes="
26+ msWrite handle "Range: bytes="
26− msWrite ms range
27+ msWrite handle range
27− msWrite ms "\r\n\r\n"
28+ msWrite handle "\r\n\r\n"
28 threadDelay 10000
29 threadDelay 10000
29− bss <- fmap (lines . filter (/= '\r') . S8.unpack) $ msRead ms 1024
30+ bss <- fmap (lines . filter (/= '\r') . S8.unpack) $ msRead handle 1024
31+ msClose handle
30 last bss `shouldBe` out
32 last bss `shouldBe` out
31 let hs = mapMaybe toHeader bss
33 let hs = mapMaybe toHeader bss
32 lookup "Content-Range" hs `shouldBe` fmap ("bytes " ++) crange
34 lookup "Content-Range" hs `shouldBe` fmap ("bytes " ++) crange
@@ -44,10 +46,12 @@ testPartial :: Integer -- ^ file size
44 -> Integer -- ^ byte count
46 -> Integer -- ^ byte count
45 -> String -- ^ expected output
47 -> String -- ^ expected output
46 -> Spec
48 -> Spec
47−testPartial size offset count out = it title $ withApp defaultSettings app $ withMySocket $ \ms -> do
49+testPartial size offset count out = it title $ withApp defaultSettings app $ \port -> do
50+ handle <- connectTo port
48− msWrite ms "GET / HTTP/1.0\r\n\r\n"
51+ msWrite handle "GET / HTTP/1.0\r\n\r\n"
49 threadDelay 10000
52 threadDelay 10000
50− bss <- fmap (lines . filter (/= '\r') . S8.unpack) $ msRead ms 1024
53+ bss <- fmap (lines . filter (/= '\r') . S8.unpack) $ msRead handle 1024
54+ msClose handle
51 out `shouldBe` last bss
55 out `shouldBe` last bss
52 let hs = mapMaybe toHeader bss
56 let hs = mapMaybe toHeader bss
53 lookup "Content-Length" hs `shouldBe` Just (show $ length $ last bss)
57 lookup "Content-Length" hs `shouldBe` Just (show $ length $ last bss)
@@ -83,7 +87,7 @@ spec = do
83 it "discards empty lines" $ do
87 it "discards empty lines" $ do
84 sanitizeHeaderValue "foo\r\n\r\nbar" `shouldBe` "foo\r\n bar"
88 sanitizeHeaderValue "foo\r\n\r\nbar" `shouldBe` "foo\r\n bar"
85
89
86− context "when sanitizing single occurrences of \n" $ do
90+ context "when sanitizing single occurences of \n" $ do
87 it "replaces \n with \r\n" $ do
91 it "replaces \n with \r\n" $ do
88 sanitizeHeaderValue "foo\n bar" `shouldBe` "foo\r\n bar"
92 sanitizeHeaderValue "foo\n bar" `shouldBe` "foo\r\n bar"
89
93
warp/test/RunSpec.hs+47−38
@@ -1,7 +1,7 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE ScopedTypeVariables #-}
2{-# LANGUAGE ScopedTypeVariables #-}
3
3
4−module RunSpec (main, spec, withApp, MySocket, msWrite, msRead, withMySocket) where
4+module RunSpec (main, spec, withApp, connectTo, MySocket, msWrite, msRead, msClose) where
5
5
6import Control.Concurrent (forkIO, killThread, threadDelay)
6import Control.Concurrent (forkIO, killThread, threadDelay)
7import Control.Concurrent.MVar (newEmptyMVar, takeMVar, putMVar)
7import Control.Concurrent.MVar (newEmptyMVar, takeMVar, putMVar)
@@ -37,7 +37,7 @@ type CounterApplication = Counter -> Application
37
37
38data MySocket = MySocket
38data MySocket = MySocket
39 { msSocket :: !Socket
39 { msSocket :: !Socket
40− , msBuffer :: !(I.IORef ByteString)
40+ , _msBuffer :: !(I.IORef ByteString)
41 }
41 }
42
42
43msWrite :: MySocket -> ByteString -> IO ()
43msWrite :: MySocket -> ByteString -> IO ()
@@ -70,16 +70,9 @@ msClose :: MySocket -> IO ()
70msClose = Network.Socket.close . msSocket
70msClose = Network.Socket.close . msSocket
71
71
72connectTo :: Int -> IO MySocket
72connectTo :: Int -> IO MySocket
73−connectTo port = do
73+connectTo port = MySocket
74− s <- fst <$> getSocketTCP "127.0.0.1" port
74+ <$> (fst <$> getSocketTCP "127.0.0.1" port)
75− ref <- I.newIORef mempty
75+ <*> I.newIORef mempty
76− return MySocket {
77− msSocket = s
78− , msBuffer = ref
79− }
80−
81−withMySocket :: (MySocket -> IO a) -> Int -> IO a
82−withMySocket body port = bracket (connectTo port) msClose body
83
76
84incr :: MonadIO m => Counter -> m ()
77incr :: MonadIO m => Counter -> m ()
85incr icount = liftIO $ I.atomicModifyIORef icount $ \ecount ->
78incr icount = liftIO $ I.atomicModifyIORef icount $ \ecount ->
@@ -157,7 +150,8 @@ runTest :: Int -- ^ expected number of requests
157 -> IO ()
150 -> IO ()
158runTest expected app chunks = do
151runTest expected app chunks = do
159 ref <- I.newIORef (Right 0)
152 ref <- I.newIORef (Right 0)
160− withApp defaultSettings (app ref) $ withMySocket $ \ms -> do
153+ withApp defaultSettings (app ref) $ \port -> do
154+ ms <- connectTo port
161 forM_ chunks $ \chunk -> msWrite ms chunk
155 forM_ chunks $ \chunk -> msWrite ms chunk
162 _ <- timeout 100000 $ replicateM_ expected $ msRead ms 4096
156 _ <- timeout 100000 $ replicateM_ expected $ msRead ms 4096
163 res <- I.readIORef ref
157 res <- I.readIORef ref
@@ -174,9 +168,10 @@ runTerminateTest :: InvalidRequest
174runTerminateTest expected input = do
168runTerminateTest expected input = do
175 ref <- I.newIORef Nothing
169 ref <- I.newIORef Nothing
176 let onExc _ = I.writeIORef ref . Just
170 let onExc _ = I.writeIORef ref . Just
177− withApp (setOnException onExc defaultSettings) dummyApp $ withMySocket $ \ms -> do
171+ withApp (setOnException onExc defaultSettings) dummyApp $ \port -> do
172+ handle <- connectTo port
178− msWrite ms input
173+ msWrite handle input
179− msClose ms -- explicitly
174+ msClose handle
180 threadDelay 1000
175 threadDelay 1000
181 res <- I.readIORef ref
176 res <- I.readIORef ref
182 show res `shouldBe` show (Just expected)
177 show res `shouldBe` show (Just expected)
@@ -247,11 +242,13 @@ spec = do
247 let app req f = do
242 let app req f = do
248 liftIO $ I.writeIORef iheaders $ requestHeaders req
243 liftIO $ I.writeIORef iheaders $ requestHeaders req
249 f $ responseLBS status200 [] ""
244 f $ responseLBS status200 [] ""
250− withApp defaultSettings app $ withMySocket $ \ms -> do
245+ withApp defaultSettings app $ \port -> do
246+ handle <- connectTo port
251 let input = S.concat
247 let input = S.concat
252 [ "GET / HTTP/1.1\r\nfoo: bar\r\n baz\r\n\tbin\r\n\r\n"
248 [ "GET / HTTP/1.1\r\nfoo: bar\r\n baz\r\n\tbin\r\n\r\n"
253 ]
249 ]
254− msWrite ms input
250+ msWrite handle input
251+ msClose handle
255 threadDelay 1000
252 threadDelay 1000
256 headers <- I.readIORef iheaders
253 headers <- I.readIORef iheaders
257 headers `shouldBe`
254 headers `shouldBe`
@@ -262,11 +259,13 @@ spec = do
262 let app req f = do
259 let app req f = do
263 liftIO $ I.writeIORef iheaders $ requestHeaders req
260 liftIO $ I.writeIORef iheaders $ requestHeaders req
264 f $ responseLBS status200 [] ""
261 f $ responseLBS status200 [] ""
265− withApp defaultSettings app $ withMySocket $ \ms -> do
262+ withApp defaultSettings app $ \port -> do
263+ handle <- connectTo port
266 let input = S.concat
264 let input = S.concat
267 [ "GET / HTTP/1.1\r\nfoo:bar\r\n\r\n"
265 [ "GET / HTTP/1.1\r\nfoo:bar\r\n\r\n"
268 ]
266 ]
269− msWrite ms input
267+ msWrite handle input
268+ msClose handle
270 threadDelay 1000
269 threadDelay 1000
271 headers <- I.readIORef iheaders
270 headers <- I.readIORef iheaders
272 headers `shouldBe`
271 headers `shouldBe`
@@ -282,14 +281,16 @@ spec = do
282 liftIO $ I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
281 liftIO $ I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
283 atomically $ modifyTVar countVar (+ 1)
282 atomically $ modifyTVar countVar (+ 1)
284 f $ responseLBS status200 [] ""
283 f $ responseLBS status200 [] ""
285− withApp defaultSettings app $ withMySocket $ \ms -> do
284+ withApp defaultSettings app $ \port -> do
285+ handle <- connectTo port
286 let input = S.concat
286 let input = S.concat
287 [ "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
287 [ "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
288 , "c\r\nHello World\n\r\n3\r\nBye\r\n0\r\n\r\n"
288 , "c\r\nHello World\n\r\n3\r\nBye\r\n0\r\n\r\n"
289 , "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
289 , "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
290 , "b\r\nHello World\r\n0\r\n\r\n"
290 , "b\r\nHello World\r\n0\r\n\r\n"
291 ]
291 ]
292− msWrite ms input
292+ msWrite handle input
293+ msClose handle
293 atomically $ do
294 atomically $ do
294 count <- readTVar countVar
295 count <- readTVar countVar
295 check $ count == 2
296 check $ count == 2
@@ -306,12 +307,14 @@ spec = do
306 I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
307 I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
307 atomically $ modifyTVar countVar (+ 1)
308 atomically $ modifyTVar countVar (+ 1)
308 f $ responseLBS status200 [] ""
309 f $ responseLBS status200 [] ""
309− withApp defaultSettings app $ withMySocket $ \ms -> do
310+ withApp defaultSettings app $ \port -> do
311+ handle <- connectTo port
310 let input = concat $ replicate 2 $
312 let input = concat $ replicate 2 $
311 ["POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"] ++
313 ["POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"] ++
312 (replicate 50 "5\r\n12345\r\n") ++
314 (replicate 50 "5\r\n12345\r\n") ++
313 ["0\r\n\r\n"]
315 ["0\r\n\r\n"]
314− mapM_ (msWrite ms) input
316+ mapM_ (msWrite handle) input
317+ msClose handle
315 atomically $ do
318 atomically $ do
316 count <- readTVar countVar
319 count <- readTVar countVar
317 check $ count == 2
320 check $ count == 2
@@ -327,14 +330,16 @@ spec = do
327 liftIO $ I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
330 liftIO $ I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
328 atomically $ modifyTVar countVar (+ 1)
331 atomically $ modifyTVar countVar (+ 1)
329 f $ responseLBS status200 [] ""
332 f $ responseLBS status200 [] ""
330− withApp defaultSettings app $ withMySocket $ \ms -> do
333+ withApp defaultSettings app $ \port -> do
334+ handle <- connectTo port
331 let input = S.concat
335 let input = S.concat
332 [ "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
336 [ "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
333 , "c\r\nHello World\n\r\n3\r\nBye\r\n0\r\n"
337 , "c\r\nHello World\n\r\n3\r\nBye\r\n0\r\n"
334 , "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
338 , "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
335 , "b\r\nHello World\r\n0\r\n\r\n"
339 , "b\r\nHello World\r\n0\r\n\r\n"
336 ]
340 ]
337− mapM_ (msWrite ms) $ map S.singleton $ S.unpack input
341+ mapM_ (msWrite handle) $ map S.singleton $ S.unpack input
342+ msClose handle
338 atomically $ do
343 atomically $ do
339 count <- readTVar countVar
344 count <- readTVar countVar
340 check $ count == 2
345 check $ count == 2
@@ -355,18 +360,20 @@ spec = do
355 E.throwIO (e :: E.SomeException)
360 E.throwIO (e :: E.SomeException)
356 liftIO $ I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
361 liftIO $ I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
357 f $ responseLBS status200 [] ""
362 f $ responseLBS status200 [] ""
358− withApp (setTimeout 1 defaultSettings) app $ withMySocket $ \ms -> do
363+ withApp (setTimeout 1 defaultSettings) app $ \port -> do
359 let bs1 = S.replicate 2048 88
364 let bs1 = S.replicate 2048 88
360 bs2 = "This is short"
365 bs2 = "This is short"
361 bs = S.append bs1 bs2
366 bs = S.append bs1 bs2
367+ handle <- connectTo port
362− msWrite ms "POST / HTTP/1.1\r\n"
368+ msWrite handle "POST / HTTP/1.1\r\n"
363− msWrite ms "content-length: "
369+ msWrite handle "content-length: "
364− msWrite ms $ S8.pack $ show $ S.length bs
370+ msWrite handle $ S8.pack $ show $ S.length bs
365− msWrite ms "\r\n\r\n"
371+ msWrite handle "\r\n\r\n"
366 threadDelay 100000
372 threadDelay 100000
367− msWrite ms bs1
373+ msWrite handle bs1
368 threadDelay 100000
374 threadDelay 100000
369− msWrite ms bs2
375+ msWrite handle bs2
376+ msClose handle
370 threadDelay 5000000
377 threadDelay 5000000
371 front <- I.readIORef ifront
378 front <- I.readIORef ifront
372 S.concat (front []) `shouldBe` bs
379 S.concat (front []) `shouldBe` bs
@@ -382,7 +389,8 @@ spec = do
382 loop
389 loop
383 loop
390 loop
384 doubleBS = S.concatMap $ \w -> S.pack [w, w]
391 doubleBS = S.concatMap $ \w -> S.pack [w, w]
385− withApp defaultSettings app $ withMySocket $ \ms -> do
392+ withApp defaultSettings app $ \port -> do
393+ ms <- connectTo port
386 msWrite ms "POST / HTTP/1.1\r\n\r\n12345"
394 msWrite ms "POST / HTTP/1.1\r\n\r\n12345"
387 timeout 100000 (msRead ms 10) >>= (`shouldBe` Just "1122334455")
395 timeout 100000 (msRead ms 10) >>= (`shouldBe` Just "1122334455")
388 msWrite ms "67890"
396 msWrite ms "67890"
@@ -410,14 +418,15 @@ spec = do
410 atomically $ modifyTVar countVar (+ 1)
418 atomically $ modifyTVar countVar (+ 1)
411 loop
419 loop
412 loop
420 loop
413− withApp defaultSettings app $ withMySocket $ \ms -> do
421+ withApp defaultSettings app $ \port -> do
422+ (sock, _addr) <- getSocketTCP "127.0.0.1" port
414− msWrite ms "POST / HTTP/1.1\r\ntransfer-encoding: chunked\r\n\r\n"
423+ sendAll sock "POST / HTTP/1.1\r\ntransfer-encoding: chunked\r\n\r\n"
415 threadDelay 10000
424 threadDelay 10000
416− msWrite ms "5\r\nhello\r\n0\r\n\r\n"
425+ sendAll sock "5\r\nhello\r\n0\r\n\r\n"
417 atomically $ do
426 atomically $ do
418 count <- readTVar countVar
427 count <- readTVar countVar
419 check $ count >= 1
428 check $ count >= 1
420− bs <- safeRecv (msSocket ms) 4096 -- must not use msRead
429+ bs <- safeRecv sock 4096
421 S.takeWhile (/= 13) bs `shouldBe` "HTTP/1.1 200 OK"
430 S.takeWhile (/= 13) bs `shouldBe` "HTTP/1.1 200 OK"
422
431
423 it "streaming response with length" $ do
432 it "streaming response with length" $ do
warp/warp.cabal+18−14
@@ -1,5 +1,5 @@
1Name: warp
1Name: warp
2−Version: 3.3.9
2+Version: 3.2.27
3Synopsis: A fast, light-weight web server for WAI applications.
3Synopsis: A fast, light-weight web server for WAI applications.
4License: MIT
4License: MIT
5License-file: LICENSE
5License-file: LICENSE
@@ -44,8 +44,8 @@ Library
44 , ghc-prim
44 , ghc-prim
45 , hashable
45 , hashable
46 , http-date
46 , http-date
47− , http-types >= 0.12
47+ , http-types >= 0.11
48− , http2 >= 2.0 && < 2.1
48+ , http2 >= 1.6 && < 1.7
49 , iproute >= 1.3.1
49 , iproute >= 1.3.1
50 , simple-sendfile >= 0.2.7 && < 0.3
50 , simple-sendfile >= 0.2.7 && < 0.3
51 , stm >= 2.3
51 , stm >= 2.3
@@ -56,7 +56,6 @@ Library
56 , vault >= 0.3
56 , vault >= 0.3
57 , wai >= 3.2 && < 3.3
57 , wai >= 3.2 && < 3.3
58 , word8
58 , word8
59− , x509
60 if impl(ghc < 8)
59 if impl(ghc < 8)
61 Build-Depends: semigroups
60 Build-Depends: semigroups
62 if flag(network-bytestring)
61 if flag(network-bytestring)
@@ -75,11 +74,15 @@ Library
75 Network.Wai.Handler.Warp.FileInfoCache
74 Network.Wai.Handler.Warp.FileInfoCache
76 Network.Wai.Handler.Warp.HashMap
75 Network.Wai.Handler.Warp.HashMap
77 Network.Wai.Handler.Warp.HTTP2
76 Network.Wai.Handler.Warp.HTTP2
77+ Network.Wai.Handler.Warp.HTTP2.EncodeFrame
78 Network.Wai.Handler.Warp.HTTP2.File
78 Network.Wai.Handler.Warp.HTTP2.File
79− Network.Wai.Handler.Warp.HTTP2.PushPromise
79+ Network.Wai.Handler.Warp.HTTP2.HPACK
80+ Network.Wai.Handler.Warp.HTTP2.Manager
81+ Network.Wai.Handler.Warp.HTTP2.Receiver
80 Network.Wai.Handler.Warp.HTTP2.Request
82 Network.Wai.Handler.Warp.HTTP2.Request
81− Network.Wai.Handler.Warp.HTTP2.Response
83+ Network.Wai.Handler.Warp.HTTP2.Sender
82 Network.Wai.Handler.Warp.HTTP2.Types
84 Network.Wai.Handler.Warp.HTTP2.Types
85+ Network.Wai.Handler.Warp.HTTP2.Worker
83 Network.Wai.Handler.Warp.Header
86 Network.Wai.Handler.Warp.Header
84 Network.Wai.Handler.Warp.IO
87 Network.Wai.Handler.Warp.IO
85 Network.Wai.Handler.Warp.Imports
88 Network.Wai.Handler.Warp.Imports
@@ -114,7 +117,6 @@ Library
114 Default-Language: Haskell2010
117 Default-Language: Haskell2010
115
118
116Test-Suite doctest
119Test-Suite doctest
117− buildable: False
118 Type: exitcode-stdio-1.0
120 Type: exitcode-stdio-1.0
119 HS-Source-Dirs: test
121 HS-Source-Dirs: test
120 Ghc-Options: -threaded -Wall
122 Ghc-Options: -threaded -Wall
@@ -151,11 +153,15 @@ Test-Suite spec
151 Network.Wai.Handler.Warp.File
153 Network.Wai.Handler.Warp.File
152 Network.Wai.Handler.Warp.FileInfoCache
154 Network.Wai.Handler.Warp.FileInfoCache
153 Network.Wai.Handler.Warp.HTTP2
155 Network.Wai.Handler.Warp.HTTP2
156+ Network.Wai.Handler.Warp.HTTP2.EncodeFrame
154 Network.Wai.Handler.Warp.HTTP2.File
157 Network.Wai.Handler.Warp.HTTP2.File
155− Network.Wai.Handler.Warp.HTTP2.PushPromise
158+ Network.Wai.Handler.Warp.HTTP2.HPACK
159+ Network.Wai.Handler.Warp.HTTP2.Manager
160+ Network.Wai.Handler.Warp.HTTP2.Receiver
156 Network.Wai.Handler.Warp.HTTP2.Request
161 Network.Wai.Handler.Warp.HTTP2.Request
157− Network.Wai.Handler.Warp.HTTP2.Response
162+ Network.Wai.Handler.Warp.HTTP2.Sender
158 Network.Wai.Handler.Warp.HTTP2.Types
163 Network.Wai.Handler.Warp.HTTP2.Types
164+ Network.Wai.Handler.Warp.HTTP2.Worker
159 Network.Wai.Handler.Warp.HashMap
165 Network.Wai.Handler.Warp.HashMap
160 Network.Wai.Handler.Warp.Header
166 Network.Wai.Handler.Warp.Header
161 Network.Wai.Handler.Warp.IO
167 Network.Wai.Handler.Warp.IO
@@ -196,8 +202,8 @@ Test-Suite spec
196 , hspec >= 1.3
202 , hspec >= 1.3
197 , http-client
203 , http-client
198 , http-date
204 , http-date
199− , http-types >= 0.12
205+ , http-types >= 0.8.5
200− , http2 >= 2.0 && < 2.1
206+ , http2 >= 1.6 && < 1.7
201 , iproute >= 1.3.1
207 , iproute >= 1.3.1
202 , lifted-base >= 0.1
208 , lifted-base >= 0.1
203 , network
209 , network
@@ -208,15 +214,14 @@ Test-Suite spec
208 , text
214 , text
209 , time
215 , time
210 , time-manager
216 , time-manager
217+ , transformers >= 0.2.2
211 , unix-compat >= 0.2
218 , unix-compat >= 0.2
212 , vault
219 , vault
213 , wai >= 3.2 && < 3.3
220 , wai >= 3.2 && < 3.3
214 , word8
221 , word8
215− , x509
216 -- Build-Tool-Depends: hspec-discover:hspec-discover
222 -- Build-Tool-Depends: hspec-discover:hspec-discover
217 if impl(ghc < 8)
223 if impl(ghc < 8)
218 Build-Depends: semigroups
224 Build-Depends: semigroups
219− , transformers
220
225
221 if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
226 if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
222 Cpp-Options: -DSENDFILEFD
227 Cpp-Options: -DSENDFILEFD
@@ -251,7 +256,6 @@ Benchmark parser
251 , network
256 , network
252 , time-manager
257 , time-manager
253 , unix-compat
258 , unix-compat
254− , x509
255 if impl(ghc < 8)
259 if impl(ghc < 8)
256 Build-Depends: semigroups
260 Build-Depends: semigroups
257
261