From f3d4ce0d164f7b17a143304e2b94421573d596a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Wed, 20 Jan 2016 16:06:28 +0200
Subject: [PATCH] core/state, ethdb, trie: test intermediate secure key leak,
fix memdb bug
---
core/state/statedb_test.go | 68 ++++++++++++++++++++++++++++++++++++++
ethdb/memory_database.go | 2 +-
trie/secure_trie.go | 6 ++--
3 files changed, 73 insertions(+), 3 deletions(-)
diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go
index fd4d02fdd..8138f8d78 100644
--- a/core/state/statedb_test.go
+++ b/core/state/statedb_test.go
@@ -50,3 +50,71 @@ func TestUpdateLeaks(t *testing.T) {
t.Errorf("State leaked into database: %x -> %x", key, value)
}
}
+
+// Tests that no intermediate state of an object is stored into the database,
+// only the one right before the commit.
+func TestIntermediateLeaks(t *testing.T) {
+ // Create two state databases, one transitioning to the final state, the other final from the beginning
+ transDb, _ := ethdb.NewMemDatabase()
+ finalDb, _ := ethdb.NewMemDatabase()
+ transState, _ := New(common.Hash{}, transDb)
+ finalState, _ := New(common.Hash{}, finalDb)
+
+ // Update the states with some objects
+ for i := byte(0); i < 255; i++ {
+ // Create a new state object with some data into the transition database
+ obj := transState.GetOrNewStateObject(common.BytesToAddress([]byte{i}))
+ obj.SetBalance(big.NewInt(int64(11 * i)))
+ obj.SetNonce(uint64(42 * i))
+ if i%2 == 0 {
+ obj.SetState(common.BytesToHash([]byte{i, i, i, 0}), common.BytesToHash([]byte{i, i, i, i, 0}))
+ }
+ if i%3 == 0 {
+ obj.SetCode([]byte{i, i, i, i, i, 0})
+ }
+ transState.UpdateStateObject(obj)
+
+ // Overwrite all the data with new values in the transition database
+ obj.SetBalance(big.NewInt(int64(11*i + 1)))
+ obj.SetNonce(uint64(42*i + 1))
+ if i%2 == 0 {
+ obj.SetState(common.BytesToHash([]byte{i, i, i, 0}), common.Hash{})
+ obj.SetState(common.BytesToHash([]byte{i, i, i, 1}), common.BytesToHash([]byte{i, i, i, i, 1}))
+ }
+ if i%3 == 0 {
+ obj.SetCode([]byte{i, i, i, i, i, 1})
+ }
+ transState.UpdateStateObject(obj)
+
+ // Create the final state object directly in the final database
+ obj = finalState.GetOrNewStateObject(common.BytesToAddress([]byte{i}))
+ obj.SetBalance(big.NewInt(int64(11*i + 1)))
+ obj.SetNonce(uint64(42*i + 1))
+ if i%2 == 0 {
+ obj.SetState(common.BytesToHash([]byte{i, i, i, 1}), common.BytesToHash([]byte{i, i, i, i, 1}))
+ }
+ if i%3 == 0 {
+ obj.SetCode([]byte{i, i, i, i, i, 1})
+ }
+ finalState.UpdateStateObject(obj)
+ }
+ if _, err := transState.Commit(); err != nil {
+ t.Fatalf("failed to commit transition state: %v", err)
+ }
+ if _, err := finalState.Commit(); err != nil {
+ t.Fatalf("failed to commit final state: %v", err)
+ }
+ // Cross check the databases to ensure they are the same
+ for _, key := range finalDb.Keys() {
+ if _, err := transDb.Get(key); err != nil {
+ val, _ := finalDb.Get(key)
+ t.Errorf("entry missing from the transition database: %x -> %x", key, val)
+ }
+ }
+ for _, key := range transDb.Keys() {
+ if _, err := finalDb.Get(key); err != nil {
+ val, _ := transDb.Get(key)
+ t.Errorf("extra entry in the transition database: %x -> %x", key, val)
+ }
+ }
+}
diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go
index 45423ed73..a729f5233 100644
--- a/ethdb/memory_database.go
+++ b/ethdb/memory_database.go
@@ -107,7 +107,7 @@ func (b *memBatch) Put(key, value []byte) error {
b.lock.Lock()
defer b.lock.Unlock()
- b.writes = append(b.writes, kv{key, common.CopyBytes(value)})
+ b.writes = append(b.writes, kv{common.CopyBytes(key), common.CopyBytes(value)})
return nil
}
diff --git a/trie/secure_trie.go b/trie/secure_trie.go
index ca515aacb..be7defe83 100644
--- a/trie/secure_trie.go
+++ b/trie/secure_trie.go
@@ -109,7 +109,7 @@ func (t *SecureTrie) TryUpdate(key, value []byte) error {
if err != nil {
return err
}
- t.secKeyCache[string(hk)] = key
+ t.secKeyCache[string(hk)] = common.CopyBytes(key)
return nil
}
@@ -123,7 +123,9 @@ func (t *SecureTrie) Delete(key []byte) {
// TryDelete removes any existing value for key from the trie.
// If a node was not found in the database, a MissingNodeError is returned.
func (t *SecureTrie) TryDelete(key []byte) error {
- return t.Trie.TryDelete(t.hashKey(key))
+ hk := t.hashKey(key)
+ delete(t.secKeyCache, string(hk))
+ return t.Trie.TryDelete(hk)
}
// GetKey returns the sha3 preimage of a hashed key that was
--
GitLab