From 0d93f4f12c4c7d0a37dc2e6f792ce0f9dde793db Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 14 Sep 2015 21:49:05 -0400 Subject: Allow storing arbitrary ByteStrings in PrivData, extracted using privDataByteString. --- src/Propellor/Gpg.hs | 10 ++++++---- src/Propellor/PrivData.hs | 13 ++++++++----- src/Propellor/Types/PrivData.hs | 6 ++++++ 3 files changed, 20 insertions(+), 9 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Gpg.hs b/src/Propellor/Gpg.hs index 86f84dc1..24743d40 100644 --- a/src/Propellor/Gpg.hs +++ b/src/Propellor/Gpg.hs @@ -14,6 +14,7 @@ import Utility.Process import Utility.Monad import Utility.Misc import Utility.Tmp +import Utility.FileSystemEncoding type KeyId = String @@ -112,8 +113,9 @@ gpgEncrypt f s = do , "--encrypt" , "--trust-model", "always" ] ++ concatMap (\k -> ["--recipient", k]) keyids - encrypted <- writeReadProcessEnv "gpg" opts - Nothing - (Just $ flip hPutStr s) - Nothing + encrypted <- writeReadProcessEnv "gpg" opts Nothing (Just writer) Nothing viaTmp writeFile f encrypted + where + writer h = do + fileEncoding h + hPutStr h s diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs index b7932518..a28fb195 100644 --- a/src/Propellor/PrivData.hs +++ b/src/Propellor/PrivData.hs @@ -31,6 +31,7 @@ import Control.Monad.IfElse import "mtl" Control.Monad.Reader import qualified Data.Map as M import qualified Data.Set as S +import qualified Data.ByteString.Lazy as L import Propellor.Types import Propellor.Types.PrivData @@ -48,6 +49,7 @@ import Utility.Misc import Utility.FileMode import Utility.Env import Utility.Table +import Utility.FileSystemEncoding -- | Allows a Property to access the value of a specific PrivDataField, -- for use in a specific Context or HostContext. @@ -149,6 +151,7 @@ getPrivData field context m = do setPrivData :: PrivDataField -> Context -> IO () setPrivData field context = do putStrLn "Enter private data on stdin; ctrl-D when done:" + fileEncoding stdin setPrivDataTo field context . PrivData =<< hGetContentsStrict stdin unsetPrivData :: PrivDataField -> Context -> IO () @@ -157,17 +160,17 @@ unsetPrivData field context = do putStrLn "Private data unset." dumpPrivData :: PrivDataField -> Context -> IO () -dumpPrivData field context = +dumpPrivData field context = do maybe (error "Requested privdata is not set.") - (mapM_ putStrLn . privDataLines) + (L.hPut stdout . privDataByteString) =<< (getPrivData field context <$> decryptPrivData) editPrivData :: PrivDataField -> Context -> IO () editPrivData field context = do v <- getPrivData field context <$> decryptPrivData - v' <- withTmpFile "propellorXXXX" $ \f h -> do - hClose h - maybe noop (writeFileProtected f . unlines . privDataLines) v + v' <- withTmpFile "propellorXXXX" $ \f th -> do + hClose th + maybe noop (\p -> writeFileProtected' f (`L.hPut` privDataByteString p)) v editor <- getEnvDefault "EDITOR" "vi" unlessM (boolSystem editor [File f]) $ error "Editor failed; aborting." diff --git a/src/Propellor/Types/PrivData.hs b/src/Propellor/Types/PrivData.hs index c72838cb..98cdb7a1 100644 --- a/src/Propellor/Types/PrivData.hs +++ b/src/Propellor/Types/PrivData.hs @@ -2,8 +2,10 @@ module Propellor.Types.PrivData where import Propellor.Types.OS import Utility.PartialPrelude +import Utility.FileSystemEncoding import Data.Maybe +import qualified Data.ByteString.Lazy as L -- | Note that removing or changing constructors or changing types will -- break the serialized privdata files, so don't do that! @@ -110,6 +112,10 @@ privDataLines (PrivData s) = lines s privDataVal :: PrivData -> String privDataVal (PrivData s) = fromMaybe "" (headMaybe (lines s)) +-- | Use to get ByteString out of PrivData. +privDataByteString :: PrivData -> L.ByteString +privDataByteString (PrivData s) = encodeBS s + data SshKeyType = SshRsa | SshDsa | SshEcdsa | SshEd25519 deriving (Read, Show, Ord, Eq, Enum, Bounded) -- cgit v1.2.3