Skip to content

Update MailKit to 4.18.2 and keep e-mails out of OIDC sync logs #985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KrzysztofPajak merged 2 commits into from
Oct 24, 2026
Merged

Update MailKit to 4.18.2 and keep e-mails out of OIDC sync logs #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4e0a0a
Pin System.Security.Cryptography.Pkcs to 10.0.13 and keep e-mails out…
Oct 24, 2026
3f90f7f
Update MailKit to 4.18.2 instead of pinning System.Security.Cryptogra…
Oct 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageVersion Include="Microsoft.OpenApi" Version="2.12.2" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.17.13" />
<PackageVersion Include="PdfPig" Version="0.1.16" />
<PackageVersion Include="MailKit" Version="4.18.1" />
<PackageVersion Include="MailKit" Version="4.18.2" />
<PackageVersion Include="AWSSDK.Core" Version="4.0.102.8" />
<PackageVersion Include="AWSSDK.S3" Version="4.0.104.1" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.30.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Grand.Web.Common.Tests/Security/Oidc/OidcProfileSynchronizerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public async Task Email_TakenByOther_Kept()
VerifyEmail("new@shop.com", Times.Never());
Assert.AreEqual("old@shop.com", _customer.Email);
_logger.Verify(x => x.Log(LogLevel.Warning, It.IsAny<EventId>(),
It.Is<It.IsAnyType>((v, _) => v.ToString()!.Contains("keeps old@shop.com") && v.ToString()!.Contains("customer c2")),
It.Is<It.IsAnyType>((v, _) => v.ToString()!.Contains("customer c2") && !v.ToString()!.Contains("@shop.com")),
It.IsAny<Exception>(), It.IsAny<Func<It.IsAnyType, Exception, string>>()), Times.Once);
}

Expand Down
12 changes: 6 additions & 6 deletions src/Web/Grand.Web.Common/Security/Oidc/OidcProfileSynchronizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,25 @@ private async Task SyncEmail(Customer customer, ExternalRegistrationIdentity ide
//emergency access
if (loginConfig.IsBreakGlass(customer.Email))
{
logger.LogWarning("OpenID Connect profile sync: break-glass customer {CustomerId} keeps {OldEmail} " +
"(the identity provider has {NewEmail})", customer.Id, customer.Email, newEmail);
logger.LogWarning("OpenID Connect profile sync: break-glass customer {CustomerId} keeps its e-mail " +
"(the identity provider has a different one)", customer.Id);
return;
}

//nor may an account take an address listed there: the password it still has would open the Admin login page
//and keep it signed in past the provider
if (loginConfig.IsBreakGlass(newEmail))
{
logger.LogWarning("OpenID Connect profile sync: customer {CustomerId} keeps {OldEmail}: {NewEmail} is a " +
"break-glass address", customer.Id, customer.Email, newEmail);
logger.LogWarning("OpenID Connect profile sync: customer {CustomerId} keeps its e-mail: the identity " +
"provider's one is a break-glass address", customer.Id);
return;
}

var owner = await customerService.GetCustomerByEmail(newEmail, customerConfig.RegisterCustomersPerStore ? storeId : "");
if (owner != null && owner.Id != customer.Id)
{
logger.LogWarning("OpenID Connect profile sync: customer {CustomerId} keeps {OldEmail}: {NewEmail} belongs to customer {OtherId}",
customer.Id, customer.Email, newEmail, owner.Id);
logger.LogWarning("OpenID Connect profile sync: customer {CustomerId} keeps its e-mail: the identity " +
"provider's one belongs to customer {OtherId}", customer.Id, owner.Id);
return;
}

Expand Down
Loading