From 789c03a56f2ee2088f3062c000553b5e5fb3ace0 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 20 Nov 2026 09:42:54 +0800 Subject: [PATCH 1/2] Upgrade MongoDB.Driver to 3.14.1 - Use `MongoUrl.Url` for client cache and transaction keys since `ToString()` is now redacted --- Directory.Packages.props | 2 +- .../MongoDB/Clients/AbpMongoClientFactory.cs | 4 +- .../UnitOfWorkMongoDbContextProvider.cs | 2 +- .../Clients/MongoClient_Factory_Tests.cs | 12 +++++ .../UnitOfWorkMongoDbContextProvider_Tests.cs | 52 ++++++++++++++++++- 5 files changed, 66 insertions(+), 6 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9589a7fe61..02e5887b21 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -124,7 +124,7 @@ - + diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/Clients/AbpMongoClientFactory.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/Clients/AbpMongoClientFactory.cs index 983f7e067e..df1d07f25c 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/Clients/AbpMongoClientFactory.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/Clients/AbpMongoClientFactory.cs @@ -22,7 +22,7 @@ public class AbpMongoClientFactory : IAbpMongoClientFactory, ISingletonDependenc Check.NotNull(mongoUrl, nameof(mongoUrl)); return Task.FromResult( - ClientCache.GetOrAdd(mongoUrl.ToString(), _ => + ClientCache.GetOrAdd(mongoUrl.Url, _ => { var mongoClientSettings = MongoClientSettings.FromUrl(mongoUrl); Options.MongoClientSettingsConfigurer?.Invoke(mongoClientSettings); @@ -34,7 +34,7 @@ public class AbpMongoClientFactory : IAbpMongoClientFactory, ISingletonDependenc { Check.NotNull(mongoUrl, nameof(mongoUrl)); - return ClientCache.GetOrAdd(mongoUrl.ToString(), _ => + return ClientCache.GetOrAdd(mongoUrl.Url, _ => { var mongoClientSettings = MongoClientSettings.FromUrl(mongoUrl); Options.MongoClientSettingsConfigurer?.Invoke(mongoClientSettings); diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs index 0dc3527756..d98d71e86a 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs @@ -273,7 +273,7 @@ public class UnitOfWorkMongoDbContextProvider : IMongoDbContext protected virtual string GetTransactionApiKey(MongoUrl url) { - return $"MongoDb_{url.ToString().ToSha256()}"; + return $"MongoDb_{url.Url.ToSha256()}"; } protected virtual async Task ResolveConnectionStringAsync(Type dbContextType) diff --git a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Clients/MongoClient_Factory_Tests.cs b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Clients/MongoClient_Factory_Tests.cs index df649132fa..79bda72891 100644 --- a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Clients/MongoClient_Factory_Tests.cs +++ b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Clients/MongoClient_Factory_Tests.cs @@ -44,6 +44,18 @@ public class MongoClient_Factory_Tests : MongoDbTestBase Assert.NotSame(client1, client2); } + [Fact] + public async Task Should_Return_Different_Instances_For_Different_Credentials() + { + var mongoUrl1 = new MongoUrl("mongodb://user1:pass1@localhost:27017/db"); + var mongoUrl2 = new MongoUrl("mongodb://user2:pass2@localhost:27017/db"); + + var client1 = await _factory.GetAsync(mongoUrl1); + var client2 = await _factory.GetAsync(mongoUrl2); + + Assert.NotSame(client1, client2); + } + [Fact] public async Task Should_Not_Throw_For_Valid_But_Unreachable_Connection() { diff --git a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Uow/UnitOfWorkMongoDbContextProvider_Tests.cs b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Uow/UnitOfWorkMongoDbContextProvider_Tests.cs index 3fe400e9e8..94e14278fb 100644 --- a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Uow/UnitOfWorkMongoDbContextProvider_Tests.cs +++ b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Uow/UnitOfWorkMongoDbContextProvider_Tests.cs @@ -3,8 +3,12 @@ using System.Threading.Tasks; using MongoDB.Driver; using Shouldly; using Volo.Abp.Data; +using Volo.Abp.MongoDB.Clients; +using Volo.Abp.MultiTenancy; using Volo.Abp.TestApp.MongoDB; +using Volo.Abp.Threading; using Volo.Abp.Uow; +using Volo.Abp.Uow.MongoDB; using Xunit; namespace Volo.Abp.MongoDB.Uow; @@ -49,10 +53,54 @@ public class UnitOfWorkMongoDbContextProvider_Tests : MongoDbTestBase { await _mongoDbContextProvider.GetDbContextAsync(); - uow.FindTransactionApi($"MongoDb_{mongoUrl}").ShouldBeNull(); - uow.FindTransactionApi($"MongoDb_{mongoUrl.ToString().ToSha256()}").ShouldNotBeNull(); + uow.FindTransactionApi($"MongoDb_{mongoUrl.Url}").ShouldBeNull(); + uow.FindTransactionApi($"MongoDb_{mongoUrl.Url.ToSha256()}").ShouldNotBeNull(); await uow.CompleteAsync(); } } + + [Fact] + public void Should_Use_Different_Transaction_Api_Keys_For_Different_Credentials() + { + var provider = new TestUnitOfWorkMongoDbContextProvider( + _unitOfWorkManager, + _connectionStringResolver, + GetRequiredService(), + GetRequiredService(), + GetRequiredService(), + GetRequiredService()); + + var key1 = provider.GetTransactionApiKeyPublic(new MongoUrl("mongodb://user1:pass1@localhost:27017/db")); + var key2 = provider.GetTransactionApiKeyPublic(new MongoUrl("mongodb://user1:pass2@localhost:27017/db")); + var key3 = provider.GetTransactionApiKeyPublic(new MongoUrl("mongodb://user1:pass1@localhost/db")); + + key1.ShouldNotBe(key2); + key1.ShouldBe(key3); + } + + private class TestUnitOfWorkMongoDbContextProvider : UnitOfWorkMongoDbContextProvider + { + public TestUnitOfWorkMongoDbContextProvider( + IUnitOfWorkManager unitOfWorkManager, + IConnectionStringResolver connectionStringResolver, + ICancellationTokenProvider cancellationTokenProvider, + ICurrentTenant currentTenant, + IMongoDbContextTypeProvider dbContextTypeProvider, + IAbpMongoClientFactory mongoClientFactory) + : base( + unitOfWorkManager, + connectionStringResolver, + cancellationTokenProvider, + currentTenant, + dbContextTypeProvider, + mongoClientFactory) + { + } + + public string GetTransactionApiKeyPublic(MongoUrl url) + { + return GetTransactionApiKey(url); + } + } } From a5dea570fa7bcbfd2a8b2a6015d259ee5e822598 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 20 Nov 2026 01:43:47 +0000 Subject: [PATCH 2/2] docs: update package version changes [skip ci] --- docs/en/package-version-changes.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/en/package-version-changes.md b/docs/en/package-version-changes.md index 59e4b1afe1..4784c8bb49 100644 --- a/docs/en/package-version-changes.md +++ b/docs/en/package-version-changes.md @@ -7,6 +7,12 @@ # Package Version Changes +## 11.0.1 + +| Package | Old Version | New Version | PR | +|---------|-------------|-------------|-----| +| MongoDB.Driver | 3.14.0 | 3.14.1 | #26538 | + ## 11.0.0-rc.2 | Package | Old Version | New Version | PR |