aboutsummaryrefslogtreecommitdiff
path: root/tests/cli
diff options
context:
space:
mode:
authorDerDonut2020-05-19 13:34:58 +0200
committerJakob Unterwurzacher2020-06-06 12:20:31 +0200
commita8230d271f394e130a8190d554eef2a86bc962d7 (patch)
treebabb6d3c4d9d76bd2d5363a1a83728a4c063c4f7 /tests/cli
parenta56e7cc5ac3ede528aaa05f912c865b09e942de4 (diff)
Added auto decryption of invalid file names
Changed invalid file decoding and decryption. Function DecryptName now shortens the filename until the filename is decodable and decryptable. Will work with valid **and** invalid Base64URL delimiter (valid delimiter [0-9a-zA-z_\\-]. If the filename is not decryptable at all, it returns the original cipher name with flag suffix Changed cli tests to generate decryptable and undecryptable file names with correct encrypted content. Replacing #474, extends #393
Diffstat (limited to 'tests/cli')
-rw-r--r--tests/cli/cli_test.go68
1 files changed, 57 insertions, 11 deletions
diff --git a/tests/cli/cli_test.go b/tests/cli/cli_test.go
index 2484cf3..08abed9 100644
--- a/tests/cli/cli_test.go
+++ b/tests/cli/cli_test.go
@@ -705,40 +705,86 @@ func TestSymlinkedCipherdir(t *testing.T) {
func TestBadname(t *testing.T) {
dir := test_helpers.InitFS(t)
mnt := dir + ".mnt"
+ validFileName := "file"
+ invalidSuffix := ".invalid_file"
+ //use static suffix for testing
test_helpers.MountOrFatal(t, dir, mnt, "-badname=*", "-extpass=echo test")
defer test_helpers.UnmountPanic(mnt)
- file := mnt + "/file"
+ //write one valid file
+ file := mnt + "/" + validFileName
err := ioutil.WriteFile(file, []byte("somecontent"), 0600)
if err != nil {
t.Fatal(err)
}
- invalid_file_name := "invalid_file"
- invalid_file := dir + "/" + invalid_file_name
- err = ioutil.WriteFile(invalid_file, []byte("somecontent"), 0600)
+ //read encrypted file name
+ fread, err := os.Open(dir)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer fread.Close()
+
+ encryptedfilename := ""
+ ciphernames, err := fread.Readdirnames(0)
+ if err != nil {
+ t.Fatal(err)
+ }
+ for _, ciphername := range ciphernames {
+ if ciphername != "gocryptfs.conf" && ciphername != "gocryptfs.diriv" {
+ encryptedfilename = ciphername
+ //found cipher name of "file"
+ }
+ }
+
+ //Read encrypted file name to generated invalid filenames
+ fsource, err := os.Open(dir + "/" + encryptedfilename)
+ if err != nil {
+ t.Fatal(err)
+ }
+ content, err := ioutil.ReadAll(fsource)
+ if err != nil {
+ t.Fatal(err)
+ }
+ fsource.Close()
+ //write invalid file which should be decodable
+ err = ioutil.WriteFile(dir+"/"+encryptedfilename+invalidSuffix, content, 0600)
+ if err != nil {
+ t.Fatal(err)
+ }
+ //write invalid file which is not decodable (cropping the encrpyted file name)
+ err = ioutil.WriteFile(dir+"/"+encryptedfilename[:len(encryptedfilename)-2]+invalidSuffix, content, 0600)
if err != nil {
t.Fatal(err)
}
+ //check for filenames
f, err := os.Open(mnt)
if err != nil {
t.Fatal(err)
}
defer f.Close()
-
names, err := f.Readdirnames(0)
- found := false
+ if err != nil {
+ t.Fatal(err)
+ }
+ foundDecodable := false
+ foundUndecodable := false
for _, name := range names {
- if strings.Contains(name, invalid_file_name) {
- found = true
- break
+ if strings.Contains(name, validFileName+invalidSuffix+" GOCRYPTFS_BAD_NAME") {
+ foundDecodable = true
+ } else if strings.Contains(name, encryptedfilename[:len(encryptedfilename)-2]+invalidSuffix+" GOCRYPTFS_BAD_NAME") {
+ foundUndecodable = true
}
}
- if !found {
- t.Errorf("did not find invalid name %s in %v", invalid_file_name, names)
+ if !foundDecodable {
+ t.Errorf("did not find invalid name %s in %v", validFileName+invalidSuffix+" GOCRYPTFS_BAD_NAME", names)
+ }
+
+ if !foundUndecodable {
+ t.Errorf("did not find invalid name %s in %v", encryptedfilename[:len(encryptedfilename)-2]+invalidSuffix+" GOCRYPTFS_BAD_NAME", names)
}
}