tests: add TestPasswdMasterkeyStdin
Tests that `gocryptfs -passwd -masterkey=stdin` works.
This was fixed by ff04b1d83a
.
Fixes https://github.com/rfjakob/gocryptfs/issues/461
This commit is contained in:
parent
ff04b1d83a
commit
3ef563493a
|
@ -167,25 +167,31 @@ func TestPasswd(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// cp copies file at `src` to `dst`, overwriting
|
||||||
|
// `dst` if it already exists. Calls t.Fatal on failure.
|
||||||
|
func cp(t *testing.T, src string, dst string) {
|
||||||
|
conf, err := ioutil.ReadFile(src)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
syscall.Unlink(dst)
|
||||||
|
err = ioutil.WriteFile(dst, conf, 0600)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Test -passwd with -masterkey
|
// Test -passwd with -masterkey
|
||||||
func TestPasswdMasterkey(t *testing.T) {
|
func TestPasswdMasterkey(t *testing.T) {
|
||||||
// Create FS
|
// Create FS
|
||||||
dir := test_helpers.InitFS(t)
|
dir := test_helpers.InitFS(t)
|
||||||
// Overwrite with config with known master key
|
// Overwrite with config with known master key
|
||||||
conf, err := ioutil.ReadFile("gocryptfs.conf.b9e5ba23")
|
cp(t, "gocryptfs.conf.b9e5ba23", dir+"/gocryptfs.conf")
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
syscall.Unlink(dir + "/gocryptfs.conf")
|
|
||||||
err = ioutil.WriteFile(dir+"/gocryptfs.conf", conf, 0600)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
// Add content
|
// Add content
|
||||||
mnt := dir + ".mnt"
|
mnt := dir + ".mnt"
|
||||||
test_helpers.MountOrFatal(t, dir, mnt, "-extpass", "echo test")
|
test_helpers.MountOrFatal(t, dir, mnt, "-extpass", "echo test")
|
||||||
file1 := mnt + "/file1"
|
file1 := mnt + "/file1"
|
||||||
err = ioutil.WriteFile(file1, []byte("somecontent"), 0600)
|
err := ioutil.WriteFile(file1, []byte("somecontent"), 0600)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -223,6 +229,55 @@ func TestPasswdMasterkey(t *testing.T) {
|
||||||
test_helpers.UnmountPanic(mnt)
|
test_helpers.UnmountPanic(mnt)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Test -passwd with -masterkey=stdin
|
||||||
|
func TestPasswdMasterkeyStdin(t *testing.T) {
|
||||||
|
// Create FS
|
||||||
|
dir := test_helpers.InitFS(t)
|
||||||
|
// Overwrite with config with known master key
|
||||||
|
cp(t, "gocryptfs.conf.b9e5ba23", dir+"/gocryptfs.conf")
|
||||||
|
// Add content
|
||||||
|
mnt := dir + ".mnt"
|
||||||
|
test_helpers.MountOrFatal(t, dir, mnt, "-extpass", "echo test")
|
||||||
|
file1 := mnt + "/file1"
|
||||||
|
err := ioutil.WriteFile(file1, []byte("somecontent"), 0600)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
test_helpers.UnmountPanic(mnt)
|
||||||
|
// Change password using stdin
|
||||||
|
args := []string{"-q", "-passwd", "-masterkey=stdin"}
|
||||||
|
args = append(args, dir)
|
||||||
|
cmd := exec.Command(test_helpers.GocryptfsBinary, args...)
|
||||||
|
cmd.Stdout = os.Stdout
|
||||||
|
cmd.Stderr = os.Stderr
|
||||||
|
p, err := cmd.StdinPipe()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
err = cmd.Start()
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
// Masterkey
|
||||||
|
p.Write([]byte("b9e5ba23-981a22b8-c8d790d8-627add29-f680513f-b7b7035f-d203fb83-21d82205\n"))
|
||||||
|
// New password
|
||||||
|
p.Write([]byte("newpasswd\n"))
|
||||||
|
p.Close()
|
||||||
|
err = cmd.Wait()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
// Mount and verify
|
||||||
|
test_helpers.MountOrFatal(t, dir, mnt, "-extpass", "echo newpasswd")
|
||||||
|
content, err := ioutil.ReadFile(file1)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
} else if string(content) != "somecontent" {
|
||||||
|
t.Errorf("wrong content: %q", string(content))
|
||||||
|
}
|
||||||
|
test_helpers.UnmountPanic(mnt)
|
||||||
|
}
|
||||||
|
|
||||||
// Test -passwd with -reverse
|
// Test -passwd with -reverse
|
||||||
func TestPasswdReverse(t *testing.T) {
|
func TestPasswdReverse(t *testing.T) {
|
||||||
// Create FS
|
// Create FS
|
||||||
|
|
Loading…
Reference in New Issue