Implemented command to delete subkeys

2 files changed, 35 insertions, 13 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 14772d8..b885805 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -626,7 +626,7 @@ data KikiReportAction =
         | UnableToExport KeyAlgorithm String
         | FailedFileWrite
         | HostsDiff ByteString
-        | DeletedPacket Packet
+        | DeletedPacket String
  deriving Show
 
 uncamel :: String -> String
@@ -2147,7 +2147,7 @@ performManipulations doDecrypt rt wk manip = do
                 return $ packet mp : concatMap (\(p,ts) -> packet p : Map.elems ts) sigs
             ctx = InputFileContext (rtSecring rt) (rtPubring rt)
             rings = [HomeSec, HomePub] >>= resolveInputFile ctx
-        return $ KikiSuccess (kd' , report ++ [ (f,DeletedPacket p) | f <- rings, p <- ps ])
+        return $ KikiSuccess (kd' , report ++ [ (f,DeletedPacket $ showPacket p) | f <- rings, p <- ps ])
 
 initializeMissingPEMFiles ::
     KeyRingOperation
diff --git a/kiki.hs b/kiki.hs
index 17cbeb1..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
 
@@ -1315,14 +1318,33 @@ kiki "init-key" args = do
 
 kiki "delete" args | "--help" `elem` args = do
     putStr . unlines $
-        [ "kiki delete <fingerprint>"
+        [ "kiki delete <fingerprint> ..."
         , ""
-        , "  Delete the subkey specified by the given fingerprint along"
-        , "  with all of its associated signatures and trust markers."
+        , "  Delete the subkeys specified by the given fingerprints along"
+        , "  with all associated signatures and trust markers."
         ]
     return ()
 kiki "delete" args = do
-    putStr "NOT IMPLEMENTED"
+    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 =