X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FHttpd.hs;h=654e50d43c46b1043f55cf0eeaa49032d6e26046;hb=73b5fba4907604681d778d3bd54cd65fd84b4454;hp=cbbb517abf2d98effe2dc806d1ebef7904fc204b;hpb=ba87ca171f0a058f501655ffa6f6e845f2f800a6;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Httpd.hs b/Network/HTTP/Lucu/Httpd.hs
index cbbb517..654e50d 100644
--- a/Network/HTTP/Lucu/Httpd.hs
+++ b/Network/HTTP/Lucu/Httpd.hs
@@ -1,6 +1,7 @@
--- | The entry point of Lucu httpd.
+-- |The entry point of Lucu httpd.
 module Network.HTTP.Lucu.Httpd
-    ( runHttpd
+    ( FallbackHandler
+    , runHttpd
     )
     where
 
@@ -12,6 +13,7 @@ import           Network.HTTP.Lucu.Interaction
 import           Network.HTTP.Lucu.RequestReader
 import           Network.HTTP.Lucu.Resource.Tree
 import           Network.HTTP.Lucu.ResponseWriter
+import qualified OpenSSL.Session as SSL
 import           System.IO
 import           System.Posix.Signals
 
@@ -34,42 +36,60 @@ import           System.Posix.Signals
 -- > main = let config    = defaultConfig
 -- >            resources = mkResTree [ ([], helloWorld) ]
 -- >        in
--- >          runHttpd config resourcees
+-- >          runHttpd config resourcees []
 -- >
 -- > helloWorld :: ResourceDef
 -- > helloWorld = ResourceDef {
 -- >                resUsesNativeThread = False
 -- >              , resIsGreedy         = False
 -- >              , resGet
--- >                  = Just $ do setContentType $ "text" </> "plain"
+-- >                  = Just $ do setContentType $ read "text/plain"
 -- >                              output "Hello, world!"
 -- >              , resHead   = Nothing
 -- >              , resPost   = Nothing
 -- >              , resPut    = Nothing
 -- >              , resDelete = Nothing
 -- >              }
-runHttpd :: Config -> ResTree -> IO ()
-runHttpd cnf tree
-    = cnf `seq` tree `seq`
-      withSocketsDo $
+runHttpd :: Config -> ResTree -> [FallbackHandler] -> IO ()
+runHttpd cnf tree fbs
+    = withSocketsDo $
       do installHandler sigPIPE Ignore Nothing
-         so <- listenOn (cnfServerPort cnf)
-         loop so
+
+         case cnfSSLConfig cnf of
+           Nothing
+               -> return ()
+           Just scnf
+               -> do so       <- listenOn (sslServerPort scnf)
+                     _loopTID <- forkIO $ httpsLoop (sslContext scnf) so
+                     return ()
+         
+         httpLoop =<< listenOn (cnfServerPort cnf)
     where
-      loop :: Socket -> IO ()
-      loop so
-          -- 本當は Network.accept を使ひたいが、このアクションは勝手に
-          -- リモートのIPを逆引きするので、使へない。
-          = so `seq`
-            do (h, addr) <- accept' so
-               tQueue    <- newInteractionQueue
-               readerTID <- forkIO $ requestReader cnf tree h addr tQueue
-               writerTID <- forkIO $ responseWriter cnf h tQueue readerTID
-               loop so
+      httpLoop :: Socket -> IO ()
+      httpLoop so
+          = do (h, addr)  <- acceptHTTP so
+               tQueue     <- newInteractionQueue
+               readerTID  <- forkIO $ requestReader cnf tree fbs h addr tQueue
+               _writerTID <- forkIO $ responseWriter cnf h tQueue readerTID
+               httpLoop so
+
+      httpsLoop :: SSL.SSLContext -> Socket -> IO ()
+      httpsLoop ctx so
+          = do (ssl, addr) <- acceptHTTPS ctx so
+               tQueue      <- newInteractionQueue
+               readerTID   <- forkIO $ requestReader cnf tree fbs ssl addr tQueue
+               _writerTID  <- forkIO $ responseWriter cnf ssl tQueue readerTID
+               httpsLoop ctx so
 
-      accept' :: Socket -> IO (Handle, So.SockAddr)
-      accept' soSelf
-          = soSelf `seq`
-            do (soPeer, addr) <- So.accept soSelf
+      acceptHTTP :: Socket -> IO (Handle, So.SockAddr)
+      acceptHTTP soSelf
+          = do (soPeer, addr) <- So.accept soSelf
                hPeer          <- So.socketToHandle soPeer ReadWriteMode
                return (hPeer, addr)
+
+      acceptHTTPS :: SSL.SSLContext -> Socket -> IO (SSL.SSL, So.SockAddr)
+      acceptHTTPS ctx so
+          = do (so', addr) <- So.accept so
+               ssl         <- SSL.connection ctx so'
+               SSL.accept ssl
+               return (ssl, addr)