diff --git a/src/ZB.MOM.WW.MxGateway.Server/Configuration/EffectiveDashboardConfiguration.cs b/src/ZB.MOM.WW.MxGateway.Server/Configuration/EffectiveDashboardConfiguration.cs index 7e9de5f0..285c79cb 100644 --- a/src/ZB.MOM.WW.MxGateway.Server/Configuration/EffectiveDashboardConfiguration.cs +++ b/src/ZB.MOM.WW.MxGateway.Server/Configuration/EffectiveDashboardConfiguration.cs @@ -9,4 +9,8 @@ public sealed record EffectiveDashboardConfiguration( bool ShowTagValues, IReadOnlyDictionary GroupToRole, IReadOnlyDictionary> GroupToTag, - UntaggedSessionVisibility UntaggedSessionVisibility); + UntaggedSessionVisibility UntaggedSessionVisibility, + bool DisableLogin = false, + string? AutoLoginUser = null, + bool RequireHttpsCookie = true, + string? CookieName = null); diff --git a/src/ZB.MOM.WW.MxGateway.Server/Configuration/GatewayConfigurationProvider.cs b/src/ZB.MOM.WW.MxGateway.Server/Configuration/GatewayConfigurationProvider.cs index 169769a5..b134c372 100644 --- a/src/ZB.MOM.WW.MxGateway.Server/Configuration/GatewayConfigurationProvider.cs +++ b/src/ZB.MOM.WW.MxGateway.Server/Configuration/GatewayConfigurationProvider.cs @@ -71,7 +71,11 @@ public sealed class GatewayConfigurationProvider(IOptions option pair => pair.Key, pair => (IReadOnlyList)pair.Value, value.Dashboard.GroupToTag.Comparer), - UntaggedSessionVisibility: value.Dashboard.UntaggedSessionVisibility), + UntaggedSessionVisibility: value.Dashboard.UntaggedSessionVisibility, + DisableLogin: value.Dashboard.DisableLogin, + AutoLoginUser: value.Dashboard.AutoLoginUser, + RequireHttpsCookie: value.Dashboard.RequireHttpsCookie, + CookieName: value.Dashboard.CookieName), Protocol: new EffectiveProtocolConfiguration( value.Protocol.WorkerProtocolVersion, value.Protocol.MaxGrpcMessageBytes)); diff --git a/src/ZB.MOM.WW.MxGateway.Server/Configuration/GatewayOptionsValidator.cs b/src/ZB.MOM.WW.MxGateway.Server/Configuration/GatewayOptionsValidator.cs index eab05e7e..9e5d5f39 100644 --- a/src/ZB.MOM.WW.MxGateway.Server/Configuration/GatewayOptionsValidator.cs +++ b/src/ZB.MOM.WW.MxGateway.Server/Configuration/GatewayOptionsValidator.cs @@ -386,6 +386,17 @@ public sealed class GatewayOptionsValidator : OptionsValidatorBaseRecent session limit@Snapshot.Configuration.Dashboard.RecentSessionLimit Show tag values@Snapshot.Configuration.Dashboard.ShowTagValues Untagged session visibility@Snapshot.Configuration.Dashboard.UntaggedSessionVisibility + Login disabled@Snapshot.Configuration.Dashboard.DisableLogin + Auto-login user@(Snapshot.Configuration.Dashboard.AutoLoginUser ?? "(default)") + Require HTTPS cookie@Snapshot.Configuration.Dashboard.RequireHttpsCookie + Cookie name@(Snapshot.Configuration.Dashboard.CookieName ?? "(default)") Worker protocol@Snapshot.Configuration.Protocol.WorkerProtocolVersion diff --git a/src/ZB.MOM.WW.MxGateway.Tests/Configuration/GatewayConfigurationProviderTests.cs b/src/ZB.MOM.WW.MxGateway.Tests/Configuration/GatewayConfigurationProviderTests.cs index 32dad0f1..b5f0f8d2 100644 --- a/src/ZB.MOM.WW.MxGateway.Tests/Configuration/GatewayConfigurationProviderTests.cs +++ b/src/ZB.MOM.WW.MxGateway.Tests/Configuration/GatewayConfigurationProviderTests.cs @@ -100,6 +100,29 @@ public sealed class GatewayConfigurationProviderTests Project(widened).Dashboard.UntaggedSessionVisibility); } + /// The login/cookie flags are projected so the Settings page can show them (R21-O20). + [Fact] + public void GetEffectiveConfiguration_ProjectsLoginAndCookieFlags() + { + GatewayOptions options = new() + { + Dashboard = new DashboardOptions + { + DisableLogin = true, + AutoLoginUser = "dev", + RequireHttpsCookie = false, + CookieName = "gw-a", + }, + }; + + EffectiveDashboardConfiguration dashboard = Project(options).Dashboard; + + Assert.True(dashboard.DisableLogin); + Assert.Equal("dev", dashboard.AutoLoginUser); + Assert.False(dashboard.RequireHttpsCookie); + Assert.Equal("gw-a", dashboard.CookieName); + } + /// The pre-existing dashboard members keep coming from the options they always did. [Fact] public void GetEffectiveConfiguration_CopiesTheOtherDashboardMembers() diff --git a/src/ZB.MOM.WW.MxGateway.Tests/Configuration/GatewayOptionsValidatorTests.cs b/src/ZB.MOM.WW.MxGateway.Tests/Configuration/GatewayOptionsValidatorTests.cs index c6e9e2c7..a8d46ac0 100644 --- a/src/ZB.MOM.WW.MxGateway.Tests/Configuration/GatewayOptionsValidatorTests.cs +++ b/src/ZB.MOM.WW.MxGateway.Tests/Configuration/GatewayOptionsValidatorTests.cs @@ -952,6 +952,30 @@ public sealed class GatewayOptionsValidatorTests Assert.True(result.Succeeded); } + /// A __Host- cookie name with RequireHttpsCookie=false is a cookie browsers drop (R21-O19). + [Fact] + public void Validate_Fails_WhenHostPrefixedCookieNameWithoutRequireHttpsCookie() + { + GatewayOptions options = CloneWithDashboard( + ValidOptions(), + new DashboardOptions { CookieName = "__Host-Custom", RequireHttpsCookie = false }); + ValidateOptionsResult result = new GatewayOptionsValidator().Validate(null, options); + Assert.True(result.Failed); + Assert.Contains(result.Failures!, f => f.Contains("__Host-") && f.Contains("RequireHttpsCookie")); + } + + /// __Host- is fine when the cookie is always Secure; a plain name is fine without it. + [Fact] + public void Validate_Succeeds_ForValidCookieNameCombinations() + { + Assert.True(new GatewayOptionsValidator().Validate(null, CloneWithDashboard( + ValidOptions(), + new DashboardOptions { CookieName = "__Host-Custom", RequireHttpsCookie = true })).Succeeded); + Assert.True(new GatewayOptionsValidator().Validate(null, CloneWithDashboard( + ValidOptions(), + new DashboardOptions { CookieName = "MyCookie", RequireHttpsCookie = false })).Succeeded); + } + /// Verifies a populated GroupToTag map with well-formed tags passes validation. [Fact] public void Validate_Succeeds_WhenGroupToTagWellFormed()