change HostContext for containers

Privdata that uses HostContext inside a container will now have the name of
the container as its context, rather than the name of the host(s) where the
container is used. This allows eg, having different passwords for a user in
different containers.

Note that previously, propellor would prompt using
the container name as the context, but not actually use privdata using that
context; so this is a bug fix.

I don't entirely like the implementation; I had to put the code to change
the context in PropAccum, and it's not generalized past PrivInfo.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs
index 5df9fe0d..0019730d 100644
--- a/src/Propellor/PrivData.hs
+++ b/src/Propellor/PrivData.hs
@@ -17,6 +17,7 @@ module Propellor.PrivData (
 	decryptPrivData,
 	PrivMap,
 	PrivInfo,
+	forceHostContext,
 ) where
 
 import Control.Applicative
@@ -236,3 +237,10 @@ newtype PrivInfo = PrivInfo
 -- hosts need it.
 instance IsInfo PrivInfo where
 	propigateInfo _ = True
+
+-- | Sets the context of any privdata that uses HostContext to the
+-- provided name.
+forceHostContext :: String -> PrivInfo -> PrivInfo
+forceHostContext name i = PrivInfo $ S.map go (fromPrivInfo i)
+  where
+	go (f, d, HostContext ctx) = (f, d, HostContext (const $ ctx name))