fix(mongodb): honour directConnection in the legacy agent
This commit is contained in:
1 parent
7fef9698ac
commit
1d9223eeed
2 files changed
+165
-1
No files matched your search
@@ -16,6 +16,7 @@ import com.mongodb.MongoNamespace;
|
|||||||
import com.mongodb.MongoCredential;
|
import com.mongodb.MongoCredential;
|
||||||
import com.mongodb.MongoClientSettings;
|
import com.mongodb.MongoClientSettings;
|
||||||
import com.mongodb.ServerAddress;
|
import com.mongodb.ServerAddress;
|
||||||
|
import com.mongodb.connection.ClusterConnectionMode;
|
||||||
import com.mongodb.bulk.BulkWriteError;
|
import com.mongodb.bulk.BulkWriteError;
|
||||||
import com.mongodb.bulk.WriteConcernError;
|
import com.mongodb.bulk.WriteConcernError;
|
||||||
import com.mongodb.client.AggregateIterable;
|
import com.mongodb.client.AggregateIterable;
|
||||||
@@ -153,7 +154,17 @@ public final class MongoAgent {
|
|||||||
|
|
||||||
MongoClientSettings.Builder builder = MongoClientSettings.builder();
|
MongoClientSettings.Builder builder = MongoClientSettings.builder();
|
||||||
if (connectionString != null && !connectionString.isBlank()) {
|
if (connectionString != null && !connectionString.isBlank()) {
|
||||||
builder.applyConnectionString(new ConnectionString(connectionString));
|
ConnectionString cs = new ConnectionString(connectionString);
|
||||||
|
builder.applyConnectionString(cs);
|
||||||
|
// Driver 3.12 predates the directConnection URI option (introduced in driver 4.x)
|
||||||
|
// and silently ignores it. When directConnection=true is present in the query of a
|
||||||
|
// single-host URI, force ClusterConnectionMode.SINGLE so the driver connects directly
|
||||||
|
// to that host instead of discovering replica-set members that may be unreachable
|
||||||
|
// (e.g. through an SSH tunnel). We preserve requiredReplicaSetName as parsed because
|
||||||
|
// ClusterSettings in 3.12 accepts it in SINGLE mode to validate the replica set name.
|
||||||
|
if (!cs.isSrvProtocol() && cs.getHosts().size() == 1 && hasDirectConnectionTrue(connectionString)) {
|
||||||
|
builder.applyToClusterSettings(settings -> settings.mode(ClusterConnectionMode.SINGLE));
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
builder.applyToClusterSettings(
|
builder.applyToClusterSettings(
|
||||||
settings -> settings.hosts(Collections.singletonList(new ServerAddress(host, port))));
|
settings -> settings.hosts(Collections.singletonList(new ServerAddress(host, port))));
|
||||||
@@ -169,6 +180,46 @@ public final class MongoAgent {
|
|||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static boolean hasDirectConnectionTrue(String connectionString) {
|
||||||
|
if (connectionString == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
int hashStart = connectionString.indexOf('#');
|
||||||
|
int queryStart = connectionString.indexOf('?');
|
||||||
|
if (queryStart < 0 || (hashStart >= 0 && queryStart > hashStart)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
int queryEnd = hashStart >= 0 ? hashStart : connectionString.length();
|
||||||
|
String query = connectionString.substring(queryStart + 1, queryEnd);
|
||||||
|
if (query.isEmpty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Boolean directConnection = null;
|
||||||
|
for (String param : query.split("[&;]")) {
|
||||||
|
if (param.isEmpty()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
int eq = param.indexOf('=');
|
||||||
|
String key = eq >= 0 ? param.substring(0, eq) : param;
|
||||||
|
String val = eq >= 0 ? param.substring(eq + 1) : "";
|
||||||
|
String decodedKey = decodeUriComponent(key);
|
||||||
|
String decodedVal = decodeUriComponent(val);
|
||||||
|
if ("directConnection".equalsIgnoreCase(decodedKey)) {
|
||||||
|
directConnection = "true".equalsIgnoreCase(decodedVal);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Boolean.TRUE.equals(directConnection);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String decodeUriComponent(String s) {
|
||||||
|
try {
|
||||||
|
return URLDecoder.decode(s, StandardCharsets.UTF_8);
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static MongoClient openClient(JsonObject params) {
|
private static MongoClient openClient(JsonObject params) {
|
||||||
JsonObject connObj = params.has("connection") && params.get("connection").isJsonObject()
|
JsonObject connObj = params.has("connection") && params.get("connection").isJsonObject()
|
||||||
? params.getAsJsonObject("connection")
|
? params.getAsJsonObject("connection")
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import com.mongodb.MongoBulkWriteException;
|
|||||||
import com.mongodb.MongoCommandException;
|
import com.mongodb.MongoCommandException;
|
||||||
import com.mongodb.MongoClientSettings;
|
import com.mongodb.MongoClientSettings;
|
||||||
import com.mongodb.ServerAddress;
|
import com.mongodb.ServerAddress;
|
||||||
|
import com.mongodb.connection.ClusterConnectionMode;
|
||||||
import com.mongodb.bulk.BulkWriteError;
|
import com.mongodb.bulk.BulkWriteError;
|
||||||
import com.mongodb.bulk.BulkWriteResult;
|
import com.mongodb.bulk.BulkWriteResult;
|
||||||
import com.mongodb.bulk.WriteConcernError;
|
import com.mongodb.bulk.WriteConcernError;
|
||||||
@@ -1520,6 +1521,118 @@ class MongoAgentTest {
|
|||||||
assertEquals("admin", MongoAgent.authenticationDatabase(connection));
|
assertEquals("admin", MongoAgent.authenticationDatabase(connection));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ─── Direct connection: configureBuilder directConnection parsing ───
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void configureBuilderWithDirectConnectionTrueSetsSingleModeAndKeepsReplicaSetName() {
|
||||||
|
JsonObject connection = new JsonObject();
|
||||||
|
connection.addProperty(
|
||||||
|
"connection_string",
|
||||||
|
"mongodb://u:p@127.0.0.1:27017/admin?replicaSet=cardetail&directConnection=true&authSource=admin");
|
||||||
|
|
||||||
|
MongoClientSettings settings = MongoAgent.configureBuilder(connection).build();
|
||||||
|
|
||||||
|
assertEquals(ClusterConnectionMode.SINGLE, settings.getClusterSettings().getMode());
|
||||||
|
assertEquals("cardetail", settings.getClusterSettings().getRequiredReplicaSetName());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void configureBuilderWithCaseInsensitiveDirectConnectionSetsSingleMode() {
|
||||||
|
JsonObject connection = new JsonObject();
|
||||||
|
connection.addProperty(
|
||||||
|
"connection_string",
|
||||||
|
"mongodb://u:p@127.0.0.1:27017/admin?replicaSet=cardetail&DirectConnection=TRUE&authSource=admin");
|
||||||
|
|
||||||
|
MongoClientSettings settings = MongoAgent.configureBuilder(connection).build();
|
||||||
|
|
||||||
|
assertEquals(ClusterConnectionMode.SINGLE, settings.getClusterSettings().getMode());
|
||||||
|
assertEquals("cardetail", settings.getClusterSettings().getRequiredReplicaSetName());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void configureBuilderWithReplicaSetWithoutDirectConnectionDefaultsToMultipleMode() {
|
||||||
|
JsonObject connection = new JsonObject();
|
||||||
|
connection.addProperty(
|
||||||
|
"connection_string",
|
||||||
|
"mongodb://u:p@127.0.0.1:27017/admin?replicaSet=cardetail&authSource=admin");
|
||||||
|
|
||||||
|
MongoClientSettings settings = MongoAgent.configureBuilder(connection).build();
|
||||||
|
|
||||||
|
assertEquals(ClusterConnectionMode.MULTIPLE, settings.getClusterSettings().getMode());
|
||||||
|
assertEquals("cardetail", settings.getClusterSettings().getRequiredReplicaSetName());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void configureBuilderWithDirectConnectionFalseAndReplicaSetLeavesMultipleMode() {
|
||||||
|
JsonObject connection = new JsonObject();
|
||||||
|
connection.addProperty(
|
||||||
|
"connection_string",
|
||||||
|
"mongodb://u:p@127.0.0.1:27017/admin?directConnection=false&replicaSet=cardetail&authSource=admin");
|
||||||
|
|
||||||
|
MongoClientSettings settings = MongoAgent.configureBuilder(connection).build();
|
||||||
|
|
||||||
|
assertEquals(ClusterConnectionMode.MULTIPLE, settings.getClusterSettings().getMode());
|
||||||
|
assertEquals("cardetail", settings.getClusterSettings().getRequiredReplicaSetName());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void configureBuilderSingleHostNoOptionsRemainsUnchanged() {
|
||||||
|
JsonObject connection = new JsonObject();
|
||||||
|
connection.addProperty("connection_string", "mongodb://127.0.0.1:27017");
|
||||||
|
|
||||||
|
MongoClientSettings settings = MongoAgent.configureBuilder(connection).build();
|
||||||
|
|
||||||
|
assertEquals(ClusterConnectionMode.SINGLE, settings.getClusterSettings().getMode());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void configureBuilderTwoHostsWithDirectConnectionTrueRemainsMultipleMode() {
|
||||||
|
JsonObject connection = new JsonObject();
|
||||||
|
connection.addProperty(
|
||||||
|
"connection_string",
|
||||||
|
"mongodb://127.0.0.1:27017,127.0.0.1:27018/?replicaSet=cardetail&directConnection=true");
|
||||||
|
|
||||||
|
MongoClientSettings settings = MongoAgent.configureBuilder(connection).build();
|
||||||
|
|
||||||
|
assertEquals(ClusterConnectionMode.MULTIPLE, settings.getClusterSettings().getMode());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void configureBuilderWithPercentEncodedDirectConnectionSetsSingleMode() {
|
||||||
|
JsonObject connection = new JsonObject();
|
||||||
|
connection.addProperty(
|
||||||
|
"connection_string",
|
||||||
|
"mongodb://u:p@127.0.0.1:27017/admin?replicaSet=cardetail&%64irect%43onnection=%74rue&authSource=admin");
|
||||||
|
|
||||||
|
MongoClientSettings settings = MongoAgent.configureBuilder(connection).build();
|
||||||
|
|
||||||
|
assertEquals(ClusterConnectionMode.SINGLE, settings.getClusterSettings().getMode());
|
||||||
|
assertEquals("cardetail", settings.getClusterSettings().getRequiredReplicaSetName());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void hasDirectConnectionTrueHandlesVariousQueryFormats() {
|
||||||
|
assertTrue(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017/?directConnection=true"));
|
||||||
|
assertTrue(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017/?DirectConnection=TRUE"));
|
||||||
|
assertTrue(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017/?directconnection=true&other=1"));
|
||||||
|
assertTrue(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017/?other=1&directConnection=true"));
|
||||||
|
assertTrue(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017/?directConnection=false&directConnection=true"));
|
||||||
|
assertTrue(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017/?directConnection=true#fragment"));
|
||||||
|
assertTrue(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017/?%64irect%43onnection=%74rue"));
|
||||||
|
|
||||||
|
assertFalse(MongoAgent.hasDirectConnectionTrue(null));
|
||||||
|
assertFalse(MongoAgent.hasDirectConnectionTrue(""));
|
||||||
|
assertFalse(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017"));
|
||||||
|
assertFalse(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017?"));
|
||||||
|
assertFalse(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017/?replicaSet=rs"));
|
||||||
|
assertFalse(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017/?directConnection=false"));
|
||||||
|
assertFalse(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017/?directConnection=1"));
|
||||||
|
assertFalse(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017/?directConnection="));
|
||||||
|
assertFalse(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017/?directConnection=true&directConnection=false"));
|
||||||
|
assertFalse(MongoAgent.hasDirectConnectionTrue("mongodb://127.0.0.1:27017/#fragment?directConnection=true"));
|
||||||
|
assertFalse(MongoAgent.hasDirectConnectionTrue("mongodb://directConnection=true@127.0.0.1:27017/db"));
|
||||||
|
}
|
||||||
|
|
||||||
// ─── TLS: configureBuilder JSON parsing ───
|
// ─── TLS: configureBuilder JSON parsing ───
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
Reference in new issue
Block a user