Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7a7a9e4d11 |
@@ -105,12 +105,6 @@ Do not let Razor components directly mutate gateway session or worker objects.
|
|||||||
Create a small read-only dashboard service that projects gateway state into
|
Create a small read-only dashboard service that projects gateway state into
|
||||||
plain DTOs.
|
plain DTOs.
|
||||||
|
|
||||||
`GatewayMetrics.GetSnapshot()` is the metrics input for the first dashboard
|
|
||||||
projection. It carries current session and worker gauges, command and event
|
|
||||||
counters, queue depth, and fault totals. The dashboard reads that snapshot
|
|
||||||
instead of reading raw `Meter` instruments because exporter configuration is an
|
|
||||||
operations concern, not a UI dependency.
|
|
||||||
|
|
||||||
Suggested service:
|
Suggested service:
|
||||||
|
|
||||||
```csharp
|
```csharp
|
||||||
@@ -367,3 +361,4 @@ The first dashboard slice should implement:
|
|||||||
8. workers page with worker table.
|
8. workers page with worker table.
|
||||||
9. 1-second realtime refresh through Blazor Server.
|
9. 1-second realtime refresh through Blazor Server.
|
||||||
10. redaction tests for secrets.
|
10. redaction tests for secrets.
|
||||||
|
|
||||||
|
|||||||
@@ -612,23 +612,6 @@ SQLite auth storage should use startup migrations with a `schema_version` table.
|
|||||||
Migrations should run inside transactions and fail startup if the database
|
Migrations should run inside transactions and fail startup if the database
|
||||||
schema is newer than the running binary understands.
|
schema is newer than the running binary understands.
|
||||||
|
|
||||||
The v1 auth store uses `Microsoft.Data.Sqlite` and creates the
|
|
||||||
`schema_version`, `api_keys`, and `api_key_audit` tables through
|
|
||||||
`SqliteAuthStoreMigrator`. `AuthStoreMigrationHostedService` runs those
|
|
||||||
migrations at gateway startup when API-key authentication and
|
|
||||||
`Authentication:RunMigrationsOnStartup` are enabled. A database with a newer
|
|
||||||
schema version fails startup instead of being modified by an older gateway
|
|
||||||
binary.
|
|
||||||
|
|
||||||
`IApiKeyStore` reads stored key records and exposes an active-key lookup that
|
|
||||||
excludes rows with `revoked_utc` set. Hash verification belongs to the API-key
|
|
||||||
hashing layer, but the store preserves the `secret_hash` bytes, display name,
|
|
||||||
scopes, timestamps, and revocation state needed by that layer.
|
|
||||||
|
|
||||||
`IApiKeyAuditStore` appends audit events to `api_key_audit` and returns recent
|
|
||||||
events for diagnostics and future administrative tools. Audit records store key
|
|
||||||
ids and event metadata only; they do not store raw API key secrets.
|
|
||||||
|
|
||||||
Commands requiring authorization:
|
Commands requiring authorization:
|
||||||
|
|
||||||
- writes,
|
- writes,
|
||||||
@@ -681,26 +664,6 @@ Metrics:
|
|||||||
|
|
||||||
Do not log credential values or full tag values by default.
|
Do not log credential values or full tag values by default.
|
||||||
|
|
||||||
The gateway registers `GatewayMetrics` as the in-process metrics foundation.
|
|
||||||
It emits .NET `Meter` instruments for collectors and keeps a
|
|
||||||
`GatewayMetricsSnapshot` for dashboard projection. The snapshot exists because
|
|
||||||
the dashboard needs current counters and queue depths without depending on a
|
|
||||||
specific metrics exporter.
|
|
||||||
|
|
||||||
HTTP request handling uses `UseGatewayRequestLoggingScope()` to attach common
|
|
||||||
structured log fields when request metadata is present:
|
|
||||||
|
|
||||||
- `SessionId`,
|
|
||||||
- `ClientIdentity`,
|
|
||||||
- `WorkerProcessId`,
|
|
||||||
- `CorrelationId`,
|
|
||||||
- `CommandMethod`.
|
|
||||||
|
|
||||||
`GatewayLogRedactor` redacts API key secrets and command values before they are
|
|
||||||
added to log state. Value logging remains opt-in and redacted by default so
|
|
||||||
secured writes, authentication commands, and ordinary tag values do not leak
|
|
||||||
through diagnostics.
|
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
Suggested configuration shape:
|
Suggested configuration shape:
|
||||||
@@ -747,18 +710,6 @@ Suggested configuration shape:
|
|||||||
|
|
||||||
Do not scatter connection or path constants through implementation code.
|
Do not scatter connection or path constants through implementation code.
|
||||||
|
|
||||||
`MxGateway.Server` binds this section to `GatewayOptions` at startup and
|
|
||||||
registers validation with `ValidateOnStart()`. Startup fails before the gateway
|
|
||||||
begins serving traffic when required authentication settings are missing,
|
|
||||||
timeouts or queue sizes are not positive, dashboard settings are malformed, or
|
|
||||||
the configured worker protocol version does not match the contract version.
|
|
||||||
|
|
||||||
The gateway exposes read-only effective settings through
|
|
||||||
`IGatewayConfigurationProvider`. This projection is for dashboard settings and
|
|
||||||
diagnostics, so it redacts secret-related fields such as
|
|
||||||
`Authentication:PepperSecretName` and does not include raw API keys or key
|
|
||||||
material.
|
|
||||||
|
|
||||||
## Galaxy Repository Metadata
|
## Galaxy Repository Metadata
|
||||||
|
|
||||||
Galaxy hierarchy and tag metadata can be discovered through SQL Server when
|
Galaxy hierarchy and tag metadata can be discovered through SQL Server when
|
||||||
|
|||||||
@@ -99,13 +99,6 @@ Responsibilities:
|
|||||||
|
|
||||||
The gateway must never instantiate or call MXAccess directly.
|
The gateway must never instantiate or call MXAccess directly.
|
||||||
|
|
||||||
The gateway observability foundation lives in `MxGateway.Server.Diagnostics`
|
|
||||||
and `MxGateway.Server.Metrics`. Structured logging scopes carry session,
|
|
||||||
worker, correlation, command, and client identity fields with redaction applied
|
|
||||||
before values enter log state. `GatewayMetrics` exposes counters, gauges, and
|
|
||||||
histograms through .NET `Meter` and a snapshot API that dashboard services can
|
|
||||||
project without binding to a metrics exporter.
|
|
||||||
|
|
||||||
### Worker Process
|
### Worker Process
|
||||||
|
|
||||||
Runtime:
|
Runtime:
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public enum AuthenticationMode
|
|
||||||
{
|
|
||||||
ApiKey,
|
|
||||||
Disabled
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed class AuthenticationOptions
|
|
||||||
{
|
|
||||||
public AuthenticationMode Mode { get; init; } = AuthenticationMode.ApiKey;
|
|
||||||
|
|
||||||
public string SqlitePath { get; init; } = @"C:\ProgramData\MxGateway\gateway-auth.db";
|
|
||||||
|
|
||||||
public string PepperSecretName { get; init; } = "MxGateway:ApiKeyPepper";
|
|
||||||
|
|
||||||
public bool RunMigrationsOnStartup { get; init; } = true;
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed class DashboardOptions
|
|
||||||
{
|
|
||||||
public bool Enabled { get; init; } = true;
|
|
||||||
|
|
||||||
public string PathBase { get; init; } = "/dashboard";
|
|
||||||
|
|
||||||
public bool RequireAdminScope { get; init; } = true;
|
|
||||||
|
|
||||||
public bool AllowAnonymousLocalhost { get; init; }
|
|
||||||
|
|
||||||
public int SnapshotIntervalMilliseconds { get; init; } = 1_000;
|
|
||||||
|
|
||||||
public int RecentFaultLimit { get; init; } = 100;
|
|
||||||
|
|
||||||
public int RecentSessionLimit { get; init; } = 200;
|
|
||||||
|
|
||||||
public bool ShowTagValues { get; init; }
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed record EffectiveAuthenticationConfiguration(
|
|
||||||
string Mode,
|
|
||||||
string SqlitePath,
|
|
||||||
string PepperSecretName,
|
|
||||||
bool RunMigrationsOnStartup);
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed record EffectiveDashboardConfiguration(
|
|
||||||
bool Enabled,
|
|
||||||
string PathBase,
|
|
||||||
bool RequireAdminScope,
|
|
||||||
bool AllowAnonymousLocalhost,
|
|
||||||
int SnapshotIntervalMilliseconds,
|
|
||||||
int RecentFaultLimit,
|
|
||||||
int RecentSessionLimit,
|
|
||||||
bool ShowTagValues);
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed record EffectiveEventConfiguration(
|
|
||||||
int QueueCapacity,
|
|
||||||
string BackpressurePolicy);
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed record EffectiveGatewayConfiguration(
|
|
||||||
EffectiveAuthenticationConfiguration Authentication,
|
|
||||||
EffectiveWorkerConfiguration Worker,
|
|
||||||
EffectiveSessionConfiguration Sessions,
|
|
||||||
EffectiveEventConfiguration Events,
|
|
||||||
EffectiveDashboardConfiguration Dashboard,
|
|
||||||
EffectiveProtocolConfiguration Protocol);
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed record EffectiveProtocolConfiguration(uint WorkerProtocolVersion);
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed record EffectiveSessionConfiguration(
|
|
||||||
int DefaultCommandTimeoutSeconds,
|
|
||||||
int MaxSessions,
|
|
||||||
bool AllowMultipleEventSubscribers);
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed record EffectiveWorkerConfiguration(
|
|
||||||
string ExecutablePath,
|
|
||||||
string? WorkingDirectory,
|
|
||||||
string RequiredArchitecture,
|
|
||||||
int StartupTimeoutSeconds,
|
|
||||||
int ShutdownTimeoutSeconds,
|
|
||||||
int HeartbeatIntervalSeconds,
|
|
||||||
int HeartbeatGraceSeconds,
|
|
||||||
int MaxMessageBytes);
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public enum EventBackpressurePolicy
|
|
||||||
{
|
|
||||||
FailFast
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed class EventOptions
|
|
||||||
{
|
|
||||||
public int QueueCapacity { get; init; } = 10_000;
|
|
||||||
|
|
||||||
public EventBackpressurePolicy BackpressurePolicy { get; init; } = EventBackpressurePolicy.FailFast;
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
using Microsoft.Extensions.Options;
|
|
||||||
|
|
||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed class GatewayConfigurationProvider(IOptions<GatewayOptions> options) : IGatewayConfigurationProvider
|
|
||||||
{
|
|
||||||
public const string RedactedValue = "[redacted]";
|
|
||||||
|
|
||||||
public EffectiveGatewayConfiguration GetEffectiveConfiguration()
|
|
||||||
{
|
|
||||||
GatewayOptions value = options.Value;
|
|
||||||
|
|
||||||
return new EffectiveGatewayConfiguration(
|
|
||||||
Authentication: new EffectiveAuthenticationConfiguration(
|
|
||||||
Mode: value.Authentication.Mode.ToString(),
|
|
||||||
SqlitePath: value.Authentication.SqlitePath,
|
|
||||||
PepperSecretName: RedactedValue,
|
|
||||||
RunMigrationsOnStartup: value.Authentication.RunMigrationsOnStartup),
|
|
||||||
Worker: new EffectiveWorkerConfiguration(
|
|
||||||
ExecutablePath: value.Worker.ExecutablePath,
|
|
||||||
WorkingDirectory: value.Worker.WorkingDirectory,
|
|
||||||
RequiredArchitecture: value.Worker.RequiredArchitecture.ToString(),
|
|
||||||
StartupTimeoutSeconds: value.Worker.StartupTimeoutSeconds,
|
|
||||||
ShutdownTimeoutSeconds: value.Worker.ShutdownTimeoutSeconds,
|
|
||||||
HeartbeatIntervalSeconds: value.Worker.HeartbeatIntervalSeconds,
|
|
||||||
HeartbeatGraceSeconds: value.Worker.HeartbeatGraceSeconds,
|
|
||||||
MaxMessageBytes: value.Worker.MaxMessageBytes),
|
|
||||||
Sessions: new EffectiveSessionConfiguration(
|
|
||||||
DefaultCommandTimeoutSeconds: value.Sessions.DefaultCommandTimeoutSeconds,
|
|
||||||
MaxSessions: value.Sessions.MaxSessions,
|
|
||||||
AllowMultipleEventSubscribers: value.Sessions.AllowMultipleEventSubscribers),
|
|
||||||
Events: new EffectiveEventConfiguration(
|
|
||||||
QueueCapacity: value.Events.QueueCapacity,
|
|
||||||
BackpressurePolicy: value.Events.BackpressurePolicy.ToString()),
|
|
||||||
Dashboard: new EffectiveDashboardConfiguration(
|
|
||||||
Enabled: value.Dashboard.Enabled,
|
|
||||||
PathBase: value.Dashboard.PathBase,
|
|
||||||
RequireAdminScope: value.Dashboard.RequireAdminScope,
|
|
||||||
AllowAnonymousLocalhost: value.Dashboard.AllowAnonymousLocalhost,
|
|
||||||
SnapshotIntervalMilliseconds: value.Dashboard.SnapshotIntervalMilliseconds,
|
|
||||||
RecentFaultLimit: value.Dashboard.RecentFaultLimit,
|
|
||||||
RecentSessionLimit: value.Dashboard.RecentSessionLimit,
|
|
||||||
ShowTagValues: value.Dashboard.ShowTagValues),
|
|
||||||
Protocol: new EffectiveProtocolConfiguration(value.Protocol.WorkerProtocolVersion));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
using Microsoft.Extensions.Options;
|
|
||||||
|
|
||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public static class GatewayConfigurationServiceCollectionExtensions
|
|
||||||
{
|
|
||||||
public static IServiceCollection AddGatewayConfiguration(this IServiceCollection services)
|
|
||||||
{
|
|
||||||
services
|
|
||||||
.AddOptions<GatewayOptions>()
|
|
||||||
.BindConfiguration(GatewayOptions.SectionName)
|
|
||||||
.ValidateOnStart();
|
|
||||||
|
|
||||||
services.AddSingleton<IValidateOptions<GatewayOptions>, GatewayOptionsValidator>();
|
|
||||||
services.AddSingleton<IGatewayConfigurationProvider, GatewayConfigurationProvider>();
|
|
||||||
|
|
||||||
return services;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed class GatewayOptions
|
|
||||||
{
|
|
||||||
public const string SectionName = "MxGateway";
|
|
||||||
|
|
||||||
public AuthenticationOptions Authentication { get; init; } = new();
|
|
||||||
|
|
||||||
public WorkerOptions Worker { get; init; } = new();
|
|
||||||
|
|
||||||
public SessionOptions Sessions { get; init; } = new();
|
|
||||||
|
|
||||||
public EventOptions Events { get; init; } = new();
|
|
||||||
|
|
||||||
public DashboardOptions Dashboard { get; init; } = new();
|
|
||||||
|
|
||||||
public ProtocolOptions Protocol { get; init; } = new();
|
|
||||||
}
|
|
||||||
@@ -1,210 +0,0 @@
|
|||||||
using Microsoft.Extensions.Options;
|
|
||||||
using MxGateway.Contracts;
|
|
||||||
|
|
||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed class GatewayOptionsValidator : IValidateOptions<GatewayOptions>
|
|
||||||
{
|
|
||||||
private const int MinimumMaxMessageBytes = 1024;
|
|
||||||
private const int MaximumMaxMessageBytes = 256 * 1024 * 1024;
|
|
||||||
|
|
||||||
public ValidateOptionsResult Validate(string? name, GatewayOptions options)
|
|
||||||
{
|
|
||||||
List<string> failures = [];
|
|
||||||
|
|
||||||
ValidateAuthentication(options.Authentication, failures);
|
|
||||||
ValidateWorker(options.Worker, failures);
|
|
||||||
ValidateSessions(options.Sessions, failures);
|
|
||||||
ValidateEvents(options.Events, failures);
|
|
||||||
ValidateDashboard(options.Dashboard, failures);
|
|
||||||
ValidateProtocol(options.Protocol, 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 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.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);
|
|
||||||
}
|
|
||||||
|
|
||||||
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 ValidateProtocol(ProtocolOptions options, List<string> failures)
|
|
||||||
{
|
|
||||||
if (options.WorkerProtocolVersion != GatewayContractInfo.WorkerProtocolVersion)
|
|
||||||
{
|
|
||||||
failures.Add(
|
|
||||||
$"MxGateway:Protocol:WorkerProtocolVersion must be {GatewayContractInfo.WorkerProtocolVersion}.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public interface IGatewayConfigurationProvider
|
|
||||||
{
|
|
||||||
EffectiveGatewayConfiguration GetEffectiveConfiguration();
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
using MxGateway.Contracts;
|
|
||||||
|
|
||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed class ProtocolOptions
|
|
||||||
{
|
|
||||||
public uint WorkerProtocolVersion { get; init; } = GatewayContractInfo.WorkerProtocolVersion;
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed class SessionOptions
|
|
||||||
{
|
|
||||||
public int DefaultCommandTimeoutSeconds { get; init; } = 30;
|
|
||||||
|
|
||||||
public int MaxSessions { get; init; } = 64;
|
|
||||||
|
|
||||||
public bool AllowMultipleEventSubscribers { get; init; }
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public enum WorkerArchitecture
|
|
||||||
{
|
|
||||||
X86,
|
|
||||||
X64
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
namespace MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
public sealed class WorkerOptions
|
|
||||||
{
|
|
||||||
public string ExecutablePath { get; init; } =
|
|
||||||
@"src\MxGateway.Worker\bin\x86\Release\MxGateway.Worker.exe";
|
|
||||||
|
|
||||||
public string? WorkingDirectory { get; init; }
|
|
||||||
|
|
||||||
public WorkerArchitecture RequiredArchitecture { get; init; } = WorkerArchitecture.X86;
|
|
||||||
|
|
||||||
public int StartupTimeoutSeconds { get; init; } = 30;
|
|
||||||
|
|
||||||
public int ShutdownTimeoutSeconds { get; init; } = 10;
|
|
||||||
|
|
||||||
public int HeartbeatIntervalSeconds { get; init; } = 5;
|
|
||||||
|
|
||||||
public int HeartbeatGraceSeconds { get; init; } = 15;
|
|
||||||
|
|
||||||
public int MaxMessageBytes { get; init; } = 16 * 1024 * 1024;
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
namespace MxGateway.Server.Diagnostics;
|
|
||||||
|
|
||||||
public static class GatewayLogRedactor
|
|
||||||
{
|
|
||||||
public const string RedactedValue = "[redacted]";
|
|
||||||
|
|
||||||
private static readonly HashSet<string> SensitiveCommandMethods = new(StringComparer.OrdinalIgnoreCase)
|
|
||||||
{
|
|
||||||
"AuthenticateUser",
|
|
||||||
"WriteSecured",
|
|
||||||
"WriteSecured2"
|
|
||||||
};
|
|
||||||
|
|
||||||
public static bool IsCredentialBearingCommand(string? commandMethod)
|
|
||||||
{
|
|
||||||
return commandMethod is not null
|
|
||||||
&& SensitiveCommandMethods.Contains(commandMethod);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static string? RedactApiKey(string? authorizationHeader)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(authorizationHeader))
|
|
||||||
{
|
|
||||||
return authorizationHeader;
|
|
||||||
}
|
|
||||||
|
|
||||||
const string bearerPrefix = "Bearer ";
|
|
||||||
if (!authorizationHeader.StartsWith(bearerPrefix, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return RedactedValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
string token = authorizationHeader[bearerPrefix.Length..].Trim();
|
|
||||||
|
|
||||||
if (!token.StartsWith("mxgw_", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return $"{bearerPrefix}{RedactedValue}";
|
|
||||||
}
|
|
||||||
|
|
||||||
string[] tokenParts = token.Split('_', 3, StringSplitOptions.RemoveEmptyEntries);
|
|
||||||
if (tokenParts.Length < 2)
|
|
||||||
{
|
|
||||||
return $"{bearerPrefix}mxgw_{RedactedValue}";
|
|
||||||
}
|
|
||||||
|
|
||||||
return $"{bearerPrefix}mxgw_{tokenParts[1]}_{RedactedValue}";
|
|
||||||
}
|
|
||||||
|
|
||||||
public static string? RedactClientIdentity(string? clientIdentity)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(clientIdentity))
|
|
||||||
{
|
|
||||||
return clientIdentity;
|
|
||||||
}
|
|
||||||
|
|
||||||
return clientIdentity.Contains("mxgw_", StringComparison.OrdinalIgnoreCase)
|
|
||||||
? RedactApiKey(clientIdentity)
|
|
||||||
: clientIdentity;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static object? RedactCommandValue(
|
|
||||||
string? commandMethod,
|
|
||||||
object? value,
|
|
||||||
bool valueLoggingEnabled = false)
|
|
||||||
{
|
|
||||||
if (value is null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!valueLoggingEnabled || IsCredentialBearingCommand(commandMethod))
|
|
||||||
{
|
|
||||||
return RedactedValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
namespace MxGateway.Server.Diagnostics;
|
|
||||||
|
|
||||||
public sealed record GatewayLogScope(
|
|
||||||
string? SessionId = null,
|
|
||||||
int? WorkerProcessId = null,
|
|
||||||
ulong? CorrelationId = null,
|
|
||||||
string? CommandMethod = null,
|
|
||||||
string? ClientIdentity = null)
|
|
||||||
{
|
|
||||||
public IReadOnlyDictionary<string, object?> ToDictionary()
|
|
||||||
{
|
|
||||||
Dictionary<string, object?> values = [];
|
|
||||||
|
|
||||||
AddIfPresent(values, "SessionId", SessionId);
|
|
||||||
AddIfPresent(values, "WorkerProcessId", WorkerProcessId);
|
|
||||||
AddIfPresent(values, "CorrelationId", CorrelationId);
|
|
||||||
AddIfPresent(values, "CommandMethod", CommandMethod);
|
|
||||||
AddIfPresent(values, "ClientIdentity", GatewayLogRedactor.RedactClientIdentity(ClientIdentity));
|
|
||||||
|
|
||||||
return values;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void AddIfPresent(
|
|
||||||
Dictionary<string, object?> values,
|
|
||||||
string key,
|
|
||||||
object? value)
|
|
||||||
{
|
|
||||||
if (value is not null)
|
|
||||||
{
|
|
||||||
values[key] = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace MxGateway.Server.Diagnostics;
|
|
||||||
|
|
||||||
public static class GatewayLoggerExtensions
|
|
||||||
{
|
|
||||||
public static IDisposable? BeginGatewayScope(
|
|
||||||
this ILogger logger,
|
|
||||||
GatewayLogScope scope)
|
|
||||||
{
|
|
||||||
ArgumentNullException.ThrowIfNull(logger);
|
|
||||||
ArgumentNullException.ThrowIfNull(scope);
|
|
||||||
|
|
||||||
return logger.BeginScope(scope.ToDictionary());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
using Microsoft.Extensions.Primitives;
|
|
||||||
|
|
||||||
namespace MxGateway.Server.Diagnostics;
|
|
||||||
|
|
||||||
public static class GatewayRequestLoggingMiddlewareExtensions
|
|
||||||
{
|
|
||||||
public const string SessionIdHeaderName = "x-session-id";
|
|
||||||
public const string WorkerProcessIdHeaderName = "x-worker-process-id";
|
|
||||||
public const string CorrelationIdHeaderName = "x-correlation-id";
|
|
||||||
public const string CommandMethodHeaderName = "x-command-method";
|
|
||||||
|
|
||||||
public static IApplicationBuilder UseGatewayRequestLoggingScope(this IApplicationBuilder app)
|
|
||||||
{
|
|
||||||
ArgumentNullException.ThrowIfNull(app);
|
|
||||||
|
|
||||||
return app.Use(async (context, next) =>
|
|
||||||
{
|
|
||||||
ILogger logger = context.RequestServices
|
|
||||||
.GetRequiredService<ILoggerFactory>()
|
|
||||||
.CreateLogger("MxGateway.Request");
|
|
||||||
|
|
||||||
using IDisposable? scope = logger.BeginGatewayScope(new GatewayLogScope(
|
|
||||||
SessionId: ReadHeader(context, SessionIdHeaderName),
|
|
||||||
WorkerProcessId: ReadInt32Header(context, WorkerProcessIdHeaderName),
|
|
||||||
CorrelationId: ReadUInt64Header(context, CorrelationIdHeaderName),
|
|
||||||
CommandMethod: ReadHeader(context, CommandMethodHeaderName),
|
|
||||||
ClientIdentity: ReadHeader(context, "authorization")));
|
|
||||||
|
|
||||||
await next(context);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string? ReadHeader(HttpContext context, string headerName)
|
|
||||||
{
|
|
||||||
return context.Request.Headers.TryGetValue(headerName, out StringValues values)
|
|
||||||
? values.ToString()
|
|
||||||
: null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static int? ReadInt32Header(HttpContext context, string headerName)
|
|
||||||
{
|
|
||||||
string? value = ReadHeader(context, headerName);
|
|
||||||
|
|
||||||
return int.TryParse(value, out int parsedValue)
|
|
||||||
? parsedValue
|
|
||||||
: null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ulong? ReadUInt64Header(HttpContext context, string headerName)
|
|
||||||
{
|
|
||||||
string? value = ReadHeader(context, headerName);
|
|
||||||
|
|
||||||
return ulong.TryParse(value, out ulong parsedValue)
|
|
||||||
? parsedValue
|
|
||||||
: null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +1,4 @@
|
|||||||
using MxGateway.Contracts;
|
using MxGateway.Contracts;
|
||||||
using MxGateway.Server.Configuration;
|
|
||||||
using MxGateway.Server.Diagnostics;
|
|
||||||
using MxGateway.Server.Metrics;
|
|
||||||
using MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
namespace MxGateway.Server;
|
namespace MxGateway.Server;
|
||||||
|
|
||||||
@@ -13,7 +9,6 @@ public static class GatewayApplication
|
|||||||
WebApplicationBuilder builder = CreateBuilder(args);
|
WebApplicationBuilder builder = CreateBuilder(args);
|
||||||
WebApplication app = builder.Build();
|
WebApplication app = builder.Build();
|
||||||
|
|
||||||
app.UseGatewayRequestLoggingScope();
|
|
||||||
app.MapGatewayEndpoints();
|
app.MapGatewayEndpoints();
|
||||||
|
|
||||||
return app;
|
return app;
|
||||||
@@ -23,10 +18,7 @@ public static class GatewayApplication
|
|||||||
{
|
{
|
||||||
WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
|
WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
|
||||||
|
|
||||||
builder.Services.AddGatewayConfiguration();
|
|
||||||
builder.Services.AddSqliteAuthStore();
|
|
||||||
builder.Services.AddHealthChecks();
|
builder.Services.AddHealthChecks();
|
||||||
builder.Services.AddSingleton<GatewayMetrics>();
|
|
||||||
|
|
||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,306 +0,0 @@
|
|||||||
using System.Diagnostics.Metrics;
|
|
||||||
|
|
||||||
namespace MxGateway.Server.Metrics;
|
|
||||||
|
|
||||||
public sealed class GatewayMetrics : IDisposable
|
|
||||||
{
|
|
||||||
public const string MeterName = "MxGateway.Server";
|
|
||||||
|
|
||||||
private readonly object _syncRoot = new();
|
|
||||||
private readonly Meter _meter;
|
|
||||||
private readonly Counter<long> _sessionsOpenedCounter;
|
|
||||||
private readonly Counter<long> _sessionsClosedCounter;
|
|
||||||
private readonly Counter<long> _commandsStartedCounter;
|
|
||||||
private readonly Counter<long> _commandsSucceededCounter;
|
|
||||||
private readonly Counter<long> _commandsFailedCounter;
|
|
||||||
private readonly Counter<long> _eventsReceivedCounter;
|
|
||||||
private readonly Counter<long> _queueOverflowsCounter;
|
|
||||||
private readonly Counter<long> _faultsCounter;
|
|
||||||
private readonly Counter<long> _workerKillsCounter;
|
|
||||||
private readonly Counter<long> _workerExitsCounter;
|
|
||||||
private readonly Counter<long> _heartbeatFailuresCounter;
|
|
||||||
private readonly Counter<long> _streamDisconnectsCounter;
|
|
||||||
private readonly Histogram<double> _workerStartupLatencyHistogram;
|
|
||||||
private readonly Histogram<double> _commandLatencyHistogram;
|
|
||||||
private readonly Histogram<double> _eventStreamSendLatencyHistogram;
|
|
||||||
private readonly Dictionary<string, long> _commandFailuresByMethod = new(StringComparer.OrdinalIgnoreCase);
|
|
||||||
private readonly Dictionary<string, long> _eventsByFamily = new(StringComparer.OrdinalIgnoreCase);
|
|
||||||
|
|
||||||
private int _openSessions;
|
|
||||||
private int _workersRunning;
|
|
||||||
private int _eventQueueDepth;
|
|
||||||
private long _sessionsOpened;
|
|
||||||
private long _sessionsClosed;
|
|
||||||
private long _commandsStarted;
|
|
||||||
private long _commandsSucceeded;
|
|
||||||
private long _commandsFailed;
|
|
||||||
private long _eventsReceived;
|
|
||||||
private long _queueOverflows;
|
|
||||||
private long _faults;
|
|
||||||
private long _workerKills;
|
|
||||||
private long _workerExits;
|
|
||||||
private long _heartbeatFailures;
|
|
||||||
private long _streamDisconnects;
|
|
||||||
private bool _disposed;
|
|
||||||
|
|
||||||
public GatewayMetrics()
|
|
||||||
{
|
|
||||||
_meter = new Meter(MeterName, typeof(GatewayMetrics).Assembly.GetName().Version?.ToString());
|
|
||||||
_sessionsOpenedCounter = _meter.CreateCounter<long>("mxgateway.sessions.opened");
|
|
||||||
_sessionsClosedCounter = _meter.CreateCounter<long>("mxgateway.sessions.closed");
|
|
||||||
_commandsStartedCounter = _meter.CreateCounter<long>("mxgateway.commands.started");
|
|
||||||
_commandsSucceededCounter = _meter.CreateCounter<long>("mxgateway.commands.succeeded");
|
|
||||||
_commandsFailedCounter = _meter.CreateCounter<long>("mxgateway.commands.failed");
|
|
||||||
_eventsReceivedCounter = _meter.CreateCounter<long>("mxgateway.events.received");
|
|
||||||
_queueOverflowsCounter = _meter.CreateCounter<long>("mxgateway.queues.overflows");
|
|
||||||
_faultsCounter = _meter.CreateCounter<long>("mxgateway.faults");
|
|
||||||
_workerKillsCounter = _meter.CreateCounter<long>("mxgateway.workers.killed");
|
|
||||||
_workerExitsCounter = _meter.CreateCounter<long>("mxgateway.workers.exited");
|
|
||||||
_heartbeatFailuresCounter = _meter.CreateCounter<long>("mxgateway.heartbeats.failed");
|
|
||||||
_streamDisconnectsCounter = _meter.CreateCounter<long>("mxgateway.grpc.streams.disconnected");
|
|
||||||
_workerStartupLatencyHistogram = _meter.CreateHistogram<double>("mxgateway.workers.startup.duration", "ms");
|
|
||||||
_commandLatencyHistogram = _meter.CreateHistogram<double>("mxgateway.commands.duration", "ms");
|
|
||||||
_eventStreamSendLatencyHistogram = _meter.CreateHistogram<double>("mxgateway.events.stream_send.duration", "ms");
|
|
||||||
|
|
||||||
_meter.CreateObservableGauge("mxgateway.sessions.open", GetOpenSessions);
|
|
||||||
_meter.CreateObservableGauge("mxgateway.workers.running", GetWorkersRunning);
|
|
||||||
_meter.CreateObservableGauge("mxgateway.events.queue.depth", GetEventQueueDepth);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SessionOpened()
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
_openSessions++;
|
|
||||||
_sessionsOpened++;
|
|
||||||
}
|
|
||||||
|
|
||||||
_sessionsOpenedCounter.Add(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SessionClosed()
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
if (_openSessions > 0)
|
|
||||||
{
|
|
||||||
_openSessions--;
|
|
||||||
}
|
|
||||||
|
|
||||||
_sessionsClosed++;
|
|
||||||
}
|
|
||||||
|
|
||||||
_sessionsClosedCounter.Add(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void WorkerStarted(TimeSpan startupDuration)
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
_workersRunning++;
|
|
||||||
}
|
|
||||||
|
|
||||||
_workerStartupLatencyHistogram.Record(startupDuration.TotalMilliseconds);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void WorkerStopped(string reason)
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
if (_workersRunning > 0)
|
|
||||||
{
|
|
||||||
_workersRunning--;
|
|
||||||
}
|
|
||||||
|
|
||||||
_workerExits++;
|
|
||||||
}
|
|
||||||
|
|
||||||
_workerExitsCounter.Add(1, new KeyValuePair<string, object?>("reason", reason));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void WorkerKilled(string reason)
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
_workerKills++;
|
|
||||||
}
|
|
||||||
|
|
||||||
_workerKillsCounter.Add(1, new KeyValuePair<string, object?>("reason", reason));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void CommandStarted(string method)
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
_commandsStarted++;
|
|
||||||
}
|
|
||||||
|
|
||||||
_commandsStartedCounter.Add(1, new KeyValuePair<string, object?>("method", method));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void CommandSucceeded(string method, TimeSpan duration)
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
_commandsSucceeded++;
|
|
||||||
}
|
|
||||||
|
|
||||||
KeyValuePair<string, object?> methodTag = new("method", method);
|
|
||||||
_commandsSucceededCounter.Add(1, methodTag);
|
|
||||||
_commandLatencyHistogram.Record(duration.TotalMilliseconds, methodTag);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void CommandFailed(string method, string category, TimeSpan duration)
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
_commandsFailed++;
|
|
||||||
Increment(_commandFailuresByMethod, method);
|
|
||||||
}
|
|
||||||
|
|
||||||
KeyValuePair<string, object?> methodTag = new("method", method);
|
|
||||||
KeyValuePair<string, object?> categoryTag = new("category", category);
|
|
||||||
_commandsFailedCounter.Add(1, methodTag, categoryTag);
|
|
||||||
_commandLatencyHistogram.Record(duration.TotalMilliseconds, methodTag, categoryTag);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void EventReceived(string sessionId, string family)
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
_eventsReceived++;
|
|
||||||
Increment(_eventsByFamily, family);
|
|
||||||
}
|
|
||||||
|
|
||||||
_eventsReceivedCounter.Add(
|
|
||||||
1,
|
|
||||||
new KeyValuePair<string, object?>("session_id", sessionId),
|
|
||||||
new KeyValuePair<string, object?>("family", family));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void RecordEventStreamSend(string family, TimeSpan duration)
|
|
||||||
{
|
|
||||||
_eventStreamSendLatencyHistogram.Record(
|
|
||||||
duration.TotalMilliseconds,
|
|
||||||
new KeyValuePair<string, object?>("family", family));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SetEventQueueDepth(int depth)
|
|
||||||
{
|
|
||||||
if (depth < 0)
|
|
||||||
{
|
|
||||||
throw new ArgumentOutOfRangeException(nameof(depth), depth, "Queue depth cannot be negative.");
|
|
||||||
}
|
|
||||||
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
_eventQueueDepth = depth;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void QueueOverflow(string queueName)
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
_queueOverflows++;
|
|
||||||
}
|
|
||||||
|
|
||||||
_queueOverflowsCounter.Add(1, new KeyValuePair<string, object?>("queue", queueName));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Fault(string category)
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
_faults++;
|
|
||||||
}
|
|
||||||
|
|
||||||
_faultsCounter.Add(1, new KeyValuePair<string, object?>("category", category));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void HeartbeatFailed(string sessionId)
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
_heartbeatFailures++;
|
|
||||||
}
|
|
||||||
|
|
||||||
_heartbeatFailuresCounter.Add(1, new KeyValuePair<string, object?>("session_id", sessionId));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void StreamDisconnected(string reason)
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
_streamDisconnects++;
|
|
||||||
}
|
|
||||||
|
|
||||||
_streamDisconnectsCounter.Add(1, new KeyValuePair<string, object?>("reason", reason));
|
|
||||||
}
|
|
||||||
|
|
||||||
public GatewayMetricsSnapshot GetSnapshot()
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
return new GatewayMetricsSnapshot(
|
|
||||||
OpenSessions: _openSessions,
|
|
||||||
WorkersRunning: _workersRunning,
|
|
||||||
EventQueueDepth: _eventQueueDepth,
|
|
||||||
SessionsOpened: _sessionsOpened,
|
|
||||||
SessionsClosed: _sessionsClosed,
|
|
||||||
CommandsStarted: _commandsStarted,
|
|
||||||
CommandsSucceeded: _commandsSucceeded,
|
|
||||||
CommandsFailed: _commandsFailed,
|
|
||||||
EventsReceived: _eventsReceived,
|
|
||||||
QueueOverflows: _queueOverflows,
|
|
||||||
Faults: _faults,
|
|
||||||
WorkerKills: _workerKills,
|
|
||||||
WorkerExits: _workerExits,
|
|
||||||
HeartbeatFailures: _heartbeatFailures,
|
|
||||||
StreamDisconnects: _streamDisconnects,
|
|
||||||
CommandFailuresByMethod: new Dictionary<string, long>(_commandFailuresByMethod, StringComparer.OrdinalIgnoreCase),
|
|
||||||
EventsByFamily: new Dictionary<string, long>(_eventsByFamily, StringComparer.OrdinalIgnoreCase));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
if (_disposed)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_meter.Dispose();
|
|
||||||
_disposed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int GetOpenSessions()
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
return _openSessions;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private int GetWorkersRunning()
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
return _workersRunning;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private int GetEventQueueDepth()
|
|
||||||
{
|
|
||||||
lock (_syncRoot)
|
|
||||||
{
|
|
||||||
return _eventQueueDepth;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void Increment(Dictionary<string, long> values, string key)
|
|
||||||
{
|
|
||||||
values.TryGetValue(key, out long currentValue);
|
|
||||||
values[key] = currentValue + 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
namespace MxGateway.Server.Metrics;
|
|
||||||
|
|
||||||
public sealed record GatewayMetricsSnapshot(
|
|
||||||
int OpenSessions,
|
|
||||||
int WorkersRunning,
|
|
||||||
int EventQueueDepth,
|
|
||||||
long SessionsOpened,
|
|
||||||
long SessionsClosed,
|
|
||||||
long CommandsStarted,
|
|
||||||
long CommandsSucceeded,
|
|
||||||
long CommandsFailed,
|
|
||||||
long EventsReceived,
|
|
||||||
long QueueOverflows,
|
|
||||||
long Faults,
|
|
||||||
long WorkerKills,
|
|
||||||
long WorkerExits,
|
|
||||||
long HeartbeatFailures,
|
|
||||||
long StreamDisconnects,
|
|
||||||
IReadOnlyDictionary<string, long> CommandFailuresByMethod,
|
|
||||||
IReadOnlyDictionary<string, long> EventsByFamily);
|
|
||||||
@@ -4,10 +4,6 @@
|
|||||||
<TargetFramework>net10.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\MxGateway.Contracts\MxGateway.Contracts.csproj" />
|
<ProjectReference Include="..\MxGateway.Contracts\MxGateway.Contracts.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public sealed record ApiKeyAuditEntry(
|
|
||||||
string? KeyId,
|
|
||||||
string EventType,
|
|
||||||
string? RemoteAddress,
|
|
||||||
string? Details);
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public sealed record ApiKeyAuditRecord(
|
|
||||||
long AuditId,
|
|
||||||
string? KeyId,
|
|
||||||
string EventType,
|
|
||||||
string? RemoteAddress,
|
|
||||||
DateTimeOffset CreatedUtc,
|
|
||||||
string? Details);
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public sealed record ApiKeyRecord(
|
|
||||||
string KeyId,
|
|
||||||
string KeyPrefix,
|
|
||||||
byte[] SecretHash,
|
|
||||||
string DisplayName,
|
|
||||||
IReadOnlySet<string> Scopes,
|
|
||||||
DateTimeOffset CreatedUtc,
|
|
||||||
DateTimeOffset? LastUsedUtc,
|
|
||||||
DateTimeOffset? RevokedUtc);
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
using System.Text.Json;
|
|
||||||
|
|
||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public static class ApiKeyScopeSerializer
|
|
||||||
{
|
|
||||||
public static string Serialize(IReadOnlySet<string> scopes)
|
|
||||||
{
|
|
||||||
return JsonSerializer.Serialize(scopes.Order(StringComparer.Ordinal));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static IReadOnlySet<string> Deserialize(string value)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(value))
|
|
||||||
{
|
|
||||||
return new HashSet<string>(StringComparer.Ordinal);
|
|
||||||
}
|
|
||||||
|
|
||||||
string[]? scopes = JsonSerializer.Deserialize<string[]>(value);
|
|
||||||
|
|
||||||
return new HashSet<string>(scopes ?? [], StringComparer.Ordinal);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
using Microsoft.Data.Sqlite;
|
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
using MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public sealed class AuthSqliteConnectionFactory(IOptions<GatewayOptions> options)
|
|
||||||
{
|
|
||||||
public SqliteConnection CreateConnection()
|
|
||||||
{
|
|
||||||
string sqlitePath = options.Value.Authentication.SqlitePath;
|
|
||||||
string? directory = Path.GetDirectoryName(sqlitePath);
|
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(directory))
|
|
||||||
{
|
|
||||||
Directory.CreateDirectory(directory);
|
|
||||||
}
|
|
||||||
|
|
||||||
SqliteConnectionStringBuilder builder = new()
|
|
||||||
{
|
|
||||||
DataSource = sqlitePath,
|
|
||||||
Mode = SqliteOpenMode.ReadWriteCreate
|
|
||||||
};
|
|
||||||
|
|
||||||
return new SqliteConnection(builder.ToString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public sealed class AuthStoreMigrationException(string message) : InvalidOperationException(message);
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
using Microsoft.Extensions.Options;
|
|
||||||
using MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public sealed class AuthStoreMigrationHostedService(
|
|
||||||
IOptions<GatewayOptions> options,
|
|
||||||
IAuthStoreMigrator migrator) : IHostedService
|
|
||||||
{
|
|
||||||
public async Task StartAsync(CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
AuthenticationOptions authentication = options.Value.Authentication;
|
|
||||||
|
|
||||||
if (authentication.Mode == AuthenticationMode.ApiKey && authentication.RunMigrationsOnStartup)
|
|
||||||
{
|
|
||||||
await migrator.MigrateAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task StopAsync(CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public static class AuthStoreServiceCollectionExtensions
|
|
||||||
{
|
|
||||||
public static IServiceCollection AddSqliteAuthStore(this IServiceCollection services)
|
|
||||||
{
|
|
||||||
services.AddSingleton<AuthSqliteConnectionFactory>();
|
|
||||||
services.AddSingleton<IAuthStoreMigrator, SqliteAuthStoreMigrator>();
|
|
||||||
services.AddSingleton<IApiKeyStore, SqliteApiKeyStore>();
|
|
||||||
services.AddSingleton<IApiKeyAuditStore, SqliteApiKeyAuditStore>();
|
|
||||||
services.AddHostedService<AuthStoreMigrationHostedService>();
|
|
||||||
|
|
||||||
return services;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public interface IApiKeyAuditStore
|
|
||||||
{
|
|
||||||
Task AppendAsync(ApiKeyAuditEntry entry, CancellationToken cancellationToken);
|
|
||||||
|
|
||||||
Task<IReadOnlyList<ApiKeyAuditRecord>> ListRecentAsync(int count, CancellationToken cancellationToken);
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public interface IApiKeyStore
|
|
||||||
{
|
|
||||||
Task<ApiKeyRecord?> FindByKeyIdAsync(string keyId, CancellationToken cancellationToken);
|
|
||||||
|
|
||||||
Task<ApiKeyRecord?> FindActiveByKeyIdAsync(string keyId, CancellationToken cancellationToken);
|
|
||||||
|
|
||||||
Task MarkKeyUsedAsync(string keyId, DateTimeOffset usedUtc, CancellationToken cancellationToken);
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public interface IAuthStoreMigrator
|
|
||||||
{
|
|
||||||
Task MigrateAsync(CancellationToken cancellationToken);
|
|
||||||
}
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
using Microsoft.Data.Sqlite;
|
|
||||||
|
|
||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public sealed class SqliteApiKeyAuditStore(AuthSqliteConnectionFactory connectionFactory) : IApiKeyAuditStore
|
|
||||||
{
|
|
||||||
public async Task AppendAsync(ApiKeyAuditEntry entry, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
await using SqliteConnection connection = connectionFactory.CreateConnection();
|
|
||||||
await connection.OpenAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
await using SqliteCommand command = connection.CreateCommand();
|
|
||||||
command.CommandText = """
|
|
||||||
INSERT INTO api_key_audit (key_id, event_type, remote_address, created_utc, details)
|
|
||||||
VALUES ($key_id, $event_type, $remote_address, $created_utc, $details);
|
|
||||||
""";
|
|
||||||
command.Parameters.AddWithValue("$key_id", (object?)entry.KeyId ?? DBNull.Value);
|
|
||||||
command.Parameters.AddWithValue("$event_type", entry.EventType);
|
|
||||||
command.Parameters.AddWithValue("$remote_address", (object?)entry.RemoteAddress ?? DBNull.Value);
|
|
||||||
command.Parameters.AddWithValue("$created_utc", DateTimeOffset.UtcNow.ToString("O"));
|
|
||||||
command.Parameters.AddWithValue("$details", (object?)entry.Details ?? DBNull.Value);
|
|
||||||
|
|
||||||
await command.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<IReadOnlyList<ApiKeyAuditRecord>> ListRecentAsync(int count, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
if (count <= 0)
|
|
||||||
{
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
await using SqliteConnection connection = connectionFactory.CreateConnection();
|
|
||||||
await connection.OpenAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
await using SqliteCommand command = connection.CreateCommand();
|
|
||||||
command.CommandText = """
|
|
||||||
SELECT audit_id, key_id, event_type, remote_address, created_utc, details
|
|
||||||
FROM api_key_audit
|
|
||||||
ORDER BY audit_id DESC
|
|
||||||
LIMIT $count;
|
|
||||||
""";
|
|
||||||
command.Parameters.AddWithValue("$count", count);
|
|
||||||
|
|
||||||
List<ApiKeyAuditRecord> records = [];
|
|
||||||
|
|
||||||
await using SqliteDataReader reader = await command.ExecuteReaderAsync(cancellationToken)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
|
|
||||||
while (await reader.ReadAsync(cancellationToken).ConfigureAwait(false))
|
|
||||||
{
|
|
||||||
records.Add(new ApiKeyAuditRecord(
|
|
||||||
AuditId: reader.GetInt64(0),
|
|
||||||
KeyId: reader.IsDBNull(1) ? null : reader.GetString(1),
|
|
||||||
EventType: reader.GetString(2),
|
|
||||||
RemoteAddress: reader.IsDBNull(3) ? null : reader.GetString(3),
|
|
||||||
CreatedUtc: DateTimeOffset.Parse(
|
|
||||||
reader.GetString(4),
|
|
||||||
System.Globalization.CultureInfo.InvariantCulture),
|
|
||||||
Details: reader.IsDBNull(5) ? null : reader.GetString(5)));
|
|
||||||
}
|
|
||||||
|
|
||||||
return records;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
using Microsoft.Data.Sqlite;
|
|
||||||
|
|
||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public sealed class SqliteApiKeyStore(AuthSqliteConnectionFactory connectionFactory) : IApiKeyStore
|
|
||||||
{
|
|
||||||
public Task<ApiKeyRecord?> FindByKeyIdAsync(string keyId, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
return FindByKeyIdAsync(keyId, requireActive: false, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task<ApiKeyRecord?> FindActiveByKeyIdAsync(string keyId, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
return FindByKeyIdAsync(keyId, requireActive: true, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task MarkKeyUsedAsync(string keyId, DateTimeOffset usedUtc, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
await using SqliteConnection connection = connectionFactory.CreateConnection();
|
|
||||||
await connection.OpenAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
await using SqliteCommand command = connection.CreateCommand();
|
|
||||||
command.CommandText = """
|
|
||||||
UPDATE api_keys
|
|
||||||
SET last_used_utc = $last_used_utc
|
|
||||||
WHERE key_id = $key_id AND revoked_utc IS NULL;
|
|
||||||
""";
|
|
||||||
command.Parameters.AddWithValue("$key_id", keyId);
|
|
||||||
command.Parameters.AddWithValue("$last_used_utc", usedUtc.ToString("O"));
|
|
||||||
|
|
||||||
await command.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<ApiKeyRecord?> FindByKeyIdAsync(
|
|
||||||
string keyId,
|
|
||||||
bool requireActive,
|
|
||||||
CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
await using SqliteConnection connection = connectionFactory.CreateConnection();
|
|
||||||
await connection.OpenAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
await using SqliteCommand command = connection.CreateCommand();
|
|
||||||
command.CommandText = requireActive
|
|
||||||
? """
|
|
||||||
SELECT key_id, key_prefix, secret_hash, display_name, scopes, created_utc, last_used_utc, revoked_utc
|
|
||||||
FROM api_keys
|
|
||||||
WHERE key_id = $key_id AND revoked_utc IS NULL;
|
|
||||||
"""
|
|
||||||
: """
|
|
||||||
SELECT key_id, key_prefix, secret_hash, display_name, scopes, created_utc, last_used_utc, revoked_utc
|
|
||||||
FROM api_keys
|
|
||||||
WHERE key_id = $key_id;
|
|
||||||
""";
|
|
||||||
command.Parameters.AddWithValue("$key_id", keyId);
|
|
||||||
|
|
||||||
await using SqliteDataReader reader = await command.ExecuteReaderAsync(cancellationToken)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (!await reader.ReadAsync(cancellationToken).ConfigureAwait(false))
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ReadApiKeyRecord(reader);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ApiKeyRecord ReadApiKeyRecord(SqliteDataReader reader)
|
|
||||||
{
|
|
||||||
return new ApiKeyRecord(
|
|
||||||
KeyId: reader.GetString(0),
|
|
||||||
KeyPrefix: reader.GetString(1),
|
|
||||||
SecretHash: (byte[])reader["secret_hash"],
|
|
||||||
DisplayName: reader.GetString(3),
|
|
||||||
Scopes: ApiKeyScopeSerializer.Deserialize(reader.GetString(4)),
|
|
||||||
CreatedUtc: DateTimeOffset.Parse(reader.GetString(5), System.Globalization.CultureInfo.InvariantCulture),
|
|
||||||
LastUsedUtc: ReadNullableDateTimeOffset(reader, 6),
|
|
||||||
RevokedUtc: ReadNullableDateTimeOffset(reader, 7));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static DateTimeOffset? ReadNullableDateTimeOffset(SqliteDataReader reader, int ordinal)
|
|
||||||
{
|
|
||||||
return reader.IsDBNull(ordinal)
|
|
||||||
? null
|
|
||||||
: DateTimeOffset.Parse(reader.GetString(ordinal), System.Globalization.CultureInfo.InvariantCulture);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public static class SqliteAuthSchema
|
|
||||||
{
|
|
||||||
public const int CurrentVersion = 1;
|
|
||||||
|
|
||||||
public const string SchemaVersionTable = "schema_version";
|
|
||||||
|
|
||||||
public const string ApiKeysTable = "api_keys";
|
|
||||||
|
|
||||||
public const string ApiKeyAuditTable = "api_key_audit";
|
|
||||||
}
|
|
||||||
@@ -1,135 +0,0 @@
|
|||||||
using Microsoft.Data.Sqlite;
|
|
||||||
|
|
||||||
namespace MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
public sealed class SqliteAuthStoreMigrator(AuthSqliteConnectionFactory connectionFactory) : IAuthStoreMigrator
|
|
||||||
{
|
|
||||||
public async Task MigrateAsync(CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
await using SqliteConnection connection = connectionFactory.CreateConnection();
|
|
||||||
await connection.OpenAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
await using SqliteTransaction transaction =
|
|
||||||
(SqliteTransaction)await connection.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
int existingVersion = await ReadExistingSchemaVersionAsync(connection, transaction, cancellationToken)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (existingVersion > SqliteAuthSchema.CurrentVersion)
|
|
||||||
{
|
|
||||||
throw new AuthStoreMigrationException(
|
|
||||||
$"Auth database schema version {existingVersion} is newer than supported version {SqliteAuthSchema.CurrentVersion}.");
|
|
||||||
}
|
|
||||||
|
|
||||||
await ApplyVersionOneAsync(connection, transaction, cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<int> ReadExistingSchemaVersionAsync(
|
|
||||||
SqliteConnection connection,
|
|
||||||
SqliteTransaction transaction,
|
|
||||||
CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
await using SqliteCommand tableExistsCommand = connection.CreateCommand();
|
|
||||||
tableExistsCommand.Transaction = transaction;
|
|
||||||
tableExistsCommand.CommandText = """
|
|
||||||
SELECT COUNT(*)
|
|
||||||
FROM sqlite_master
|
|
||||||
WHERE type = 'table' AND name = $table_name;
|
|
||||||
""";
|
|
||||||
tableExistsCommand.Parameters.AddWithValue("$table_name", SqliteAuthSchema.SchemaVersionTable);
|
|
||||||
|
|
||||||
long tableCount = (long)(await tableExistsCommand.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false) ?? 0L);
|
|
||||||
|
|
||||||
if (tableCount == 0)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
await using SqliteCommand versionCommand = connection.CreateCommand();
|
|
||||||
versionCommand.Transaction = transaction;
|
|
||||||
versionCommand.CommandText = """
|
|
||||||
SELECT version
|
|
||||||
FROM schema_version
|
|
||||||
WHERE id = 1;
|
|
||||||
""";
|
|
||||||
|
|
||||||
object? version = await versionCommand.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
return version is null || version == DBNull.Value
|
|
||||||
? 0
|
|
||||||
: Convert.ToInt32(version, System.Globalization.CultureInfo.InvariantCulture);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task ApplyVersionOneAsync(
|
|
||||||
SqliteConnection connection,
|
|
||||||
SqliteTransaction transaction,
|
|
||||||
CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
await ExecuteNonQueryAsync(
|
|
||||||
connection,
|
|
||||||
transaction,
|
|
||||||
"""
|
|
||||||
CREATE TABLE IF NOT EXISTS schema_version (
|
|
||||||
id INTEGER PRIMARY KEY CHECK (id = 1),
|
|
||||||
version INTEGER NOT NULL,
|
|
||||||
applied_utc TEXT NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS api_keys (
|
|
||||||
key_id TEXT PRIMARY KEY,
|
|
||||||
key_prefix TEXT NOT NULL,
|
|
||||||
secret_hash BLOB NOT NULL,
|
|
||||||
display_name TEXT NOT NULL,
|
|
||||||
scopes TEXT NOT NULL,
|
|
||||||
created_utc TEXT NOT NULL,
|
|
||||||
last_used_utc TEXT NULL,
|
|
||||||
revoked_utc TEXT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS api_key_audit (
|
|
||||||
audit_id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
||||||
key_id TEXT NULL,
|
|
||||||
event_type TEXT NOT NULL,
|
|
||||||
remote_address TEXT NULL,
|
|
||||||
created_utc TEXT NOT NULL,
|
|
||||||
details TEXT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS ix_api_keys_revoked_utc
|
|
||||||
ON api_keys (revoked_utc);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS ix_api_key_audit_key_id_created_utc
|
|
||||||
ON api_key_audit (key_id, created_utc);
|
|
||||||
""",
|
|
||||||
cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
await using SqliteCommand versionCommand = connection.CreateCommand();
|
|
||||||
versionCommand.Transaction = transaction;
|
|
||||||
versionCommand.CommandText = """
|
|
||||||
INSERT INTO schema_version (id, version, applied_utc)
|
|
||||||
VALUES (1, $version, $applied_utc)
|
|
||||||
ON CONFLICT(id) DO UPDATE SET
|
|
||||||
version = excluded.version,
|
|
||||||
applied_utc = excluded.applied_utc;
|
|
||||||
""";
|
|
||||||
versionCommand.Parameters.AddWithValue("$version", SqliteAuthSchema.CurrentVersion);
|
|
||||||
versionCommand.Parameters.AddWithValue("$applied_utc", DateTimeOffset.UtcNow.ToString("O"));
|
|
||||||
|
|
||||||
await versionCommand.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task ExecuteNonQueryAsync(
|
|
||||||
SqliteConnection connection,
|
|
||||||
SqliteTransaction transaction,
|
|
||||||
string commandText,
|
|
||||||
CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
await using SqliteCommand command = connection.CreateCommand();
|
|
||||||
command.Transaction = transaction;
|
|
||||||
command.CommandText = commandText;
|
|
||||||
|
|
||||||
await command.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,44 +5,5 @@
|
|||||||
"Microsoft.AspNetCore": "Warning"
|
"Microsoft.AspNetCore": "Warning"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"AllowedHosts": "*",
|
"AllowedHosts": "*"
|
||||||
"MxGateway": {
|
|
||||||
"Authentication": {
|
|
||||||
"Mode": "ApiKey",
|
|
||||||
"SqlitePath": "C:\\ProgramData\\MxGateway\\gateway-auth.db",
|
|
||||||
"PepperSecretName": "MxGateway:ApiKeyPepper",
|
|
||||||
"RunMigrationsOnStartup": true
|
|
||||||
},
|
|
||||||
"Worker": {
|
|
||||||
"ExecutablePath": "src\\MxGateway.Worker\\bin\\x86\\Release\\MxGateway.Worker.exe",
|
|
||||||
"RequiredArchitecture": "X86",
|
|
||||||
"StartupTimeoutSeconds": 30,
|
|
||||||
"ShutdownTimeoutSeconds": 10,
|
|
||||||
"HeartbeatIntervalSeconds": 5,
|
|
||||||
"HeartbeatGraceSeconds": 15,
|
|
||||||
"MaxMessageBytes": 16777216
|
|
||||||
},
|
|
||||||
"Sessions": {
|
|
||||||
"DefaultCommandTimeoutSeconds": 30,
|
|
||||||
"MaxSessions": 64,
|
|
||||||
"AllowMultipleEventSubscribers": false
|
|
||||||
},
|
|
||||||
"Events": {
|
|
||||||
"QueueCapacity": 10000,
|
|
||||||
"BackpressurePolicy": "FailFast"
|
|
||||||
},
|
|
||||||
"Dashboard": {
|
|
||||||
"Enabled": true,
|
|
||||||
"PathBase": "/dashboard",
|
|
||||||
"RequireAdminScope": true,
|
|
||||||
"AllowAnonymousLocalhost": false,
|
|
||||||
"SnapshotIntervalMilliseconds": 1000,
|
|
||||||
"RecentFaultLimit": 100,
|
|
||||||
"RecentSessionLimit": 200,
|
|
||||||
"ShowTagValues": false
|
|
||||||
},
|
|
||||||
"Protocol": {
|
|
||||||
"WorkerProtocolVersion": 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,119 +0,0 @@
|
|||||||
using Microsoft.Extensions.Configuration;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
using MxGateway.Server.Configuration;
|
|
||||||
|
|
||||||
namespace MxGateway.Tests.Configuration;
|
|
||||||
|
|
||||||
public sealed class GatewayOptionsTests
|
|
||||||
{
|
|
||||||
[Fact]
|
|
||||||
public void OptionsBinding_UsesDesignDefaults()
|
|
||||||
{
|
|
||||||
GatewayOptions options = BindOptions(new Dictionary<string, string?>());
|
|
||||||
|
|
||||||
Assert.Equal(AuthenticationMode.ApiKey, options.Authentication.Mode);
|
|
||||||
Assert.Equal(@"C:\ProgramData\MxGateway\gateway-auth.db", options.Authentication.SqlitePath);
|
|
||||||
Assert.Equal("MxGateway:ApiKeyPepper", options.Authentication.PepperSecretName);
|
|
||||||
Assert.True(options.Authentication.RunMigrationsOnStartup);
|
|
||||||
|
|
||||||
Assert.Equal(@"src\MxGateway.Worker\bin\x86\Release\MxGateway.Worker.exe", options.Worker.ExecutablePath);
|
|
||||||
Assert.Equal(WorkerArchitecture.X86, options.Worker.RequiredArchitecture);
|
|
||||||
Assert.Equal(30, options.Worker.StartupTimeoutSeconds);
|
|
||||||
Assert.Equal(10, options.Worker.ShutdownTimeoutSeconds);
|
|
||||||
Assert.Equal(5, options.Worker.HeartbeatIntervalSeconds);
|
|
||||||
Assert.Equal(15, options.Worker.HeartbeatGraceSeconds);
|
|
||||||
Assert.Equal(16 * 1024 * 1024, options.Worker.MaxMessageBytes);
|
|
||||||
|
|
||||||
Assert.Equal(30, options.Sessions.DefaultCommandTimeoutSeconds);
|
|
||||||
Assert.Equal(64, options.Sessions.MaxSessions);
|
|
||||||
Assert.False(options.Sessions.AllowMultipleEventSubscribers);
|
|
||||||
|
|
||||||
Assert.Equal(10_000, options.Events.QueueCapacity);
|
|
||||||
Assert.Equal(EventBackpressurePolicy.FailFast, options.Events.BackpressurePolicy);
|
|
||||||
|
|
||||||
Assert.True(options.Dashboard.Enabled);
|
|
||||||
Assert.Equal("/dashboard", options.Dashboard.PathBase);
|
|
||||||
Assert.True(options.Dashboard.RequireAdminScope);
|
|
||||||
Assert.False(options.Dashboard.AllowAnonymousLocalhost);
|
|
||||||
Assert.Equal(1_000, options.Dashboard.SnapshotIntervalMilliseconds);
|
|
||||||
Assert.Equal(100, options.Dashboard.RecentFaultLimit);
|
|
||||||
Assert.Equal(200, options.Dashboard.RecentSessionLimit);
|
|
||||||
Assert.False(options.Dashboard.ShowTagValues);
|
|
||||||
|
|
||||||
Assert.Equal(1u, options.Protocol.WorkerProtocolVersion);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void OptionsBinding_AppliesConfigurationOverrides()
|
|
||||||
{
|
|
||||||
GatewayOptions options = BindOptions(
|
|
||||||
new Dictionary<string, string?>
|
|
||||||
{
|
|
||||||
["MxGateway:Authentication:Mode"] = "Disabled",
|
|
||||||
["MxGateway:Worker:ExecutablePath"] = @"C:\Gateway\MxGateway.Worker.exe",
|
|
||||||
["MxGateway:Sessions:MaxSessions"] = "12",
|
|
||||||
["MxGateway:Events:QueueCapacity"] = "256",
|
|
||||||
["MxGateway:Dashboard:Enabled"] = "false"
|
|
||||||
});
|
|
||||||
|
|
||||||
Assert.Equal(AuthenticationMode.Disabled, options.Authentication.Mode);
|
|
||||||
Assert.Equal(@"C:\Gateway\MxGateway.Worker.exe", options.Worker.ExecutablePath);
|
|
||||||
Assert.Equal(12, options.Sessions.MaxSessions);
|
|
||||||
Assert.Equal(256, options.Events.QueueCapacity);
|
|
||||||
Assert.False(options.Dashboard.Enabled);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData("MxGateway:Worker:ExecutablePath", "worker.dll", "MxGateway:Worker:ExecutablePath must point to a .exe file.")]
|
|
||||||
[InlineData("MxGateway:Events:QueueCapacity", "0", "MxGateway:Events:QueueCapacity must be greater than zero.")]
|
|
||||||
[InlineData("MxGateway:Authentication:PepperSecretName", "", "MxGateway:Authentication:PepperSecretName is required")]
|
|
||||||
[InlineData("MxGateway:Dashboard:PathBase", "dashboard", "MxGateway:Dashboard:PathBase must start with '/'.")]
|
|
||||||
public void Validation_InvalidConfiguration_FailsClearly(string key, string value, string expectedFailure)
|
|
||||||
{
|
|
||||||
OptionsValidationException exception = Assert.Throws<OptionsValidationException>(() =>
|
|
||||||
_ = BindOptions(new Dictionary<string, string?> { [key] = value }));
|
|
||||||
|
|
||||||
Assert.Contains(exception.Failures, failure => failure.Contains(expectedFailure, StringComparison.Ordinal));
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void EffectiveConfiguration_RedactsPepperSecretName()
|
|
||||||
{
|
|
||||||
using ServiceProvider services = BuildServices(
|
|
||||||
new Dictionary<string, string?>
|
|
||||||
{
|
|
||||||
["MxGateway:Authentication:PepperSecretName"] = "RawPepperSecretName"
|
|
||||||
});
|
|
||||||
|
|
||||||
IGatewayConfigurationProvider provider = services.GetRequiredService<IGatewayConfigurationProvider>();
|
|
||||||
|
|
||||||
EffectiveGatewayConfiguration configuration = provider.GetEffectiveConfiguration();
|
|
||||||
|
|
||||||
Assert.Equal(GatewayConfigurationProvider.RedactedValue, configuration.Authentication.PepperSecretName);
|
|
||||||
Assert.DoesNotContain(
|
|
||||||
"RawPepperSecretName",
|
|
||||||
System.Text.Json.JsonSerializer.Serialize(configuration),
|
|
||||||
StringComparison.Ordinal);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static GatewayOptions BindOptions(IReadOnlyDictionary<string, string?> configurationValues)
|
|
||||||
{
|
|
||||||
using ServiceProvider services = BuildServices(configurationValues);
|
|
||||||
|
|
||||||
return services.GetRequiredService<IOptions<GatewayOptions>>().Value;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ServiceProvider BuildServices(IReadOnlyDictionary<string, string?> configurationValues)
|
|
||||||
{
|
|
||||||
IConfigurationRoot configuration = new ConfigurationBuilder()
|
|
||||||
.AddInMemoryCollection(configurationValues)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
ServiceCollection services = new();
|
|
||||||
services.AddSingleton<IConfiguration>(configuration);
|
|
||||||
services.AddGatewayConfiguration();
|
|
||||||
|
|
||||||
return services.BuildServiceProvider(validateScopes: true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
using MxGateway.Server.Diagnostics;
|
|
||||||
|
|
||||||
namespace MxGateway.Tests.Diagnostics;
|
|
||||||
|
|
||||||
public sealed class GatewayLogRedactorTests
|
|
||||||
{
|
|
||||||
[Fact]
|
|
||||||
public void RedactApiKey_PreservesKeyIdAndRemovesSecret()
|
|
||||||
{
|
|
||||||
string? redacted = GatewayLogRedactor.RedactApiKey("Bearer mxgw_operator01_super-secret");
|
|
||||||
|
|
||||||
Assert.Equal("Bearer mxgw_operator01_[redacted]", redacted);
|
|
||||||
Assert.DoesNotContain("super-secret", redacted);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData("AuthenticateUser")]
|
|
||||||
[InlineData("WriteSecured")]
|
|
||||||
[InlineData("WriteSecured2")]
|
|
||||||
public void IsCredentialBearingCommand_IdentifiesSensitiveMxAccessCommands(string commandMethod)
|
|
||||||
{
|
|
||||||
Assert.True(GatewayLogRedactor.IsCredentialBearingCommand(commandMethod));
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void RedactCommandValue_DoesNotLogRawValuesByDefault()
|
|
||||||
{
|
|
||||||
object? redacted = GatewayLogRedactor.RedactCommandValue("Write", "plaintext-tag-value");
|
|
||||||
|
|
||||||
Assert.Equal("[redacted]", redacted);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void RedactCommandValue_RedactsSecuredWriteEvenWhenValueLoggingIsEnabled()
|
|
||||||
{
|
|
||||||
object? redacted = GatewayLogRedactor.RedactCommandValue(
|
|
||||||
"WriteSecured",
|
|
||||||
"credential-bearing-value",
|
|
||||||
valueLoggingEnabled: true);
|
|
||||||
|
|
||||||
Assert.Equal("[redacted]", redacted);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void RedactCommandValue_AllowsNonSensitiveValueOnlyWhenValueLoggingIsEnabled()
|
|
||||||
{
|
|
||||||
object? redacted = GatewayLogRedactor.RedactCommandValue(
|
|
||||||
"Write",
|
|
||||||
"diagnostic-value",
|
|
||||||
valueLoggingEnabled: true);
|
|
||||||
|
|
||||||
Assert.Equal("diagnostic-value", redacted);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void LogScope_RedactsClientIdentityBeforeScopeStateIsCreated()
|
|
||||||
{
|
|
||||||
GatewayLogScope scope = new(
|
|
||||||
SessionId: "session-1",
|
|
||||||
WorkerProcessId: 1234,
|
|
||||||
CorrelationId: 99,
|
|
||||||
CommandMethod: "AuthenticateUser",
|
|
||||||
ClientIdentity: "Bearer mxgw_admin_secret");
|
|
||||||
|
|
||||||
IReadOnlyDictionary<string, object?> values = scope.ToDictionary();
|
|
||||||
|
|
||||||
Assert.Equal("session-1", values["SessionId"]);
|
|
||||||
Assert.Equal(1234, values["WorkerProcessId"]);
|
|
||||||
Assert.Equal((ulong)99, values["CorrelationId"]);
|
|
||||||
Assert.Equal("AuthenticateUser", values["CommandMethod"]);
|
|
||||||
Assert.Equal("Bearer mxgw_admin_[redacted]", values["ClientIdentity"]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +1,6 @@
|
|||||||
using Microsoft.AspNetCore.Builder;
|
using Microsoft.AspNetCore.Builder;
|
||||||
using Microsoft.AspNetCore.Routing;
|
using Microsoft.AspNetCore.Routing;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
using MxGateway.Server;
|
using MxGateway.Server;
|
||||||
using MxGateway.Server.Metrics;
|
|
||||||
|
|
||||||
namespace MxGateway.Tests.Gateway;
|
namespace MxGateway.Tests.Gateway;
|
||||||
|
|
||||||
@@ -22,47 +19,4 @@ public sealed class GatewayApplicationTests
|
|||||||
|
|
||||||
Assert.Equal("LiveHealth", endpoint.Metadata.GetMetadata<IEndpointNameMetadata>()?.EndpointName);
|
Assert.Equal("LiveHealth", endpoint.Metadata.GetMetadata<IEndpointNameMetadata>()?.EndpointName);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void Build_RegistersGatewayMetrics()
|
|
||||||
{
|
|
||||||
WebApplication app = GatewayApplication.Build([]);
|
|
||||||
|
|
||||||
GatewayMetrics metrics = app.Services.GetRequiredService<GatewayMetrics>();
|
|
||||||
|
|
||||||
Assert.NotNull(metrics);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(
|
|
||||||
"MxGateway:Worker:ExecutablePath",
|
|
||||||
"worker.dll",
|
|
||||||
"MxGateway:Worker:ExecutablePath must point to a .exe file.")]
|
|
||||||
[InlineData(
|
|
||||||
"MxGateway:Events:QueueCapacity",
|
|
||||||
"0",
|
|
||||||
"MxGateway:Events:QueueCapacity must be greater than zero.")]
|
|
||||||
[InlineData(
|
|
||||||
"MxGateway:Authentication:PepperSecretName",
|
|
||||||
"",
|
|
||||||
"MxGateway:Authentication:PepperSecretName is required")]
|
|
||||||
[InlineData(
|
|
||||||
"MxGateway:Dashboard:PathBase",
|
|
||||||
"dashboard",
|
|
||||||
"MxGateway:Dashboard:PathBase must start with '/'.")]
|
|
||||||
public async Task StartAsync_InvalidGatewayConfiguration_FailsStartup(
|
|
||||||
string key,
|
|
||||||
string value,
|
|
||||||
string expectedFailure)
|
|
||||||
{
|
|
||||||
await using WebApplication app = GatewayApplication.Build(
|
|
||||||
[$"--{key}={value}", "--urls=http://127.0.0.1:0"]);
|
|
||||||
|
|
||||||
OptionsValidationException exception = await Assert.ThrowsAsync<OptionsValidationException>(
|
|
||||||
() => app.StartAsync());
|
|
||||||
|
|
||||||
Assert.Contains(
|
|
||||||
exception.Failures,
|
|
||||||
failure => failure.Contains(expectedFailure, StringComparison.Ordinal));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
using MxGateway.Server.Metrics;
|
|
||||||
|
|
||||||
namespace MxGateway.Tests.Metrics;
|
|
||||||
|
|
||||||
public sealed class GatewayMetricsTests
|
|
||||||
{
|
|
||||||
[Fact]
|
|
||||||
public void GetSnapshot_ReflectsSessionWorkerCommandEventAndFaultUpdates()
|
|
||||||
{
|
|
||||||
using GatewayMetrics metrics = new();
|
|
||||||
|
|
||||||
metrics.SessionOpened();
|
|
||||||
metrics.WorkerStarted(TimeSpan.FromMilliseconds(250));
|
|
||||||
metrics.CommandStarted("Register");
|
|
||||||
metrics.CommandSucceeded("Register", TimeSpan.FromMilliseconds(10));
|
|
||||||
metrics.CommandStarted("WriteSecured");
|
|
||||||
metrics.CommandFailed("WriteSecured", "AuthorizationFailed", TimeSpan.FromMilliseconds(12));
|
|
||||||
metrics.EventReceived("session-1", "OnDataChange");
|
|
||||||
metrics.EventReceived("session-1", "OnDataChange");
|
|
||||||
metrics.SetEventQueueDepth(7);
|
|
||||||
metrics.QueueOverflow("session-events");
|
|
||||||
metrics.Fault("CommandTimeout");
|
|
||||||
metrics.WorkerKilled("CommandTimeout");
|
|
||||||
metrics.WorkerStopped("Killed");
|
|
||||||
metrics.HeartbeatFailed("session-1");
|
|
||||||
metrics.StreamDisconnected("ClientCancelled");
|
|
||||||
metrics.SessionClosed();
|
|
||||||
|
|
||||||
GatewayMetricsSnapshot snapshot = metrics.GetSnapshot();
|
|
||||||
|
|
||||||
Assert.Equal(0, snapshot.OpenSessions);
|
|
||||||
Assert.Equal(0, snapshot.WorkersRunning);
|
|
||||||
Assert.Equal(7, snapshot.EventQueueDepth);
|
|
||||||
Assert.Equal(1, snapshot.SessionsOpened);
|
|
||||||
Assert.Equal(1, snapshot.SessionsClosed);
|
|
||||||
Assert.Equal(2, snapshot.CommandsStarted);
|
|
||||||
Assert.Equal(1, snapshot.CommandsSucceeded);
|
|
||||||
Assert.Equal(1, snapshot.CommandsFailed);
|
|
||||||
Assert.Equal(2, snapshot.EventsReceived);
|
|
||||||
Assert.Equal(1, snapshot.QueueOverflows);
|
|
||||||
Assert.Equal(1, snapshot.Faults);
|
|
||||||
Assert.Equal(1, snapshot.WorkerKills);
|
|
||||||
Assert.Equal(1, snapshot.WorkerExits);
|
|
||||||
Assert.Equal(1, snapshot.HeartbeatFailures);
|
|
||||||
Assert.Equal(1, snapshot.StreamDisconnects);
|
|
||||||
Assert.Equal(1, snapshot.CommandFailuresByMethod["WriteSecured"]);
|
|
||||||
Assert.Equal(2, snapshot.EventsByFamily["OnDataChange"]);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void SetEventQueueDepth_RejectsNegativeDepth()
|
|
||||||
{
|
|
||||||
using GatewayMetrics metrics = new();
|
|
||||||
|
|
||||||
ArgumentOutOfRangeException exception = Assert.Throws<ArgumentOutOfRangeException>(
|
|
||||||
() => metrics.SetEventQueueDepth(-1));
|
|
||||||
|
|
||||||
Assert.Equal("depth", exception.ParamName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,280 +0,0 @@
|
|||||||
using Microsoft.AspNetCore.Builder;
|
|
||||||
using Microsoft.Data.Sqlite;
|
|
||||||
using Microsoft.Extensions.Configuration;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using MxGateway.Server;
|
|
||||||
using MxGateway.Server.Configuration;
|
|
||||||
using MxGateway.Server.Security.Authentication;
|
|
||||||
|
|
||||||
namespace MxGateway.Tests.Security.Authentication;
|
|
||||||
|
|
||||||
public sealed class SqliteAuthStoreTests
|
|
||||||
{
|
|
||||||
[Fact]
|
|
||||||
public async Task MigrateAsync_EmptyDatabase_InitializesCurrentSchema()
|
|
||||||
{
|
|
||||||
string databasePath = CreateTempDatabasePath();
|
|
||||||
await using ServiceProvider services = BuildAuthServices(databasePath);
|
|
||||||
|
|
||||||
IAuthStoreMigrator migrator = services.GetRequiredService<IAuthStoreMigrator>();
|
|
||||||
|
|
||||||
await migrator.MigrateAsync(CancellationToken.None);
|
|
||||||
|
|
||||||
Assert.Equal(SqliteAuthSchema.CurrentVersion, await ReadSchemaVersionAsync(databasePath));
|
|
||||||
Assert.True(await TableExistsAsync(databasePath, SqliteAuthSchema.ApiKeysTable));
|
|
||||||
Assert.True(await TableExistsAsync(databasePath, SqliteAuthSchema.ApiKeyAuditTable));
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task MigrateAsync_ExistingVersionZeroDatabase_MigratesIdempotently()
|
|
||||||
{
|
|
||||||
string databasePath = CreateTempDatabasePath();
|
|
||||||
await CreateVersionZeroDatabaseAsync(databasePath);
|
|
||||||
await using ServiceProvider services = BuildAuthServices(databasePath);
|
|
||||||
|
|
||||||
IAuthStoreMigrator migrator = services.GetRequiredService<IAuthStoreMigrator>();
|
|
||||||
|
|
||||||
await migrator.MigrateAsync(CancellationToken.None);
|
|
||||||
await migrator.MigrateAsync(CancellationToken.None);
|
|
||||||
|
|
||||||
Assert.Equal(SqliteAuthSchema.CurrentVersion, await ReadSchemaVersionAsync(databasePath));
|
|
||||||
Assert.True(await TableExistsAsync(databasePath, SqliteAuthSchema.ApiKeysTable));
|
|
||||||
Assert.True(await TableExistsAsync(databasePath, SqliteAuthSchema.ApiKeyAuditTable));
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task StartAsync_NewerSchemaVersion_BlocksStartup()
|
|
||||||
{
|
|
||||||
string databasePath = CreateTempDatabasePath();
|
|
||||||
await CreateSchemaVersionDatabaseAsync(databasePath, SqliteAuthSchema.CurrentVersion + 1);
|
|
||||||
|
|
||||||
await using WebApplication app = GatewayApplication.Build(
|
|
||||||
[
|
|
||||||
$"--MxGateway:Authentication:SqlitePath={databasePath}",
|
|
||||||
"--urls=http://127.0.0.1:0"
|
|
||||||
]);
|
|
||||||
|
|
||||||
AuthStoreMigrationException exception = await Assert.ThrowsAsync<AuthStoreMigrationException>(
|
|
||||||
() => app.StartAsync(CancellationToken.None));
|
|
||||||
|
|
||||||
Assert.Contains("newer than supported version", exception.Message, StringComparison.Ordinal);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task FindActiveByKeyIdAsync_ExistingActiveKey_ReturnsKey()
|
|
||||||
{
|
|
||||||
string databasePath = CreateTempDatabasePath();
|
|
||||||
await using ServiceProvider services = BuildAuthServices(databasePath);
|
|
||||||
await services.GetRequiredService<IAuthStoreMigrator>().MigrateAsync(CancellationToken.None);
|
|
||||||
await InsertApiKeyAsync(databasePath, revokedUtc: null);
|
|
||||||
|
|
||||||
IApiKeyStore store = services.GetRequiredService<IApiKeyStore>();
|
|
||||||
|
|
||||||
ApiKeyRecord? key = await store.FindActiveByKeyIdAsync("test-key", CancellationToken.None);
|
|
||||||
|
|
||||||
Assert.NotNull(key);
|
|
||||||
Assert.Equal("test-key", key.KeyId);
|
|
||||||
Assert.Equal("mxgw_test", key.KeyPrefix);
|
|
||||||
Assert.Equal([1, 2, 3, 4], key.SecretHash);
|
|
||||||
Assert.Contains("session:open", key.Scopes);
|
|
||||||
Assert.Null(key.RevokedUtc);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task FindActiveByKeyIdAsync_RevokedKey_ReturnsNull()
|
|
||||||
{
|
|
||||||
string databasePath = CreateTempDatabasePath();
|
|
||||||
await using ServiceProvider services = BuildAuthServices(databasePath);
|
|
||||||
await services.GetRequiredService<IAuthStoreMigrator>().MigrateAsync(CancellationToken.None);
|
|
||||||
await InsertApiKeyAsync(databasePath, DateTimeOffset.UtcNow);
|
|
||||||
|
|
||||||
IApiKeyStore store = services.GetRequiredService<IApiKeyStore>();
|
|
||||||
|
|
||||||
ApiKeyRecord? activeKey = await store.FindActiveByKeyIdAsync(
|
|
||||||
"test-key",
|
|
||||||
CancellationToken.None);
|
|
||||||
ApiKeyRecord? storedKey = await store.FindByKeyIdAsync("test-key", CancellationToken.None);
|
|
||||||
|
|
||||||
Assert.Null(activeKey);
|
|
||||||
Assert.NotNull(storedKey);
|
|
||||||
Assert.NotNull(storedKey.RevokedUtc);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task ApiKeyAuditStore_AppendAsync_PersistsAuditEvent()
|
|
||||||
{
|
|
||||||
string databasePath = CreateTempDatabasePath();
|
|
||||||
await using ServiceProvider services = BuildAuthServices(databasePath);
|
|
||||||
await services.GetRequiredService<IAuthStoreMigrator>().MigrateAsync(CancellationToken.None);
|
|
||||||
|
|
||||||
IApiKeyAuditStore auditStore = services.GetRequiredService<IApiKeyAuditStore>();
|
|
||||||
|
|
||||||
await auditStore.AppendAsync(
|
|
||||||
new ApiKeyAuditEntry(
|
|
||||||
KeyId: "test-key",
|
|
||||||
EventType: "lookup",
|
|
||||||
RemoteAddress: "127.0.0.1",
|
|
||||||
Details: "matched active key"),
|
|
||||||
CancellationToken.None);
|
|
||||||
|
|
||||||
IReadOnlyList<ApiKeyAuditRecord> records = await auditStore.ListRecentAsync(
|
|
||||||
10,
|
|
||||||
CancellationToken.None);
|
|
||||||
|
|
||||||
ApiKeyAuditRecord record = Assert.Single(records);
|
|
||||||
Assert.Equal("test-key", record.KeyId);
|
|
||||||
Assert.Equal("lookup", record.EventType);
|
|
||||||
Assert.Equal("127.0.0.1", record.RemoteAddress);
|
|
||||||
Assert.Equal("matched active key", record.Details);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ServiceProvider BuildAuthServices(string databasePath)
|
|
||||||
{
|
|
||||||
IConfigurationRoot configuration = new ConfigurationBuilder()
|
|
||||||
.AddInMemoryCollection(
|
|
||||||
new Dictionary<string, string?>
|
|
||||||
{
|
|
||||||
["MxGateway:Authentication:SqlitePath"] = databasePath
|
|
||||||
})
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
ServiceCollection services = new();
|
|
||||||
services.AddSingleton<IConfiguration>(configuration);
|
|
||||||
services.AddGatewayConfiguration();
|
|
||||||
services.AddSqliteAuthStore();
|
|
||||||
|
|
||||||
return services.BuildServiceProvider(validateScopes: true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string CreateTempDatabasePath()
|
|
||||||
{
|
|
||||||
string directory = Path.Combine(Path.GetTempPath(), "mxgateway-auth-tests", Guid.NewGuid().ToString("N"));
|
|
||||||
Directory.CreateDirectory(directory);
|
|
||||||
|
|
||||||
return Path.Combine(directory, "gateway-auth.db");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task CreateVersionZeroDatabaseAsync(string databasePath)
|
|
||||||
{
|
|
||||||
await using SqliteConnection connection = CreateConnection(databasePath);
|
|
||||||
await connection.OpenAsync(CancellationToken.None);
|
|
||||||
|
|
||||||
await using SqliteCommand command = connection.CreateCommand();
|
|
||||||
command.CommandText = """
|
|
||||||
CREATE TABLE schema_version (
|
|
||||||
id INTEGER PRIMARY KEY CHECK (id = 1),
|
|
||||||
version INTEGER NOT NULL,
|
|
||||||
applied_utc TEXT NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
INSERT INTO schema_version (id, version, applied_utc)
|
|
||||||
VALUES (1, 0, $applied_utc);
|
|
||||||
""";
|
|
||||||
command.Parameters.AddWithValue("$applied_utc", DateTimeOffset.UtcNow.ToString("O"));
|
|
||||||
|
|
||||||
await command.ExecuteNonQueryAsync(CancellationToken.None);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task CreateSchemaVersionDatabaseAsync(string databasePath, int version)
|
|
||||||
{
|
|
||||||
await using SqliteConnection connection = CreateConnection(databasePath);
|
|
||||||
await connection.OpenAsync(CancellationToken.None);
|
|
||||||
|
|
||||||
await using SqliteCommand command = connection.CreateCommand();
|
|
||||||
command.CommandText = """
|
|
||||||
CREATE TABLE schema_version (
|
|
||||||
id INTEGER PRIMARY KEY CHECK (id = 1),
|
|
||||||
version INTEGER NOT NULL,
|
|
||||||
applied_utc TEXT NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
INSERT INTO schema_version (id, version, applied_utc)
|
|
||||||
VALUES (1, $version, $applied_utc);
|
|
||||||
""";
|
|
||||||
command.Parameters.AddWithValue("$version", version);
|
|
||||||
command.Parameters.AddWithValue("$applied_utc", DateTimeOffset.UtcNow.ToString("O"));
|
|
||||||
|
|
||||||
await command.ExecuteNonQueryAsync(CancellationToken.None);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task InsertApiKeyAsync(string databasePath, DateTimeOffset? revokedUtc)
|
|
||||||
{
|
|
||||||
await using SqliteConnection connection = CreateConnection(databasePath);
|
|
||||||
await connection.OpenAsync(CancellationToken.None);
|
|
||||||
|
|
||||||
await using SqliteCommand command = connection.CreateCommand();
|
|
||||||
command.CommandText = """
|
|
||||||
INSERT INTO api_keys (
|
|
||||||
key_id,
|
|
||||||
key_prefix,
|
|
||||||
secret_hash,
|
|
||||||
display_name,
|
|
||||||
scopes,
|
|
||||||
created_utc,
|
|
||||||
last_used_utc,
|
|
||||||
revoked_utc)
|
|
||||||
VALUES (
|
|
||||||
$key_id,
|
|
||||||
$key_prefix,
|
|
||||||
$secret_hash,
|
|
||||||
$display_name,
|
|
||||||
$scopes,
|
|
||||||
$created_utc,
|
|
||||||
NULL,
|
|
||||||
$revoked_utc);
|
|
||||||
""";
|
|
||||||
command.Parameters.AddWithValue("$key_id", "test-key");
|
|
||||||
command.Parameters.AddWithValue("$key_prefix", "mxgw_test");
|
|
||||||
command.Parameters.Add("$secret_hash", SqliteType.Blob).Value = new byte[] { 1, 2, 3, 4 };
|
|
||||||
command.Parameters.AddWithValue("$display_name", "Test Key");
|
|
||||||
command.Parameters.AddWithValue(
|
|
||||||
"$scopes",
|
|
||||||
ApiKeyScopeSerializer.Serialize(new HashSet<string>(StringComparer.Ordinal) { "session:open", "events:read" }));
|
|
||||||
command.Parameters.AddWithValue("$created_utc", DateTimeOffset.UtcNow.ToString("O"));
|
|
||||||
command.Parameters.AddWithValue("$revoked_utc", revokedUtc?.ToString("O") ?? (object)DBNull.Value);
|
|
||||||
|
|
||||||
await command.ExecuteNonQueryAsync(CancellationToken.None);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<int> ReadSchemaVersionAsync(string databasePath)
|
|
||||||
{
|
|
||||||
await using SqliteConnection connection = CreateConnection(databasePath);
|
|
||||||
await connection.OpenAsync(CancellationToken.None);
|
|
||||||
|
|
||||||
await using SqliteCommand command = connection.CreateCommand();
|
|
||||||
command.CommandText = "SELECT version FROM schema_version WHERE id = 1;";
|
|
||||||
|
|
||||||
object? result = await command.ExecuteScalarAsync(CancellationToken.None);
|
|
||||||
|
|
||||||
return Convert.ToInt32(result, System.Globalization.CultureInfo.InvariantCulture);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<bool> TableExistsAsync(string databasePath, string tableName)
|
|
||||||
{
|
|
||||||
await using SqliteConnection connection = CreateConnection(databasePath);
|
|
||||||
await connection.OpenAsync(CancellationToken.None);
|
|
||||||
|
|
||||||
await using SqliteCommand command = connection.CreateCommand();
|
|
||||||
command.CommandText = """
|
|
||||||
SELECT COUNT(*)
|
|
||||||
FROM sqlite_master
|
|
||||||
WHERE type = 'table' AND name = $table_name;
|
|
||||||
""";
|
|
||||||
command.Parameters.AddWithValue("$table_name", tableName);
|
|
||||||
|
|
||||||
long result = (long)(await command.ExecuteScalarAsync(CancellationToken.None) ?? 0L);
|
|
||||||
|
|
||||||
return result == 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static SqliteConnection CreateConnection(string databasePath)
|
|
||||||
{
|
|
||||||
SqliteConnectionStringBuilder builder = new()
|
|
||||||
{
|
|
||||||
DataSource = databasePath,
|
|
||||||
Mode = SqliteOpenMode.ReadWriteCreate
|
|
||||||
};
|
|
||||||
|
|
||||||
return new SqliteConnection(builder.ToString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user