module Network.HTTP.Lucu.Parser
( Parser(..)
- , parse -- Parser a -> ByteString -> Maybe (a, ByteString)
+ , ParserResult(..)
+ , parse -- Parser a -> ByteString -> ParserResult a
, anyChar -- Parser Char
, satisfy -- (Char -> Bool) -> Parser Char
, char -- Char -> Parser Char
import Data.ByteString.Lazy.Char8 (ByteString)
data Parser a = Parser {
- runParser :: State ByteString (Maybe a)
+ runParser :: State ByteString (ParserResult a)
}
+data ParserResult a = Success a
+ | IllegalInput -- 受理出來ない入力があった
+ | ReachedEOF -- 限界を越えて讀まうとした
+
-- (>>=) :: Parser a -> (a -> Parser b) -> Parser b
instance Monad Parser where
p >>= f = Parser $ do saved <- get -- 失敗した時の爲に状態を保存
result <- runParser p
case result of
- Just a -> runParser (f a)
- Nothing -> do put saved -- 状態を復歸
- return Nothing
- return = Parser . return . Just
- fail _ = Parser $ return Nothing
+ Success a -> runParser (f a)
+ IllegalInput -> do put saved -- 状態を復歸
+ return IllegalInput
+ ReachedEOF -> return ReachedEOF
+ return = Parser . return . Success
+ fail _ = Parser $ return IllegalInput
-parse :: Parser a -> ByteString -> Maybe (a, ByteString)
-parse p input = case runState (runParser p) input of
- (Just a , input') -> Just (a, input')
- (Nothing, _ ) -> Nothing
+parse :: Parser a -> ByteString -> (ParserResult a, ByteString)
+parse p input = runState (runParser p) input
anyChar :: Parser Char
anyChar = Parser $ do input <- get
if B.null input then
- return Nothing
+ return ReachedEOF
else
do let c = B.head input
put (B.tail input)
- return (Just c)
+ return (Success c)
satisfy :: (Char -> Bool) -> Parser Char
f <|> g = Parser $ do saved <- get -- 状態を保存
result <- runParser f
case result of
- Just a -> return (Just a)
- Nothing -> do put saved -- 状態を復歸
- runParser g
+ Success a -> return $ Success a
+ IllegalInput -> do put saved -- 状態を復歸
+ runParser g
+ ReachedEOF -> return ReachedEOF
oneOf :: [Char] -> Parser Char
requestReader :: Config -> ResTree -> Handle -> HostName -> InteractionQueue -> IO ()
requestReader cnf tree h host tQueue
- = do input <- B.hGetContents h
- catch (acceptRequest input) $ \ exc ->
+ = do catch (acceptRequest B.empty) $ \ exc ->
case exc of
- IOException _ -> return ()
- _ -> print exc
+ IOException _ -> return ()
+ AsyncException ThreadKilled -> return ()
+ BlockedIndefinitely -> putStrLn "requestReader: blocked indefinitely"
+ _ -> print exc
where
acceptRequest :: ByteString -> IO ()
- acceptRequest input
+ acceptRequest soFar
-- キューに最大パイプライン深度以上のリクエストが溜まってゐる
-- 時は、それが限度以下になるまで待つ。
- = do action
- <- atomically $
- do queue <- readTVar tQueue
- when (S.length queue >= cnfMaxPipelineDepth cnf)
- retry
+ = do atomically $ do queue <- readTVar tQueue
+ when (S.length queue >= cnfMaxPipelineDepth cnf)
+ retry
+
+ -- リクエストを讀む。パースできない場合は直ちに 400 Bad
+ -- Request 應答を設定し、それを出力してから切斷するやう
+ -- に ResponseWriter に通知する。
+ hWaitForInput h (-1)
+ chunk <- B.hGetNonBlocking h 1024
+
+ let input = B.append soFar chunk
+ case parse requestP input of
+ (Success req , input') -> acceptParsableRequest req input'
+ (IllegalInput, _ ) -> acceptNonparsableRequest
+ (ReachedEOF , _ ) -> if B.length input >= 1024 * 1024 then
+ -- ヘッダ長過ぎ
+ acceptNonparsableRequest
+ else
+ acceptRequest input
- -- リクエストを讀む。パースできない場合は直ち
- -- に 400 Bad Request 應答を設定し、それを出力
- -- してから切斷するやうに ResponseWriter に通
- -- 知する。
- case parse requestP input of
- Nothing -> return acceptNonparsableRequest
- Just (req, input') -> return $ acceptParsableRequest req input'
- action
acceptNonparsableRequest :: IO ()
acceptNonparsableRequest
enqueue itr
acceptParsableRequest :: Request -> ByteString -> IO ()
- acceptParsableRequest req input'
+ acceptParsableRequest req soFar
= do itr <- newInteraction host (Just req)
action
<- atomically $
do preprocess itr
isErr <- readItrF itr itrResponse (isError . resStatus)
if isErr == Just True then
- acceptSemanticallyInvalidRequest itr input'
+ acceptSemanticallyInvalidRequest itr soFar
else
case findResource tree $ (reqURI . fromJust . itrRequest) itr of
Nothing -- Resource が無かった
- -> acceptRequestForNonexistentResource itr input'
+ -> acceptRequestForNonexistentResource itr soFar
Just rsrcDef -- あった
- -> acceptRequestForExistentResource itr input' rsrcDef
+ -> acceptRequestForExistentResource itr soFar rsrcDef
action
acceptSemanticallyInvalidRequest :: Interaction -> ByteString -> STM (IO ())
- acceptSemanticallyInvalidRequest itr input
+ acceptSemanticallyInvalidRequest itr soFar
= do writeItr itr itrState Done
writeDefaultPage itr
postprocess itr
enqueue itr
- return $ acceptRequest input
+ return $ acceptRequest soFar
acceptRequestForNonexistentResource :: Interaction -> ByteString -> STM (IO ())
- acceptRequestForNonexistentResource itr input
+ acceptRequestForNonexistentResource itr soFar
= do let res = Response {
resVersion = HttpVersion 1 1
, resStatus = NotFound
writeDefaultPage itr
postprocess itr
enqueue itr
- return $ acceptRequest input
+ return $ acceptRequest soFar
acceptRequestForExistentResource :: Interaction -> ByteString -> ResourceDef -> STM (IO ())
- acceptRequestForExistentResource itr input rsrcDef
+ acceptRequestForExistentResource itr soFar rsrcDef
= do requestHasBody <- readItr itr itrRequestHasBody id
writeItr itr itrState (if requestHasBody
then ExaminingHeader
enqueue itr
return $ do runResource rsrcDef itr
if requestHasBody then
- observeRequest itr input
+ observeRequest itr soFar
else
- acceptRequest input
+ acceptRequest soFar
observeRequest :: Interaction -> ByteString -> IO ()
- observeRequest itr input = fail "FIXME: Not Implemented"
+ observeRequest itr soFar = fail "FIXME: Not Implemented"
enqueue :: Interaction -> STM ()
enqueue itr = do queue <- readTVar tQueue
projects / Lucu.git / commitdiff