Merge branch 'delete-key'

1 files changed, 41 insertions, 7 deletions

diff --git a/kiki.hs b/kiki.hs
index c80f2cc..6eb5954 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -758,7 +758,15 @@ parseKeySpecs = map $ \specfile -> do
     let cmd = (drop 1 . reverse . drop 1) bdmcb
     Just (spec,file,cmd)
 
---kiki :: (Eq a, Data.String.IsString a) => a -> [String] -> IO ()
+buildStreamInfo :: KeyFilter -> FileType -> StreamInfo
+buildStreamInfo rtyp ftyp = StreamInfo { typ = ftyp
+                                       , fill = rtyp
+                                       , spill = KF_All
+                                       , access = AutoAccess
+                                       , initializer = Nothing
+                                       , transforms = [] }
+
+sync :: Bool -> Bool -> Bool -> String -> [String] -> IO ()
 sync bExport bImport bSecret cmdarg args_raw = do
     let (sargs,margs) = processArgs sargspec polyVariadicArgs "--keyrings" args_raw
         sargspec = [ ("--import",0)
@@ -828,12 +836,6 @@ sync bExport bImport bSecret cmdarg args_raw = do
                                    $ Map.lookup "--import" margs
                 importifauth_f = fmap (const KF_Authentic)
                                    $ Map.lookup "--import-if-authentic" margs
-        buildStreamInfo rtyp ftyp = StreamInfo { typ = ftyp
-                                               , fill = rtyp
-                                               , spill = KF_All
-                                               , access = AutoAccess
-                                               , initializer = Nothing
-                                               , transforms = [] }
         kikiOp = KeyRingOperation
             { opFiles = Map.fromList $
                 [ ( HomeSec, buildStreamInfo (if bSecret && bImport then KF_All
@@ -876,6 +878,7 @@ sync bExport bImport bSecret cmdarg args_raw = do
         putStrLn $ fname ++ ": " ++ reportString act
 
 
+kiki :: String -> [String] -> IO ()
 kiki "sync-secret" args_raw =
     sync True True True "sync-secret" args_raw
 
@@ -1313,6 +1316,36 @@ kiki "init-key" args = do
 
     mapM_ installConctact cs
 
+kiki "delete" args | "--help" `elem` args = do
+    putStr . unlines $
+        [ "kiki delete <fingerprint> ..."
+        , ""
+        , "  Delete the subkeys specified by the given fingerprints along"
+        , "  with all associated signatures and trust markers."
+        ]
+    return ()
+kiki "delete" args = do
+    let (sargs,margs) = processArgs sargspec polyVariadicArgs "--delete" args
+            where sargspec = []
+                  polyVariadicArgs = ["--delete"]
+        passfd = fmap (FileDesc . read) passphrase_fd
+            where passphrase_fd = concat <$> Map.lookup "--passphrase-fd" margs
+        fps = fromMaybe [] $ Map.lookup "--delete" margs
+        homespec = join . take 1 <$> Map.lookup "--homedir" margs
+        kikiOp = KeyRingOperation
+            { opFiles = Map.fromList $
+                [ ( HomeSec, buildStreamInfo KF_All KeyRingFile )
+                , ( HomePub, buildStreamInfo KF_All KeyRingFile )
+                ]
+            , opPassphrases = do pfile <- maybeToList passfd
+                                 return $ PassphraseSpec Nothing Nothing pfile
+            , opTransforms = map DeleteSubKey fps
+            , opHome = homespec
+            }
+    KikiResult rt report <- runKeyRing kikiOp
+    forM_ report $ \(fname,act) -> do
+        putStrLn $ fname ++ ": " ++ reportString act
+
 splitArg :: String -> Either (String,Maybe String) String
 splitArg arg =
     case hyphens of
@@ -1341,6 +1374,7 @@ commands =
  , ( "working-key", "show the current working master key and its subkeys" )
  , ( "merge", "low level import/export operation" )
  , ( "init-key", "initialize the samizdat key ring")
+ , ( "delete", "Delete a subkey and its associated signatures" )
  ]
 
 interp vars raw = es >>= interp1