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

More debug logging, improve main_test.go (do not use all-zero content)

Browse Source
This commit is contained in:
Jakob Unterwurzacher 2015-09-08 22:03:27 +02:00
parent caaad7c8d7
commit 1ca4fc89aa
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cryptfs/log.go
View File

@ -15,5 +15,5 @@ func (l logChannel) Printf(format string, args ...interface{}) {
} }
var Debug = logChannel{false} var Debug = logChannel{true}
var Warn = logChannel{true} var Warn = logChannel{true}

21
main_test.go
View File

@ -47,7 +47,7 @@ func TestMain(m *testing.M) {
os.Exit(r) os.Exit(r)
} }
func testWriteN(t *testing.T, fn string, n int, hashWant string) { func testWriteN(t *testing.T, fn string, n int) string {
file, err := os.Create(plainDir + fn) file, err := os.Create(plainDir + fn)
if err != nil { if err != nil {
t.FailNow() t.FailNow()
@ -66,28 +66,33 @@ func testWriteN(t *testing.T, fn string, n int, hashWant string) {
t.Fail() t.Fail()
} }
rawHash := md5.Sum(buf) raw := md5.Sum(d)
hashActual := hex.EncodeToString(rawHash[:]) hashWant := hex.EncodeToString(raw[:])
raw = md5.Sum(buf)
hashActual := hex.EncodeToString(raw[:])
if hashActual != hashWant { if hashActual != hashWant {
fmt.Printf("hashWant=%s hashActual=%s\n", hashWant, hashActual) fmt.Printf("hashWant=%s hashActual=%s\n", hashWant, hashActual)
t.Fail() t.Fail()
} }
return hashActual
} }
func TestWrite10(t *testing.T) { func TestWrite10(t *testing.T) {
testWriteN(t, "10", 10, "a63c90cc3684ad8b0a2176a6a8fe9005") testWriteN(t, "10", 10)
} }
func TestWrite100(t *testing.T) { func TestWrite100(t *testing.T) {
testWriteN(t, "100", 100, "6d0bb00954ceb7fbee436bb55a8397a9") testWriteN(t, "100", 100)
} }
func TestWrite1M(t *testing.T) { func TestWrite1M(t *testing.T) {
testWriteN(t, "1M", 1024*1024, "b6d81b360a5672d80c27430f39153e2c") testWriteN(t, "1M", 1024*1024)
} }
func TestWrite1Mx100(t *testing.T) { func TestWrite1Mx100(t *testing.T) {
testWriteN(t, "1Mx100", 1024*1024, "b6d81b360a5672d80c27430f39153e2c") hashWant := testWriteN(t, "1Mx100", 1024*1024)
// Read and check 100 times to catch race conditions // Read and check 100 times to catch race conditions
var i int var i int
for i = 0; i < 100; i++ { for i = 0; i < 100; i++ {
@ -97,7 +102,7 @@ func TestWrite1Mx100(t *testing.T) {
} }
rawHash := md5.Sum(buf) rawHash := md5.Sum(buf)
hashActual := hex.EncodeToString(rawHash[:]) hashActual := hex.EncodeToString(rawHash[:])
if hashActual != "b6d81b360a5672d80c27430f39153e2c" { if hashActual != hashWant {
fmt.Printf("Read corruption in loop # %d\n", i) fmt.Printf("Read corruption in loop # %d\n", i)
t.FailNow() t.FailNow()
} else { } else {

6
pathfs_frontend/file.go
View File

@ -59,11 +59,11 @@ func (f *file) doRead(off uint64, length uint64) ([]byte, fuse.Status) {
ciphertext := make([]byte, int(alignedLength)) ciphertext := make([]byte, int(alignedLength))
n, err := f.fd.ReadAt(ciphertext, int64(alignedOffset)) n, err := f.fd.ReadAt(ciphertext, int64(alignedOffset))
ciphertext = ciphertext[0:n] ciphertext = ciphertext[0:n]
cryptfs.Debug.Printf("ReadAt length=%d offset=%d -> n=%d len=%d\n", alignedLength, alignedOffset, n, len(ciphertext))
if err != nil && err != io.EOF { if err != nil && err != io.EOF {
cryptfs.Warn.Printf("read: ReadAt: %s\n", err.Error()) cryptfs.Warn.Printf("read: ReadAt: %s\n", err.Error())
return nil, fuse.ToStatus(err) return nil, fuse.ToStatus(err)
} }
cryptfs.Debug.Printf("ReadAt length=%d offset=%d -> n=%d len=%d\n", alignedLength, alignedOffset, n, len(ciphertext))
// Decrypt it // Decrypt it
plaintext, err := f.cfs.DecryptBlocks(ciphertext) plaintext, err := f.cfs.DecryptBlocks(ciphertext)
@ -107,6 +107,8 @@ func (f *file) Read(buf []byte, off int64) (resultData fuse.ReadResult, code fus
// Write - FUSE call // Write - FUSE call
func (f *file) Write(data []byte, off int64) (uint32, fuse.Status) { func (f *file) Write(data []byte, off int64) (uint32, fuse.Status) {
cryptfs.Debug.Printf("Write: offset=%d length=%d\n", off, len(data))
var written uint32 var written uint32
var status fuse.Status var status fuse.Status
dataBuf := bytes.NewBuffer(data) dataBuf := bytes.NewBuffer(data)
@ -126,10 +128,12 @@ func (f *file) Write(data []byte, off int64) (uint32, fuse.Status) {
} }
// Modify // Modify
blockData = f.cfs.MergeBlocks(oldData, blockData, int(b.Offset)) blockData = f.cfs.MergeBlocks(oldData, blockData, int(b.Offset))
cryptfs.Debug.Printf("oldData=%d blockData=%d\n", len(oldData), len(blockData))
} }
// Write // Write
blockOffset, _ := b.CiphertextRange() blockOffset, _ := b.CiphertextRange()
blockData = f.cfs.EncryptBlock(blockData) blockData = f.cfs.EncryptBlock(blockData)
cryptfs.Debug.Printf("WriteAt offset=%d length=%d\n", blockOffset, len(blockData))
_, err := f.fd.WriteAt(blockData, int64(blockOffset)) _, err := f.fd.WriteAt(blockData, int64(blockOffset))
if err != nil { if err != nil {