From 2efb5d0d36e3a9b33cdf7de854abd64947c005aa Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Mon, 10 May 2021 15:51:27 +0200 Subject: [PATCH] Fixes #20752 --- CHANGELOG.md | 1 + .../data/transfer/library/transferers/TransfererBuilder.java | 2 +- .../java/org/gcube/data/transfer/library/utils/Utils.java | 2 +- .../java/org/gcube/data/transfer/library/TransfererTest.java | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 628ce97..1a12c91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ##[v1.3.0-SNAPSHOT] 2020-12-01 * Upgraded integration with security layer +* Removed http [#20752] ##[v1.2.3] 2020-12-01 diff --git a/src/main/java/org/gcube/data/transfer/library/transferers/TransfererBuilder.java b/src/main/java/org/gcube/data/transfer/library/transferers/TransfererBuilder.java index 17ac1ca..5f1f470 100644 --- a/src/main/java/org/gcube/data/transfer/library/transferers/TransfererBuilder.java +++ b/src/main/java/org/gcube/data/transfer/library/transferers/TransfererBuilder.java @@ -75,7 +75,7 @@ public class TransfererBuilder { if(found.isEmpty()) throw new HostingNodeNotFoundException("No Hosting node with the id "+nodeId); - return "http://"+found.get(0).profile().description().name(); + return "https://"+found.get(0).profile().description().name(); } private static String resolveRedirects(String url) throws IOException{ diff --git a/src/main/java/org/gcube/data/transfer/library/utils/Utils.java b/src/main/java/org/gcube/data/transfer/library/utils/Utils.java index 0c7043f..3fe7a8d 100644 --- a/src/main/java/org/gcube/data/transfer/library/utils/Utils.java +++ b/src/main/java/org/gcube/data/transfer/library/utils/Utils.java @@ -17,7 +17,7 @@ public class Utils { * given timeout, otherwise false. */ public static boolean pingURL(String url, int timeout) { - url = url.replaceFirst("^https", "http"); // Otherwise an exception may be thrown on invalid SSL certificates. + // url = url.replaceFirst("^https", "http"); // Otherwise an exception may be thrown on invalid SSL certificates. try { HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); diff --git a/src/test/java/org/gcube/data/transfer/library/TransfererTest.java b/src/test/java/org/gcube/data/transfer/library/TransfererTest.java index 9d22e9e..4527bc1 100644 --- a/src/test/java/org/gcube/data/transfer/library/TransfererTest.java +++ b/src/test/java/org/gcube/data/transfer/library/TransfererTest.java @@ -32,13 +32,13 @@ import org.junit.Test; public class TransfererTest { - static String hostname="http://geoserver1.dev.d4science.org"; + static String hostname="https://geoserver1.dev.d4science.org"; // static String nodeId="462b68c5-463f-4295-86da-37d6c0abc7ea"; static String scope="/gcube/devNext/NextNext"; static DataTransferClient client; - static String link="http://maven.research-infrastructures.eu/nexus/content/groups/gcube-releases-all/org/gcube/data/transfer/data-transfer-model/1.0.0-3.11.0-128236/data-transfer-model-1.0.0-3.11.0-128236-javadoc.jar"; + static String link="https://nexus.d4science.org/nexus/content/groups/gcube-releases-all/org/gcube/data/transfer/data-transfer-model/1.0.0-3.11.0-128236/data-transfer-model-1.0.0-3.11.0-128236-javadoc.jar"; static File tempFile;