Bugfix/whitelist filter

pom.xml

@@ -78,6 +78,13 @@
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
                     <version>0.8.3</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>commons-collections</groupId>
+                            <artifactId>commons-collections</artifactId>
+                            <version>3.2.1</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
 
                 <plugin>

tessera-jaxrs/common-jaxrs/src/main/java/com/quorum/tessera/api/filter/IPWhitelistFilter.java

@@ -60,11 +60,6 @@ public void filter(final ContainerRequestContext requestContext) {
             return;
         }
 
-        // this is the unix socket request, so let it through the filter
-        if ("unixsocket".equals(requestContext.getUriInfo().getBaseUri().toString())) {
-            return;
-        }
-
         try {
 
             final Set<String> whitelisted =
@@ -74,6 +69,11 @@ public void filter(final ContainerRequestContext requestContext) {
                             .map(URL::getHost)
                             .collect(Collectors.toSet());
 
+            if (whitelisted.contains("localhost")) {
+                whitelisted.add("127.0.0.1");
+                whitelisted.add("0:0:0:0:0:0:0:1");
+            }
+
             final String remoteAddress = httpServletRequest.getRemoteAddr();
             final String remoteHost = httpServletRequest.getRemoteHost();
 

tessera-jaxrs/common-jaxrs/src/test/java/com/quorum/tessera/api/filter/IPWhitelistFilterTest.java

@@ -95,7 +95,6 @@ public void hostInWhitelistGetsAccepted() {
 
         verify(request).getRemoteHost();
         verify(request).getRemoteAddr();
-        verify(ctx).getUriInfo();
         verifyNoMoreInteractions(ctx);
     }
 
@@ -109,15 +108,15 @@ public void errorFilteringStopsFutureFilters() {
         filter.filter(ctx);
         verify(request).getRemoteHost();
         verify(request).getRemoteAddr();
-        verify(ctx).getUriInfo();
+
         verifyNoMoreInteractions(ctx);
 
         // show the second one errors
         final HttpServletRequest requestError = mock(HttpServletRequest.class);
         doThrow(RuntimeException.class).when(requestError).getRemoteHost();
         filter.setHttpServletRequest(requestError);
         filter.filter(ctx);
-        verify(ctx, times(2)).getUriInfo();
+
         verifyNoMoreInteractions(ctx);
         verify(request).getRemoteAddr();
 
@@ -130,28 +129,46 @@ public void errorFilteringStopsFutureFilters() {
     }
 
     @Test
-    public void unixsocketIsWhitelisted() throws URISyntaxException {
+    public void defaultConstructor() {
+        when(configService.isUseWhiteList()).thenReturn(Boolean.TRUE);
+        MockServiceLocator mockServiceLocator = (MockServiceLocator) ServiceLocator.create();
+        mockServiceLocator.setServices(Collections.singleton(configService));
 
-        final HttpServletRequest requestError = mock(HttpServletRequest.class);
-        filter.setHttpServletRequest(requestError);
+        assertThat(new IPWhitelistFilter()).isNotNull();
+    }
 
-        final UriInfo uriInfo = mock(UriInfo.class);
-        when(uriInfo.getBaseUri()).thenReturn(new URI("unixsocket"));
-        when(ctx.getUriInfo()).thenReturn(uriInfo);
+    @Test
+    public void localhostIsWhiteListed() {
+
+        Peer peer = new Peer("http://localhost:8080");
+        when(configService.getPeers()).thenReturn(singletonList(peer));
+
+        final HttpServletRequest request = mock(HttpServletRequest.class);
+        doReturn("127.0.0.1").when(request).getRemoteAddr();
+
+        filter.setHttpServletRequest(request);
 
         filter.filter(ctx);
 
-        verify(ctx).getUriInfo();
+        verify(request).getRemoteHost();
+        verify(request).getRemoteAddr();
         verifyNoMoreInteractions(ctx);
-        verifyZeroInteractions(requestError);
     }
 
     @Test
-    public void defaultConstructor() {
-        when(configService.isUseWhiteList()).thenReturn(Boolean.TRUE);
-        MockServiceLocator mockServiceLocator = (MockServiceLocator) ServiceLocator.create();
-        mockServiceLocator.setServices(Collections.singleton(configService));
+    public void localhostIPv6IsAlsoWhiteListed() {
+        Peer peer = new Peer("http://localhost:8080");
+        when(configService.getPeers()).thenReturn(singletonList(peer));
 
-        assertThat(new IPWhitelistFilter()).isNotNull();
+        final HttpServletRequest request = mock(HttpServletRequest.class);
+        doReturn("0:0:0:0:0:0:0:1").when(request).getRemoteAddr();
+
+        filter.setHttpServletRequest(request);
+
+        filter.filter(ctx);
+
+        verify(request).getRemoteHost();
+        verify(request).getRemoteAddr();
+        verifyNoMoreInteractions(ctx);
     }
 }

tessera-jaxrs/transaction-jaxrs/src/main/java/com/quorum/tessera/q2t/Q2TRestApp.java

@@ -1,7 +1,5 @@
 package com.quorum.tessera.q2t;
 
-import com.quorum.tessera.api.filter.GlobalFilter;
-import com.quorum.tessera.api.filter.IPWhitelistFilter;
 import com.quorum.tessera.app.TesseraRestApplication;
 import com.quorum.tessera.config.AppType;
 import com.quorum.tessera.service.locator.ServiceLocator;
@@ -18,7 +16,6 @@
  * locator
  */
 @Api
-@GlobalFilter
 @ApplicationPath("/")
 public class Q2TRestApp extends TesseraRestApplication {
 
@@ -35,10 +32,9 @@ public Q2TRestApp(ServiceLocator serviceLocator) {
     @Override
     public Set<Object> getSingletons() {
 
-        IPWhitelistFilter iPWhitelistFilter = new IPWhitelistFilter();
         TransactionResource transactionResource = new TransactionResource();
 
-        return Stream.of(iPWhitelistFilter, transactionResource).collect(Collectors.toSet());
+        return Stream.of(transactionResource).collect(Collectors.toSet());
     }
 
     @Override

tessera-jaxrs/transaction-jaxrs/src/test/java/com/quorum/tessera/q2t/Q2TRestAppTest.java

@@ -62,7 +62,7 @@ public void getSingletons() {
 
         Set<Object> results = q2TRestApp.getSingletons();
 
-        assertThat(results).hasSize(2);
+        assertThat(results).hasSize(1);
     }
 
     @Test

tests/acceptance-test/src/test/java/transaction/whitelist/WhitelistSteps.java

@@ -66,9 +66,10 @@ public WhitelistSteps() {
                                         .withNodeId("whitelist")
                                         .withNodeNumber(5)
                                         .withQ2TSocketType(SocketType.HTTP)
+                                        .withQt2Port(7001)
                                         .withExecutionContext(executionContext)
                                         .withP2pPort(port)
-                                        .withPeer("http://localhost:7000")
+                                        .withPeer("http://other:7000")
                                         .withEncryptorConfig(
                                                 new EncryptorConfig() {
                                                     {
@@ -82,7 +83,8 @@ public WhitelistSteps() {
                         Config whiteListConfig = whiteListConfigBuilder.build();
                         whiteListConfig.setUseWhiteList(true);
 
-                        Path configFile = Paths.get(System.getProperty("java.io.tmpdir")).resolve("white-list-config.json");
+                        Path configFile =
+                                Paths.get(System.getProperty("java.io.tmpdir")).resolve("white-list-config.json");
 
                         try (OutputStream out = Files.newOutputStream(configFile)) {
                             JaxbUtil.marshalWithNoValidation(whiteListConfig, out);
@@ -136,7 +138,7 @@ public WhitelistSteps() {
                         ServerStatusCheck serverStatusCheck =
                                 ServerStatusCheck.create(
                                         whiteListConfig.getServerConfigs().stream()
-                                                .filter(s -> s.getApp() == AppType.P2P)
+                                                .filter(s -> s.getApp() == AppType.Q2T)
                                                 .findAny()
                                                 .get());