X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FStaticFile.hs;h=9175ce9289c816cdb4f8375195b9adf53efb2214;hb=70bf5bd248aa426ca4e410b3fb9a0529354aedaf;hp=12cf78b0729c760c82e6f35faa08909f6d53b876;hpb=0dc3d31312a12f2b085242841b29eb0d96e9c4ac;p=Lucu.git

diff --git a/Network/HTTP/Lucu/StaticFile.hs b/Network/HTTP/Lucu/StaticFile.hs
index 12cf78b..9175ce9 100644
--- a/Network/HTTP/Lucu/StaticFile.hs
+++ b/Network/HTTP/Lucu/StaticFile.hs
@@ -1,3 +1,7 @@
+{-# LANGUAGE
+    BangPatterns
+  , UnicodeSyntax
+  #-}
 -- | Handling static files on the filesystem.
 module Network.HTTP.Lucu.StaticFile
     ( staticFile
@@ -13,6 +17,7 @@ module Network.HTTP.Lucu.StaticFile
 import           Control.Monad
 import           Control.Monad.Trans
 import qualified Data.ByteString.Lazy.Char8 as B
+import           Data.Time.Clock.POSIX
 import           Network.HTTP.Lucu.Abortion
 import           Network.HTTP.Lucu.Config
 import           Network.HTTP.Lucu.ETag
@@ -22,7 +27,7 @@ import           Network.HTTP.Lucu.Resource
 import           Network.HTTP.Lucu.Resource.Tree
 import           Network.HTTP.Lucu.Response
 import           Network.HTTP.Lucu.Utils
-import           System.Directory
+import           System.FilePath.Posix
 import           System.Posix.Files
 
 
@@ -53,33 +58,33 @@ staticFile path
 handleStaticFile :: FilePath -> Resource ()
 handleStaticFile path
     = path `seq`
-      do isFile <- liftIO $ doesFileExist path
-         if isFile then
+      do exists <- liftIO $ fileExist path
+         if exists then
              -- 存在はした。讀めるかどうかは知らない。
-             do readable <- liftIO $ fileAccess path True False False
-                unless readable
+             do stat <- liftIO $ getFileStatus path
+                if isRegularFile stat then
+                    do readable <- liftIO $ fileAccess path True False False
+                       unless readable
                            -- 讀めない
                            $ abort Forbidden [] Nothing
+                       -- 讀める
+                       tag     <- liftIO $ generateETagFromFile path
+                       let lastMod = posixSecondsToUTCTime $ fromRational $ toRational $ modificationTime stat
+                       foundEntity tag lastMod
 
-                -- 讀める
-                tag      <- liftIO $ generateETagFromFile path
-                lastMod  <- liftIO $ getModificationTime path
-                foundEntity tag lastMod
+                       -- MIME Type を推定
+                       conf <- getConfig
+                       case guessTypeByFileName (cnfExtToMIMEType conf) path of
+                         Nothing   -> return ()
+                         Just mime -> setContentType mime
 
-                -- MIME Type を推定
-                conf <- getConfig
-                case guessTypeByFileName (cnfExtToMIMEType conf) path of
-                  Nothing   -> return ()
-                  Just mime -> setContentType mime
-
-                -- 實際にファイルを讀んで送る
-                (liftIO $ B.readFile path) >>= outputLBS
-           else
-             do isDir <- liftIO $ doesDirectoryExist path
-                if isDir then
-                    abort Forbidden [] Nothing
+                       -- 實際にファイルを讀んで送る
+                       liftIO (B.readFile path) >>= outputLBS
                   else
-                    foundNoEntity Nothing
+                    abort Forbidden [] Nothing
+           else
+             foundNoEntity Nothing
+
 
 -- |Computation of @'generateETagFromFile' fpath@ generates a strong
 -- entity tag from a file. The file doesn't necessarily have to be a
@@ -134,16 +139,15 @@ staticDir path
 -- 'Network.HTTP.Lucu.Resource.Tree.ResTree', you had better use
 -- 'staticDir' instead of this.
 handleStaticDir :: FilePath -> Resource ()
-handleStaticDir basePath
-    = basePath `seq`
-      do extraPath <- getPathInfo
+handleStaticDir !basePath
+    = do extraPath <- getPathInfo
          securityCheck extraPath
-         let path = basePath ++ "/" ++ joinWith "/" extraPath
+         let path = basePath </> joinPath extraPath
 
          handleStaticFile path
     where
       securityCheck :: Monad m => [String] -> m ()
-      securityCheck pathElems
-          = pathElems `seq`
-            when (any (== "..") pathElems) $ fail ("security error: "
+      securityCheck !pathElems
+          = when (any (== "..") pathElems) $ fail ("security error: "
                                                    ++ joinWith "/" pathElems)
+-- TODO: implement directory listing.