From 3d88559e58089080547fc002bdc36f6ea280e4f3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 17 Sep 2013 20:02:42 -0400
Subject: [PATCH] webapp: Show encryption information when editing a remote.

---
 Assistant/WebApp/Configurators/Edit.hs        |  26 +++++++++-
 Assistant/WebApp/Configurators/Local.hs       |  33 ++++--------
 Assistant/WebApp/Gpg.hs                       |  47 ++++++++++++++++++
 debian/changelog                              |   1 +
 doc/assistant/repoinfo.png                    | Bin 0 -> 7603 bytes
 .../configurators/adddrive/encrypt.hamlet     |   8 +--
 templates/configurators/editrepository.hamlet |   2 +
 7 files changed, 84 insertions(+), 33 deletions(-)
 create mode 100644 Assistant/WebApp/Gpg.hs
 create mode 100644 doc/assistant/repoinfo.png

diff --git a/Assistant/WebApp/Configurators/Edit.hs b/Assistant/WebApp/Configurators/Edit.hs
index b277629aad..32d0e5ecde 100644
--- a/Assistant/WebApp/Configurators/Edit.hs
+++ b/Assistant/WebApp/Configurators/Edit.hs
@@ -11,6 +11,7 @@ module Assistant.WebApp.Configurators.Edit where
 
 import Assistant.WebApp.Common
 import Assistant.WebApp.Utility
+import Assistant.WebApp.Gpg
 import Assistant.DaemonStatus
 import Assistant.MakeRemote (uniqueRemoteName)
 import Assistant.WebApp.Configurators.XMPP (xmppNeeded)
@@ -33,6 +34,9 @@ import qualified Git.Command
 import qualified Git.Config
 import qualified Annex
 import Git.Remote
+import Remote.Helper.Encryptable (extractCipher)
+import Types.Crypto
+import Utility.Gpg
 
 import qualified Data.Text as T
 import qualified Data.Map as M
@@ -187,8 +191,9 @@ editForm new uuid = page "Edit repository" (Just Configuration) $ do
 			redirect DashboardR
 		_ -> do
 			let istransfer = repoGroup curr == RepoGroupStandard TransferGroup
-			repoInfo <- getRepoInfo mremote . M.lookup uuid
-				<$> liftAnnex readRemoteLog
+			config <- liftAnnex $ M.lookup uuid <$> readRemoteLog
+			let repoInfo = getRepoInfo mremote config
+			let repoEncryption = getRepoEncryption mremote config
 			$(widgetFile "configurators/editrepository")
 
 {- Makes any directory associated with the repository. -}
