Merge lp:~nobuto/ecryptfs/verify-wrapped-passphrase into lp:ecryptfs

[Nobuto Murata]

currently ecryptfs-verify script does not check permission of wrapped-passphrase.

This branch checks existence and permission of wrapped-passphrase.

one possible situation of mistaken permission of wrapped-passphrase is:
 * a user forgot his/her password
 * an admin reset user's login password
 * the admin also created new wrapped-passphrase with stored passphrase and new password by ecryptfs-wrap-passphrase
 * the admin forgot to change permission and left owner of wrapped-passphrase as root:root

then the user cannot read wrapped-passphrase and fails to mount ecryptfs.

Unmerged revisions

776. By Nobuto Murata on 2013-03-18

src/utils/ecryptfs-verify: check existence and permission of
wrapped-passphrase (LP: #1156672)

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-13 18:17:04 +0000
+++ debian/changelog	2013-03-18 15:47:24 +0000
@@ -9,6 +9,8 @@
   [ Nobuto MURATA ]
   * fix an empty update-notifier window (LP: #1107650)
     - changes made in Rev.758 was incomplete
+  * src/utils/ecryptfs-verify: check existence and permission of
+    wrapped-passphrase (LP: #1156672)
 
   [ Tyler Hicks ]
   * doc/manpage/ecryptfs.7:
@@ -16,7 +18,7 @@
       mount helper takes a capital 'N' for the answer to y/n questions
       (LP: #1130460)
 
- -- Nobuto MURATA <[e-mail]>  Thu, 21 Feb 2013 01:56:33 +0900
+ -- Nobuto MURATA <[e-mail]>  Tue, 19 Mar 2013 00:41:03 +0900
 
 ecryptfs-utils (103) quantal; urgency=low
 

=== modified file 'src/utils/ecryptfs-verify'
--- src/utils/ecryptfs-verify	2011-09-21 16:55:08 +0000
+++ src/utils/ecryptfs-verify	2013-03-18 15:47:24 +0000
@@ -118,6 +118,21 @@
 	fi
 }
 
+wrapped_passphrase_valid() {
+	local w="$1/.ecryptfs/wrapped-passphrase"
+	if [ -e "$w" ]; then
+		info "[$w] exists"
+	else
+		error "[$w] does not exist"
+	fi
+	local owner=$(stat -c "%U" "$w")
+	if [ "$owner" = "$user" ]; then
+		info "Ownership [$owner] of [$w] is correct"
+	else
+		error "Invalid owner [$owner] of [$w]"
+	fi
+}
+
 mount_is_home() {
 	local home="$1"
 	local mountfile="$home/.ecryptfs/Private.mnt"
@@ -218,12 +233,14 @@
 			mountfile_valid "$home"
 			automount_true "$home"
 			mount_is_home "$home"
+			wrapped_passphrase_valid "$home"
 		;;
 		check_private)
 			ecryptfs_exists "$home"
 			sigfile_valid "$home"
 			mountfile_valid "$home"
 			mount_is_private "$home"
+			wrapped_passphrase_valid "$home"
 		;;
 		check_filenames_encrypted)
 			ecryptfs_exists "$home"