diff --git a/distro/changelog.xml b/distro/changelog.xml index 3614a51..b9d9557 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,7 @@ + + enabled ssl connection to mongodb + upgraded mongo-java-driver-library to 3.6.0 managed internal "SOFT_COPY" operation diff --git a/src/main/java/org/gcube/contentmanager/storageserver/store/MongoDB.java b/src/main/java/org/gcube/contentmanager/storageserver/store/MongoDB.java index a24c4c9..3dcc003 100644 --- a/src/main/java/org/gcube/contentmanager/storageserver/store/MongoDB.java +++ b/src/main/java/org/gcube/contentmanager/storageserver/store/MongoDB.java @@ -123,7 +123,7 @@ public class MongoDB { } if(mongo==null){ logger.debug(" open mongo connection "); - MongoClientOptions options=MongoClientOptions.builder().connectionsPerHost(10).connectTimeout(30000).readPreference(READ_PREFERENCE).build(); + MongoClientOptions options=MongoClientOptions.builder().sslEnabled(true).connectionsPerHost(10).connectTimeout(30000).readPreference(READ_PREFERENCE).build(); if(((pwd != null) && (pwd.length() >0)) && ((user != null) && (user.length() > 0))){ MongoCredential credential = MongoCredential.createMongoCRCredential(user, ACCOUNTING_DB, pwd.toCharArray()); mongo = new MongoClient(srvList, Arrays.asList(credential), options); diff --git a/src/test/java/org/gcube/contentmanager/storageserver/startup/ConfigurationTest.java b/src/test/java/org/gcube/contentmanager/storageserver/startup/ConfigurationTest.java index 6b41f6a..c517de7 100644 --- a/src/test/java/org/gcube/contentmanager/storageserver/startup/ConfigurationTest.java +++ b/src/test/java/org/gcube/contentmanager/storageserver/startup/ConfigurationTest.java @@ -7,7 +7,7 @@ import org.junit.Test; public class ConfigurationTest { - static String scope="/d4science.research-infrastructures.eu/FARM"; + static String scope="/d4science.research-infrastructures.eu"; static String user=null; static String password=null; static String serviceClass="DataTransformation";