Skip to content

Fix AzureAd options validation #13480

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
Tratcher merged 2 commits into from
Aug 27, 2019
Merged

Fix AzureAd options validation #13480

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
9253071
Skip getting AzureAdOptions for not AzureADUi Cookies scheme #13311 (…
vbornand Aug 27, 2019
5bb2046
Also check Azure Jwt options for #13311
Tratcher Aug 27, 2019
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
5 changes: 5 additions & 0 deletions src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADCookieOptionsConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ public AzureADCookieOptionsConfiguration(IOptions<AzureADSchemeOptions> schemeOp
public void Configure(string name, CookieAuthenticationOptions options)
{
var AzureADScheme = GetAzureADScheme(name);
if (AzureADScheme is null)
{
return;
}

var AzureADOptions = _AzureADOptions.Get(AzureADScheme);
if (name != AzureADOptions.CookieSchemeName)
{
Expand Down
5 changes: 5 additions & 0 deletions src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADJwtBearerOptionsConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ public AzureADJwtBearerOptionsConfiguration(
public void Configure(string name, JwtBearerOptions options)
{
var azureADScheme = GetAzureADScheme(name);
if (azureADScheme is null)
{
return;
}

var azureADOptions = _azureADOptions.Get(azureADScheme);
if (name != azureADOptions.JwtBearerSchemeName)
{
Expand Down
32 changes: 32 additions & 0 deletions ...ure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,22 @@ public void AddAzureAD_ThrowsWhenInstanceIsNotSet()
Assert.Contains(expectedMessage, exception.Failures);
}

[Fact]
public void AddAzureAD_SkipsOptionsValidationForNonAzureCookies()
{
var services = new ServiceCollection();
services.AddSingleton<ILoggerFactory>(new NullLoggerFactory());

services.AddAuthentication()
.AddAzureAD(o => { })
.AddCookie("other");

var provider = services.BuildServiceProvider();
var cookieAuthOptions = provider.GetService<IOptionsMonitor<CookieAuthenticationOptions>>();

Assert.NotNull(cookieAuthOptions.Get("other"));
}

[Fact]
public void AddAzureADBearer_AddsAllAuthenticationHandlers()
{
Expand Down Expand Up @@ -453,5 +469,21 @@ public void AddAzureADBearer_ThrowsWhenInstanceIsNotSet()

Assert.Contains(expectedMessage, exception.Failures);
}

[Fact]
public void AddAzureADBearer_SkipsOptionsValidationForNonAzureCookies()
{
var services = new ServiceCollection();
services.AddSingleton<ILoggerFactory>(new NullLoggerFactory());

services.AddAuthentication()
.AddAzureADBearer(o => { })
.AddJwtBearer("other", o => { });

var provider = services.BuildServiceProvider();
var jwtOptions = provider.GetService<IOptionsMonitor<JwtBearerOptions>>();

Assert.NotNull(jwtOptions.Get("other"));
}
}
}