Merge branch 'master' into ui2

Conflicts:
	kiki.hs

1 files changed, 75 insertions, 36 deletions

diff --git a/kiki.hs b/kiki.hs
index 211b0a4..b7092dc 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -459,28 +459,39 @@ whoseKey rsakey db = filter matchkey (Map.elems db)
 
 
 
-kiki_sync_help = putStr . unlines $
-        {-
-        ["kiki - a pgp key editing utility"
-        ,""
-        ,"kiki [OPTIONS]"
-        ,""
-        ,"     kiki merges a set of keyring files into a combined database and then"
-        ,"     uses the database to update the files so that they have the most complete"
-        ,"     information."
-        ,""
-        ,"     The files pubring.gpg and subring.gpg in the directory specified by the "
-        ,"     --homedir option are implicitly included in the keyring set."
-        ,""
-        ,"     kiki can also import or export secret subkeys by using the --keypairs option."
-        ,""
-        ,"     Subkeys that are imported with kiki are given an annotation \"usage@\" which"
-        ,"     indicates what the key is for.  This tag can be used as a SPEC to select a"
-        ,"     particular key.  Master keys may be specified by using fingerprints or by"
-        ,"     specifying a substring of an associated UID."
-        -}
-        ["kiki sync [options...]"
-        ,""
+kiki_usage cmd = putStr $
+        case cmd of
+         "sync-secret" -> unlines
+            ["kiki sync-secret [options...]"
+            ,""
+            ,"     sync-secret merges a set of key files into a combined database and then"
+            ,"     uses the database to update all the input files, those inside and outside of"
+            ,"     of the home directory (see --homedir), to have the most complete information."
+            ,""
+            ,"     The files pubring.gpg and subring.gpg in the directory specified by the "
+            ,"     --homedir option are implicitly included in the keyring set."
+            ,""
+            ,"     Subkeys that are imported with kiki are given an annotation \"usage@\" which"
+            ,"     indicates what the key is for.  This tag can be used as a SPEC to select a"
+            ,"     particular key.  Master keys may be specified by using fingerprints or by"
+            ,"     specifying a substring of an associated UID."
+            ]
+         "import-secret" -> unlines
+            ["kiki import-secret [options...]"
+            ,""
+            ,"     import-secret uses a set of key files to update your keyring.  It does not"
+            ,"     alter any files outside of the home directory (see --homedir)."
+            ,""
+            ,"     The files pubring.gpg and subring.gpg in the directory specified by the "
+            ,"     --homedir option are implicitly included in the keyring set."
+            ,""
+            ,"     Subkeys that are imported with kiki are given an annotation \"usage@\" which"
+            ,"     indicates what the key is for.  This tag can be used as a SPEC to select a"
+            ,"     particular key.  Master keys may be specified by using fingerprints or by"
+            ,"     specifying a substring of an associated UID."
+            ]
+        ++ unlines
+        [""
         ,"Flags:"
         ,"     --homedir DIR"
         ,"                Where to find the the files secring.gpg and pubring.gpg. The "
@@ -535,7 +546,6 @@ kiki_sync_help = putStr . unlines $
         ,""
         ,"                If neither SPEC or FILE match any keys, then the CMD will be "
         ,"                executed in order to create the FILE."
-
         ,""
 {-        ,"Output:"
         ,"     --show-wk  Show fingerprints for the working key (which will be used to"
@@ -678,7 +688,7 @@ parseKeySpecs = map $ \specfile -> do
     Just (spec,file,cmd)
 
 --kiki :: (Eq a, Data.String.IsString a) => a -> [String] -> IO ()
-kiki "sync" args_raw = do
+sync bExport bSecret cmdarg args_raw = do
     let (sargs,margs) = processArgs sargspec polyVariadicArgs "--keyrings" args_raw
         sargspec = [ ("--import",0)
                    , ("--autosign",0)
@@ -715,16 +725,22 @@ kiki "sync" args_raw = do
     let keypairs = catMaybes keypairs0
         homespec = join . take 1 <$> Map.lookup "--homedir" margs
         passfd = fmap (FileDesc . read) passphrase_fd
-        pems = flip map keypairs
+        reftyp = if bExport then MutableRef Nothing
+                                 else ConstRef
+        pems = flip map keypairs 
                 $ \(usage,path,cmd) ->
                     let cmd' = guard (not $ null cmd) >> return cmd
-                    in (ArgFile path, (MutableRef cmd', PEMFile usage))
-        walts = map (\fname -> (ArgFile fname, (MutableRef Nothing, WalletFile)))
+                    in if bExport
+                        then (ArgFile path, (MutableRef cmd', PEMFile usage)) 
+                        else if isNothing cmd'
+                                then (ArgFile path, (ConstRef, PEMFile usage))
+                                else error "Unexpected PEM file initializer."
+        walts = map (\fname -> (ArgFile fname, (reftyp, WalletFile)))
                     wallets
-        rings = map (\fname -> (ArgFile fname, (MutableRef Nothing, KeyRingFile passfd)))
+        rings = map (\fname -> (ArgFile fname, (reftyp, KeyRingFile passfd)))
                     keyrings_
         hosts = maybe [] (map decorate) $ Map.lookup "--hosts" margs
-                    where decorate fname = (ArgFile fname, (MutableRef Nothing, Hosts))
+                    where decorate fname = (ArgFile fname, (reftyp, Hosts))
         importStyle = maybe (\_ _ -> subkeysOnly)
                             (\f rt kd -> f rt kd >> importPublic)
                         $ mplus import_f importifauth_f
@@ -735,19 +751,20 @@ kiki "sync" args_raw = do
                                     return guardAuthentic
         kikiOp = KeyRingOperation
             { kFiles = Map.fromList $
-                [ ( HomeSec, (MutableRef Nothing, KeyRingFile passfd)  )
+                [ ( HomeSec, (if bSecret then MutableRef Nothing else ConstRef, KeyRingFile passfd)  )
                 , ( HomePub, (MutableRef Nothing, KeyRingFile Nothing) )
                 ]
                 ++ rings
-                ++ pems
-                ++ walts
+                ++ if bSecret then pems else []
+                ++ if bSecret then walts else []
                 ++ hosts
             , kImports = Map.fromList [ ( HomePub, importStyle ) ]
             , kManip = maybe noManip (const doAutosign) $ Map.lookup "--autosign" margs
             , homeSpec = homespec
             }
 
-    KikiResult rt report <- runKeyRing kikiOp
+    (\f -> maybe f (const $ kiki_usage cmdarg) $ Map.lookup "--help" margs) $ do
+    KikiResult rt report <- runKeyRing kikiOp 
 
     case rt of
       KikiSuccess rt -> do -- interpret --show-* commands.
@@ -759,7 +776,7 @@ kiki "sync" args_raw = do
                                       ,("--show-pem",\[x] -> show_pem x $ fromMaybe "" grip)
                                       ,("--show-ssh",\[x] -> show_ssh x $ fromMaybe "" grip)
                                       ,("--show-wip",\[x] -> show_wip x $ fromMaybe "" grip)-}
-                                      ,("--help", \_ _ ->kiki_sync_help)]
+                                      ]
                 shargs = mapMaybe (\(x:xs) -> (,xs) <$> Map.lookup x shspec) sargs
 
             forM_ shargs $ \(cmd,args) -> cmd args (rtKeyDB rt)
@@ -768,8 +785,26 @@ kiki "sync" args_raw = do
     forM_ report $ \(fname,act) -> do
         putStrLn $ fname ++ ": " ++ reportString act
 
+kiki "sync-secret" args_raw =
+    sync True True "sync-secret" args_raw
+
+kiki "sync-public" args_raw =
+    sync True False "sync-public" args_raw
+
+kiki "import-secret" args_raw =
+    sync False True "import-secret" args_raw
+
+kiki "import-public" args_raw =
+    sync False False "import-public" args_raw
+
 kiki "working-key" args = do
-    kiki "sync" ["--show-wk"]
+    if "--help" `notElem` args
+        then sync False False "working-key" ["--show-wk"]
+        else putStrLn $
+            unlines ["working-key"
+                    ,""
+                    ,"    Displays the master key with its subkeys that will be"
+                    ,"    used for making signatures"]
 
 -- Generic help
 kiki "help" [] = do
@@ -792,8 +827,12 @@ kiki "show" args = return ()
 commands :: [(String,String)]
 commands =
  [ ( "help", "display usage information" )
- , ( "sync", "update key files of various kinds by propogating information" )
+ --, ( "sync", "update key files of various kinds by propogating information" )
  , ( "show", "display information from your keyrings")
+ , ( "sync-secret", "update key files of various kinds by propogating information (both secret and public)" )
+ , ( "sync-public", "update key files of various kinds by propogating public information" )
+ , ( "import-secret", "import (both public and secret) information into your keyring" )
+ , ( "import-public", "import (public) information into your keyring" )
  , ( "working-key", "show the current working master key and its subkeys" )
  ]