Skip to content

Commit 4f76e65

Browse files
authored
fix(net): robustness fixes for multiple issues (#6983)
* fix(net): harden peer message handling Validate inbound HELLO messages before logging or handshake processing, and tolerate optional node identity data. Handle concurrent sync queue changes, missing connection failure causes, and accurate transaction diagnostics. Correct the default QPS parameter type so fallback configuration remains usable. * fix(net): restore completed connection failure logging The listener runs after completion and handles cancellation separately, so a failed connection has a non-null cause. Restore direct cause logging and keep the misleading incomplete-future comment removed. * style(net): keep processed block log on one line Format the processed-block log as requested in review while preserving the non-null guard and runtime behavior.
1 parent a162df5 commit 4f76e65

13 files changed

Lines changed: 202 additions & 106 deletions

File tree

‎framework/src/main/java/org/tron/core/net/P2pEventHandlerImpl.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ private void processMessage(PeerConnection peer, byte[] data) {
164164

165165
peer.getPeerStatistics().messageStatistics.addTcpInMessage(msg);
166166
if (PeerConnection.needToLog(msg)) {
167-
logger.info("Receive message from peer: {}, {}", peer.getInetSocketAddress(), msg);
167+
logger.info("Receive message from peer: {}, {}", peer.getInetSocketAddress(), msg);
168168
}
169169

170170
switch (type) {
@@ -307,13 +307,8 @@ private void processException(PeerConnection peer, TronMessage msg, Exception ex
307307
code = Protocol.ReasonCode.UNKNOWN;
308308
break;
309309
}
310-
if (type.equals(P2pException.TypeEnum.BAD_MESSAGE)) {
311-
logger.error("Message from {} process failed, {} \n type: ({})",
312-
peer.getInetSocketAddress(), msg, type, ex);
313-
} else {
314-
logger.warn("Message from {} process failed, {} \n type: ({}), detail: {}",
315-
peer.getInetSocketAddress(), msg, type, ex.getMessage());
316-
}
310+
logger.warn("Message from {} process failed, {} \n type: ({}), detail: {}",
311+
peer.getInetSocketAddress(), msg, type, ex.getMessage());
317312
} else {
318313
code = Protocol.ReasonCode.UNKNOWN;
319314
logger.warn("Message from {} process failed, {}",

‎framework/src/main/java/org/tron/core/net/message/handshake/HelloMessage.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
import org.tron.core.ChainBaseManager;
1010
import org.tron.core.capsule.BlockCapsule;
1111
import org.tron.core.config.args.Args;
12+
import org.tron.core.exception.P2pException;
1213
import org.tron.core.net.message.MessageTypes;
1314
import org.tron.core.net.message.TronMessage;
1415
import org.tron.p2p.discover.Node;
16+
import org.tron.p2p.utils.NetUtil;
1517
import org.tron.program.Version;
1618
import org.tron.protos.Discover.Endpoint;
1719
import org.tron.protos.Protocol;
@@ -30,6 +32,9 @@ public HelloMessage(byte type, byte[] rawData) throws Exception {
3032
public HelloMessage(byte[] data) throws Exception {
3133
super(MessageTypes.P2P_HELLO.asByte(), data);
3234
this.helloMessage = Protocol.HelloMessage.parseFrom(data);
35+
if (!valid()) {
36+
throw new P2pException(P2pException.TypeEnum.BAD_MESSAGE, "invalid hello message");
37+
}
3338
}
3439

3540
public HelloMessage(Node from, long timestamp, ChainBaseManager chainBaseManager) {
@@ -123,7 +128,6 @@ public String toString() {
123128
StringBuilder builder = new StringBuilder();
124129

125130
builder.append(super.toString())
126-
.append("from: ").append(getFrom().getPreferInetSocketAddress()).append("\n")
127131
.append("timestamp: ").append(getTimestamp()).append("\n")
128132
.append("headBlockId: ").append(getHeadBlockId().getString()).append("\n")
129133
.append("nodeType: ").append(helloMessage.getNodeType()).append("\n")
@@ -155,6 +159,10 @@ public Protocol.HelloMessage getInstance() {
155159
}
156160

157161
public boolean valid() {
162+
if (helloMessage.hasFrom() && !NetUtil.validNode(getFrom())) {
163+
return false;
164+
}
165+
158166
byte[] genesisBlockByte = this.helloMessage.getGenesisBlockId().getHash().toByteArray();
159167
if (genesisBlockByte.length != Sha256Hash.LENGTH) {
160168
return false;

‎framework/src/main/java/org/tron/core/net/messagehandler/ChainInventoryMsgHandler.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.util.Deque;
66
import java.util.LinkedList;
77
import java.util.List;
8-
import java.util.NoSuchElementException;
98
import lombok.extern.slf4j.Slf4j;
109
import org.apache.commons.collections4.CollectionUtils;
1110
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +56,7 @@ public void processMessage(PeerConnection peer, TronMessage msg) throws P2pExcep
5756
}
5857

5958
while (!peer.getSyncBlockToFetch().isEmpty()) {
60-
if (peer.getSyncBlockToFetch().peekLast().equals(blockIdWeGet.peekFirst())) {
59+
if (blockIdWeGet.peekFirst().equals(peer.getSyncBlockToFetch().peekLast())) {
6160
break;
6261
}
6362
peer.getSyncBlockToFetch().pollLast();
@@ -69,22 +68,17 @@ public void processMessage(PeerConnection peer, TronMessage msg) throws P2pExcep
6968
peer.getSyncBlockToFetch().addAll(blockIdWeGet);
7069

7170
synchronized (tronNetDelegate.getBlockLock()) {
72-
try {
73-
BlockId blockId = null;
74-
while (!peer.getSyncBlockToFetch().isEmpty() && tronNetDelegate
75-
.containBlock(peer.getSyncBlockToFetch().peek())) {
76-
blockId = peer.getSyncBlockToFetch().pop();
71+
Deque<BlockId> toFetch = peer.getSyncBlockToFetch();
72+
BlockId blockId = null;
73+
BlockId next;
74+
while ((next = toFetch.peek()) != null && tronNetDelegate.containBlock(next)) {
75+
if (toFetch.remove(next)) {
76+
blockId = next;
7777
peer.setBlockBothHave(blockId);
7878
}
79-
if (blockId != null) {
80-
logger.info("Block {} from {} is processed",
81-
blockId.getString(), peer.getInetAddress());
82-
}
83-
} catch (NoSuchElementException e) {
84-
logger.warn("Process ChainInventoryMessage failed, peer {}, isDisconnect:{}",
85-
peer.getInetAddress(), peer.isDisconnect());
86-
peer.setFetchAble(true);
87-
return;
79+
}
80+
if (blockId != null) {
81+
logger.info("Block {} from {} is processed", blockId.getString(), peer.getInetAddress());
8882
}
8983

9084
peer.setFetchAble(true);

‎framework/src/main/java/org/tron/core/net/messagehandler/TransactionsMsgHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private Set<Sha256Hash> check(PeerConnection peer, TransactionsMessage msg)
154154
Item item = new Item(id, InventoryType.TRX);
155155
if (!peer.getAdvInvRequest().containsKey(item)) {
156156
throw new P2pException(TypeEnum.BAD_MESSAGE,
157-
"trx: " + msg.getMessageId() + " without request.");
157+
"trx: " + id + " without request.");
158158
}
159159
if (trx.getRawData().getContractCount() < 1) {
160160
throw new P2pException(TypeEnum.BAD_TRX,

‎framework/src/main/java/org/tron/core/net/service/effective/EffectiveCheckService.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,6 @@ private void findEffectiveNode() {
132132
// Connection attempt cancelled by user
133133
cur = null;
134134
} else if (!future.isSuccess()) {
135-
// You might get a NullPointerException here because the future might not be
136-
// completed yet.
137135
logger.warn("Connect to chosen peer {} fail, cause:{}",
138136
cur, future.cause().getMessage());
139137
future.channel().close();

‎framework/src/main/java/org/tron/core/net/service/handshake/HandshakeService.java‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import lombok.extern.slf4j.Slf4j;
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.stereotype.Component;
8-
import org.tron.common.utils.ByteArray;
98
import org.tron.core.ChainBaseManager;
109
import org.tron.core.config.args.Args;
1110
import org.tron.core.net.TronNetService;
@@ -45,27 +44,14 @@ public void processHelloMessage(PeerConnection peer, HelloMessage msg) {
4544
return;
4645
}
4746

48-
if (!Objects.equals(peer.getChannel().getNodeId(), msg.getFrom().getHexId())) {
47+
if (msg.getHelloMessage().hasFrom()
48+
&& !Objects.equals(peer.getChannel().getNodeId(), msg.getFrom().getHexId())) {
4949
logger.warn("Peer {} sent an application HELLO with a different node ID",
5050
peer.getInetSocketAddress());
5151
peer.disconnect(ReasonCode.UNEXPECTED_IDENTITY);
5252
return;
5353
}
5454

55-
if (!msg.valid()) {
56-
logger.warn("Peer {} invalid hello message parameters, GenesisBlockId: {}, SolidBlockId: {}, "
57-
+ "HeadBlockId: {}, address: {}, sig: {}, codeVersion: {}",
58-
peer.getInetSocketAddress(),
59-
ByteArray.toHexString(msg.getInstance().getGenesisBlockId().getHash().toByteArray()),
60-
ByteArray.toHexString(msg.getInstance().getSolidBlockId().getHash().toByteArray()),
61-
ByteArray.toHexString(msg.getInstance().getHeadBlockId().getHash().toByteArray()),
62-
msg.getInstance().getAddress().toByteArray().length,
63-
msg.getInstance().getSignature().toByteArray().length,
64-
msg.getInstance().getCodeVersion().toByteArray().length);
65-
peer.disconnect(ReasonCode.INCOMPATIBLE_PROTOCOL);
66-
return;
67-
}
68-
6955
peer.setAddress(msg.getHelloMessage().getAddress());
7056

7157
if (!relayService.checkHelloMessage(msg, peer.getChannel())) {

‎framework/src/main/java/org/tron/core/services/ratelimiter/strategy/QpsStrategy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public QpsStrategy(String paramString) {
2222
@Override
2323
protected Map<String, ParamItem> defaultParam() {
2424
Map<String, ParamItem> map = new HashMap<>();
25-
map.put(STRATEGY_PARAM_QPS, new ParamItem(Double.class, DEFAULT_QPS));
25+
map.put(STRATEGY_PARAM_QPS, new ParamItem(Double.class, (double) DEFAULT_QPS));
2626
return map;
2727
}
2828

@@ -34,4 +34,4 @@ public boolean acquire() {
3434
rateLimiter.acquire();
3535
return true;
3636
}
37-
}
37+
}

‎framework/src/test/java/org/tron/core/net/Base58MessageLoggingTest.java‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
import static org.junit.Assert.assertEquals;
44
import static org.junit.Assert.assertFalse;
5+
import static org.junit.Assert.assertThrows;
56
import static org.junit.Assert.assertTrue;
67
import static org.mockito.Mockito.CALLS_REAL_METHODS;
78
import static org.mockito.Mockito.mock;
89
import static org.mockito.Mockito.mockStatic;
910
import static org.mockito.Mockito.never;
1011
import static org.mockito.Mockito.verify;
12+
import static org.mockito.Mockito.verifyNoInteractions;
1113
import static org.mockito.Mockito.when;
1214

1315
import ch.qos.logback.classic.Level;
@@ -34,6 +36,7 @@
3436
import org.tron.consensus.base.Param;
3537
import org.tron.consensus.base.PbftInterface;
3638
import org.tron.consensus.pbft.message.PbftMessage;
39+
import org.tron.core.exception.P2pException;
3740
import org.tron.core.net.message.MessageTypes;
3841
import org.tron.core.net.message.handshake.HelloMessage;
3942
import org.tron.core.net.messagehandler.PbftMsgHandler;
@@ -42,7 +45,6 @@
4245
import org.tron.core.net.service.handshake.HandshakeService;
4346
import org.tron.core.net.service.statistics.PeerStatistics;
4447
import org.tron.p2p.P2pConfig;
45-
import org.tron.p2p.P2pService;
4648
import org.tron.p2p.base.Parameter;
4749
import org.tron.p2p.connection.Channel;
4850
import org.tron.protos.Discover;
@@ -94,27 +96,31 @@ public void tearDown() {
9496
}
9597

9698
@Test
97-
public void helloReceiveLogCannotEncodeOversizedAddressBeforeHandshakeRejection()
99+
public void helloReceiveRejectsOversizedAddressBeforeLoggingOrHandshake()
98100
throws Exception {
99101
for (Level level : new Level[]{Level.INFO, Level.OFF}) {
100102
logger.setLevel(level);
101103
logMessages.clear();
102104
PeerConnection peer = peer();
103105
P2pEventHandlerImpl handler = new P2pEventHandlerImpl();
104-
setField(handler, "handshakeService", new HandshakeService());
106+
HandshakeService handshake = mock(HandshakeService.class);
107+
setField(handler, "handshakeService", handshake);
105108
Method process = P2pEventHandlerImpl.class.getDeclaredMethod("processMessage",
106109
PeerConnection.class, byte[].class);
107110
process.setAccessible(true);
108-
HelloMessage message = hello(16384);
109-
try (MockedStatic<TronNetService> network = mockStatic(TronNetService.class);
110-
MockedStatic<Base58> base58 = mockStatic(Base58.class)) {
111-
network.when(TronNetService::getP2pService).thenReturn(mock(P2pService.class));
112-
process.invoke(handler, peer, message.getSendBytes());
113-
verify(peer).disconnect(ReasonCode.INCOMPATIBLE_PROTOCOL);
111+
byte[] payload = helloData(16384);
112+
byte[] message = new byte[payload.length + 1];
113+
message[0] = MessageTypes.P2P_HELLO.asByte();
114+
System.arraycopy(payload, 0, message, 1, payload.length);
115+
try (MockedStatic<Base58> base58 = mockStatic(Base58.class)) {
116+
process.invoke(handler, peer, message);
117+
verify(peer).disconnect(ReasonCode.BAD_PROTOCOL);
118+
verifyNoInteractions(handshake);
114119
base58.verifyNoInteractions();
115120
}
116121
if (level == Level.INFO) {
117-
assertTrue(logMessages.stream().anyMatch(s -> s.contains(",len=16384)")));
122+
assertTrue(logMessages.stream().anyMatch(s -> s.contains("invalid hello message")));
123+
assertFalse(logMessages.stream().anyMatch(s -> s.contains("Receive message from")));
118124
}
119125
}
120126
}
@@ -130,7 +136,8 @@ public void helloFormattingPreservesSmallInputsAndExistingLengthValidation() thr
130136
HelloMessage unusual = hello(200);
131137
assertTrue(unusual.valid());
132138
assertTrue(unusual.toString().contains(",len=200)"));
133-
assertFalse(hello(201).valid());
139+
P2pException exception = assertThrows(P2pException.class, () -> hello(201));
140+
assertEquals(P2pException.TypeEnum.BAD_MESSAGE, exception.getType());
134141
}
135142

136143
@Test
@@ -189,14 +196,18 @@ private static PeerConnection peer() {
189196
}
190197

191198
private static HelloMessage hello(int size) throws Exception {
199+
return new HelloMessage(helloData(size));
200+
}
201+
202+
private static byte[] helloData(int size) {
192203
Protocol.HelloMessage.BlockId block = Protocol.HelloMessage.BlockId.newBuilder()
193204
.setHash(ByteString.copyFrom(new byte[32])).build();
194205
Protocol.HelloMessage value = Protocol.HelloMessage.newBuilder()
195206
.setFrom(Discover.Endpoint.newBuilder().setAddress(ByteString.copyFromUtf8("127.0.0.1"))
196207
.setPort(18888).setNodeId(ByteString.copyFrom(new byte[64])))
197208
.setGenesisBlockId(block).setSolidBlockId(block).setHeadBlockId(block)
198209
.setAddress(bytes(size)).build();
199-
return new HelloMessage(value.toByteArray());
210+
return value.toByteArray();
200211
}
201212

202213
private static PbftMessage pbft(ByteString data) {

‎framework/src/test/java/org/tron/core/net/P2pEventHandlerImplTest.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.tron.common.utils.Sha256Hash;
1919
import org.tron.core.config.args.Args;
2020
import org.tron.core.exception.P2pException;
21+
import org.tron.core.net.message.MessageTypes;
2122
import org.tron.core.net.message.TronMessage;
2223
import org.tron.core.net.message.adv.FetchInvDataMessage;
2324
import org.tron.core.net.message.adv.InventoryMessage;
@@ -34,6 +35,19 @@ public static void init() throws Exception {
3435
TestConstants.TEST_CONF);
3536
}
3637

38+
@Test
39+
public void testInvalidHelloRejectedBeforeLoggingAndHandshake() throws Exception {
40+
PeerConnection peer = mock(PeerConnection.class);
41+
P2pEventHandlerImpl handler = new P2pEventHandlerImpl();
42+
Method method = handler.getClass()
43+
.getDeclaredMethod("processMessage", PeerConnection.class, byte[].class);
44+
method.setAccessible(true);
45+
method.invoke(handler, peer, new byte[]{MessageTypes.P2P_HELLO.asByte()});
46+
47+
verify(peer).disconnect(Protocol.ReasonCode.BAD_PROTOCOL);
48+
Mockito.verify(peer, Mockito.never()).getPeerStatistics();
49+
}
50+
3751
@Test
3852
public void testProcessInventoryMessage() throws Exception {
3953
CommonParameter parameter = CommonParameter.getInstance();

‎framework/src/test/java/org/tron/core/net/messagehandler/ChainInventoryMsgHandlerTest.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.ArrayList;
44
import java.util.Arrays;
5+
import java.util.Deque;
56
import java.util.LinkedList;
67
import java.util.List;
78
import java.util.concurrent.atomic.AtomicBoolean;
@@ -41,6 +42,38 @@ public static void destroy() {
4142
private ChainInventoryMessage msg = new ChainInventoryMessage(new ArrayList<>(), 0L);
4243
private List<BlockId> blockIds = new ArrayList<>();
4344

45+
@Test
46+
public void testQueueChangedDuringProcessing() throws Exception {
47+
ChainInventoryMsgHandler handler = new ChainInventoryMsgHandler();
48+
TronNetDelegate delegate = Mockito.mock(TronNetDelegate.class);
49+
SyncService syncService = Mockito.mock(SyncService.class);
50+
ReflectUtils.setFieldValue(handler, "tronNetDelegate", delegate);
51+
ReflectUtils.setFieldValue(handler, "syncService", syncService);
52+
53+
BlockId parent = new BlockId(Sha256Hash.ZERO_HASH, 0);
54+
BlockId next = new BlockId(Sha256Hash.ZERO_HASH, 1);
55+
PeerConnection peer = Mockito.mock(PeerConnection.class);
56+
Deque<BlockId> toFetch = Mockito.mock(Deque.class);
57+
LinkedList<BlockId> requested = new LinkedList<>();
58+
requested.add(parent);
59+
Mockito.when(peer.getSyncChainRequested())
60+
.thenReturn(new Pair<>(requested, System.currentTimeMillis()));
61+
Mockito.when(peer.getSyncBlockToFetch()).thenReturn(toFetch);
62+
Mockito.when(toFetch.peek()).thenReturn(next, (BlockId) null);
63+
Mockito.when(toFetch.isEmpty()).thenReturn(false, true);
64+
Mockito.when(toFetch.peekLast()).thenReturn(null);
65+
Mockito.when(delegate.getHeadBlockId()).thenReturn(parent);
66+
Mockito.when(delegate.getBlockLock()).thenReturn(new Object());
67+
Mockito.when(delegate.containBlock(next)).thenReturn(true);
68+
Mockito.when(toFetch.remove(next)).thenReturn(false);
69+
70+
handler.processMessage(peer, new ChainInventoryMessage(
71+
java.util.Arrays.asList(parent, next), 0L));
72+
73+
Mockito.verify(toFetch).pollLast();
74+
Mockito.verify(peer, Mockito.never()).setBlockBothHave(Mockito.any());
75+
}
76+
4477
@Test
4578
public void testProcessMessage() throws Exception {
4679
try {

0 commit comments

Comments
 (0)