forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

clef, signer: address some review concerns

Browse source
This commit is contained in:
Martin Holst Swende 2019-01-15 13:32:44 +01:00
parent fd12de9e49
commit e7a6b08db5
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
5 changed files with 12 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/clef/README.md
View file

@ -489,10 +489,7 @@ Response
### account_ecRecover
#### Sign data
<<<<<<< HEAD
=======
>>>>>>> c72099670... Added example RPC calls for account_signData and account_signTypedData
Derive the address from the account that was used to sign data with content type `text/plain` and the signature.
#### Arguments

1
cmd/clef/extapi_changelog.md
View file

@ -15,7 +15,6 @@ The addition of `contentType` makes it possible to use the method for different
* The external `account_Ecrecover`-method was removed.
* The external `account_Import`-method was removed.
#### 3.0.0
* The external `account_List`-method was changed to not expose `url`, which contained info about the local filesystem. It now returns only a list of addresses.

1
signer/core/api.go
View file

@ -176,7 +176,6 @@ type (
ContentType string `json:"content_type"`
Address common.MixedcaseAddress `json:"address"`
Rawdata interface{} `json:"raw_data"`
//Message string `json:"message"`
Message []*NameValueType `json:"message"`
Hash hexutil.Bytes `json:"hash"`
Meta Metadata `json:"meta"`

15
signer/core/signed_data.go
View file

@ -21,7 +21,6 @@ import (
"context"
"errors"
"fmt"
"golang.org/x/crypto/sha3"
"math/big"
"mime"
"regexp"
@ -30,15 +29,15 @@ import (
"strings"
"unicode"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/rlp"
"golang.org/x/crypto/sha3"
)
type SigFormat struct {
@ -117,7 +116,7 @@ type TypedDataDomain struct {
Salt string `json:"salt"`
}
var typedDataRegexp = regexp.MustCompile(`^((address|bool|bytes|string)|((bytes)([1-9]|[1-2][0-9]|3[0-2]))|((int|uint)(8|16|32|64|128|256)))(\[])?$`)
var typedDataRegexp = regexp.MustCompile(`^((address|bool|bytes|string)|((bytes)([1-9]|[1-2][0-9]|3[0-2]))|((int|uint)(8|16|32|64|128|256)))(\[\])?$`)
var typedDataReferenceTypeRegexp = regexp.MustCompile(`^[A-Z](\w*)(\[])?$`)
// Sign receives a request and produces a signature
@ -221,7 +220,7 @@ func (api *SignerAPI) determineSignatureFormat(contentType string, addr common.M
},
}
req = &SignDataRequest{ContentType: mediaType, Rawdata: cliqueData, Message: message, Hash: sighash}
case TextPlain.Mime:
default: // also case TextPlain.Mime:
// Calculates an Ethereum ECDSA signature for:
// hash = keccak256("\x19${byteVersion}Ethereum Signed Message:\n${message length}${message}")
plainData, err := hexutil.Decode(data.(string))
@ -238,8 +237,6 @@ func (api *SignerAPI) determineSignatureFormat(contentType string, addr common.M
}
req = &SignDataRequest{ContentType: mediaType, Rawdata: plainData, Message: message, Hash: sighash}
default:
return nil, fmt.Errorf("content type '%s' not implemented for signing", contentType)
}
return req, nil
@ -314,7 +311,6 @@ func (api *SignerAPI) SignTypedData(ctx context.Context, addr common.MixedcaseAd
return nil, err
}
sighash := crypto.Keccak256([]byte(fmt.Sprintf("\x19\x01%s%s", string(domainSeparator), string(typedDataHash))))
//output := typedData.PrettyPrint()
message := typedData.Format()
req := &SignDataRequest{ContentType: DataTyped.Mime, Rawdata: typedData.Map(), Message: message, Hash: sighash}
signature, err := api.Sign(ctx, addr, req)
@ -390,6 +386,7 @@ func (typedData *TypedData) EncodeType(primaryType string) hexutil.Bytes {
return buffer.Bytes()
}
// TypeHash creates the keccak256 hash of the data
func (typedData *TypedData) TypeHash(primaryType string) hexutil.Bytes {
return crypto.Keccak256(typedData.EncodeType(primaryType))
}
@ -627,7 +624,7 @@ func (typedData *TypedData) PrettyPrint() string {
return output.String()
}
// Format returns a representation of d, which can be easily displayed by a user-interface
// Format returns a representation of typedData, which can be easily displayed by a user-interface
// without in-depth knowledge about 712 rules
func (typedData *TypedData) Format() []*NameValueType {
var nvts []*NameValueType

23
signer/core/signed_data_test.go
View file

@ -275,7 +275,7 @@ func TestEncodeData(t *testing.T) {
}
}
func TestMalformedData1(t *testing.T) {
func TestMalformedDomainkeys(t *testing.T) {
// Verifies that malformed domain keys are properly caught:
//{
// "name": "Ether Mail",
@ -365,7 +365,7 @@ func TestMalformedData1(t *testing.T) {
}
}
func TestMalformedData2(t *testing.T) {
func TestTypeMismatch(t *testing.T) {
// Verifies that:
// 1. Mismatches between the given type and data, i.e. `Person` and
// the data item is a string, are properly caught:
@ -472,7 +472,7 @@ func TestMalformedData2(t *testing.T) {
}
}
func TestMalformedData3(t *testing.T) {
func TestMalformedTypesAndExtradata(t *testing.T) {
// Verifies several quirks
// 1. Using dynamic types and only validating the prefix:
//{
@ -567,7 +567,7 @@ func TestMalformedData3(t *testing.T) {
}
}
func TestMalformedData4(t *testing.T) {
func TestTypeMismatch(t *testing.T) {
// Verifies data that doesn't fit into it:
//{
// "test": 65536 <-- test defined as uint8
@ -606,19 +606,6 @@ func TestFormatter(t *testing.T) {
if err != nil {
t.Fatalf("unmarshalling failed %v", err)
}
//x := PrettyPrintPrimitiveValue("address", "wallet", "0x123123123", 1)
//fmt.Printf(x)
//y := FormatPrimitiveValue("address", "wallet", "0x123123123")
//fmt.Printf("%v\n", y)
//fmt.Printf(d.PrettyPrintData(d.PrimaryType,d.Message, 1))
//formatted := d.FormatData(d.PrimaryType,d.Message)
//for _,item := range formatted{
// fmt.Printf("%v\n", item.Pprint(0))
//}
formatted := d.Format()
for _, item := range formatted {
fmt.Printf("%v\n", item.Pprint(0))
@ -629,7 +616,7 @@ func TestFormatter(t *testing.T) {
}
func TestMalformedData5(t *testing.T) {
func TestCustomTypeAsArray(t *testing.T) {
var jsonTypedData = `
{
"types": {