diff options
Diffstat (limited to 'src/Propellor/PrivData.hs')
| -rw-r--r-- | src/Propellor/PrivData.hs | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs index 5ddbdcff..fec6acc3 100644 --- a/src/Propellor/PrivData.hs +++ b/src/Propellor/PrivData.hs @@ -10,6 +10,7 @@ import System.Directory import Data.Maybe import Data.List import Control.Monad +import Control.Monad.IfElse import "mtl" Control.Monad.Reader import Propellor.Types @@ -21,6 +22,8 @@ import Utility.Process import Utility.Tmp import Utility.SafeCommand import Utility.Misc +import Utility.FileMode +import Utility.Env -- | When the specified PrivDataField is available on the host Propellor -- is provisioning, it provies the data to the action. Otherwise, it prints @@ -46,11 +49,31 @@ getPrivData field = do setPrivData :: HostName -> PrivDataField -> IO () setPrivData host field = do putStrLn "Enter private data on stdin; ctrl-D when done:" - value <- chomp <$> hGetContentsStrict stdin + setPrivDataTo host field =<< hGetContentsStrict stdin + +dumpPrivData :: HostName -> PrivDataField -> IO () +dumpPrivData host field = + maybe (error "Requested privdata is not set.") putStrLn + =<< getPrivDataFor host field + +editPrivData :: HostName -> PrivDataField -> IO () +editPrivData host field = do + v <- getPrivDataFor host field + v' <- withTmpFile "propellorXXXX" $ \f h -> do + hClose h + maybe noop (writeFileProtected f) v + editor <- getEnvDefault "EDITOR" "vi" + unlessM (boolSystem editor [File f]) $ + error "Editor failed; aborting." + readFile f + setPrivDataTo host field v' + +setPrivDataTo :: HostName -> PrivDataField -> String -> IO () +setPrivDataTo host field value = do makePrivDataDir let f = privDataFile host m <- decryptPrivData host - let m' = M.insert field value m + let m' = M.insert field (chomp value) m gpgEncrypt f (show m') putStrLn "Private data set." void $ boolSystem "git" [Param "add", File f] @@ -59,11 +82,8 @@ setPrivData host field = do | end s == "\n" = chomp (beginning s) | otherwise = s -dumpPrivData :: HostName -> PrivDataField -> IO () -dumpPrivData host field = go . M.lookup field =<< decryptPrivData host - where - go Nothing = error "Requested privdata is not set." - go (Just s) = putStrLn s +getPrivDataFor :: HostName -> PrivDataField -> IO (Maybe String) +getPrivDataFor host field = M.lookup field <$> decryptPrivData host decryptPrivData :: HostName -> IO (M.Map PrivDataField String) decryptPrivData host = fromMaybe M.empty . readish |