[jena] branch master updated: JENA-1853: Listen to localhost only

[andy]

This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/master by this push:
     new c756d9b  JENA-1853: Listen to localhost only
     new 907cfe9  Merge pull request #703 from 
afs/jena1853-fuseki-test-localhost
c756d9b is described below

commit c756d9b7ead628d8f28674b2a76ce6adb24aca36
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Tue Mar 3 18:35:07 2020 +0000

    JENA-1853: Listen to localhost only
---
 .../test/java/org/apache/jena/fuseki/main/FusekiTestServer.java    | 1 +
 .../src/test/java/org/apache/jena/fuseki/ServerCtl.java            | 7 ++++---
 .../jena/test/rdfconnection/TestRDFConnectionFusekiBinary.java     | 2 +-
 .../apache/jena/test/rdfconnection/TestRDFConnectionRemote.java    | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/FusekiTestServer.java
 
b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/FusekiTestServer.java
index 4350b89..92e04a7 100644
--- 
a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/FusekiTestServer.java
+++ 
b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/FusekiTestServer.java
@@ -232,6 +232,7 @@ public class FusekiTestServer {
         server = FusekiServer.create()
             .add(datasetPath(), dsgTesting)
             .port(port())
+            .loopback(true)
             .build()
             .start();
     }
diff --git 
a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/ServerCtl.java
 
b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/ServerCtl.java
index adb5979..1abab4c 100644
--- 
a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/ServerCtl.java
+++ 
b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/ServerCtl.java
@@ -261,7 +261,7 @@ public class ServerCtl {
 
         FusekiServerListener.initialSetup = params;
 
-        JettyServerConfig config = make(port, true, true);
+        JettyServerConfig config = make(port, true);
         config.authConfigFile = authConfigFile;
         JettyFusekiWebapp.initializeServer(config);
         JettyFusekiWebapp.instance.start();
@@ -278,12 +278,13 @@ public class ServerCtl {
         server = null;
     }
 
-    /*package*/ static JettyServerConfig make(int port, boolean allowUpdate, 
boolean listenLocal) {
+    /*package*/ static JettyServerConfig make(int port, boolean allowUpdate) {
         JettyServerConfig config = new JettyServerConfig();
         // Avoid any persistent record.
         config.port = port;
         config.contextPath = "/";
-        config.loopback = listenLocal;
+        // Always execute tests with localhost only access.
+        config.loopback = true;
         config.jettyConfigFile = null;
         config.enableCompression = true;
         config.verboseLogging = false;
diff --git 
a/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionFusekiBinary.java
 
b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionFusekiBinary.java
index 5d07d4b..d5eaa08 100644
--- 
a/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionFusekiBinary.java
+++ 
b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionFusekiBinary.java
@@ -114,7 +114,7 @@ public class TestRDFConnectionFusekiBinary {
     private static FusekiServer.Builder createFusekiServer(int PORT) {
         DatasetGraph dsg = DatasetGraphFactory.createTxnMem();
         return  
-            FusekiServer.create()
+            FusekiServer.create().loopback(true)
                 .port(PORT)
                 //.setStaticFileBase("/home/afs/ASF/jena-fuseki-cmds/sparqler")
                 .add("/ds", dsg)
diff --git 
a/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionRemote.java
 
b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionRemote.java
index e7e2ef2..3bda412 100644
--- 
a/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionRemote.java
+++ 
b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionRemote.java
@@ -40,7 +40,7 @@ public class TestRDFConnectionRemote extends 
AbstractTestRDFConnection {
     @BeforeClass
     public static void beforeClass() {
         PORT = WebLib.choosePort();
-        server = FusekiServer.create()
+        server = FusekiServer.create().loopback(true)
             .port(PORT)
             .add("/ds", serverdsg)
             .build() ;