hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

tests: TestBadname: simplify test by using empty files

Browse Source 
Simplify the tests by using empty files. Empty
files are valid, and we don't check the content
anyway.

Also adjust comment style a little and add
a missing break statement.
This commit is contained in:
Jakob Unterwurzacher 2020-06-06 12:50:39 +02:00
parent 261cf12829
commit 3b61244b72
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/cli/cli_test.go
View File

@ -708,18 +708,18 @@ func TestBadname(t *testing.T) {
validFileName := "file" validFileName := "file"
invalidSuffix := ".invalid_file" invalidSuffix := ".invalid_file"
//use static suffix for testing // use static suffix for testing
test_helpers.MountOrFatal(t, dir, mnt, "-badname=*", "-extpass=echo test") test_helpers.MountOrFatal(t, dir, mnt, "-badname=*", "-extpass=echo test")
defer test_helpers.UnmountPanic(mnt) defer test_helpers.UnmountPanic(mnt)
//write one valid file // write one valid filename (empty content)
file := mnt + "/" + validFileName file := mnt + "/" + validFileName
err := ioutil.WriteFile(file, []byte("somecontent"), 0600) err := ioutil.WriteFile(file, nil, 0600)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
//read encrypted file name // read encrypted file name
fread, err := os.Open(dir) fread, err := os.Open(dir)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -734,32 +734,23 @@ func TestBadname(t *testing.T) {
for _, ciphername := range ciphernames { for _, ciphername := range ciphernames {
if ciphername != "gocryptfs.conf" && ciphername != "gocryptfs.diriv" { if ciphername != "gocryptfs.conf" && ciphername != "gocryptfs.diriv" {
encryptedfilename = ciphername encryptedfilename = ciphername
//found cipher name of "file" // found cipher name of "file"
break
} }
} }
//Read encrypted file name to generated invalid filenames // write invalid file which should be decodable
fsource, err := os.Open(dir + "/" + encryptedfilename) err = ioutil.WriteFile(dir+"/"+encryptedfilename+invalidSuffix, nil, 0600)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
content, err := ioutil.ReadAll(fsource) // write invalid file which is not decodable (cropping the encrpyted file name)
if err != nil { err = ioutil.WriteFile(dir+"/"+encryptedfilename[:len(encryptedfilename)-2]+invalidSuffix, nil, 0600)
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 { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
//check for filenames // check for filenames
f, err := os.Open(mnt) f, err := os.Open(mnt)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)