This commit introduces IPv6 support (and thus closes #1145). It also allows using local hostnames as a parameter for --host. For this, multiple things needed to be changed: - checkWebOpts is dropped, as the supplied parameter is checked later by Network.Socket.getAddrInfo - defbaseurl needs to check if : is used in the host, as this indicates the usage of an IPv6 address. In this case, the host needs to be wrapped in [] for the base URL - To allow opening such a modified base URL, runHostPortFullUrl is used instead of runhostPortUrl, as it allows opening arbitrary URLs instead of a path prefixed with http://127.0.0.1 As checking the host for validity is postponed until the webserver tries to start, an invalid hostname leads to an exception caused by Network.Socket.getAddrInfo. This is still fine, as hledger-web won't start in an undefined state, but will terminate with a nonzero exit code.
111 lines
4.1 KiB
Haskell
111 lines
4.1 KiB
Haskell
{-# LANGUAGE OverloadedStrings #-}
|
|
{-|
|
|
|
|
hledger-web - a hledger add-on providing a web interface.
|
|
Copyright (c) 2007-2012 Simon Michael <simon@joyful.com>
|
|
Released under GPL version 3 or later.
|
|
|
|
-}
|
|
|
|
module Hledger.Web.Main where
|
|
|
|
import Control.Exception (bracket)
|
|
import Control.Monad (when)
|
|
import Data.String (fromString)
|
|
import qualified Data.Text as T
|
|
import Network.Socket
|
|
import Network.Wai (Application)
|
|
import Network.Wai.Handler.Warp (runSettings, runSettingsSocket, defaultSettings, setHost, setPort)
|
|
import Network.Wai.Handler.Launch (runHostPortFullUrl)
|
|
import Prelude hiding (putStrLn)
|
|
import System.Directory (removeFile)
|
|
import System.Exit (exitSuccess, exitFailure)
|
|
import System.IO (hFlush, stdout)
|
|
import System.PosixCompat.Files (getFileStatus, isSocket)
|
|
import Text.Printf (printf)
|
|
import Yesod.Default.Config
|
|
import Yesod.Default.Main (defaultDevelApp)
|
|
|
|
import Hledger
|
|
import Hledger.Cli hiding (progname,prognameandversion)
|
|
import Hledger.Utils.UTF8IOCompat (putStrLn)
|
|
import Hledger.Web.Application (makeApplication)
|
|
import Hledger.Web.Settings (Extra(..), parseExtra)
|
|
import Hledger.Web.WebOptions
|
|
|
|
|
|
hledgerWebMain :: IO ()
|
|
hledgerWebMain = do
|
|
opts <- getHledgerWebOpts
|
|
when (debug_ (cliopts_ opts) > 0) $ printf "%s\n" prognameandversion >> printf "opts: %s\n" (show opts)
|
|
runWith opts
|
|
|
|
hledgerWebDev :: IO (Int, Application)
|
|
hledgerWebDev =
|
|
withJournalDo (cliopts_ defwebopts) (defaultDevelApp loader . makeApplication defwebopts)
|
|
where
|
|
loader =
|
|
Yesod.Default.Config.loadConfig
|
|
(configSettings Development) {csParseExtra = parseExtra}
|
|
|
|
runWith :: WebOpts -> IO ()
|
|
runWith opts
|
|
| "help" `inRawOpts` rawopts_ (cliopts_ opts) = putStr (showModeUsage webmode) >> exitSuccess
|
|
| "version" `inRawOpts` rawopts_ (cliopts_ opts) = putStrLn prognameandversion >> exitSuccess
|
|
| "binary-filename" `inRawOpts` rawopts_ (cliopts_ opts) = putStrLn (binaryfilename progname)
|
|
| otherwise = withJournalDo (cliopts_ opts) (web opts)
|
|
|
|
-- | The web command.
|
|
web :: WebOpts -> Journal -> IO ()
|
|
web opts j = do
|
|
d <- getCurrentDay
|
|
let initq = queryFromOpts d $ reportopts_ $ cliopts_ opts
|
|
j' = filterJournalTransactions initq j
|
|
h = host_ opts
|
|
p = port_ opts
|
|
u = base_url_ opts
|
|
staticRoot = T.pack <$> file_url_ opts
|
|
appconfig = AppConfig{appEnv = Development
|
|
,appHost = fromString h
|
|
,appPort = p
|
|
,appRoot = T.pack u
|
|
,appExtra = Extra "" Nothing staticRoot
|
|
}
|
|
app <- makeApplication opts j' appconfig
|
|
-- XXX would like to allow a host name not just an IP address here
|
|
_ <- printf "Serving web %s on %s:%d with base url %s\n"
|
|
(if serve_api_ opts then "API" else "UI and API" :: String) h p u
|
|
if serve_ opts || serve_api_ opts
|
|
then do
|
|
putStrLn "Press ctrl-c to quit"
|
|
hFlush stdout
|
|
let warpsettings = setHost (fromString h) (setPort p defaultSettings)
|
|
case socket_ opts of
|
|
Just s -> do
|
|
if isUnixDomainSocketAvailable then
|
|
bracket
|
|
(do
|
|
sock <- socket AF_UNIX Stream 0
|
|
setSocketOption sock ReuseAddr 1
|
|
bind sock $ SockAddrUnix s
|
|
listen sock maxListenQueue
|
|
return sock
|
|
)
|
|
(\_ -> do
|
|
sockstat <- getFileStatus s
|
|
when (isSocket sockstat) $ removeFile s
|
|
)
|
|
(\sock -> Network.Wai.Handler.Warp.runSettingsSocket warpsettings sock app)
|
|
else do
|
|
putStrLn "Unix domain sockets are not available on your operating system"
|
|
putStrLn "Please try again without --socket"
|
|
exitFailure
|
|
Nothing -> Network.Wai.Handler.Warp.runSettings warpsettings app
|
|
else do
|
|
putStrLn "This server will exit after 2m with no browser windows open (or press ctrl-c)"
|
|
putStrLn "Opening web browser..."
|
|
hFlush stdout
|
|
-- exits after 2m of inactivity (hardcoded)
|
|
Network.Wai.Handler.Launch.runHostPortFullUrl h p u app
|
|
|