From 034866a9aaeb07a1e072db83279acf1ad0ffcf46 Mon Sep 17 00:00:00 2001 From: Tom Smeding Date: Sun, 8 Nov 2026 13:09:49 +0000 Subject: Move server-test to test/server --- .gitignore | 1 + server-test/Main.hs | 85 ---------------------------------------------------- test/server/Main.hs | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tirclogv.cabal | 2 +- 4 files changed, 88 insertions(+), 86 deletions(-) delete mode 100644 server-test/Main.hs create mode 100644 test/server/Main.hs diff --git a/.gitignore b/.gitignore index 2d48d90..fc32a27 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +cabal.project.local dist-newstyle/ .ccls-cache/ tirclogv.prof diff --git a/server-test/Main.hs b/server-test/Main.hs deleted file mode 100644 index 43cba76..0000000 --- a/server-test/Main.hs +++ /dev/null @@ -1,85 +0,0 @@ -{-# LANGUAGE OverloadedStrings #-} -module Main where - -import Control.Monad (when) -import Control.Monad.Trans.State.Strict -import Data.ByteString (ByteString) -import Data.ByteString qualified as BS -import Hedgehog -import Hedgehog.Gen qualified as Gen -import Hedgehog.Range qualified as Range -import System.Exit - -import Network.HTTP.Server.Mini.Internal.Parser -import Network.HTTP.Server.Mini.Types - - -randomSlicing :: Int -> Int -> Gen [Int] -randomSlicing n _ | n <= 0 = error "no slices" -randomSlicing 1 target = return [target] -randomSlicing numslice target = do - n1 <- Gen.integral (Range.constant 1 (target - numslice)) - ns <- (n1:) <$> go (numslice - 1) (target - n1) - when (sum ns /= target || any (== 0) ns) $ - error (show (ns, target)) - Gen.shuffle ns - where - go 1 tg - | tg <= 0 = error "impossible" - | otherwise = return [tg] - go ns tg - | tg < ns = error "impossible" - | tg == ns = return (replicate ns 1) - | otherwise = do - s <- Gen.integral (Range.constant 1 (min (tg - (ns-1)) (round (fromIntegral (3 * tg) / fromIntegral ns :: Double)))) - (s:) <$> go (ns-1) (tg - s) - -randomTextSlicing :: ByteString -> Gen [ByteString] -randomTextSlicing str = do - nfragments <- Gen.integral (Range.linear 1 10) - lens <- randomSlicing nfragments (BS.length str) - let slices [] _ = [] - slices (l:ls) r = let (pre, post) = BS.splitAt l r - in pre : slices ls post - return (slices lens str) - -readRequestSliced :: Int -> [ByteString] -> Maybe Request -readRequestSliced maxlen slices = - evalState (readRequest maxlen (\_ -> state (\case x:xs -> (x, xs) - [] -> (BS.empty, [])))) - slices - -prop_valid :: Property -prop_valid = property $ do - crlf <- forAll (Gen.choice [pure "\r\n", pure "\n"]) - slices <- forAll (randomTextSlicing (requestText crlf)) - readRequestSliced 4096 slices === Just answer - where - requestText :: ByteString -> ByteString - requestText crlf = BS.concat - ["GET /path/x?q=1&a=2 HTTP/1.1", crlf - ,"Host: tirclogv.example", crlf - ,"Accept: */*", crlf - ,crlf] - - answer = Request - { reqMethod = "GET" - , reqURI = "/path/x?q=1&a=2" - , reqHeaders = [("host", "tirclogv.example"), ("accept", "*/*")] - , reqPath = ["path", "x"] - , reqQuery = [("q", "1"), ("a", "2")] - } - -tests :: IO Bool -tests = checkParallel $ Group "mini-http-server" - [("valid", withTests 10000 prop_valid) - ] - --- main :: IO () --- main = do --- print $ evalState (readRequest 4096 (\_ -> state (\case x:xs -> (x, xs); [] -> (BS.empty, [])))) ["GET /path/x?q=1&a=2 HTTP/1.1\r\nHost: tirclogv.example\r\nAccept: */*\r\n", "\r", "\n"] - -main :: IO () -main = tests >>= \case - True -> exitSuccess - False -> exitFailure diff --git a/test/server/Main.hs b/test/server/Main.hs new file mode 100644 index 0000000..cd69f9c --- /dev/null +++ b/test/server/Main.hs @@ -0,0 +1,86 @@ +{-# LANGUAGE OverloadedStrings #-} +module Main where + +import Control.Monad (when) +import Control.Monad.Trans.State.Strict +import Data.ByteString (ByteString) +import Data.ByteString qualified as BS +import Hedgehog +import Hedgehog.Gen qualified as Gen +import Hedgehog.Range qualified as Range +import System.Exit + +import Network.HTTP.Server.Mini.Internal.Parser +import Network.HTTP.Server.Mini.Types + + +randomSlicing :: Int -> Int -> Gen [Int] +randomSlicing n _ | n <= 0 = error "no slices" +randomSlicing 1 target = return [target] +randomSlicing numslice target = do + n1 <- Gen.integral (Range.constant 1 (target - numslice)) + ns <- (n1:) <$> go (numslice - 1) (target - n1) + when (sum ns /= target || any (== 0) ns) $ + error (show (ns, target)) + Gen.shuffle ns + where + go 1 tg + | tg <= 0 = error "impossible" + | otherwise = return [tg] + go ns tg + | tg < ns = error "impossible" + | tg == ns = return (replicate ns 1) + | otherwise = do + s <- Gen.integral (Range.constant 1 (min (tg - (ns-1)) (round (fromIntegral (3 * tg) / fromIntegral ns :: Double)))) + (s:) <$> go (ns-1) (tg - s) + +randomTextSlicing :: ByteString -> Gen [ByteString] +randomTextSlicing str = do + nfragments <- Gen.integral (Range.linear 1 10) + lens <- randomSlicing nfragments (BS.length str) + let slices [] _ = [] + slices (l:ls) r = let (pre, post) = BS.splitAt l r + in pre : slices ls post + return (slices lens str) + +readRequestSliced :: Int -> [ByteString] -> Maybe Request +readRequestSliced maxlen slices = + evalState (readRequest maxlen (\_ -> state (\case x:xs -> (x, xs) + [] -> (BS.empty, [])))) + slices + +prop_valid :: Property +prop_valid = property $ do + crlf <- forAll (Gen.choice [pure "\r\n", pure "\n"]) + slices <- forAll (randomTextSlicing (requestText crlf)) + readRequestSliced 4096 slices === Just answer + where + requestText :: ByteString -> ByteString + requestText crlf = BS.concat + ["GET /path/x?q=1&a=2 HTTP/1.1", crlf + ,"Host: tirclogv.example", crlf + ,"Accept: */*", crlf + ,crlf] + + answer = Request + { reqMethod = "GET" + , reqURI = "/path/x?q=1&a=2" + , reqHeaders = [("host", "tirclogv.example"), ("accept", "*/*")] + , reqPath = ["path", "x"] + , reqQuery = [("q", "1"), ("a", "2")] + , reqCookies = [] + } + +tests :: IO Bool +tests = checkParallel $ Group "mini-http-server" + [("valid", withTests 10000 prop_valid) + ] + +-- main :: IO () +-- main = do +-- print $ evalState (readRequest 4096 (\_ -> state (\case x:xs -> (x, xs); [] -> (BS.empty, [])))) ["GET /path/x?q=1&a=2 HTTP/1.1\r\nHost: tirclogv.example\r\nAccept: */*\r\n", "\r", "\n"] + +main :: IO () +main = tests >>= \case + True -> exitSuccess + False -> exitFailure diff --git a/tirclogv.cabal b/tirclogv.cabal index 8484e40..b0c3fe1 100644 --- a/tirclogv.cabal +++ b/tirclogv.cabal @@ -110,7 +110,7 @@ test-suite server-test bytestring, hedgehog, transformers - hs-source-dirs: server-test + hs-source-dirs: test/server executable echo-server import: common -- cgit v1.3.1