Skip to content

Fix: OpenIdClientSettingsStep does not protect the client secret and throws null reference exceptions #18313 #19073

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

Open
mroskamp wants to merge 5 commits into
base: main
Choose a base branch
from
+20 −3
Open

Fix: OpenIdClientSettingsStep does not protect the client secret and throws null reference exceptions #18313 #19073

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65632db
Fix issue where OpenIdClientSettings recipe step didn't protect the c…
mroskamp Sep 4, 2025
b9d8435
Avoid protecting a null or blank secret.
mroskamp Sep 4, 2025
2fd5270
Update src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdClien…
mroskamp Oct 28, 2025
4a7cbf3
Merge branch 'main' into openid-recipe-step-improvements
mroskamp Mar 27, 2026
1a7fc53
Respond to PR suggestions. Add separate ClientSecretPlainText propert…
mroskamp Mar 27, 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
23 changes: 20 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdClientSettingsStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.Text.Json.Nodes;
using Microsoft.AspNetCore.DataProtection;
using OrchardCore.OpenId.Configuration;
using OrchardCore.OpenId.Services;
using OrchardCore.OpenId.Settings;
using OrchardCore.Recipes.Models;
Expand All @@ -12,23 +14,37 @@ namespace OrchardCore.OpenId.Recipes;
public sealed class OpenIdClientSettingsStep : NamedRecipeStepHandler
{
private readonly IOpenIdClientService _clientService;
private readonly IDataProtectionProvider _dataProtectionProvider;

public OpenIdClientSettingsStep(IOpenIdClientService clientService)
private static readonly char[] ScopeDelimiters = [' ', ','];

public OpenIdClientSettingsStep(
IOpenIdClientService clientService,
IDataProtectionProvider dataProtectionProvider)
: base("OpenIdClientSettings")
{
_clientService = clientService;
_dataProtectionProvider = dataProtectionProvider;
}

protected override async Task HandleAsync(RecipeExecutionContext context)
{
var model = context.Step.ToObject<OpenIdClientSettingsStepModel>();
var settings = await _clientService.LoadSettingsAsync();

settings.Scopes = model.Scopes.Split(' ', ',');
settings.Scopes = model.Scopes?.Split(ScopeDelimiters, StringSplitOptions.RemoveEmptyEntries);
settings.Authority = !string.IsNullOrEmpty(model.Authority) ? new Uri(model.Authority, UriKind.Absolute) : null;
settings.CallbackPath = model.CallbackPath;
settings.ClientId = model.ClientId;
settings.ClientSecret = model.ClientSecret;
if (!string.IsNullOrEmpty(model.ClientSecret))
{
settings.ClientSecret = model.ClientSecret;
}
else if (!string.IsNullOrEmpty(model.ClientSecretPlainText))
{
var protector = _dataProtectionProvider.CreateProtector(nameof(OpenIdClientConfiguration));
settings.ClientSecret = protector.Protect(model.ClientSecret);
}
settings.DisplayName = model.DisplayName;
settings.ResponseMode = model.ResponseMode;
settings.ResponseType = model.ResponseType;
Expand All @@ -50,6 +66,7 @@ public sealed class OpenIdClientSettingsStepModel

public string ClientId { get; set; }
public string ClientSecret { get; set; }
public string ClientSecretPlainText { get; set; }
public string CallbackPath { get; set; }
public string SignedOutRedirectUri { get; set; }
public string SignedOutCallbackPath { get; set; }
Expand Down
Loading