Switched cache update to lib/Keyring.hs interface.

1 files changed, 27 insertions, 2 deletions

diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index 70d5ed6..d5b3457 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -199,7 +199,6 @@ importAndRefresh root cmn cipher = do
                                           return $ PassphraseSpec Nothing Nothing pfd
             passwordop = KeyRingOperation
                             { opFiles = Map.empty
-                            -- TODO: ask agent for new passphrase
                             , opPassphrases = main_passwds
                             , opHome = homespec
                             , opTransforms = []
@@ -390,7 +389,30 @@ refreshCache rt rootdir = do
         wkkd = rtKeyDB rt Map.! keykey wk
         getSecret tag = sortOn (Down . timestamp)
                         $ getSubkeys Unsigned wk (keySubKeys wkkd) tag
-
+        exportOp = withOutgoing $ minimalOp (CommonArgsParsed (Just $ takeDirectory $ rtPubring rt)
+                                                              Nothing)
+         where
+          withOutgoing op = op
+            { opFiles = opFiles op `Map.union` Map.fromList outgoing_secrets
+            , opPassphrases = [PassphraseMemoizer (rtPassphrases rt)]
+            }
+          outgoing_secrets =
+            [ send "ipsec"      (mkpath "ipsec.d/private/" ++ Char8.unpack oname++".pem") "missing ipsec key?"
+            , send "ssh-client" (mkpath "root/.ssh/id_rsa")                               "missing ssh-client key?"
+            , send "ssh-server" (mkpath "ssh_host_rsa_key")                               "missing ssh host key?"
+            , send "tor"        (mkpath "tor/private_key")                                "missing tor key?"
+            ]
+          send usage path warning =
+            ( ArgFile path, StreamInfo { typ = PEMFile
+                                       , fill = KF_Match usage
+                                       , spill = KF_None
+                                       , access = Sec
+                                       , initializer = WarnMissing warning
+                                       , transforms = []
+                                       })
+    KikiResult rt' report <- runKeyRing exportOp
+
+    {-
     let writeSecret tag path warning = do
         let my_ks :: [Packet]
             my_ks = getSecret tag
@@ -425,6 +447,7 @@ refreshCache rt rootdir = do
     writeSecret "tor"
                 (mkpath "tor/private_key")
                 "missing tor key?"
+    -}
 
     -- Finally, export public keys if they do not exist.
     either warn (write $ mkpath "root/.ssh/id_rsa.pub")
@@ -561,6 +584,7 @@ sshblobFromPacket k = blob
     bs = SSH.keyblob (n,e)
     blob = Char8.unpack bs
 
+{-
 replaceSshServerKeys root cmn = do
     let homepass' = cmn { cap_homespec = fmap root (cap_homespec cmn) }
         replaceSSH op = op { opFiles = files }
@@ -578,6 +602,7 @@ replaceSshServerKeys root cmn = do
                                                     ""  -> Nothing
                                                     pth -> Just pth
         err            -> hPutStrLn stderr $ errorString err
+-}
 
 slash :: String -> String -> String
 slash "/"    ('/':xs) = '/':xs