X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FPostprocess.hs;h=062a3bf6203c303195684999a4198cb510338700;hb=d05d8c883eaca12ee621975a2b95c5ebdc2357d2;hp=b7b910f3142ed54caa0078e2a78a35105ec9fe36;hpb=3c7a58ab749a55a30466a033b170536bcdf18b98;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Postprocess.hs b/Network/HTTP/Lucu/Postprocess.hs
index b7b910f..062a3bf 100644
--- a/Network/HTTP/Lucu/Postprocess.hs
+++ b/Network/HTTP/Lucu/Postprocess.hs
@@ -1,6 +1,6 @@
 module Network.HTTP.Lucu.Postprocess
-    ( postprocess -- Interaction -> STM ()
-    , completeUnconditionalHeaders -- Response -> IO Response
+    ( postprocess
+    , completeUnconditionalHeaders
     )
     where
 
@@ -9,31 +9,36 @@ import           Control.Monad
 import           Data.Char
 import           Data.Maybe
 import           GHC.Conc (unsafeIOToSTM)
+import           Network.HTTP.Lucu.Abortion
+import           Network.HTTP.Lucu.Config
 import           Network.HTTP.Lucu.Headers
 import           Network.HTTP.Lucu.HttpVersion
 import           Network.HTTP.Lucu.Interaction
 import           Network.HTTP.Lucu.RFC1123DateTime
 import           Network.HTTP.Lucu.Request
 import           Network.HTTP.Lucu.Response
-import           Network.HTTP.Lucu.Utils
 import           System.Time
 
 {-
   
-  * Response が未設定なら、HTTP/1.1 500 Internal Server Error にする。
+  * Response が未設定なら、200 OK にする。
 
-  * Content-Length があれば、それを削除する。
+  * ステータスが 2xx, 3xx, 4xx, 5xx のいずれでもなければ 500 にする。
 
-  * HTTP/1.1 であり、且つ body を持つ事が出來る時、Transfer-Encoding の
-    最後の要素が chunked でなければ 500 Internal Error にする。
-    Transfer-Encoding が未設定であれば、chunked に設定する。
+  * 405 Method Not Allowed なのに Allow ヘッダが無ければ 500 にする。
 
-  * HTTP/1.0 なのに Transfer-Encoding が設定濟なら 500 Internal Server
-    Error にする。但し identity だけは許す。
+  * 304 Not Modified 以外の 3xx なのに Location ヘッダが無ければ 500 に
+    する。
 
-  * body を持つ事が出來る時、Content-Type が無ければ
-    application/octet-stream にする。出來ない時、HEAD でなければ
-    Content-Type を削除する。
+  * Content-Length があれば、それを削除する。Transfer-Encoding があって
+    も削除する。
+
+  * HTTP/1.1 であり、body を持つ事が出來る時、Transfer-Encoding を
+    chunked に設定する。
+
+  * body を持つ事が出來る時、Content-Type が無ければデフォルト値にする。
+    出來ない時、HEAD でなければContent-Type, Etag, Last-Modified を削除
+    する。
 
   * body を持つ事が出來ない時、body 破棄フラグを立てる。
 
@@ -47,93 +52,104 @@ import           System.Time
 
 -}
 
-{- Postprocess は body を補完した後で實行する事 -}
-
 postprocess :: Interaction -> STM ()
 postprocess itr
-    = do res <- readTVar (itrResponse itr)
+    = itr `seq`
+      do reqM <- readItr itr itrRequest id
+         res  <- readItr itr itrResponse id
+         let sc = resStatus res
+
+         when (not $ any (\ p -> p sc) [isSuccessful, isRedirection, isError])
+                  $ abortSTM InternalServerError []
+                        $ Just ("The status code is not good for a final status: "
+                                ++ show sc)
 
-         when (res == Nothing)
-              $ setStatus itr InternalServerError
+         when (sc == MethodNotAllowed && getHeader "Allow" res == Nothing)
+                  $ abortSTM InternalServerError []
+                        $ Just ("The status was " ++ show sc ++ " but no Allow header.")
 
-         when (itrRequest itr /= Nothing)
+         when (sc /= NotModified && isRedirection sc && getHeader "Location" res == Nothing)
+                  $ abortSTM InternalServerError []
+                        $ Just ("The status code was " ++ show sc ++ " but no Location header.")
+
+         when (reqM /= Nothing)
               $ relyOnRequest itr
 
-         do oldRes <- readTVar (itrResponse itr)
-            newRes <- unsafeIOToSTM $ completeUnconditionalHeaders $ fromJust oldRes
-            setRes itr newRes
+         -- itrResponse の内容は relyOnRequest によって變へられてゐる可
+         -- 能性が高い。
+         do oldRes <- readItr itr itrResponse id
+            newRes <- unsafeIOToSTM
+                      $ completeUnconditionalHeaders (itrConfig itr) oldRes
+            writeItr itr itrResponse newRes
     where
+      relyOnRequest :: Interaction -> STM ()
       relyOnRequest itr
-          = do resM <- readTVar (itrResponse itr)
+          = itr `seq`
+            do status <- readItr itr itrResponse resStatus
+               req    <- readItr itr itrRequest fromJust
 
-               let req         = fromJust $ itrRequest itr
-                   reqVer      = reqVersion req
-                   res         = fromJust resM
-                   status      = resStatus res
+               let reqVer      = reqVersion req
                    canHaveBody = if reqMethod req == HEAD then
                                      False
                                  else
-                                     isInformational status ||
-                                     status == NoContent    ||
-                                     status == ResetContent ||
-                                     status == NotModified
+                                     not (isInformational status ||
+                                          status == NoContent    ||
+                                          status == ResetContent ||
+                                          status == NotModified    )
+
+               updateRes itr $! deleteHeader "Content-Length"
+               updateRes itr $! deleteHeader "Transfer-Encoding"
 
-               setRes itr (deleteHeader res "Content-Length")
+               cType <- readHeader itr "Content-Type"
+               when (cType == Nothing)
+                        $ updateRes itr $ setHeader "Content-Type" defaultPageContentType
 
                if canHaveBody then
-                   do if reqVer == HttpVersion 1 1 then
-
-                          case getHeader res "Transfer-Encoding" of
-                            Nothing -> setRes itr (setHeader res "Transfer-Encoding" "chunked")
-                            Just te -> let teList = [trim isWhiteSpace x
-                                                         | x <- splitBy (== ',') (map toLower te)]
-                                       in
-                                         when (teList == [] || last teList /= "chunked")
-                                                  $ setStatus itr InternalServerError
-                        else
-                          case getHeader res "Transfer-Encoding" of
-                            Nothing         -> return ()
-                            Just "identity" -> return ()
-                            _               -> setStatus itr InternalServerError
-                
-                      when (getHeader res "Content-Type" == Nothing)
-                               $ setRes itr (setHeader res "Content-Type" "application/octet-stream")
+                   when (reqVer == HttpVersion 1 1)
+                            $ do updateRes itr $! setHeader "Transfer-Encoding" "chunked"
+                                 writeItr itr itrWillChunkBody True
                  else
                    -- body 関連のヘッダを削除。但し HEAD なら Content-* は殘す
-                   do setRes itr (deleteHeader res "Transfer-Encoding")
-                      when (reqMethod req /= HEAD)
-                               $ setRes itr (deleteHeader res "Content-Type")
+                   when (reqMethod req /= HEAD)
+                            $ do updateRes itr $! deleteHeader "Content-Type"
+                                 updateRes itr $! deleteHeader "Etag"
+                                 updateRes itr $! deleteHeader "Last-Modified"
 
-               if fmap (map toLower) (getHeader res "Connection") == Just "close" then
-                   writeTVar (itrWillClose itr) True
-                 else
-                   setRes itr (setHeader res "Connection" "close")
+               conn <- readHeader itr "Connection"
+               case fmap (map toLower) conn of
+                 Just "close" -> writeItr itr itrWillClose True
+                 _            -> return ()
+
+               willClose <- readItr itr itrWillClose id
+               when willClose
+                        $ updateRes itr $! setHeader "Connection" "close"
 
                when (reqMethod req == HEAD || not canHaveBody)
                         $ writeTVar (itrWillDiscardBody itr) True
 
-      setStatus itr status
-          = writeTVar (itrResponse itr) (Just $ Response {
-                                                    resVersion = HttpVersion 1 1
-                                                  , resStatus  = status
-                                                  , resHeaders = []
-                                                  })
+      readHeader :: Interaction -> String -> STM (Maybe String)
+      readHeader itr name
+          = itr `seq` name `seq`
+            readItr itr itrResponse $ getHeader name
 
-      setRes itr res
-          = writeTVar (itrResponse itr) (Just res)
+      updateRes :: Interaction -> (Response -> Response) -> STM ()
+      updateRes itr updator 
+          = itr `seq` updator `seq`
+            updateItr itr itrResponse updator
 
 
-completeUnconditionalHeaders :: Response -> IO Response
-completeUnconditionalHeaders res
-    = return res >>= compServer >>= compDate >>= return
+completeUnconditionalHeaders :: Config -> Response -> IO Response
+completeUnconditionalHeaders conf res
+    = conf `seq` res `seq`
+      return res >>= compServer >>= compDate >>= return
       where
         compServer res
-            = case getHeader res "Server" of
-                Nothing -> return $ addHeader res "Server" "Lucu/1.0"
+            = case getHeader "Server" res of
+                Nothing -> return $ addHeader "Server" (cnfServerSoftware conf) res
                 Just _  -> return res
 
         compDate res
-            = case getHeader res "Date" of
+            = case getHeader "Date" res of
                 Nothing -> do time <- getClockTime
-                              return $ addHeader res "Date" $ formatHTTPDateTime time
+                              return $ addHeader "Date" (formatHTTPDateTime time) res
                 Just _  -> return res
\ No newline at end of file