Enforce whitelist if discovery disabled (#975)

* enforce whitelist filtering if peer auto-discovery is being disabled
Consensys · Jan 17, 2020 · a5d9c51 · a5d9c51
1 parent 2ac9d90
commit a5d9c51
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/tessera-admin/src/main/java/com/quorum/tessera/admin/ConfigServiceImpl.java b/tessera-admin/src/main/java/com/quorum/tessera/admin/ConfigServiceImpl.java
@@ -6,6 +6,8 @@
 import com.quorum.tessera.config.util.ConfigFileStore;
 import com.quorum.tessera.enclave.Enclave;
 import com.quorum.tessera.encryption.PublicKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.URI;
 import java.util.List;
@@ -14,6 +16,8 @@
 
 public class ConfigServiceImpl implements ConfigService {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigServiceImpl.class);
+
     private final Config config;
 
     private final Enclave enclave;
@@ -39,6 +43,12 @@ public List<Peer> getPeers() {
 
     @Override
     public boolean isUseWhiteList() {
+        if (isDisablePeerDiscovery()) {
+            LOGGER.warn(
+                    "As peer discovery is being disabled, the use of peer whitelist restriction will be switched on."
+                            + "This is to prevent unauthorized attempt to push transactions from unknown peers.");
+            return true;
+        }
         return config.isUseWhiteList();
     }
 

diff --git a/tessera-admin/src/test/java/com/quorum/tessera/admin/ConfigServiceTest.java b/tessera-admin/src/test/java/com/quorum/tessera/admin/ConfigServiceTest.java
@@ -42,16 +42,33 @@ public void onTearDown() {
 
     @Test
     public void isUseWhileList() {
+        when(config.isDisablePeerDiscovery()).thenReturn(false);
         when(config.isUseWhiteList()).thenReturn(false);
 
         assertThat(configService.isUseWhiteList()).isFalse();
 
         when(config.isUseWhiteList()).thenReturn(true);
         assertThat(configService.isUseWhiteList()).isTrue();
 
+        verify(config, times(2)).isDisablePeerDiscovery();
         verify(config, times(2)).isUseWhiteList();
     }
 
+    @Test
+    public void useWhiteListIsEnforcedWhenAutoDiscoveryIsOff() {
+
+        when(config.isDisablePeerDiscovery()).thenReturn(true);
+        when(config.isUseWhiteList()).thenReturn(true);
+
+        assertThat(configService.isUseWhiteList()).isTrue();
+
+        when(config.isUseWhiteList()).thenReturn(false);
+
+        assertThat(configService.isUseWhiteList()).isTrue();
+
+        verify(config, times(2)).isDisablePeerDiscovery();
+    }
+
     @Test
     public void addPeer() {
         configService.addPeer("JUNIT");