mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 01:41:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Add processing of SendersNodeAddressMessage to

Browse Source 
onBundleOfEnvelopes method.

In case we received a SendersNodeAddressMessage
inside a BundleOfEnvelope we did not set the
peers address.
This commit is contained in:
chimp1984 2021-01-12 17:40:40 -05:00
parent 3e69edeb9e
commit 3834785828
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
p2p/src/main/java/bisq/network/p2p/network/Connection.java
View File

@ -442,6 +442,12 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
Set<NetworkEnvelope> envelopesToProcess = new HashSet<>();
List<NetworkEnvelope> networkEnvelopes = bundleOfEnvelopes.getEnvelopes();
for (NetworkEnvelope networkEnvelope : networkEnvelopes) {
// If SendersNodeAddressMessage we do some verifications and apply if successful, otherwise we return false.
if (networkEnvelope instanceof SendersNodeAddressMessage &&
!processSendersNodeAddressMessage((SendersNodeAddressMessage) networkEnvelope)) {
continue;
}
if (networkEnvelope instanceof AddPersistableNetworkPayloadMessage) {
PersistableNetworkPayload persistableNetworkPayload = ((AddPersistableNetworkPayloadMessage) networkEnvelope).getPersistableNetworkPayload();
byte[] hash = persistableNetworkPayload.getHash();
@ -705,6 +711,29 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
shutDown(closeConnectionReason);
}
private boolean processSendersNodeAddressMessage(SendersNodeAddressMessage sendersNodeAddressMessage) {
NodeAddress senderNodeAddress = sendersNodeAddressMessage.getSenderNodeAddress();
checkNotNull(senderNodeAddress,
"senderNodeAddress must not be null at SendersNodeAddressMessage " +
sendersNodeAddressMessage.getClass().getSimpleName());
Optional<NodeAddress> existingAddressOptional = getPeersNodeAddressOptional();
if (existingAddressOptional.isPresent()) {
// If we have already the peers address we check again if it matches our stored one
checkArgument(existingAddressOptional.get().equals(senderNodeAddress),
"senderNodeAddress not matching connections peer address.\n\t" +
"message=" + sendersNodeAddressMessage);
} else {
setPeersNodeAddress(senderNodeAddress);
}
if (networkFilter != null && networkFilter.isPeerBanned(senderNodeAddress)) {
reportInvalidRequest(RuleViolation.PEER_BANNED);
return false;
}
return true;
}
///////////////////////////////////////////////////////////////////////////////////////////
// InputHandler
///////////////////////////////////////////////////////////////////////////////////////////
@ -843,26 +872,13 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
if (!(networkEnvelope instanceof KeepAliveMessage))
statistic.updateLastActivityTimestamp();
if (networkEnvelope instanceof SendersNodeAddressMessage) {
NodeAddress senderNodeAddress = ((SendersNodeAddressMessage) networkEnvelope).getSenderNodeAddress();
checkNotNull(senderNodeAddress,
"senderNodeAddress must not be null at SendersNodeAddressMessage " +
networkEnvelope.getClass().getSimpleName());
Optional<NodeAddress> existingAddressOptional = getPeersNodeAddressOptional();
if (existingAddressOptional.isPresent()) {
// If we have already the peers address we check again if it matches our stored one
checkArgument(existingAddressOptional.get().equals(senderNodeAddress),
"senderNodeAddress not matching connections peer address.\n\t" +
"message=" + networkEnvelope);
} else {
setPeersNodeAddress(senderNodeAddress);
}
if (networkFilter != null && networkFilter.isPeerBanned(senderNodeAddress)) {
reportInvalidRequest(RuleViolation.PEER_BANNED);
return;
}
// If SendersNodeAddressMessage we do some verifications and apply if successful,
// otherwise we return false.
if (networkEnvelope instanceof SendersNodeAddressMessage &&
!processSendersNodeAddressMessage((SendersNodeAddressMessage) networkEnvelope)) {
return;
}
onMessage(networkEnvelope, this);
UserThread.execute(() -> connectionStatistics.addReceivedMsgMetrics(System.currentTimeMillis() - ts, size));
}