From 8951eb2472d6af50554806df2ffd655f53da8bfe Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher <jakobunt@gmail.com>
Date: Wed, 17 Jan 2018 00:23:09 +0100
Subject: [PATCH] fusefronted: add PlaintextNames special-cases for Create &
 Rename

gocryptfs.longname.XXX files were considered magic in PlaintextNames
mode, which was wrong.

Fix that and add tests.

Fixes https://github.com/rfjakob/gocryptfs/issues/174
---
 internal/fusefrontend/fs.go |  7 ++-
 tests/matrix/matrix_test.go | 86 +++++++++++++++++++++++--------------
 2 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/internal/fusefrontend/fs.go b/internal/fusefrontend/fs.go
index cabfdd2..8b0bb2e 100644
--- a/internal/fusefrontend/fs.go
+++ b/internal/fusefrontend/fs.go
@@ -195,7 +195,7 @@ func (fs *FS) Create(path string, flags uint32, mode uint32, context *fuse.Conte
 	cName := filepath.Base(cPath)
 
 	// Handle long file name
-	if nametransform.IsLongContent(cName) {
+	if !fs.args.PlaintextNames && nametransform.IsLongContent(cName) {
 		var dirfd *os.File
 		dirfd, err = os.Open(filepath.Dir(cPath))
 		if err != nil {
@@ -466,7 +466,10 @@ func (fs *FS) Rename(oldPath string, newPath string, context *fuse.Context) (cod
 	// The Rename may cause a directory to take the place of another directory.
 	// That directory may still be in the DirIV cache, clear it.
 	fs.nameTransform.DirIVCache.Clear()
-
+	// Easy case.
+	if fs.args.PlaintextNames {
+		return fuse.ToStatus(syscall.Rename(cOldPath, cNewPath))
+	}
 	// Handle long source file name
 	var oldDirFd *os.File
 	var finalOldDirFd int
diff --git a/tests/matrix/matrix_test.go b/tests/matrix/matrix_test.go
index 90cf55e..2494ed6 100644
--- a/tests/matrix/matrix_test.go
+++ b/tests/matrix/matrix_test.go
@@ -800,38 +800,58 @@ func TestMkfifo(t *testing.T) {
 	}
 }
 
-// Make sure the Symlink call works with paths starting with "gocryptfs.longname."
-func TestSymlink(t *testing.T) {
-	path := test_helpers.DefaultPlainDir + "/gocryptfs.longname.XXX"
-	err := syscall.Symlink("target", path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = os.Remove(path)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Make sure the Link call works with paths starting with "gocryptfs.longname."
-func TestLink(t *testing.T) {
-	target := test_helpers.DefaultPlainDir + "/linktarget"
-	f, err := os.Create(target)
-	if err != nil {
-		t.Fatal(err)
-	}
-	f.Close()
-	path := test_helpers.DefaultPlainDir + "/gocryptfs.longname.XXX"
-	err = syscall.Link(target, path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = os.Remove(target)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = os.Remove(path)
-	if err != nil {
-		t.Fatal(err)
+// TestMagicNames verifies that "magic" names are handled correctly
+// https://github.com/rfjakob/gocryptfs/issues/174
+func TestMagicNames(t *testing.T) {
+	names := []string{"gocryptfs.longname.QhUr5d9FHerwEs--muUs6_80cy6JRp89c1otLwp92Cs", "gocryptfs.diriv"}
+	for _, n := range names {
+		t.Logf("Testing n=%q", n)
+		p := test_helpers.DefaultPlainDir + "/" + n
+		// Create file
+		err := ioutil.WriteFile(p, []byte("xxxxxxx"), 0200)
+		if err != nil {
+			t.Fatalf("creating file %q failed: %v", n, err)
+		}
+		// Rename magic to normal
+		err = os.Rename(p, test_helpers.DefaultPlainDir+"/x")
+		if err != nil {
+			t.Fatalf("rename 1 failed: %v", err)
+		}
+		// Rename normal to magic
+		err = os.Rename(test_helpers.DefaultPlainDir+"/x", p)
+		if err != nil {
+			t.Fatalf("rename 2 failed: %v", err)
+		}
+		// Unlink
+		err = syscall.Unlink(p)
+		if err != nil {
+			t.Fatal(err)
+		}
+		// Mkdir
+		err = os.Mkdir(p, 0700)
+		if err != nil {
+			t.Fatal(err)
+		}
+		// Rmdir
+		err = syscall.Rmdir(p)
+		if err != nil {
+			t.Fatal(err)
+		}
+		// Symlink
+		err = syscall.Symlink("xxxyyyyzzz", p)
+		if err != nil {
+			t.Fatal(err)
+		}
+		syscall.Unlink(p)
+		// Link
+		target := test_helpers.DefaultPlainDir + "/linktarget"
+		err = ioutil.WriteFile(target, []byte("yyyyy"), 0200)
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = syscall.Link(target, p)
+		if err != nil {
+			t.Fatal(err)
+		}
 	}
 }