Merge pull request #3162 from chimp1984/fix-mandatory-capability-check

Add missing check if capability is not empty before checking mandatory capabilities
bisq-network · Aug 29, 2019 · 9a2dfda · 9a2dfda
2 parents 4e7cb04 + adac3bd
commit 9a2dfda
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/common/src/main/java/bisq/common/app/Capabilities.java b/common/src/main/java/bisq/common/app/Capabilities.java
@@ -25,13 +25,15 @@
 import java.util.stream.Collectors;
 
 import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * hold a set of capabilities and offers appropriate comparison methods.
  *
  * @author Florian Reimair
  */
 @EqualsAndHashCode
+@Slf4j
 public class Capabilities {
 
     /**

diff --git a/p2p/src/main/java/bisq/network/p2p/network/CloseConnectionReason.java b/p2p/src/main/java/bisq/network/p2p/network/CloseConnectionReason.java
@@ -45,7 +45,8 @@ public enum CloseConnectionReason {
     // illegal requests
     RULE_VIOLATION(true, false),
     PEER_BANNED(true, false),
-    INVALID_CLASS_RECEIVED(false, false);
+    INVALID_CLASS_RECEIVED(false, false),
+    MANDATORY_CAPABILITIES_NOT_SUPPORTED(false, false);
 
     public final boolean sendCloseMessage;
     public final boolean isIntended;

diff --git a/p2p/src/main/java/bisq/network/p2p/network/Connection.java b/p2p/src/main/java/bisq/network/p2p/network/Connection.java
@@ -799,12 +799,14 @@ && reportInvalidRequest(RuleViolation.WRONG_NETWORK_ID)) {
                         Capabilities supportedCapabilities = ((SupportedCapabilitiesMessage) networkEnvelope).getSupportedCapabilities();
                         if (supportedCapabilities != null) {
                             if (!capabilities.equals(supportedCapabilities)) {
-                                if (!Capabilities.hasMandatoryCapability(capabilities)) {
-                                    shutDown(CloseConnectionReason.RULE_VIOLATION);
+                                capabilities.set(supportedCapabilities);
+
+                                // Capabilities can be empty. We only check for mandatory if we get some capabilities.
+                                if (!capabilities.isEmpty() && !Capabilities.hasMandatoryCapability(capabilities)) {
+                                    shutDown(CloseConnectionReason.MANDATORY_CAPABILITIES_NOT_SUPPORTED);
                                     return;
                                 }
 
-                                capabilities.set(supportedCapabilities);
                                 capabilitiesListeners.forEach(weakListener -> {
                                     SupportedCapabilitiesListener supportedCapabilitiesListener = weakListener.get();
                                     if (supportedCapabilitiesListener != null) {