Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check for empty in disconnect reason bytes #6938

Merged
merged 2 commits into from
Apr 15, 2024
Merged

check for empty in disconnect reason bytes #6938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d3c8a1
check for empty in disconnect reason bytes
macfarla Apr 12, 2024
89b4d6c
Merge branch 'main' into denylist-inddex-oob
macfarla Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...reum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/PeerDenylistManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void onDisconnect(
final boolean initiatedByPeer) {
// we have a number of reasons that use the same code, but with different message strings
// so here we use the code of the reason param to ensure we get the no-message version
if (shouldBlock(DisconnectReason.forCode(reason.getValue().get(0)), initiatedByPeer)) {
if (shouldBlock(DisconnectReason.forCode(reason.getValue()), initiatedByPeer)) {
if (maintainedPeers.contains(connection.getPeer())) {
LOG.debug(
"Skip adding maintained peer {} to peer denylist for reason {}",
Expand Down
8 changes: 8 additions & 0 deletions ...src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/DisconnectMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,14 @@ public static DisconnectReason forCode(final Byte code) {
return BY_ID[code];
}

public static DisconnectReason forCode(final Bytes codeBytes) {
if (codeBytes == null || codeBytes.isEmpty()) {
return UNKNOWN;
} else {
return forCode(codeBytes.get(0));
}
}

DisconnectReason(final Byte code) {
this.code = Optional.ofNullable(code);
this.message = Optional.empty();
Expand Down
9 changes: 9 additions & 0 deletions .../p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/PeerDenylistManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,15 @@ public void denylistIncompatiblePeerWhoIssuesDisconnect() {
checkPermissions(denylist, peer.getPeer(), false);
}

@Test
public void disconnectReasonWithEmptyValue_doesNotAddToDenylist() {
final PeerConnection peer = generatePeerConnection();

checkPermissions(denylist, peer.getPeer(), true);
peerDenylistManager.onDisconnect(peer, DisconnectReason.UNKNOWN, false);
checkPermissions(denylist, peer.getPeer(), true);
}

private void checkPermissions(
final PeerPermissionsDenylist denylist, final Peer remotePeer, final boolean expectedResult) {
for (PeerPermissions.Action action : PeerPermissions.Action.values()) {
Expand Down
Loading