572baae10a
* Named functions and defined a basic EIP191 content type list * Written basic content type functions * Added ecRecover method in the clef api * Updated the extapi changelog and addded indications in the README * Changed the version of the external API * Added tests for 0x45 * Implementing UnmarshalJSON() for TypedData * Working on TypedData * Solved the auditlog issue * Changed method to signTypedData * Changed mimes and implemented the 'encodeType' function for EIP-712 * Polished docstrings, ran goimports and swapped fmt.Errorf with errors.New where possible * Drafted recursive encodeData * Ran goimports and gofmt * Drafted first version of EIP-712, including tests * Temporarily switched to using common.Address in tests * Drafted text/validator and and rewritten []byte as hexutil.Bytes * Solved stringified address encoding issue * Changed the property type required by signData from bytes to interface{} * Fixed bugs in 'data/typed' signs * Brought legal warning back after temporarily disabling it for development * Added example RPC calls for account_signData and account_signTypedData * Named functions and defined a basic EIP191 content type list * Written basic content type functions * Added ecRecover method in the clef api * Updated the extapi changelog and addded indications in the README * Added tests for 0x45 * Implementing UnmarshalJSON() for TypedData * Working on TypedData * Solved the auditlog issue * Changed method to signTypedData * Changed mimes and implemented the 'encodeType' function for EIP-712 * Polished docstrings, ran goimports and swapped fmt.Errorf with errors.New where possible * Drafted recursive encodeData * Ran goimports and gofmt * Drafted first version of EIP-712, including tests * Temporarily switched to using common.Address in tests * Drafted text/validator and and rewritten []byte as hexutil.Bytes * Solved stringified address encoding issue * Changed the property type required by signData from bytes to interface{} * Fixed bugs in 'data/typed' signs * Brought legal warning back after temporarily disabling it for development * Added example RPC calls for account_signData and account_signTypedData * Polished and fixed PR * Polished and fixed PR * Solved malformed data panics and also wrote tests * Solved malformed data panics and also wrote tests * Added alphabetical sorting to type dependencies * Added alphabetical sorting to type dependencies * Added pretty print to data/typed UI * Added pretty print to data/typed UI * signer: more tests for typed data * signer: more tests for typed data * Fixed TestMalformedData4 errors and renamed IsValid to Validate * Fixed TestMalformedData4 errors and renamed IsValid to Validate * Fixed more new failing tests and deanonymised some functions * Fixed more new failing tests and deanonymised some functions * Added types to EIP712 output in cliui * Added types to EIP712 output in cliui * Fixed regexp issues * Fixed regexp issues * Added pseudo-failing test * Added pseudo-failing test * Fixed false positive test * Fixed false positive test * Added PrettyPrint method * Added PrettyPrint method * signer: refactor formatting and UI * signer: make ui use new message format for signing * Fixed breaking changes * Fixed rules_test failing test * Added extra regexp for reference types * signer: more hard types * Fixed failing test, formatted files * signer: use golang/x keccak * Fixed goimports error * clef, signer: address some review concerns * Implemented latest recommendations * Fixed comments and uintint256 issue * accounts, signer: fix mimetypes, add interface to sign data with passphrase * signer, accounts: remove duplicated code, pass hash preimages to signing * signer: prevent panic in type assertions, make cliui print rawdata as quotable-safe * signer: linter fixes, remove deprecated crypto dependency * accounts: fix goimport
116 lines
4.3 KiB
Go
116 lines
4.3 KiB
Go
// Copyright 2018 The go-ethereum Authors
|
|
// This file is part of go-ethereum.
|
|
//
|
|
// go-ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// go-ethereum 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 General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package core
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
|
|
"github.com/ethereum/go-ethereum/accounts"
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
"github.com/ethereum/go-ethereum/internal/ethapi"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
)
|
|
|
|
type AuditLogger struct {
|
|
log log.Logger
|
|
api ExternalAPI
|
|
}
|
|
|
|
func (l *AuditLogger) List(ctx context.Context) ([]common.Address, error) {
|
|
l.log.Info("List", "type", "request", "metadata", MetadataFromContext(ctx).String())
|
|
res, e := l.api.List(ctx)
|
|
l.log.Info("List", "type", "response", "data", res)
|
|
|
|
return res, e
|
|
}
|
|
|
|
func (l *AuditLogger) New(ctx context.Context) (accounts.Account, error) {
|
|
return l.api.New(ctx)
|
|
}
|
|
|
|
func (l *AuditLogger) SignTransaction(ctx context.Context, args SendTxArgs, methodSelector *string) (*ethapi.SignTransactionResult, error) {
|
|
sel := "<nil>"
|
|
if methodSelector != nil {
|
|
sel = *methodSelector
|
|
}
|
|
l.log.Info("SignTransaction", "type", "request", "metadata", MetadataFromContext(ctx).String(),
|
|
"tx", args.String(),
|
|
"methodSelector", sel)
|
|
|
|
res, e := l.api.SignTransaction(ctx, args, methodSelector)
|
|
if res != nil {
|
|
l.log.Info("SignTransaction", "type", "response", "data", common.Bytes2Hex(res.Raw), "error", e)
|
|
} else {
|
|
l.log.Info("SignTransaction", "type", "response", "data", res, "error", e)
|
|
}
|
|
return res, e
|
|
}
|
|
|
|
func (l *AuditLogger) SignData(ctx context.Context, contentType string, addr common.MixedcaseAddress, data interface{}) (hexutil.Bytes, error) {
|
|
l.log.Info("SignData", "type", "request", "metadata", MetadataFromContext(ctx).String(),
|
|
"addr", addr.String(), "data", data, "content-type", contentType)
|
|
b, e := l.api.SignData(ctx, contentType, addr, data)
|
|
l.log.Info("SignData", "type", "response", "data", common.Bytes2Hex(b), "error", e)
|
|
return b, e
|
|
}
|
|
|
|
func (l *AuditLogger) SignTypedData(ctx context.Context, addr common.MixedcaseAddress, data TypedData) (hexutil.Bytes, error) {
|
|
l.log.Info("SignTypedData", "type", "request", "metadata", MetadataFromContext(ctx).String(),
|
|
"addr", addr.String(), "data", data)
|
|
b, e := l.api.SignTypedData(ctx, addr, data)
|
|
l.log.Info("SignTypedData", "type", "response", "data", common.Bytes2Hex(b), "error", e)
|
|
return b, e
|
|
}
|
|
|
|
func (l *AuditLogger) EcRecover(ctx context.Context, data hexutil.Bytes, sig hexutil.Bytes) (common.Address, error) {
|
|
l.log.Info("EcRecover", "type", "request", "metadata", MetadataFromContext(ctx).String(),
|
|
"data", common.Bytes2Hex(data), "sig", common.Bytes2Hex(sig))
|
|
b, e := l.api.EcRecover(ctx, data, sig)
|
|
l.log.Info("EcRecover", "type", "response", "address", b.String(), "error", e)
|
|
return b, e
|
|
}
|
|
|
|
func (l *AuditLogger) Export(ctx context.Context, addr common.Address) (json.RawMessage, error) {
|
|
l.log.Info("Export", "type", "request", "metadata", MetadataFromContext(ctx).String(),
|
|
"addr", addr.Hex())
|
|
j, e := l.api.Export(ctx, addr)
|
|
// In this case, we don't actually log the json-response, which may be extra sensitive
|
|
l.log.Info("Export", "type", "response", "json response size", len(j), "error", e)
|
|
return j, e
|
|
}
|
|
|
|
func (l *AuditLogger) Version(ctx context.Context) (string, error) {
|
|
l.log.Info("Version", "type", "request", "metadata", MetadataFromContext(ctx).String())
|
|
data, err := l.api.Version(ctx)
|
|
l.log.Info("Version", "type", "response", "data", data, "error", err)
|
|
return data, err
|
|
|
|
}
|
|
|
|
func NewAuditLogger(path string, api ExternalAPI) (*AuditLogger, error) {
|
|
l := log.New("api", "signer")
|
|
handler, err := log.FileHandler(path, log.LogfmtFormat())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
l.SetHandler(handler)
|
|
l.Info("Configured", "audit log", path)
|
|
return &AuditLogger{l, api}, nil
|
|
}
|