Merge lost Sweeden commits.

1 files changed, 31 insertions, 5 deletions

diff --git a/cokiki.hs b/cokiki.hs
index 54cc4ba..b6d94a0 100644
--- a/cokiki.hs
+++ b/cokiki.hs
@@ -20,6 +20,7 @@ import System.IO
 import System.Posix.User
 import CommandLine
 import Data.OpenPGP (SymmetricAlgorithm(Unencrypted))
+import qualified Hosts
 
 usage = unlines
     [ "cokiki <command> [--chroot=ROOTDIR]"
@@ -42,17 +43,20 @@ usage = unlines
     , "COMMANDS"
     , ""
     , "  ssh-client   Modify system ssh configuration to respect"
-    , "               /var/cache/kiki/ssh_known_hosts."
+    , "               /var/cache/kiki/config/ssh_known_hosts."
     , ""
     , "  ssh-server   Modify system ssh configuration to use the"
     , "               kiki-managed host key at"
-    , "               /var/cache/kiki/ssh_host_rsa_key."
+    , "               /var/cache/kiki/config/ssh_host_rsa_key."
     , ""
     , "  strongswan   Modify /etc/ipsec.conf to include settings from"
-    , "               /var/cache/kiki/ipsec.conf."
+    , "               /var/cache/kiki/config/ipsec.conf."
     , ""
     , "  tor          Modify /etc/tor/torrc to configure a tor hidden"
     , "               service for email (smtp), ssh, and http ports."
+    , ""
+    , "  hosts        Merge hostnames from /var/cache/kiki/config/hosts"
+    , "               into system file /etc/hosts."
     ]
 
 main = do
@@ -63,6 +67,7 @@ main = do
                 ["ssh-server"] -> Just $ sshServer  uid <$> Kiki.ㄧchroot <*> Kiki.ㄧhomedir
                 ["strongswan"] -> Just $ strongswan uid <$> Kiki.ㄧchroot <*> Kiki.ㄧhomedir
                 ["tor"]        -> Just $ configureTor uid <$> Kiki.ㄧchroot <*> Kiki.ㄧhomedir
+                ["hosts"]      -> Just $ configureHosts uid <$> Kiki.ㄧchroot <*> Kiki.ㄧhomedir
                 _ -> Nothing
         spec = uncurry fancy Kiki.kikiOptions ""
         errorQuit msg = do
@@ -78,6 +83,7 @@ main = do
 maybeReadFile :: FilePath -> IO (Maybe L.ByteString)
 maybeReadFile path = do
     doesFileExist path >>= bool (return Nothing) (Just <$> L.readFile path)
+
 myWriteFile f bs = do
     createDirectoryIfMissing True (takeDirectory f)
     hPutStrLn stderr $ "Writing "++f
@@ -133,17 +139,29 @@ sshServer uid root cmn = whenRoot uid root cmn $ do
     Kiki.importAndRefresh root cmn Unencrypted
 
 strongswan uid root cmn = whenRoot uid root cmn $ do
+    -- (1) /etc/ipsec.conf    <--  'include /var/cache/kiki/config/ipsec.conf'
     -- Parsing as if ssh config, that's not right, but good enough for now.
     ipsecconf <- parseSshConfig . fromMaybe "" <$> maybeReadFile (root "/etc/ipsec.conf")
     let p:gs = groupBy (\_ d -> not $ sshIsDirective "include" d) $ ["#"]:ipsecconf
         got = filter (\(d:ds) -> elem "/var/cache/kiki/config/ipsec.conf" d) gs
     case got of
-        _:_ -> do hPutStrLn stderr "ipsec already configured."
+        _:_ -> do hPutStrLn stderr "ipsec.conf already configured."
         [] -> do let ipsecconf' = drop 1 $ ipsecconf ++ [stmt]
                      stmt = ["include", " ", "/var/cache/kiki/config/ipsec.conf"]
                  hPutStrLn stderr "adding include directive"
                  myWriteFile (root "/etc/ipsec.conf") $ unparseSshConfig ipsecconf'
-    -- etc/ipsec.conf    <--  'include /var/cache/kiki/ipsec.conf'
+
+    -- (2) /etc/ipsec.secrets/ <- include /var/cache/kiki/config/ipsec.secrets
+    -- Parsing as if ssh config, that's not right, but good enough for now.
+    ipsecconf <- parseSshConfig . fromMaybe "" <$> maybeReadFile (root "/etc/ipsec.secrets")
+    let p:gs = groupBy (\_ d -> not $ sshIsDirective "include" d) $ ["#"]:ipsecconf
+        got = filter (\(d:ds) -> elem "/var/cache/kiki/config/ipsec.secrets" d) gs
+    case got of
+        _:_ -> do hPutStrLn stderr "ipsec.secrets already configured."
+        [] -> do let ipsecconf' = drop 1 $ ipsecconf ++ [stmt]
+                     stmt = ["include", " ", "/var/cache/kiki/config/ipsec.secrets"]
+                 hPutStrLn stderr "adding include directive"
+                 myWriteFile (root "/etc/ipsec.secrets") $ unparseSshConfig ipsecconf'
     Kiki.importAndRefresh root cmn Unencrypted
 
 configureTor uid root cmn = whenRoot uid root cmn $ do
@@ -201,6 +219,14 @@ configureTor uid root cmn = whenRoot uid root cmn $ do
     Kiki.importAndRefresh root cmn Unencrypted
     return ()
 
+configureHosts uid root cmn = whenRoot uid root cmn $ do
+    Kiki.importAndRefresh root cmn Unencrypted
+    hosts <- Hosts.decode . fromMaybe "" <$> maybeReadFile (root "/etc/hosts")
+    kikihosts <- Hosts.decode . fromMaybe "" <$> maybeReadFile (root "/var/cache/kiki/config/hosts")
+    let hosts' = hosts `Hosts.plus` kikihosts
+    case Hosts.diff hosts hosts' of
+        [] -> hPutStrLn stderr "kiki hosts are already merged."
+        _ -> myWriteFile (root "/etc/hosts") $ Hosts.encode hosts'
 
 parseSshConfig :: L.ByteString -> [[L.ByteString]]
 parseSshConfig bs = map tokenize $ L8.lines bs