cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #10440 from filecoin-project/steb/reject-masked-id

Browse Source 
feat: eth API: reject masked ID addresses embedded in f410f payloads
This commit is contained in:
Aayush Rajasekaran 2023-03-10 14:34:15 -05:00 committed by GitHub
commit 9d994dac9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
chain/types/ethtypes/eth_types.go
View File

@ -295,17 +295,21 @@ func EthAddressFromPubKey(pubk []byte) ([]byte, error) {
return ethAddr, nil return ethAddr, nil
} }
var maskedIDPrefix = [20 - 8]byte{0xff}
func IsEthAddress(addr address.Address) bool { func IsEthAddress(addr address.Address) bool {
if addr.Protocol() != address.Delegated { if addr.Protocol() != address.Delegated {
return false return false
} }
payload := addr.Payload() payload := addr.Payload()
namespace, _, err := varint.FromUvarint(payload) namespace, offset, err := varint.FromUvarint(payload)
if err != nil { if err != nil {
return false return false
} }
return namespace == builtintypes.EthereumAddressManagerActorID payload = payload[offset:]
return namespace == builtintypes.EthereumAddressManagerActorID && len(payload) == 20 && !bytes.HasPrefix(payload, maskedIDPrefix[:])
} }
func EthAddressFromFilecoinAddress(addr address.Address) (EthAddress, error) { func EthAddressFromFilecoinAddress(addr address.Address) (EthAddress, error) {
@ -326,9 +330,17 @@ func EthAddressFromFilecoinAddress(addr address.Address) (EthAddress, error) {
return EthAddress{}, xerrors.Errorf("invalid delegated address namespace in: %s", addr) return EthAddress{}, xerrors.Errorf("invalid delegated address namespace in: %s", addr)
} }
payload = payload[n:] payload = payload[n:]
if namespace == builtintypes.EthereumAddressManagerActorID { if namespace != builtintypes.EthereumAddressManagerActorID {
return CastEthAddress(payload) return EthAddress{}, ErrInvalidAddress
} }
ethAddr, err := CastEthAddress(payload)
if err != nil {
return EthAddress{}, err
}
if ethAddr.IsMaskedID() {
return EthAddress{}, xerrors.Errorf("f410f addresses cannot embed masked-ID payloads: %s", ethAddr)
}
return ethAddr, nil
} }
return EthAddress{}, ErrInvalidAddress return EthAddress{}, ErrInvalidAddress
} }
@ -376,8 +388,7 @@ func (ea *EthAddress) UnmarshalJSON(b []byte) error {
} }
func (ea EthAddress) IsMaskedID() bool { func (ea EthAddress) IsMaskedID() bool {
idmask := [12]byte{0xff} return bytes.HasPrefix(ea[:], maskedIDPrefix[:])
return bytes.Equal(ea[:12], idmask[:])
} }
func (ea EthAddress) ToFilecoinAddress() (address.Address, error) { func (ea EthAddress) ToFilecoinAddress() (address.Address, error) {

15
chain/types/ethtypes/eth_types_test.go
View File

@ -9,6 +9,7 @@ import (
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/big"
"github.com/filecoin-project/go-state-types/builtin"
) )
type TestCase struct { type TestCase struct {
@ -178,6 +179,20 @@ func TestParseEthAddr(t *testing.T) {
} }
} }
func TestMaskedIDInF4(t *testing.T) {
addr, err := address.NewIDAddress(100)
require.NoError(t, err)
eaddr, err := EthAddressFromFilecoinAddress(addr)
require.NoError(t, err)
badaddr, err := address.NewDelegatedAddress(builtin.EthereumAddressManagerActorID, eaddr[:])
require.NoError(t, err)
_, err = EthAddressFromFilecoinAddress(badaddr)
require.Error(t, err)
}
func TestUnmarshalEthCall(t *testing.T) { func TestUnmarshalEthCall(t *testing.T) {
data := `{"from":"0x4D6D86b31a112a05A473c4aE84afaF873f632325","to":"0xFe01CC39f5Ae8553D6914DBb9dC27D219fa22D7f","gas":"0x5","gasPrice":"0x6","value":"0x123","data":""}` data := `{"from":"0x4D6D86b31a112a05A473c4aE84afaF873f632325","to":"0xFe01CC39f5Ae8553D6914DBb9dC27D219fa22D7f","gas":"0x5","gasPrice":"0x6","value":"0x123","data":""}`