Pull request #301: Configurable support for FTP and JAR URIs in OWL imports (disabled by default)

Merge in ITB/shacl-validator from development to master

* commit '12b0820789bf9bcf65b81f44b6c67c15b0384608':
  Configurable support for FTP and JAR URIs in OWL imports (disabled by default)

Author: costas80

shaclvalidator-common/src/main/java/eu/europa/ec/itb/shacl/ApplicationConfig.java

@@ -55,6 +55,36 @@ public class ApplicationConfig extends eu.europa.ec.itb.validation.commons.confi
     private String defaultRdfReportQueryDescription;
     private String defaultLocaleDescription;
     private Integer maximumConcurrentValidations;
+    private boolean allowUriImportsFromFtpSources = false;
+    private boolean allowUriImportsFromJarSources = false;
+
+    /**
+     * @return Whether URIs for resource imports can use the FTP scheme.
+     */
+    public boolean isAllowUriImportsFromFtpSources() {
+        return allowUriImportsFromFtpSources;
+    }
+
+    /**
+     * @param allowUriImportsFromFtpSources Whether URIs for resource imports can use the FTP scheme.
+     */
+    public void setAllowUriImportsFromFtpSources(boolean allowUriImportsFromFtpSources) {
+        this.allowUriImportsFromFtpSources = allowUriImportsFromFtpSources;
+    }
+
+    /**
+     * @return Whether URIs for resource imports can use the JAR scheme.
+     */
+    public boolean isAllowUriImportsFromJarSources() {
+        return allowUriImportsFromJarSources;
+    }
+
+    /**
+     * @param allowUriImportsFromJarSources Whether URIs for resource imports can use the JAR scheme.
+     */
+    public void setAllowUriImportsFromJarSources(boolean allowUriImportsFromJarSources) {
+        this.allowUriImportsFromJarSources = allowUriImportsFromJarSources;
+    }
 
     /**
      * @return The maximum number of concurrent validations to perform.

shaclvalidator-common/src/main/java/eu/europa/ec/itb/shacl/config/BeanConfiguration.java

@@ -15,6 +15,7 @@
 
 package eu.europa.ec.itb.shacl.config;
 
+import eu.europa.ec.itb.shacl.ApplicationConfig;
 import eu.europa.ec.itb.shacl.CustomJenaFileManager;
 import eu.europa.ec.itb.shacl.DomainConfig;
 import eu.europa.ec.itb.shacl.validation.CustomReadFailureHandler;
@@ -23,6 +24,7 @@
 import org.apache.jena.ontology.OntDocumentManager;
 import org.apache.jena.riot.system.stream.LocatorFTP;
 import org.apache.jena.riot.system.stream.LocatorFile;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -33,6 +35,9 @@
 @Configuration
 public class BeanConfiguration {
 
+    @Autowired
+    private ApplicationConfig appConfig;
+
     /**
      * Support the definition of plugins.
      *
@@ -50,7 +55,12 @@ public void initialise() {
         fileManager.getStreamManager().clearLocators();
         fileManager.getStreamManager().addLocator(new CustomLocatorFile());
         fileManager.getStreamManager().addLocator(new CustomLocatorHTTP());
-        fileManager.getStreamManager().addLocator(new CustomClassLoaderLocator(fileManager.getStreamManager().getClass().getClassLoader()));
+        if (appConfig.isAllowUriImportsFromFtpSources()) {
+            fileManager.getStreamManager().addLocator(new LocatorFTP()) ;
+        }
+        if (appConfig.isAllowUriImportsFromJarSources()) {
+            fileManager.getStreamManager().addLocator(new CustomClassLoaderLocator(fileManager.getStreamManager().getClass().getClassLoader()));
+        }
         fileManager.setModelCaching(true);
         // Setup OntDocumentManager.
         var ontDocumentManager = OntDocumentManager.getInstance();