X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Lucu.git;a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FHttpd.hs;h=654e50d43c46b1043f55cf0eeaa49032d6e26046;hp=f7f8a1d8d4c4ddcb5ede9e817cdfc2d2396e41f6;hb=73b5fba4907604681d778d3bd54cd65fd84b4454;hpb=c179f51aa7b15764807141c175f9fe8797424991 diff --git a/Network/HTTP/Lucu/Httpd.hs b/Network/HTTP/Lucu/Httpd.hs index f7f8a1d..654e50d 100644 --- a/Network/HTTP/Lucu/Httpd.hs +++ b/Network/HTTP/Lucu/Httpd.hs @@ -13,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 @@ -53,21 +54,42 @@ 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を逆引きするので、使へない。 - = do (h, addr) <- accept' 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 - loop so + 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 + 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)