Commits

Oben Sonne committed 6fd3120 Merge

Merge Frédéric's changes

- tests for custom encfs config file locations
- automatically detect version of config file

This is the result of Frédéric's and Sebastian's changes plus my changes
on top of it. Though the final state of custom encfs config file
locations support now is different than both contributions, I hope
everyone is happy with it.

Comments (0)

Files changed (6)

 mounted to `~/Private`. Make it known to *gnome-encfs*:
 
     $ gnome-encfs -a ~/.Private.encrypted ~/Private
-    EncFS config file [-]: <optional custom encfs6.xml location>
+    EncFS config file [-]: <optional custom .encfs6.xml location>
     EncFS password: <enter encfs password>
     Mount at login [Y/n]: <say 'y' or 'n'>
 
 This adds the EncFS path, its mount location and password to the GNOME keyring
 and sets up a GNOME autostart entry to mount it at GNOME login (if enabled).
 
-Note that EncFS config file option only works with EncFS6 config files.
+Check [Anthony's EncFS hints][ehi] for custom `.encfs6.xml` locations.
 
 ### Mount an EncFS folder
 
 [gkr]: http://live.gnome.org/GnomeKeyring
 [gpl]: http://www.gnu.org/licenses/gpl.html
 [itr]: http://bitbucket.org/obensonne/gnome-encfs/issues/?status=new&status=open
+[ehi]: http://www.ict.griffith.edu.au/anthony/info/crypto/encfs.hints
 
 
 def _proceed(msg):
     print("Warning: %s" % msg)
-    proceed = preset.proceed or raw_input("Proceed [y/N]: ")
-    if not proceed or proceed.strip()[0].lower() != "y":
+    proceed = preset.proceed or raw_input("Proceed [y/N]: ") or "n"
+    if proceed.strip()[0].lower() != "y":
         _exit(2)
 
 def _pathify(path):
     """Get environment for encfs commands."""
     env = os.environ.copy()
     if econfig != "-":
-        env["ENCFS6_CONFIG"] = econfig
+        cmd = ["file", "-b", "--mime-type", econfig]
+        p = subprocess.Popen(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+        mime_type = p.communicate()[0].strip()
+        v = 6 if mime_type == 'application/xml' else 5
+        env["ENCFS%s_CONFIG" % v] = econfig
     return env
 
 def _is_mounted(mpoint):
 #!/bin/sh
 
-sh test.sh | sed -e "s,/.*/tenv,./tenv," > test.out
+LC_MESSAGES=C sh test.sh | sed -e "s,/.*/tenv,./tenv," > test.out
 
-ERR=`diff -Nur test.exp test.out`
+ERR=`diff -u test.exp test.out`
 
 if [ -n "$ERR" ] ; then
 	echo "$ERR" > test.err

tests/tenv.tar

Binary file modified.
 # EXPECT: 1 succeeding edits
 # EXPECT: autostart off
 autostart off
+# EXPECT: succeeding add (1) with custom v5 config file location
+# EXPECT: 1 listed item (1)
+* encfs path     : ./tenv/e1
+  mount point    : ./tenv/m1
+  mount at login : no
+  encfs config   : ./tenv/e1_encfs5
+# EXPECT: 1 succeeding mounts (1)
+Mounting ./tenv/m1: OK
+# EXPECT: 1 mounted paths (1)
+encfs on ./tenv/m1 type fuse.encfs
+# EXPECT: no mounted paths - all unmounted
+# EXPECT: succeeding edit (1) reset config file location
+# EXPECT: 1 listed item (1)
+* encfs path     : ./tenv/e1
+  mount point    : ./tenv/m1
+  mount at login : no
+  encfs config   : -
+# EXPECT: succeeding edit (1) with custom v5 config file location
+# EXPECT: 1 listed item (1)
+* encfs path     : ./tenv/e1
+  mount point    : ./tenv/m1
+  mount at login : no
+  encfs config   : ./tenv/e1_encfs5
+# EXPECT: succeeding remove (1)
+# EXPECT: 0 items
+# EXPECT: succeeding add (1) with custom v6 config file location
+# EXPECT: 1 listed item (2)
+* encfs path     : ./tenv/e2
+  mount point    : ./tenv/m2
+  mount at login : no
+  encfs config   : ./tenv/e2_encfs6.xml
+# EXPECT: 1 succeeding mounts (2)
+Mounting ./tenv/m2: OK
+# EXPECT: 1 mounted paths (2)
+encfs on ./tenv/m2 type fuse.encfs
+# EXPECT: no mounted paths - all unmounted
+# EXPECT: succeeding edit (2) reset config file location
+# EXPECT: 1 listed item (2)
+* encfs path     : ./tenv/e2
+  mount point    : ./tenv/m2
+  mount at login : no
+  encfs config   : -
+# EXPECT: succeeding edit (2) with custom v6 config file locations
+# EXPECT: 1 listed item (2)
+* encfs path     : ./tenv/e2
+  mount point    : ./tenv/m2
+  mount at login : no
+  encfs config   : ./tenv/e2_encfs6.xml
+# EXPECT: succeeding remove (2)
+# EXPECT: 0 items
 # EXPECT: no listed items
 # EXPECT: autostart off
 autostart off
 $GENCFS -l
 
 expect "failing add - mount point in use"
-$GENCFS -a ./tenv/e1 ./tenv/m1 --econfig "-" --password p1 --proceed n --amount y
+$GENCFS -a $TENV/e1 $TENV/m1 --econfig "-" --password p1 --proceed n --amount y
 expect "1 listed item (1)"
 $GENCFS -l
 
 $GENCFS -l
 
 expect "2 succeeding mounts (3a,3b)"
-$GENCFS -m ./tenv/e3
+$GENCFS -m $TENV/e3
 expect "2 mounted paths (3a,3b)"
 mounts
 
 test -e autostart.desktop && echo "autostart on" ||  echo "autostart off"
 
 # clean up keyring
+
+$GENCFS -l | grep "mount point" | grep "/tenv/m[0-9]" | awk {'print $4'} | \
+    while read MP ; do $GENCFS -r $MP ; done
+
+# test custom EncFS config file location (v5)
+
+expect "succeeding add (1) with custom v5 config file location"
+mv $TENV/e1/.encfs5 $TENV/e1_encfs5
+$GENCFS -a $TENV/e1 $TENV/m1 --econfig $TENV/e1_encfs5 --password p1 --proceed n --amount n
+expect "1 listed item (1)"
+$GENCFS -l
+
+expect "1 succeeding mounts (1)"
+$GENCFS -m $TENV/e1
+expect "1 mounted paths (1)"
+mounts
+
+for MPOINT in $TENV/m1* ; do
+        fusermount -u $MPOINT 2>&1
+done
+expect "no mounted paths - all unmounted"
+mounts
+
+expect "succeeding edit (1) reset config file location"
+mv $TENV/e1_encfs5 $TENV/e1/.encfs5
+$GENCFS -e $TENV/m1 --econfig "-" --password p1 --epath $TENV/e1 --mpoint $TENV/m1 --proceed n --amount n
+expect "1 listed item (1)"
+$GENCFS -l
+
+expect "succeeding edit (1) with custom v5 config file location"
+mv $TENV/e1/.encfs5 $TENV/e1_encfs5
+$GENCFS -e $TENV/m1 --econfig $TENV/e1_encfs5 --password p1 --epath $TENV/e1 --mpoint $TENV/m1 --proceed n --amount n
+expect "1 listed item (1)"
+$GENCFS -l
+
+expect "succeeding remove (1)"
+$GENCFS -r $TENV/m1
+mv $TENV/e1_encfs5 $TENV/e1/.encfs5
+expect "0 items"
+$GENCFS -l
+
+# test custom EncFS config file location (v6)
+
+expect "succeeding add (1) with custom v6 config file location"
+mv $TENV/e2/.encfs6.xml $TENV/e2_encfs6.xml
+$GENCFS -a $TENV/e2 $TENV/m2 --econfig $TENV/e2_encfs6.xml --password p2 --proceed n --amount n
+expect "1 listed item (2)"
+$GENCFS -l
+
+expect "1 succeeding mounts (2)"
+$GENCFS -m $TENV/e2
+expect "1 mounted paths (2)"
+mounts
+
+for MPOINT in $TENV/m2* ; do
+        fusermount -u $MPOINT 2>&1
+done
+expect "no mounted paths - all unmounted"
+mounts
+
+expect "succeeding edit (2) reset config file location"
+mv $TENV/e2_encfs6.xml $TENV/e2/.encfs6.xml
+$GENCFS -e $TENV/m2 --econfig "-" --password p2 --epath $TENV/e2 --mpoint $TENV/m2 --proceed n --amount n
+expect "1 listed item (2)"
+$GENCFS -l
+
+expect "succeeding edit (2) with custom v6 config file locations"
+mv $TENV/e2/.encfs6.xml $TENV/e2_encfs6.xml
+$GENCFS -e $TENV/m2 --econfig $TENV/e2_encfs6.xml --password p2 --epath $TENV/e2 --mpoint $TENV/m2 --proceed n --amount n
+expect "1 listed item (2)"
+$GENCFS -l
+
+expect "succeeding remove (2)"
+$GENCFS -r $TENV/m2
+mv $TENV/e2_encfs6.xml $TENV/e2/.encfs6.xml
+expect "0 items"
+$GENCFS -l
+
+# clean up keyring
 $GENCFS -l | grep "mount point" | grep "/tenv/m[0-9]" | awk {'print $4'} | \
     while read MP ; do $GENCFS -r $MP ; done
 
 expect "no listed items"
 $GENCFS -l
 expect "autostart off"
-test -e autostart.desktop && echo "autostart on" ||  echo "autostart off"
+test -e autostart.desktop && echo "autostart on" || echo "autostart off"