From ae9ff43fc68c607ebc55539afde21951fa5c54f6 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 7 Mar 2022 17:34:06 +0100 Subject: [PATCH] change credential mechanism #22920, upgrade to 1.12.0-SNAPSHOT --- CHANGELOG.md | 3 +++ pom.xml | 2 +- .../contentmanager/storageserver/data/ReadingMongoOplog.java | 2 +- .../org/gcube/contentmanager/storageserver/store/MongoDB.java | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3774a79..21690ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog for storage-manager-trigger +## [v1.12.0-SNAPSHOT] 2022-03-07 + * change mongodb authentication mechanism. It was mongodbcr now it is handshaked from client and server. fix incident #22920 + ## [v1.11.1-SNAPSHOT] * moved from UmaJWTProvider to AccessTokenProvider diff --git a/pom.xml b/pom.xml index 5aef340..e43d85d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.gcube.contentmanagement storage-manager-trigger - 1.11.1-SNAPSHOT + 1.12.0-SNAPSHOT https://code-repo.d4science.org/gCubeSystem/${project.artifactId} diff --git a/src/main/java/org/gcube/contentmanager/storageserver/data/ReadingMongoOplog.java b/src/main/java/org/gcube/contentmanager/storageserver/data/ReadingMongoOplog.java index baf63bf..4aa9647 100644 --- a/src/main/java/org/gcube/contentmanager/storageserver/data/ReadingMongoOplog.java +++ b/src/main/java/org/gcube/contentmanager/storageserver/data/ReadingMongoOplog.java @@ -116,7 +116,7 @@ public class ReadingMongoOplog extends Thread{ boolean auth =false; logger.info("try to auth "); if(user!=null && password !=null){ - MongoCredential credential = MongoCredential.createMongoCRCredential(user, "admin", password.toCharArray()); + MongoCredential credential = MongoCredential.createCredential(user, "admin", password.toCharArray()); logger.debug("try to connect to mongo with authentication... "); mongoClient = new MongoClient(Arrays.asList(server), Arrays.asList(credential), options);//"146.48.123.71" 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 ed28707..564924c 100644 --- a/src/main/java/org/gcube/contentmanager/storageserver/store/MongoDB.java +++ b/src/main/java/org/gcube/contentmanager/storageserver/store/MongoDB.java @@ -128,7 +128,7 @@ public class MongoDB { MongoClientOptions options=MongoClientOptions.builder().sslEnabled(true).connectionsPerHost(10).connectTimeout(30000).readPreference(READ_PREFERENCE).build(); // MongoClientOptions options=MongoClientOptions.builder().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()); + MongoCredential credential = MongoCredential.createCredential(user, ACCOUNTING_DB, pwd.toCharArray()); mongo = new MongoClient(srvList, Arrays.asList(credential), options); }else{ mongo = new MongoClient(srvList, options);