where
import Control.Applicative
import Control.Monad
-import Control.Monad.State
+import Control.Monad.State.Strict
import Data.Ascii (Ascii)
import qualified Data.Ascii as A
import qualified Data.ByteString.Char8 as C8
+import Data.CaseInsensitive (CI)
+import qualified Data.CaseInsensitive as CI
+import Data.Convertible.Base
+import Data.Convertible.Instances.Text ()
import Data.Maybe
import Data.Text (Text)
-import qualified Data.Text as T
import qualified Data.Text.Encoding as T
import Network.HTTP.Lucu.Headers
import Network.HTTP.Lucu.HttpVersion
import Network.HTTP.Lucu.Request
-import Network.HTTP.Lucu.Response
+import Network.HTTP.Lucu.Response.StatusCode
import Network.Socket
import Network.URI
import Prelude.Unicode
data AugmentedRequest
= AugmentedRequest {
- arRequest ∷ !(Maybe Request)
- , arInitialStatus ∷ !StatusCode
+ arRequest ∷ !Request
+ , arInitialStatus ∷ !SomeStatusCode
+ , arWillChunkBody ∷ !Bool
, arWillClose ∷ !Bool
- , arWillDiscardBody ∷ !Bool
- , arExpectedContinue ∷ !(Maybe Bool)
+ , arExpectedContinue ∷ !Bool
, arReqBodyLength ∷ !(Maybe RequestBodyLength)
}
| Chunked
deriving (Eq, Show)
-preprocess ∷ Text
- → PortNumber
- → Either StatusCode Request
- → AugmentedRequest
-preprocess localHost localPort request
- = case request of
- Right req
- → preprocess' localHost localPort req
- Left sc
- → unparsable sc
-
-unparsable ∷ StatusCode → AugmentedRequest
-unparsable sc
- = AugmentedRequest {
- arRequest = Nothing
- , arInitialStatus = sc
- , arWillClose = True
- , arWillDiscardBody = False
- , arExpectedContinue = Nothing
- , arReqBodyLength = Nothing
- }
-
-preprocess' ∷ Text → PortNumber → Request → AugmentedRequest
-preprocess' localHost localPort req@(Request {..})
+preprocess ∷ CI Text → PortNumber → Request → AugmentedRequest
+preprocess localHost localPort req@(Request {..})
= execState go initialAR
where
initialAR ∷ AugmentedRequest
initialAR = AugmentedRequest {
- arRequest = Just req
- , arInitialStatus = Ok
+ arRequest = req
+ , arInitialStatus = fromStatusCode OK
+ , arWillChunkBody = False
, arWillClose = False
- , arWillDiscardBody = False
- , arExpectedContinue = Just False
+ , arExpectedContinue = False
, arReqBodyLength = Nothing
}
-
go ∷ State AugmentedRequest ()
go = do examineHttpVersion
examineMethod
setRequest ∷ Request → State AugmentedRequest ()
setRequest req
- = modify $ \ar → ar { arRequest = Just req }
+ = modify $ \ar → ar { arRequest = req }
-setStatus ∷ StatusCode → State AugmentedRequest ()
+setStatus ∷ StatusCode sc ⇒ sc → State AugmentedRequest ()
setStatus sc
- = modify $ \ar → ar { arInitialStatus = sc }
+ = modify $ \ar → ar { arInitialStatus = fromStatusCode sc }
setWillClose ∷ Bool → State AugmentedRequest ()
setWillClose b
examineHttpVersion ∷ State AugmentedRequest ()
examineHttpVersion
- = do req ← gets (fromJust ∘ arRequest)
+ = do req ← gets arRequest
case reqVersion req of
-- HTTP/1.0 requests can't Keep-Alive.
HttpVersion 1 0
→ setWillClose True
HttpVersion 1 1
- → return ()
- _ → do setStatus HttpVersionNotSupported
+ → modify $ \ar → ar { arWillChunkBody = True }
+ _ → do setStatus HTTPVersionNotSupported
setWillClose True
examineMethod ∷ State AugmentedRequest ()
examineMethod
- = do req ← gets (fromJust ∘ arRequest)
+ = do req ← gets arRequest
case reqMethod req of
GET → return ()
- HEAD → modify $ \ar → ar { arWillDiscardBody = True }
+ HEAD → return ()
POST → return ()
PUT → return ()
DELETE → return ()
_ → setStatus NotImplemented
-examineAuthority ∷ Text → PortNumber → State AugmentedRequest ()
+examineAuthority ∷ CI Text → PortNumber → State AugmentedRequest ()
examineAuthority localHost localPort
- = do req ← gets (fromJust ∘ arRequest)
+ = do req ← gets arRequest
when (isNothing $ uriAuthority $ reqURI req) $
case reqVersion req of
-- HTTP/1.0 requests have no Host header so complete it
req' = updateAuthority host port req
in
setRequest req'
- -- HTTP/1.1 requests MUST have a Host header.
+ -- HTTP/1.1 requests MUST have a Host header, but if
+ -- the requested URI has an authority, the value of
+ -- Host header must be ignored. See:
+ -- http://tools.ietf.org/html/rfc2616#section-5.2
HttpVersion 1 1
→ case getHeader "Host" req of
Just str
- → let (host, port)
- = parseHost str
- req' = updateAuthority host port req
- in
- setRequest req'
+ | isNothing ∘ uriAuthority ∘ reqURI $ req
+ → let (host, port)
+ = parseHost str
+ req' = updateAuthority host port req
+ in
+ setRequest req'
+ | otherwise
+ → return ()
Nothing
→ setStatus BadRequest
-- Should never reach here...
ver → fail ("internal error: unknown version: " ⧺ show ver)
-parseHost ∷ Ascii → (Text, Ascii)
+parseHost ∷ Ascii → (CI Text, Ascii)
parseHost hp
- = let (h, p) = C8.break (≡ ':') $ A.toByteString hp
+ = let (h, p) = C8.break (≡ ':') $ cs hp
-- FIXME: should decode punycode here.
- hText = T.decodeUtf8 h
+ hText = CI.mk $ T.decodeUtf8 h
pAscii = A.unsafeFromByteString p
in
(hText, pAscii)
-updateAuthority ∷ Text → Ascii → Request → Request
-updateAuthority host port req
- = let uri = reqURI req
- uri' = uri {
+updateAuthority ∷ CI Text → Ascii → Request → Request
+updateAuthority host port req@(Request {..})
+ = let uri' = reqURI {
uriAuthority = Just URIAuth {
uriUserInfo = ""
- , uriRegName = T.unpack host
- , uriPort = A.toString port
+ , uriRegName = cs $ CI.original host
+ , uriPort = cs port
}
}
in
examineHeaders ∷ State AugmentedRequest ()
examineHeaders
- = do req ← gets (fromJust ∘ arRequest)
+ = do req ← gets arRequest
case getCIHeader "Expect" req of
Nothing → return ()
Just v
| v ≡ "100-continue"
- → modify $ \ar → ar { arExpectedContinue = Just True }
+ → modify $ \ar → ar { arExpectedContinue = True }
| otherwise
→ setStatus ExpectationFailed
| otherwise
→ setStatus NotImplemented
- case A.toByteString <$> getHeader "Content-Length" req of
+ case cs <$> getHeader "Content-Length" req of
Nothing → return ()
Just value → case C8.readInt value of
Just (len, garbage)
examineBodyLength ∷ State AugmentedRequest ()
examineBodyLength
- = do req ← gets (fromJust ∘ arRequest)
+ = do req ← gets arRequest
len ← gets arReqBodyLength
- if reqMustHaveBody req then
+ if reqHasBody req then
-- POST and PUT requests must have an entity body.
when (isNothing len)
$ setStatus LengthRequired
projects / Lucu.git / blobdiff