diff options
| -rw-r--r-- | internal/fusefrontend_reverse/reverse_longnames.go | 4 | ||||
| -rw-r--r-- | tests/reverse/ctlsock_test.go | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/internal/fusefrontend_reverse/reverse_longnames.go b/internal/fusefrontend_reverse/reverse_longnames.go index 212d493..6a561d8 100644 --- a/internal/fusefrontend_reverse/reverse_longnames.go +++ b/internal/fusefrontend_reverse/reverse_longnames.go @@ -51,7 +51,7 @@ func initLongnameCache() { // findLongnameParent converts "gocryptfs.longname.XYZ" to the plaintext name func (rfs *ReverseFS) findLongnameParent(dir string, dirIV []byte, longname string) (plaintextName string, err error) { longnameCacheLock.Lock() - hit := longnameParentCache[longname] + hit := longnameParentCache[dir + "/" + longname] longnameCacheLock.Unlock() if hit != "" { return hit, nil @@ -79,7 +79,7 @@ func (rfs *ReverseFS) findLongnameParent(dir string, dirIV []byte, longname stri log.Panic("logic error or wrong shortNameMax constant?") } hName := rfs.nameTransform.HashLongName(cName) - longnameParentCache[hName] = plaintextName + longnameParentCache[dir + "/" + hName] = plaintextName if longname == hName { hit = plaintextName } diff --git a/tests/reverse/ctlsock_test.go b/tests/reverse/ctlsock_test.go index c3ee121..d60fbde 100644 --- a/tests/reverse/ctlsock_test.go +++ b/tests/reverse/ctlsock_test.go @@ -35,10 +35,11 @@ func TestCtlSockPathOps(t *testing.T) { test_helpers.MountOrFatal(t, "ctlsock_reverse_test_fs", mnt, "-reverse", "-extpass", "echo test", "-ctlsock="+sock) defer test_helpers.UnmountPanic(mnt) var req ctlsock.RequestStruct + var response ctlsock.ResponseStruct for i, tc := range ctlSockTestCases { // Decrypt req = ctlsock.RequestStruct{DecryptPath: tc[0]} - response := test_helpers.QueryCtlSock(t, sock, req) + response = test_helpers.QueryCtlSock(t, sock, req) if response.ErrNo != 0 { t.Errorf("Testcase %d Decrypt: %q ErrNo=%d ErrText=%s", i, tc[0], response.ErrNo, response.ErrText) } else if response.Result != tc[1] { @@ -53,6 +54,18 @@ func TestCtlSockPathOps(t *testing.T) { t.Errorf("Testcase %d Encrypt: Want %q got %q", i, tc[1], response.Result) } } + // At this point the longname parent cache should be populated. + // Check that we do not mix up information for different directories. + req = ctlsock.RequestStruct{DecryptPath: "gocryptfs.longname.y6rxCn6Id8hIZL2t_STpdLZpu-aE2HpprJR25xD60mk="} + response = test_helpers.QueryCtlSock(t, sock, req) + if response.ErrNo != -1 { + t.Errorf("File should not exist: ErrNo=%d ErrText=%s", response.ErrNo, response.ErrText) + } + req = ctlsock.RequestStruct{DecryptPath: "v6puXntoQOk7Mhl8zJ4Idg==/gocryptfs.longname.ZQCAoi5li3xvDZRO8McBV0L_kzJc4IcAOEzuW-2S1Y4="} + response = test_helpers.QueryCtlSock(t, sock, req) + if response.ErrNo != -1 { + t.Errorf("File should not exist: ErrNo=%d ErrText=%s", response.ErrNo, response.ErrText) + } } // We should not panic when somebody feeds requests that make no sense |