191364c350
* p2p/dnsdisc: add support for enode.Iterator This changes the dnsdisc.Client API to support the enode.Iterator interface. * p2p/dnsdisc: rate-limit DNS requests * p2p/dnsdisc: preserve linked trees across root updates This improves the way links are handled when the link root changes. Previously, sync would simply remove all links from the current tree and garbage-collect all unreachable trees before syncing the new list of links. This behavior isn't great in certain cases: Consider a structure where trees A, B, and C reference each other and D links to A. If D's link root changed, the sync code would first remove trees A, B and C, only to re-sync them later when the link to A was found again. The fix for this problem is to track the current set of links in each clientTree and removing old links only AFTER all links are synced. * p2p/dnsdisc: deflake iterator test * cmd/devp2p: adapt dnsClient to new p2p/dnsdisc API * p2p/dnsdisc: tiny comment fix
145 lines
4.8 KiB
Go
145 lines
4.8 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 dnsdisc
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/davecgh/go-spew/spew"
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
"github.com/ethereum/go-ethereum/p2p/enode"
|
|
)
|
|
|
|
func TestParseRoot(t *testing.T) {
|
|
tests := []struct {
|
|
input string
|
|
e rootEntry
|
|
err error
|
|
}{
|
|
{
|
|
input: "enrtree-root:v1 e=TO4Q75OQ2N7DX4EOOR7X66A6OM seq=3 sig=N-YY6UB9xD0hFx1Gmnt7v0RfSxch5tKyry2SRDoLx7B4GfPXagwLxQqyf7gAMvApFn_ORwZQekMWa_pXrcGCtw",
|
|
err: entryError{"root", errSyntax},
|
|
},
|
|
{
|
|
input: "enrtree-root:v1 e=TO4Q75OQ2N7DX4EOOR7X66A6OM l=TO4Q75OQ2N7DX4EOOR7X66A6OM seq=3 sig=N-YY6UB9xD0hFx1Gmnt7v0RfSxch5tKyry2SRDoLx7B4GfPXagwLxQqyf7gAMvApFn_ORwZQekMWa_pXrcGCtw",
|
|
err: entryError{"root", errInvalidSig},
|
|
},
|
|
{
|
|
input: "enrtree-root:v1 e=QFT4PBCRX4XQCV3VUYJ6BTCEPU l=JGUFMSAGI7KZYB3P7IZW4S5Y3A seq=3 sig=3FmXuVwpa8Y7OstZTx9PIb1mt8FrW7VpDOFv4AaGCsZ2EIHmhraWhe4NxYhQDlw5MjeFXYMbJjsPeKlHzmJREQE",
|
|
e: rootEntry{
|
|
eroot: "QFT4PBCRX4XQCV3VUYJ6BTCEPU",
|
|
lroot: "JGUFMSAGI7KZYB3P7IZW4S5Y3A",
|
|
seq: 3,
|
|
sig: hexutil.MustDecode("0xdc5997b95c296bc63b3acb594f1f4f21bd66b7c16b5bb5690ce16fe006860ac6761081e686b69685ee0dc588500e5c393237855d831b263b0f78a947ce62511101"),
|
|
},
|
|
},
|
|
}
|
|
for i, test := range tests {
|
|
e, err := parseRoot(test.input)
|
|
if !reflect.DeepEqual(e, test.e) {
|
|
t.Errorf("test %d: wrong entry %s, want %s", i, spew.Sdump(e), spew.Sdump(test.e))
|
|
}
|
|
if err != test.err {
|
|
t.Errorf("test %d: wrong error %q, want %q", i, err, test.err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestParseEntry(t *testing.T) {
|
|
testkey := testKey(signingKeySeed)
|
|
tests := []struct {
|
|
input string
|
|
e entry
|
|
err error
|
|
}{
|
|
// Subtrees:
|
|
{
|
|
input: "enrtree-branch:1,2",
|
|
err: entryError{"branch", errInvalidChild},
|
|
},
|
|
{
|
|
input: "enrtree-branch:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
|
|
err: entryError{"branch", errInvalidChild},
|
|
},
|
|
{
|
|
input: "enrtree-branch:",
|
|
e: &branchEntry{},
|
|
},
|
|
{
|
|
input: "enrtree-branch:AAAAAAAAAAAAAAAAAAAA",
|
|
e: &branchEntry{[]string{"AAAAAAAAAAAAAAAAAAAA"}},
|
|
},
|
|
{
|
|
input: "enrtree-branch:AAAAAAAAAAAAAAAAAAAA,BBBBBBBBBBBBBBBBBBBB",
|
|
e: &branchEntry{[]string{"AAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBB"}},
|
|
},
|
|
// Links
|
|
{
|
|
input: "enrtree://AKPYQIUQIL7PSIACI32J7FGZW56E5FKHEFCCOFHILBIMW3M6LWXS2@nodes.example.org",
|
|
e: &linkEntry{"AKPYQIUQIL7PSIACI32J7FGZW56E5FKHEFCCOFHILBIMW3M6LWXS2@nodes.example.org", "nodes.example.org", &testkey.PublicKey},
|
|
},
|
|
{
|
|
input: "enrtree://nodes.example.org",
|
|
err: entryError{"link", errNoPubkey},
|
|
},
|
|
{
|
|
input: "enrtree://AP62DT7WOTEQZGQZOU474PP3KMEGVTTE7A7NPRXKX3DUD57@nodes.example.org",
|
|
err: entryError{"link", errBadPubkey},
|
|
},
|
|
{
|
|
input: "enrtree://AP62DT7WONEQZGQZOU474PP3KMEGVTTE7A7NPRXKX3DUD57TQHGIA@nodes.example.org",
|
|
err: entryError{"link", errBadPubkey},
|
|
},
|
|
// ENRs
|
|
{
|
|
input: "enr:-HW4QES8QIeXTYlDzbfr1WEzE-XKY4f8gJFJzjJL-9D7TC9lJb4Z3JPRRz1lP4pL_N_QpT6rGQjAU9Apnc-C1iMP36OAgmlkgnY0iXNlY3AyNTZrMaED5IdwfMxdmR8W37HqSFdQLjDkIwBd4Q_MjxgZifgKSdM",
|
|
e: &enrEntry{node: testNode(nodesSeed1)},
|
|
},
|
|
{
|
|
input: "enr:-HW4QLZHjM4vZXkbp-5xJoHsKSbE7W39FPC8283X-y8oHcHPTnDDlIlzL5ArvDUlHZVDPgmFASrh7cWgLOLxj4wprRkHgmlkgnY0iXNlY3AyNTZrMaEC3t2jLMhDpCDX5mbSEwDn4L3iUfyXzoO8G28XvjGRkrAg=",
|
|
err: entryError{"enr", errInvalidENR},
|
|
},
|
|
// Invalid:
|
|
{input: "", err: errUnknownEntry},
|
|
{input: "foo", err: errUnknownEntry},
|
|
{input: "enrtree", err: errUnknownEntry},
|
|
{input: "enrtree-x=", err: errUnknownEntry},
|
|
}
|
|
for i, test := range tests {
|
|
e, err := parseEntry(test.input, enode.ValidSchemes)
|
|
if !reflect.DeepEqual(e, test.e) {
|
|
t.Errorf("test %d: wrong entry %s, want %s", i, spew.Sdump(e), spew.Sdump(test.e))
|
|
}
|
|
if err != test.err {
|
|
t.Errorf("test %d: wrong error %q, want %q", i, err, test.err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestMakeTree(t *testing.T) {
|
|
nodes := testNodes(nodesSeed2, 50)
|
|
tree, err := MakeTree(2, nodes, nil)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
txt := tree.ToTXT("")
|
|
if len(txt) < len(nodes)+1 {
|
|
t.Fatal("too few TXT records in output")
|
|
}
|
|
}
|