dc9c0c950c
Apply the ZB.MOM.WW. prefix to all gateway-side projects, folders,
.csproj/.sln contents, C# namespaces, using directives, generated proto
C# (csharp_namespace + checked-in generated files), InternalsVisibleTo
attributes, project-name string literals (LoadProject, .sln lookups,
worker exe paths, staticwebassets manifest), and the install/script/doc
references that point at any of the above. Migrate the solution from
.sln to .slnx via `dotnet sln migrate` and delete the old file.
External-runtime identifiers are intentionally NOT prefixed so external
configuration keeps working:
- GatewayMetrics.cs MeterName ("MxGateway.Server")
- DashboardAuthenticationDefaults Scheme/Policy ("MxGateway.Dashboard")
- GatewayRequestLoggingMiddleware logger category ("MxGateway.Request")
- StaRuntime thread name ("MxGateway.Worker.STA")
- appsettings.json root section "MxGateway" + env-var prefix
MxGateway__... and secret-name MxGateway:ApiKeyPepper
- C:\ProgramData\MxGateway\ data dir paths
Also fixes two tests that were not rename-related but became visible
while validating the rename:
- WorkerLiveMxAccessSmokeTests.ShutDownAsync: cancellation that the
gateway service correctly maps to RpcException(Cancelled) per gRPC
convention was being misclassified as a stream fault. Added a sibling
catch on RpcException with StatusCode.Cancelled.
- IntegrationTestEnvironment.ResolveRepositoryRoot: extracted IsRepositoryRoot
and made it accept either a .git marker OR a .sln/.slnx next to src/
so the worker-exe walker works in non-git working copies.
clients/proto/proto-inputs.json's protoRoot updated to point at
src/ZB.MOM.WW.MxGateway.Contracts/Protos.
Verified by `dotnet build` and a full `dotnet test` of the .slnx with
MXGATEWAY_RUN_LIVE_{MXACCESS,LDAP,GALAXY}_TESTS=1:
Tests: 472/472 pass
Worker.Tests: 280/280 pass (4 dev-rig [Fact(Skip=...)] skipped)
IntegrationTests: 18/18 pass
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
322 lines
12 KiB
C#
322 lines
12 KiB
C#
using Microsoft.Extensions.Options;
|
|
using ZB.MOM.WW.MxGateway.Contracts;
|
|
|
|
namespace ZB.MOM.WW.MxGateway.Server.Configuration;
|
|
|
|
public sealed class GatewayOptionsValidator : IValidateOptions<GatewayOptions>
|
|
{
|
|
private const int MinimumMaxMessageBytes = 1024;
|
|
private const int MaximumMaxMessageBytes = 256 * 1024 * 1024;
|
|
|
|
/// <summary>
|
|
/// Validates gateway configuration options.
|
|
/// </summary>
|
|
/// <param name="name">Options name.</param>
|
|
/// <param name="options">Gateway options to validate.</param>
|
|
/// <returns>Validation result.</returns>
|
|
public ValidateOptionsResult Validate(string? name, GatewayOptions options)
|
|
{
|
|
List<string> failures = [];
|
|
|
|
ValidateAuthentication(options.Authentication, failures);
|
|
ValidateLdap(options.Ldap, failures);
|
|
ValidateWorker(options.Worker, failures);
|
|
ValidateSessions(options.Sessions, failures);
|
|
ValidateEvents(options.Events, failures);
|
|
ValidateDashboard(options.Dashboard, failures);
|
|
ValidateProtocol(options.Protocol, failures);
|
|
ValidateAlarms(options.Alarms, failures);
|
|
|
|
return failures.Count == 0
|
|
? ValidateOptionsResult.Success
|
|
: ValidateOptionsResult.Fail(failures);
|
|
}
|
|
|
|
private static void ValidateAuthentication(AuthenticationOptions options, List<string> failures)
|
|
{
|
|
if (!Enum.IsDefined(options.Mode))
|
|
{
|
|
failures.Add("MxGateway:Authentication:Mode must be a supported authentication mode.");
|
|
return;
|
|
}
|
|
|
|
if (options.Mode == AuthenticationMode.ApiKey)
|
|
{
|
|
AddIfBlank(
|
|
options.SqlitePath,
|
|
"MxGateway:Authentication:SqlitePath is required when API-key authentication is enabled.",
|
|
failures);
|
|
AddIfInvalidPath(
|
|
options.SqlitePath,
|
|
"MxGateway:Authentication:SqlitePath must be a valid filesystem path.",
|
|
failures);
|
|
AddIfBlank(
|
|
options.PepperSecretName,
|
|
"MxGateway:Authentication:PepperSecretName is required when API-key authentication is enabled.",
|
|
failures);
|
|
}
|
|
}
|
|
|
|
private static void ValidateLdap(LdapOptions options, List<string> failures)
|
|
{
|
|
if (!options.Enabled)
|
|
{
|
|
return;
|
|
}
|
|
|
|
AddIfBlank(options.Server, "MxGateway:Ldap:Server is required when LDAP login is enabled.", failures);
|
|
AddIfBlank(options.SearchBase, "MxGateway:Ldap:SearchBase is required when LDAP login is enabled.", failures);
|
|
AddIfBlank(
|
|
options.ServiceAccountDn,
|
|
"MxGateway:Ldap:ServiceAccountDn is required when LDAP login is enabled.",
|
|
failures);
|
|
AddIfBlank(
|
|
options.ServiceAccountPassword,
|
|
"MxGateway:Ldap:ServiceAccountPassword is required when LDAP login is enabled.",
|
|
failures);
|
|
AddIfBlank(
|
|
options.UserNameAttribute,
|
|
"MxGateway:Ldap:UserNameAttribute is required when LDAP login is enabled.",
|
|
failures);
|
|
AddIfBlank(
|
|
options.DisplayNameAttribute,
|
|
"MxGateway:Ldap:DisplayNameAttribute is required when LDAP login is enabled.",
|
|
failures);
|
|
AddIfBlank(
|
|
options.GroupAttribute,
|
|
"MxGateway:Ldap:GroupAttribute is required when LDAP login is enabled.",
|
|
failures);
|
|
AddIfBlank(
|
|
options.RequiredGroup,
|
|
"MxGateway:Ldap:RequiredGroup is required when LDAP login is enabled.",
|
|
failures);
|
|
AddIfNotPositive(options.Port, "MxGateway:Ldap:Port must be greater than zero.", failures);
|
|
|
|
if (!options.UseTls && !options.AllowInsecureLdap)
|
|
{
|
|
failures.Add("MxGateway:Ldap:AllowInsecureLdap must be true when UseTls is false.");
|
|
}
|
|
}
|
|
|
|
private static void ValidateWorker(WorkerOptions options, List<string> failures)
|
|
{
|
|
AddIfBlank(options.ExecutablePath, "MxGateway:Worker:ExecutablePath is required.", failures);
|
|
AddIfInvalidPath(
|
|
options.ExecutablePath,
|
|
"MxGateway:Worker:ExecutablePath must be a valid filesystem path.",
|
|
failures);
|
|
|
|
if (!string.IsNullOrWhiteSpace(options.ExecutablePath)
|
|
&& !string.Equals(Path.GetExtension(options.ExecutablePath), ".exe", StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
failures.Add("MxGateway:Worker:ExecutablePath must point to a .exe file.");
|
|
}
|
|
|
|
if (!string.IsNullOrWhiteSpace(options.WorkingDirectory))
|
|
{
|
|
AddIfInvalidPath(
|
|
options.WorkingDirectory,
|
|
"MxGateway:Worker:WorkingDirectory must be a valid filesystem path.",
|
|
failures);
|
|
}
|
|
|
|
if (!Enum.IsDefined(options.RequiredArchitecture))
|
|
{
|
|
failures.Add("MxGateway:Worker:RequiredArchitecture must be a supported worker architecture.");
|
|
}
|
|
|
|
AddIfNotPositive(
|
|
options.StartupTimeoutSeconds,
|
|
"MxGateway:Worker:StartupTimeoutSeconds must be greater than zero.",
|
|
failures);
|
|
AddIfNotPositive(
|
|
options.StartupProbeRetryAttempts,
|
|
"MxGateway:Worker:StartupProbeRetryAttempts must be greater than zero.",
|
|
failures);
|
|
AddIfNotPositive(
|
|
options.StartupProbeRetryDelayMilliseconds,
|
|
"MxGateway:Worker:StartupProbeRetryDelayMilliseconds must be greater than zero.",
|
|
failures);
|
|
AddIfNotPositive(
|
|
options.PipeConnectAttemptTimeoutMilliseconds,
|
|
"MxGateway:Worker:PipeConnectAttemptTimeoutMilliseconds must be greater than zero.",
|
|
failures);
|
|
AddIfNotPositive(
|
|
options.ShutdownTimeoutSeconds,
|
|
"MxGateway:Worker:ShutdownTimeoutSeconds must be greater than zero.",
|
|
failures);
|
|
AddIfNotPositive(
|
|
options.HeartbeatIntervalSeconds,
|
|
"MxGateway:Worker:HeartbeatIntervalSeconds must be greater than zero.",
|
|
failures);
|
|
AddIfNotPositive(
|
|
options.HeartbeatGraceSeconds,
|
|
"MxGateway:Worker:HeartbeatGraceSeconds must be greater than zero.",
|
|
failures);
|
|
|
|
if (options.HeartbeatGraceSeconds < options.HeartbeatIntervalSeconds)
|
|
{
|
|
failures.Add(
|
|
"MxGateway:Worker:HeartbeatGraceSeconds must be greater than or equal to HeartbeatIntervalSeconds.");
|
|
}
|
|
|
|
if (options.MaxMessageBytes is < MinimumMaxMessageBytes or > MaximumMaxMessageBytes)
|
|
{
|
|
failures.Add(
|
|
$"MxGateway:Worker:MaxMessageBytes must be between {MinimumMaxMessageBytes} and {MaximumMaxMessageBytes}.");
|
|
}
|
|
}
|
|
|
|
private static void ValidateSessions(SessionOptions options, List<string> failures)
|
|
{
|
|
AddIfNotPositive(
|
|
options.DefaultCommandTimeoutSeconds,
|
|
"MxGateway:Sessions:DefaultCommandTimeoutSeconds must be greater than zero.",
|
|
failures);
|
|
AddIfNotPositive(options.MaxSessions, "MxGateway:Sessions:MaxSessions must be greater than zero.", failures);
|
|
AddIfNotPositive(
|
|
options.MaxPendingCommandsPerSession,
|
|
"MxGateway:Sessions:MaxPendingCommandsPerSession must be greater than zero.",
|
|
failures);
|
|
AddIfNotPositive(
|
|
options.DefaultLeaseSeconds,
|
|
"MxGateway:Sessions:DefaultLeaseSeconds must be greater than zero.",
|
|
failures);
|
|
AddIfNotPositive(
|
|
options.LeaseSweepIntervalSeconds,
|
|
"MxGateway:Sessions:LeaseSweepIntervalSeconds must be greater than zero.",
|
|
failures);
|
|
|
|
if (options.AllowMultipleEventSubscribers)
|
|
{
|
|
failures.Add(
|
|
"MxGateway:Sessions:AllowMultipleEventSubscribers is not supported until event fan-out is implemented.");
|
|
}
|
|
}
|
|
|
|
private static void ValidateEvents(EventOptions options, List<string> failures)
|
|
{
|
|
AddIfNotPositive(options.QueueCapacity, "MxGateway:Events:QueueCapacity must be greater than zero.", failures);
|
|
|
|
if (!Enum.IsDefined(options.BackpressurePolicy))
|
|
{
|
|
failures.Add("MxGateway:Events:BackpressurePolicy must be a supported backpressure policy.");
|
|
}
|
|
}
|
|
|
|
private static void ValidateDashboard(DashboardOptions options, List<string> failures)
|
|
{
|
|
if (options.Enabled)
|
|
{
|
|
AddIfBlank(options.PathBase, "MxGateway:Dashboard:PathBase is required when the dashboard is enabled.", failures);
|
|
if (!string.IsNullOrWhiteSpace(options.PathBase) && !options.PathBase.StartsWith('/'))
|
|
{
|
|
failures.Add("MxGateway:Dashboard:PathBase must start with '/'.");
|
|
}
|
|
}
|
|
|
|
AddIfNotPositive(
|
|
options.SnapshotIntervalMilliseconds,
|
|
"MxGateway:Dashboard:SnapshotIntervalMilliseconds must be greater than zero.",
|
|
failures);
|
|
AddIfNegative(
|
|
options.RecentFaultLimit,
|
|
"MxGateway:Dashboard:RecentFaultLimit must be greater than or equal to zero.",
|
|
failures);
|
|
AddIfNegative(
|
|
options.RecentSessionLimit,
|
|
"MxGateway:Dashboard:RecentSessionLimit must be greater than or equal to zero.",
|
|
failures);
|
|
}
|
|
|
|
private static void ValidateAlarms(AlarmsOptions options, List<string> failures)
|
|
{
|
|
if (!options.Enabled)
|
|
{
|
|
return;
|
|
}
|
|
|
|
// When the central alarm monitor is enabled, it needs either a canonical
|
|
// SubscriptionExpression or a DefaultArea to compose one from. Validating
|
|
// it at startup makes the misconfiguration fail-fast at boot, in line
|
|
// with every other section.
|
|
if (string.IsNullOrWhiteSpace(options.SubscriptionExpression)
|
|
&& string.IsNullOrWhiteSpace(options.DefaultArea))
|
|
{
|
|
failures.Add(
|
|
"MxGateway:Alarms requires either a non-blank SubscriptionExpression or a non-blank DefaultArea when Enabled is true.");
|
|
}
|
|
|
|
if (!string.IsNullOrWhiteSpace(options.SubscriptionExpression)
|
|
&& !options.SubscriptionExpression.StartsWith(@"\\", StringComparison.Ordinal))
|
|
{
|
|
failures.Add(
|
|
@"MxGateway:Alarms:SubscriptionExpression must start with '\\' (canonical \\<host>\Galaxy!<area> shape).");
|
|
}
|
|
}
|
|
|
|
private static void ValidateProtocol(ProtocolOptions options, List<string> failures)
|
|
{
|
|
if (options.WorkerProtocolVersion != GatewayContractInfo.WorkerProtocolVersion)
|
|
{
|
|
failures.Add(
|
|
$"MxGateway:Protocol:WorkerProtocolVersion must be {GatewayContractInfo.WorkerProtocolVersion}.");
|
|
}
|
|
|
|
if (options.MaxGrpcMessageBytes is < MinimumMaxMessageBytes or > MaximumMaxMessageBytes)
|
|
{
|
|
failures.Add(
|
|
$"MxGateway:Protocol:MaxGrpcMessageBytes must be between {MinimumMaxMessageBytes} and {MaximumMaxMessageBytes}.");
|
|
}
|
|
}
|
|
|
|
private static void AddIfBlank(string? value, string message, List<string> failures)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(value))
|
|
{
|
|
failures.Add(message);
|
|
}
|
|
}
|
|
|
|
private static void AddIfNotPositive(int value, string message, List<string> failures)
|
|
{
|
|
if (value <= 0)
|
|
{
|
|
failures.Add(message);
|
|
}
|
|
}
|
|
|
|
private static void AddIfNegative(int value, string message, List<string> failures)
|
|
{
|
|
if (value < 0)
|
|
{
|
|
failures.Add(message);
|
|
}
|
|
}
|
|
|
|
private static void AddIfInvalidPath(string? value, string message, List<string> failures)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(value))
|
|
{
|
|
return;
|
|
}
|
|
|
|
try
|
|
{
|
|
_ = Path.GetFullPath(value);
|
|
}
|
|
catch (ArgumentException)
|
|
{
|
|
failures.Add(message);
|
|
}
|
|
catch (NotSupportedException)
|
|
{
|
|
failures.Add(message);
|
|
}
|
|
catch (PathTooLongException)
|
|
{
|
|
failures.Add(message);
|
|
}
|
|
}
|
|
}
|