X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FStaticFile.hs;h=7ceb787d5a9355a040559cc867630efb090aa0ae;hb=195fd2318fb0ad21c2fd60f61e7df72a8f25d12c;hp=b84c9cb0ad1fe678ea48ddf66f0a32d4477a2230;hpb=0b4db5681e3b0b27357a87316822ea3671f8c174;p=Lucu.git

diff --git a/Network/HTTP/Lucu/StaticFile.hs b/Network/HTTP/Lucu/StaticFile.hs
index b84c9cb..7ceb787 100644
--- a/Network/HTTP/Lucu/StaticFile.hs
+++ b/Network/HTTP/Lucu/StaticFile.hs
@@ -13,18 +13,18 @@ module Network.HTTP.Lucu.StaticFile
 import           Control.Monad
 import           Control.Monad.Trans
 import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
+import           Data.Time.Clock.POSIX
 import           Network.HTTP.Lucu.Abortion
 import           Network.HTTP.Lucu.Config
 import           Network.HTTP.Lucu.ETag
+import           Network.HTTP.Lucu.Format
 import           Network.HTTP.Lucu.MIMEType.Guess
 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
-import           Text.Printf
 
 
 -- | @'staticFile' fpath@ is a
@@ -35,7 +35,7 @@ staticFile path
     = ResourceDef {
         resUsesNativeThread = False
       , resIsGreedy         = False
-      , resGet              = Just $ handleStaticFile path
+      , resGet              = Just $! handleStaticFile path
       , resHead             = Nothing
       , resPost             = Nothing
       , resPut              = Nothing
@@ -53,33 +53,34 @@ staticFile path
 -- 'staticFile' instead of this.
 handleStaticFile :: FilePath -> Resource ()
 handleStaticFile path
-    = do isFile <- liftIO $ doesFileExist path
-         if isFile then
+    = path `seq`
+      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) >>= outputBS
-           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
@@ -95,11 +96,17 @@ handleStaticFile path
 -- large (say, 1 TiB).
 generateETagFromFile :: FilePath -> IO ETag
 generateETagFromFile path
-    = do stat <- getFileStatus path
-         let inode   = fromEnum $ fileID   stat
-             size    = fromEnum $ fileSize stat
-             lastmod = fromEnum $ modificationTime stat
-         return $ strongETag $ printf "%x-%x-%x" inode size lastmod
+    = path `seq`
+      do stat <- getFileStatus path
+         let inode   = fromEnum $! fileID   stat
+             size    = fromEnum $! fileSize stat
+             lastMod = fromEnum $! modificationTime stat
+             tag     = fmtHex False 0 inode
+                       ++ "-" ++
+                       fmtHex False 0 size
+                       ++ "-" ++
+                       fmtHex False 0 lastMod
+         return $! strongETag tag
 
 -- | @'staticDir' dir@ is a
 -- 'Network.HTTP.Lucu.Resource.Tree.ResourceDef' which maps all files
@@ -110,7 +117,7 @@ staticDir path
     = ResourceDef {
         resUsesNativeThread = False
       , resIsGreedy         = True
-      , resGet              = Just $ handleStaticDir path
+      , resGet              = Just $! handleStaticDir path
       , resHead             = Nothing
       , resPost             = Nothing
       , resPut              = Nothing
@@ -128,14 +135,15 @@ staticDir path
 -- 'Network.HTTP.Lucu.Resource.Tree.ResTree', you had better use
 -- 'staticDir' instead of this.
 handleStaticDir :: FilePath -> Resource ()
-handleStaticDir basePath
+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
+      securityCheck !pathElems
           = when (any (== "..") pathElems) $ fail ("security error: "
                                                    ++ joinWith "/" pathElems)
+-- TODO: implement directory listing.