Skip to content
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

Defaulting SwtAuthenticationEnabled to False #10195

Merged
merged 1 commit into from
May 30, 2024
Merged

Defaulting SwtAuthenticationEnabled to False #10195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/WebJobs.Script/Config/FunctionsHostingConfigOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ internal bool SwtAuthenticationEnabled
{
get
{
return GetFeatureAsBooleanOrDefault(ScriptConstants.HostingConfigSwtAuthenticationEnabled, true);
return GetFeatureAsBooleanOrDefault(ScriptConstants.HostingConfigSwtAuthenticationEnabled, false);
}

set
Expand Down
4 changes: 4 additions & 0 deletions test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/SamplesEndToEndTests_CSharp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,6 +1391,10 @@ public override void ConfigureWebHost(IServiceCollection services)
{
base.ConfigureWebHost(services);

// SWT auth is disabled by default so we must enable to test
services.AddOptions<FunctionsHostingConfigOptions>()
.Configure(o => o.SwtAuthenticationEnabled = true);

// The legacy http tests use sync IO so explicitly allow this
var environment = new TestEnvironment();
string testSiteName = "somewebsite";
Expand Down
8 changes: 4 additions & 4 deletions test/WebJobs.Script.Tests/Configuration/FunctionsHostingConfigOptionsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ public void Property_Validation()
(nameof(FunctionsHostingConfigOptions.SwtAuthenticationEnabled), "SwtAuthenticationEnabled=False", false),
(nameof(FunctionsHostingConfigOptions.SwtAuthenticationEnabled), "SwtAuthenticationEnabled=True", true),
(nameof(FunctionsHostingConfigOptions.SwtAuthenticationEnabled), "SwtAuthenticationEnabled=0", false),
(nameof(FunctionsHostingConfigOptions.SwtAuthenticationEnabled), "SwtAuthenticationEnabled=unparseable", true), // default
(nameof(FunctionsHostingConfigOptions.SwtAuthenticationEnabled), string.Empty, true), // default
(nameof(FunctionsHostingConfigOptions.SwtAuthenticationEnabled), "SwtAuthenticationEnabled=unparseable", false), // default
(nameof(FunctionsHostingConfigOptions.SwtAuthenticationEnabled), string.Empty, false), // default

// Supports True/False/1/0
(nameof(FunctionsHostingConfigOptions.SwtIssuerEnabled), "SwtIssuerEnabled=False", false),
Expand Down Expand Up @@ -251,8 +251,8 @@ public void SwtAuthenticationEnabled_ReturnsExpectedValue()
{
FunctionsHostingConfigOptions options = new FunctionsHostingConfigOptions();

// defaults to true
Assert.True(options.SwtAuthenticationEnabled);
// defaults to false
Assert.False(options.SwtAuthenticationEnabled);

// returns true when explicitly enabled
options.Features[ScriptConstants.HostingConfigSwtAuthenticationEnabled] = "1";
Expand Down
6 changes: 6 additions & 0 deletions test/WebJobs.Script.Tests/Security/Authentication/ArmAuthenticationHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Http;
using Microsoft.Azure.WebJobs.Extensions.Http;
using Microsoft.Azure.WebJobs.Script.Config;
using Microsoft.Azure.WebJobs.Script.WebHost.Security;
using Microsoft.Azure.WebJobs.Script.WebHost.Security.Authentication;
using Microsoft.Extensions.DependencyInjection;
Expand All @@ -19,6 +20,11 @@ public class ArmAuthenticationHandlerTests
private static DefaultHttpContext GetContext()
{
var services = new ServiceCollection().AddLogging();

// SWT auth is disabled by default so we must enable to test
services.AddOptions<FunctionsHostingConfigOptions>()
.Configure(o => o.SwtAuthenticationEnabled = true);

services.AddAuthentication(o =>
{
o.DefaultScheme = ArmAuthenticationDefaults.AuthenticationScheme;
Expand Down
Loading