mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-05-10 18:16:39 +00:00
8e2107dc39
The rlpx ping command mishandled disconnect responses on two counts:
the error return from rlp.DecodeBytes was ignored, so decode failures
silently produced an "invalid disconnect message" error with no context;
and the decoder assumed the spec-compliant list form exclusively, while
older geth and some other implementations send the reason as a bare
byte.
Accept both wire forms (matching the legacy-tolerant behavior already
in p2p.decodeDisconnectMessage), and on decode failure include the raw
payload so operators can see exactly what the peer sent. Add a unit
test for the decoder covering both forms plus the empty-payload error
path.
75 lines
1.9 KiB
Go
75 lines
1.9 KiB
Go
// Copyright 2026 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 main
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/ethereum/go-ethereum/p2p"
|
|
)
|
|
|
|
func TestDecodeRLPxDisconnect(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
payload []byte
|
|
want p2p.DiscReason
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "list form (spec-compliant)",
|
|
payload: []byte{0xc1, 0x04}, // [4] = TooManyPeers
|
|
want: p2p.DiscTooManyPeers,
|
|
},
|
|
{
|
|
name: "list form with reason zero",
|
|
payload: []byte{0xc1, 0x80}, // [0] = Requested
|
|
want: p2p.DiscRequested,
|
|
},
|
|
{
|
|
name: "bare byte form (legacy geth)",
|
|
payload: []byte{0x04}, // 4 = TooManyPeers
|
|
want: p2p.DiscTooManyPeers,
|
|
},
|
|
{
|
|
name: "bare byte form zero",
|
|
payload: []byte{0x80}, // 0 = Requested
|
|
want: p2p.DiscRequested,
|
|
},
|
|
{
|
|
name: "empty payload",
|
|
payload: []byte{},
|
|
wantErr: true,
|
|
},
|
|
}
|
|
for _, tc := range tests {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
got, err := decodeRLPxDisconnect(tc.payload)
|
|
if tc.wantErr {
|
|
if err == nil {
|
|
t.Fatalf("expected error, got reason=%v", got)
|
|
}
|
|
return
|
|
}
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if got != tc.want {
|
|
t.Fatalf("got reason %v, want %v", got, tc.want)
|
|
}
|
|
})
|
|
}
|
|
}
|