e83c3ccc47
* p2p/enr: add entries for for IPv4/IPv6 separation This adds entry types for "ip6", "udp6", "tcp6" keys. The IP type stays around because removing it would break a lot of code and force everyone to care about the distinction. * p2p/enode: track IPv4 and IPv6 address separately LocalNode predicts the local node's UDP endpoint and updates the record. This change makes it predict IPv4 and IPv6 endpoints separately since they can now be in the record at the same time. * p2p/enode: implement base64 text format * all: switch to enode.Parse(...) This allows passing base64-encoded node records to all the places that previously accepted enode:// URLs. The URL format is still supported. * cmd/bootnode, p2p: log node URL instead of ENR ...and return the base64 record in NodeInfo.
191 lines
6.3 KiB
Go
191 lines
6.3 KiB
Go
// Copyright 2018 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 enode
|
|
|
|
import (
|
|
"crypto/ecdsa"
|
|
"net"
|
|
"reflect"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
"github.com/ethereum/go-ethereum/p2p/enr"
|
|
)
|
|
|
|
var parseNodeTests = []struct {
|
|
input string
|
|
wantError string
|
|
wantResult *Node
|
|
}{
|
|
// Records
|
|
{
|
|
input: "enr:-IS4QGrdq0ugARp5T2BZ41TrZOqLc_oKvZoPuZP5--anqWE_J-Tucc1xgkOL7qXl0puJgT7qc2KSvcupc4NCb0nr4tdjgmlkgnY0gmlwhH8AAAGJc2VjcDI1NmsxoQM6UUF2Rm-oFe1IH_rQkRCi00T2ybeMHRSvw1HDpRvjPYN1ZHCCdl8",
|
|
wantResult: func() *Node {
|
|
testKey, _ := crypto.HexToECDSA("45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8")
|
|
var r enr.Record
|
|
r.Set(enr.IP{127, 0, 0, 1})
|
|
r.Set(enr.UDP(30303))
|
|
r.SetSeq(99)
|
|
SignV4(&r, testKey)
|
|
n, _ := New(ValidSchemes, &r)
|
|
return n
|
|
}(),
|
|
},
|
|
// Invalid Records
|
|
{
|
|
input: "enr:",
|
|
wantError: "EOF", // could be nicer
|
|
},
|
|
{
|
|
input: "enr:x",
|
|
wantError: "illegal base64 data at input byte 0",
|
|
},
|
|
{
|
|
input: "enr:-EmGZm9vYmFyY4JpZIJ2NIJpcIR_AAABiXNlY3AyNTZrMaEDOlFBdkZvqBXtSB_60JEQotNE9sm3jB0Ur8NRw6Ub4z2DdWRwgnZf",
|
|
wantError: enr.ErrInvalidSig.Error(),
|
|
},
|
|
// Complete node URLs with IP address and ports
|
|
{
|
|
input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@hostname:3",
|
|
wantError: `invalid IP address`,
|
|
},
|
|
{
|
|
input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:foo",
|
|
wantError: `invalid port`,
|
|
},
|
|
{
|
|
input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:3?discport=foo",
|
|
wantError: `invalid discport in query`,
|
|
},
|
|
{
|
|
input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:52150",
|
|
wantResult: NewV4(
|
|
hexPubkey("1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439"),
|
|
net.IP{0x7f, 0x0, 0x0, 0x1},
|
|
52150,
|
|
52150,
|
|
),
|
|
},
|
|
{
|
|
input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@[::]:52150",
|
|
wantResult: NewV4(
|
|
hexPubkey("1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439"),
|
|
net.ParseIP("::"),
|
|
52150,
|
|
52150,
|
|
),
|
|
},
|
|
{
|
|
input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@[2001:db8:3c4d:15::abcd:ef12]:52150",
|
|
wantResult: NewV4(
|
|
hexPubkey("1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439"),
|
|
net.ParseIP("2001:db8:3c4d:15::abcd:ef12"),
|
|
52150,
|
|
52150,
|
|
),
|
|
},
|
|
{
|
|
input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:52150?discport=22334",
|
|
wantResult: NewV4(
|
|
hexPubkey("1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439"),
|
|
net.IP{0x7f, 0x0, 0x0, 0x1},
|
|
52150,
|
|
22334,
|
|
),
|
|
},
|
|
// Incomplete node URLs with no address
|
|
{
|
|
input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439",
|
|
wantResult: NewV4(
|
|
hexPubkey("1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439"),
|
|
nil, 0, 0,
|
|
),
|
|
},
|
|
// Invalid URLs
|
|
{
|
|
input: "",
|
|
wantError: errMissingPrefix.Error(),
|
|
},
|
|
{
|
|
input: "1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439",
|
|
wantError: errMissingPrefix.Error(),
|
|
},
|
|
{
|
|
input: "01010101",
|
|
wantError: errMissingPrefix.Error(),
|
|
},
|
|
{
|
|
input: "enode://01010101@123.124.125.126:3",
|
|
wantError: `invalid public key (wrong length, want 128 hex chars)`,
|
|
},
|
|
{
|
|
input: "enode://01010101",
|
|
wantError: `invalid public key (wrong length, want 128 hex chars)`,
|
|
},
|
|
{
|
|
input: "http://foobar",
|
|
wantError: errMissingPrefix.Error(),
|
|
},
|
|
{
|
|
input: "://foo",
|
|
wantError: errMissingPrefix.Error(),
|
|
},
|
|
}
|
|
|
|
func hexPubkey(h string) *ecdsa.PublicKey {
|
|
k, err := parsePubkey(h)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return k
|
|
}
|
|
|
|
func TestParseNode(t *testing.T) {
|
|
for _, test := range parseNodeTests {
|
|
n, err := Parse(ValidSchemes, test.input)
|
|
if test.wantError != "" {
|
|
if err == nil {
|
|
t.Errorf("test %q:\n got nil error, expected %#q", test.input, test.wantError)
|
|
continue
|
|
} else if err.Error() != test.wantError {
|
|
t.Errorf("test %q:\n got error %#q, expected %#q", test.input, err.Error(), test.wantError)
|
|
continue
|
|
}
|
|
} else {
|
|
if err != nil {
|
|
t.Errorf("test %q:\n unexpected error: %v", test.input, err)
|
|
continue
|
|
}
|
|
if !reflect.DeepEqual(n, test.wantResult) {
|
|
t.Errorf("test %q:\n result mismatch:\ngot: %#v\nwant: %#v", test.input, n, test.wantResult)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestNodeString(t *testing.T) {
|
|
for i, test := range parseNodeTests {
|
|
if test.wantError == "" && strings.HasPrefix(test.input, "enode://") {
|
|
str := test.wantResult.String()
|
|
if str != test.input {
|
|
t.Errorf("test %d: Node.String() mismatch:\ngot: %s\nwant: %s", i, str, test.input)
|
|
}
|
|
}
|
|
}
|
|
}
|