diff --git a/core/src/main/java/apoc/ApocConfig.java b/core/src/main/java/apoc/ApocConfig.java index 208b226204..83513c2782 100644 --- a/core/src/main/java/apoc/ApocConfig.java +++ b/core/src/main/java/apoc/ApocConfig.java @@ -267,6 +267,12 @@ public void isImportFileEnabled() { } } + /* + TODO + This needs to be cleaned up in 5.0 + WebURLAccessRule was added in the database in 4.4.5, so it would + break backwards compatibility with 4.4.xx previous versions + */ private void checkAllowedUrl(String url) throws IOException { try { URL parsedUrl = new URL(url); @@ -274,7 +280,7 @@ private void checkAllowedUrl(String url) throws IOException { for (var blockedIpRange : blockedIpRanges) { - if (blockedIpRange.contains(new IPAddressString( inetAddress.getHostAddress()))) + if (blockedIpRange.contains(new IPAddressString(inetAddress.getHostAddress()))) { throw new IOException("access to " + inetAddress + " is blocked via the configuration property " + ApocSettings.cypher_ip_blocklist.name()); diff --git a/core/src/main/java/apoc/ApocSettings.java b/core/src/main/java/apoc/ApocSettings.java index 77df5be25a..7b5606abca 100644 --- a/core/src/main/java/apoc/ApocSettings.java +++ b/core/src/main/java/apoc/ApocSettings.java @@ -23,6 +23,12 @@ */ @ServiceProvider public class ApocSettings implements SettingsDeclaration { + /* + TODO + This needs to be cleaned up in 5.0, along with cypher_ip_blocklist + The option was added in the database in 4.4.5, so it would + break backwards compatibility with 4.4.xx previous versions + */ public static final SettingValueParser CIDR_IP = new SettingValueParser<>() { @Override diff --git a/core/src/main/java/apoc/util/FileUtils.java b/core/src/main/java/apoc/util/FileUtils.java index 58a75a59f1..00225706c4 100644 --- a/core/src/main/java/apoc/util/FileUtils.java +++ b/core/src/main/java/apoc/util/FileUtils.java @@ -44,7 +44,6 @@ public enum SupportedProtocols { http(true, null), https(true, null), ftp(true, null), - ftps(true, null), s3(Util.classExists("com.amazonaws.services.s3.AmazonS3"), Util.createInstanceOrNull("apoc.util.s3.S3UrlStreamHandlerFactory")), gs(Util.classExists("com.google.cloud.storage.Storage"), @@ -69,7 +68,6 @@ public StreamConnection getStreamConnection(String urlAddress, Map