interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

accounts: don't store address in unlocked and add commentary 

This was suggested during review.
This commit is contained in:
Felix Lange 2015-03-08 02:45:02 +01:00
parent fb53a9362e
commit 6684ef201a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
accounts/account_manager.go
View File

@ -60,10 +60,8 @@ type Manager struct {
} }
type unlocked struct { type unlocked struct {
addr []byte
abort chan struct{}
*crypto.Key *crypto.Key
abort chan struct{}
} }
func NewManager(keyStore crypto.KeyStore2, unlockTime time.Duration) *Manager { func NewManager(keyStore crypto.KeyStore2, unlockTime time.Duration) *Manager {
@ -119,7 +117,7 @@ func (am *Manager) SignLocked(a Account, keyAuth string, toSign []byte) (signatu
return nil, err return nil, err
} }
u := am.addUnlocked(a.Address, key) u := am.addUnlocked(a.Address, key)
go am.dropLater(u) go am.dropLater(a.Address, u)
signature, err = crypto.Sign(toSign, key.PrivateKey) signature, err = crypto.Sign(toSign, key.PrivateKey)
return signature, err return signature, err
} }
@ -149,7 +147,7 @@ func (am *Manager) Accounts() ([]Account, error) {
} }
func (am *Manager) addUnlocked(addr []byte, key *crypto.Key) *unlocked { func (am *Manager) addUnlocked(addr []byte, key *crypto.Key) *unlocked {
u := &unlocked{addr: addr, abort: make(chan struct{}), Key: key} u := &unlocked{Key: key, abort: make(chan struct{})}
am.mutex.Lock() am.mutex.Lock()
prev, found := am.unlocked[string(addr)] prev, found := am.unlocked[string(addr)]
if found { if found {
@ -162,7 +160,7 @@ func (am *Manager) addUnlocked(addr []byte, key *crypto.Key) *unlocked {
return u return u
} }
func (am *Manager) dropLater(u *unlocked) { func (am *Manager) dropLater(addr []byte, u *unlocked) {
t := time.NewTimer(am.unlockTime) t := time.NewTimer(am.unlockTime)
defer t.Stop() defer t.Stop()
select { select {
@ -170,9 +168,13 @@ func (am *Manager) dropLater(u *unlocked) {
// just quit // just quit
case <-t.C: case <-t.C:
am.mutex.Lock() am.mutex.Lock()
if am.unlocked[string(u.addr)] == u { // only drop if it's still the same key instance that dropLater
// was launched with. we can check that using pointer equality
// because the map stores a new pointer every time the key is
// unlocked.
if am.unlocked[string(addr)] == u {
zeroKey(u.PrivateKey) zeroKey(u.PrivateKey)
delete(am.unlocked, string(u.addr)) delete(am.unlocked, string(addr))
} }
am.mutex.Unlock() am.mutex.Unlock()
} }