Skip to content

Commit 543e391

Browse files
papafepapafe
authored
CSHARP-5291: Remove MONGODB-CR support (#1469)
* CSHARP-5291: Remove MONGODB-CR support
1 parent f54ba02 commit 543e391

File tree

7 files changed

+17
-85
lines changed

7 files changed

+17
-85
lines changed

Diff for: ‎src/MongoDB.Driver/MongoCredential.cs

-37
Original file line numberDiff line numberDiff line change
@@ -228,42 +228,6 @@ public static MongoCredential CreateGssapiCredential(string username, SecureStri
228228
new PasswordEvidence(password));
229229
}
230230

231-
/// <summary>
232-
/// Creates a credential used with MONGODB-CR.
233-
/// </summary>
234-
/// <param name="databaseName">Name of the database.</param>
235-
/// <param name="username">The username.</param>
236-
/// <param name="password">The password.</param>
237-
/// <returns>A credential for MONGODB-CR.</returns>
238-
[Obsolete("MONGODB-CR was replaced by SCRAM-SHA-1 in MongoDB 3.0, and is now deprecated.")]
239-
public static MongoCredential CreateMongoCRCredential(string databaseName, string username, string password)
240-
{
241-
return FromComponents(
242-
mechanism: "MONGODB-CR",
243-
source: null,
244-
databaseName,
245-
username,
246-
new PasswordEvidence(password));
247-
}
248-
249-
/// <summary>
250-
/// Creates a credential used with MONGODB-CR.
251-
/// </summary>
252-
/// <param name="databaseName">Name of the database.</param>
253-
/// <param name="username">The username.</param>
254-
/// <param name="password">The password.</param>
255-
/// <returns>A credential for MONGODB-CR.</returns>
256-
[Obsolete("MONGODB-CR was replaced by SCRAM-SHA-1 in MongoDB 3.0, and is now deprecated.")]
257-
public static MongoCredential CreateMongoCRCredential(string databaseName, string username, SecureString password)
258-
{
259-
return FromComponents(
260-
mechanism: "MONGODB-CR",
261-
source: null,
262-
databaseName,
263-
username,
264-
new PasswordEvidence(password));
265-
}
266-
267231
/// <summary>
268232
/// Creates a credential used with MONGODB-OIDC.
269233
/// </summary>
@@ -473,7 +437,6 @@ private static MongoCredential FromComponents(string mechanism, string source, s
473437
switch (defaultedMechanism)
474438
{
475439
case "DEFAULT":
476-
case "MONGODB-CR":
477440
case "SCRAM-SHA-1":
478441
case "SCRAM-SHA-256":
479442
// it is allowed for a password to be an empty string, but not a username

Diff for: ‎tests/MongoDB.Driver.Tests/ClusterKeyTests.cs

+4-8
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,7 @@ private ClusterKey CreateSubject(string notEqualFieldName = null)
195195
var connectionMode = ConnectionMode.Direct;
196196
#pragma warning restore CS0618 // Type or member is obsolete
197197
var connectTimeout = TimeSpan.FromSeconds(1);
198-
#pragma warning disable 618
199-
var credential = MongoCredential.CreateMongoCRCredential("source", "username", "password");
200-
#pragma warning restore 618
198+
var credential = MongoCredential.CreateCredential("source", "username", "password");
201199
bool? directConnection = null;
202200
var libraryInfo = new LibraryInfo("name", "1.0.0");
203201
var encryptedFieldsMap = new Dictionary<string, BsonDocument>();
@@ -253,16 +251,16 @@ private ClusterKey CreateSubject(string notEqualFieldName = null)
253251
break;
254252
#pragma warning restore CS0618 // Type or member is obsolete
255253
case "ConnectTimeout": connectTimeout = TimeSpan.FromSeconds(99); break;
254+
case "Credential": credential = MongoCredential.CreateCredential("different", "different", "different"); break;
256255
#pragma warning disable CS0618 // Type or member is obsolete
257-
case "Credential": credential = MongoCredential.CreateMongoCRCredential("different", "different", "different"); break;
258256
case "DirectConnection":
259257
{
260258
directConnection = true;
261259
connectionModeSwitch = ConnectionModeSwitch.UseDirectConnection;
262260
connectionMode = ConnectionMode.Automatic; // reset
263-
#pragma warning restore CS0618 // Type or member is obsolete
264261
}
265262
break;
263+
#pragma warning restore CS0618 // Type or member is obsolete
266264
case "libraryInfo": libraryInfo = new LibraryInfo("name", "1.0.1"); break;
267265
case "EncryptedFieldsMap": encryptedFieldsMap.Add("k1", new BsonDocument()); break;
268266
case "HeartbeatInterval": heartbeatInterval = TimeSpan.FromSeconds(99); break;
@@ -353,9 +351,7 @@ internal ClusterKey CreateSubjectWith(
353351
var connectionMode = connectionModeSwitch != ConnectionModeSwitch.UseConnectionMode ? ConnectionMode.Automatic : ConnectionMode.Direct;
354352
#pragma warning restore CS0618 // Type or member is obsolete
355353
var connectTimeout = TimeSpan.FromSeconds(1);
356-
#pragma warning disable 618
357-
var credential = MongoCredential.CreateMongoCRCredential("source", "username", "password");
358-
#pragma warning restore 618
354+
var credential = MongoCredential.CreateCredential("source", "username", "password");
359355
bool? directConnection = null;
360356
var libraryInfo = new LibraryInfo("my_lib");
361357
var heartbeatInterval = TimeSpan.FromSeconds(7);

Diff for: ‎tests/MongoDB.Driver.Tests/ClusterRegistryTests.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ public void Instance_should_return_the_same_instance_every_time()
5151
public void GetOrCreateCluster_should_return_a_cluster_with_the_correct_settings()
5252
{
5353
var clusterConfigurator = new Action<ClusterBuilder>(b => { });
54-
#pragma warning disable 618
55-
var credential = MongoCredential.CreateMongoCRCredential("source", "username", "password");
56-
#pragma warning restore 618
54+
var credential = MongoCredential.CreateCredential("source", "username", "password");
5755
var serverApi = new ServerApi(ServerApiVersion.V1, true, true);
5856
var servers = new[] { new MongoServerAddress("localhost"), new MongoServerAddress("127.0.0.1", 30000), new MongoServerAddress("[::1]", 27018) };
5957
var sslSettings = new SslSettings

Diff for: ‎tests/MongoDB.Driver.Tests/Core/Configuration/ConnectionStringTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,6 @@ public void When_appname_is_too_long()
519519

520520
[Theory]
521521
[InlineData("mongodb://localhost?authMechanism=GSSAPI", "GSSAPI")]
522-
[InlineData("mongodb://localhost?authMechanism=MONGODB-CR", "MONGODB-CR")]
523522
[InlineData("mongodb://localhost?authMechanism=PLAIN", "PLAIN")]
524523
[InlineData("mongodb://localhost?authMechanism=MONGODB-X509", "MONGODB-X509")]
525524
public void When_authMechanism_is_specified(string connectionString, string authMechanism)

Diff for: ‎tests/MongoDB.Driver.Tests/MongoClientSettingsTests.cs

+4-12
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,7 @@ public void TestClone()
9898
var settings = MongoClientSettings.FromUrl(url);
9999

100100
// a few settings can only be made in code
101-
#pragma warning disable 618
102-
settings.Credential = MongoCredential.CreateMongoCRCredential("database", "username", "password").WithMechanismProperty("SERVICE_NAME", "other");
103-
#pragma warning restore 618
101+
settings.Credential = MongoCredential.CreateCredential("database", "username", "password").WithMechanismProperty("SERVICE_NAME", "other");
104102
settings.SslSettings = new SslSettings { CheckCertificateRevocation = false };
105103
settings.ServerApi = new ServerApi(ServerApiVersion.V1, true, true);
106104

@@ -419,15 +417,11 @@ public void TestEquals()
419417
Assert.False(clone.Equals(settings));
420418

421419
clone = settings.Clone();
422-
#pragma warning disable 618
423-
clone.Credential = MongoCredential.CreateMongoCRCredential("db2", "user2", "password2");
424-
#pragma warning restore 618
420+
clone.Credential = MongoCredential.CreateCredential("db2", "user2", "password2");
425421
Assert.False(clone.Equals(settings));
426422

427423
clone = settings.Clone();
428-
#pragma warning disable 618
429-
clone.Credential = MongoCredential.CreateMongoCRCredential("db", "user2", "password2");
430-
#pragma warning restore 618
424+
clone.Credential = MongoCredential.CreateCredential("db", "user2", "password2");
431425
Assert.False(clone.Equals(settings));
432426

433427
clone = settings.Clone();
@@ -1392,9 +1386,7 @@ public void TestWriteConcern()
13921386
public void ToClusterKey_should_copy_relevant_values()
13931387
{
13941388
var clusterConfigurator = new Action<ClusterBuilder>(b => { });
1395-
#pragma warning disable 618
1396-
var credential = MongoCredential.CreateMongoCRCredential("source", "username", "password");
1397-
#pragma warning restore 618
1389+
var credential = MongoCredential.CreateCredential("source", "username", "password");
13981390
var serverApi = new ServerApi(ServerApiVersion.V1, true, true);
13991391
var servers = new[] { new MongoServerAddress("localhost") };
14001392
var sslSettings = new SslSettings

Diff for: ‎tests/MongoDB.Driver.Tests/MongoCredentialTests.cs

+8-23
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,6 @@ namespace MongoDB.Driver.Tests
2222
{
2323
public class MongoCredentialTests
2424
{
25-
[Fact]
26-
public void TestCreateMongoCRCredential()
27-
{
28-
#pragma warning disable 618
29-
var credential = MongoCredential.CreateMongoCRCredential("db", "username", "password");
30-
#pragma warning restore 618
31-
Assert.Equal("MONGODB-CR", credential.Mechanism);
32-
Assert.Equal("username", credential.Username);
33-
Assert.Equal(new PasswordEvidence("password"), credential.Evidence);
34-
}
35-
3625
[Fact]
3726
public void TestCreateMongoX509Credential()
3827
{
@@ -82,15 +71,13 @@ public void CreateOidcCredential_should_initialize_all_required_properties_with_
8271
[Fact]
8372
public void TestEquals()
8473
{
85-
#pragma warning disable 618
86-
var a = MongoCredential.CreateMongoCRCredential("db", "user1", "password");
87-
var b = MongoCredential.CreateMongoCRCredential("db", "user1", "password");
88-
var c = MongoCredential.CreateMongoCRCredential("db", "user2", "password");
89-
var d = MongoCredential.CreateMongoCRCredential("db", "user2", "password1");
90-
var e = MongoCredential.CreateMongoCRCredential("db", "user2", "password1").WithMechanismProperty("TEST", true);
91-
var f = MongoCredential.CreateMongoCRCredential("db", "user2", "password1").WithMechanismProperty("TEST", true);
74+
var a = MongoCredential.CreateCredential("db", "user1", "password");
75+
var b = MongoCredential.CreateCredential("db", "user1", "password");
76+
var c = MongoCredential.CreateCredential("db", "user2", "password");
77+
var d = MongoCredential.CreateCredential("db", "user2", "password1");
78+
var e = MongoCredential.CreateCredential("db", "user2", "password1").WithMechanismProperty("TEST", true);
79+
var f = MongoCredential.CreateCredential("db", "user2", "password1").WithMechanismProperty("TEST", true);
9280
var n = (MongoCredential)null;
93-
#pragma warning restore 618
9481

9582
Assert.True(object.Equals(a, b));
9683
Assert.False(object.Equals(a, c));
@@ -124,8 +111,8 @@ public void TestEquals()
124111
[Fact]
125112
public void TestPassword()
126113
{
114+
var credentials = MongoCredential.CreateCredential("database", "username", "password");
127115
#pragma warning disable 618
128-
var credentials = MongoCredential.CreateMongoCRCredential("database", "username", "password");
129116
Assert.Equal("password", credentials.Password);
130117
#pragma warning restore 618
131118
}
@@ -156,9 +143,7 @@ public void TestCreatePlainCredential()
156143
[Fact]
157144
public void TestMechanismProperty()
158145
{
159-
#pragma warning disable 618
160-
var credential = MongoCredential.CreateMongoCRCredential("database", "username", "password");
161-
#pragma warning restore 618
146+
var credential = MongoCredential.CreateCredential("database", "username", "password");
162147
var withProperties = credential
163148
.WithMechanismProperty("SPN", "awesome")
164149
.WithMechanismProperty("OTHER", 10);

Diff for: ‎tests/MongoDB.Driver.Tests/MongoUrlBuilderTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ public void TestApplicationName_too_long()
256256

257257
[Theory]
258258
[InlineData(null, "mongodb://localhost")]
259-
[InlineData("MONGODB-CR", "mongodb://localhost/?authMechanism=MONGODB-CR")]
260259
[InlineData("SCRAM-SHA-1", "mongodb://localhost/?authMechanism=SCRAM-SHA-1")]
261260
[InlineData("MONGODB-X509", "mongodb://localhost/?authMechanism=MONGODB-X509")]
262261
[InlineData("GSSAPI", "mongodb://localhost/?authMechanism=GSSAPI")]

0 commit comments

Comments
 (0)