@@ -221,3 +226,20 @@ getGitRepoInfo :: Git.Repo -> Widget
 getGitRepoInfo r = do
 	let loc = Git.repoLocation r
 	[whamlet|git repository located at <tt>#{loc}</tt>|]
+
+getRepoEncryption :: Maybe Remote.Remote -> Maybe Remote.RemoteConfig -> Widget
+getRepoEncryption (Just _) (Just c) = case extractCipher c of
+  	Nothing ->
+		[whamlet|not encrypted|]
+	(Just (SharedCipher _)) ->
+		[whamlet|encrypted: encryption key stored in git repository|]
+	(Just (EncryptedCipher _ _ (KeyIds { keyIds = ks }))) -> do
+		knownkeys <- liftIO secretKeys
+		[whamlet|
+encrypted using gpg key:
+<ul style="list-style: none">
+  $forall k <- ks
+    <li>
+      ^{gpgKeyDisplay k (M.lookup k knownkeys)}
+|]
+getRepoEncryption _ _ = [whamlet||] -- local repo
diff --git a/Assistant/WebApp/Configurators/Local.hs b/Assistant/WebApp/Configurators/Local.hs
index 00cc2e95ad..120864e8ec 100644
--- a/Assistant/WebApp/Configurators/Local.hs
+++ b/Assistant/WebApp/Configurators/Local.hs
@@ -11,6 +11,7 @@ module Assistant.WebApp.Configurators.Local where
 
 import Assistant.WebApp.Common
 import Assistant.WebApp.OtherRepos
+import Assistant.WebApp.Gpg
 import Assistant.MakeRemote
 import Assistant.Sync
 import Init
@@ -276,30 +277,14 @@ genKeyModal :: Widget
 genKeyModal = $(widgetFile "configurators/genkeymodal")
 
 getGenKeyForDriveR :: RemovableDrive -> Handler Html
-getGenKeyForDriveR drive = do
-	userid <- liftIO $ newUserId
-	liftIO $ genSecretKey RSA "" userid maxRecommendedKeySize
-	results <- M.keys . M.filter (== userid) <$> liftIO secretKeys
-	case results of
-		[] -> error "Failed to generate gpg key!"
-		(key:_) -> do
-			{- Generating a key takes a long time, and 
-			 - the removable drive may have been disconnected
-			 - in the meantime. Check that it is still mounted
-			 - before finishing. -}
-			ifM (liftIO $ any (\d -> mountPoint d == mountPoint drive) <$> driveList)
-				( getFinishAddDriveR drive (RepoKey key)
-				, getAddDriveR
-				)
-
-newUserId :: IO UserId
-newUserId = do
-	oldkeys <- secretKeys
-	username <- myUserName
-  	let basekeyname = username ++ " git-annex"
-	return $ Prelude.head $ filter (\n -> M.null $ M.filter (== n) oldkeys)
-		( basekeyname
-		: map (\n -> basekeyname ++ show n) ([2..] :: [Int])
+getGenKeyForDriveR drive = withNewSecretKey $ \key -> do
+	{- Generating a key takes a long time, and 
+	 - the removable drive may have been disconnected
+	 - in the meantime. Check that it is still mounted
+	 - before finishing. -}
+	ifM (liftIO $ any (\d -> mountPoint d == mountPoint drive) <$> driveList)
+		( getFinishAddDriveR drive (RepoKey key)
+		, getAddDriveR
 		)
 
 getFinishAddDriveR :: RemovableDrive -> RepoKey -> Handler Html
diff --git a/Assistant/WebApp/Gpg.hs b/Assistant/WebApp/Gpg.hs
new file mode 100644
index 0000000000..a75d89fcc6
--- /dev/null
+++ b/Assistant/WebApp/Gpg.hs
@@ -0,0 +1,47 @@
+{- git-annex webapp gpg stuff
+ -
+ - Copyright 2013 Joey Hess <joey@kitenet.net>
+ -
+ - Licensed under the GNU AGPL version 3 or higher.
+ -}
+
+{-# LANGUAGE QuasiQuotes, TemplateHaskell #-}
+
+module Assistant.WebApp.Gpg where
+
+import Assistant.WebApp.Common
+import Utility.Gpg
+import Utility.UserInfo
+
+import qualified Data.Map as M
+
+gpgKeyDisplay :: KeyId -> Maybe UserId -> Widget
+gpgKeyDisplay keyid userid = [whamlet|
+  <span title="key id #{keyid}">
+    <i .icon-user></i> #
+      ^{displayname}
+|]
+  where
+  	displayname = case userid of
+		Just name | not (null name) -> [whamlet|#{name}|]
+		_ -> [whamlet|key id #{keyid}|]
+
+{- Generates a gpg user id that is not used by any existing secret key -}
+newUserId :: IO UserId
+newUserId = do
+	oldkeys <- secretKeys
+	username <- myUserName
+  	let basekeyname = username ++ "'s git-annex encryption key"
+	return $ Prelude.head $ filter (\n -> M.null $ M.filter (== n) oldkeys)
+		( basekeyname
+		: map (\n -> basekeyname ++ show n) ([2..] :: [Int])
+		)
+
+withNewSecretKey :: (KeyId -> Handler Html) -> Handler Html
+withNewSecretKey use = do
+	userid <- liftIO $ newUserId
+	liftIO $ genSecretKey RSA "" userid maxRecommendedKeySize
+	results <- M.keys . M.filter (== userid) <$> liftIO secretKeys
+	case results of
+		[] -> error "Failed to generate gpg key!"
+		(key:_) -> use key
diff --git a/debian/changelog b/debian/changelog
index 6616ea00a7..4329cef844 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ git-annex (4.20130912) UNRELEASED; urgency=low
   * status: In local mode, displays information about variance from configured
     numcopies levels. (--fast avoids calculating these)
   * gcrypt: Ensure that signing key is set to one of the participants keys.
+  * webapp: Show encryption information when editing a remote.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 12 Sep 2013 12:14:46 -0400
 
diff --git a/doc/assistant/repoinfo.png b/doc/assistant/repoinfo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d43ffc9f99bd49b7b801d32c81128fe8aa0c20ae
GIT binary patch
literal 7603
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

literal 0
HcmV?d00001

diff --git a/templates/configurators/adddrive/encrypt.hamlet b/templates/configurators/adddrive/encrypt.hamlet
index 5cc27798d4..5d7cec9aaf 100644
--- a/templates/configurators/adddrive/encrypt.hamlet
+++ b/templates/configurators/adddrive/encrypt.hamlet
@@ -16,13 +16,7 @@
       <p>
         <a .btn onclick="$('#setupmodal').modal('show');" href="@{FinishAddDriveR drive (RepoKey keyid)}">
           <i .icon-ok-sign></i> Encrypt repository #
-        to
-        <span title="key id #{keyid}">
-          <i .icon-user></i> #
-          $if null name
-            key id #{keyid}
-          $else
-            #{name}
+        to ^{gpgKeyDisplay keyid (Just name)}
   <p>
     <a .btn onclick="$('#genkeymodal').modal('show');" href="@{GenKeyForDriveR drive}">
       <i .icon-plus-sign></i> Encrypt repository #
diff --git a/templates/configurators/editrepository.hamlet b/templates/configurators/editrepository.hamlet
index cb48c59732..95faa9a78f 100644
--- a/templates/configurators/editrepository.hamlet
+++ b/templates/configurators/editrepository.hamlet
@@ -33,3 +33,5 @@
     Repository information
   <p>
     ^{repoInfo}
+  <p>
+    ^{repoEncryption}