a9f26dcd0d
In order to avoid disk thrashing for Accounts and HasAccount, address->key file mappings are now cached in memory. This makes it no longer necessary to keep the key address in the file name. The address of each key is derived from file content instead. There are minor user-visible changes: - "geth account list" now reports key file paths alongside the address. - If multiple keys are present for an address, unlocking by address is not possible. Users are directed to remove the duplicate files instead. Unlocking by index is still possible. - Key files are overwritten written in place when updating the password.
63 lines
1.7 KiB
Go
63 lines
1.7 KiB
Go
// Copyright 2014 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package accounts
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
)
|
|
|
|
type keyStorePlain struct {
|
|
keysDirPath string
|
|
}
|
|
|
|
func (ks keyStorePlain) GetKey(addr common.Address, filename, auth string) (*Key, error) {
|
|
fd, err := os.Open(filename)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer fd.Close()
|
|
key := new(Key)
|
|
if err := json.NewDecoder(fd).Decode(key); err != nil {
|
|
return nil, err
|
|
}
|
|
if key.Address != addr {
|
|
return nil, fmt.Errorf("key content mismatch: have address %x, want %x", key.Address, addr)
|
|
}
|
|
return key, nil
|
|
}
|
|
|
|
func (ks keyStorePlain) StoreKey(filename string, key *Key, auth string) error {
|
|
content, err := json.Marshal(key)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return writeKeyFile(filename, content)
|
|
}
|
|
|
|
func (ks keyStorePlain) JoinPath(filename string) string {
|
|
if filepath.IsAbs(filename) {
|
|
return filename
|
|
} else {
|
|
return filepath.Join(ks.keysDirPath, filename)
|
|
}
|
|
}
|