dc9c0c950c
Apply the ZB.MOM.WW. prefix to all gateway-side projects, folders,
.csproj/.sln contents, C# namespaces, using directives, generated proto
C# (csharp_namespace + checked-in generated files), InternalsVisibleTo
attributes, project-name string literals (LoadProject, .sln lookups,
worker exe paths, staticwebassets manifest), and the install/script/doc
references that point at any of the above. Migrate the solution from
.sln to .slnx via `dotnet sln migrate` and delete the old file.
External-runtime identifiers are intentionally NOT prefixed so external
configuration keeps working:
- GatewayMetrics.cs MeterName ("MxGateway.Server")
- DashboardAuthenticationDefaults Scheme/Policy ("MxGateway.Dashboard")
- GatewayRequestLoggingMiddleware logger category ("MxGateway.Request")
- StaRuntime thread name ("MxGateway.Worker.STA")
- appsettings.json root section "MxGateway" + env-var prefix
MxGateway__... and secret-name MxGateway:ApiKeyPepper
- C:\ProgramData\MxGateway\ data dir paths
Also fixes two tests that were not rename-related but became visible
while validating the rename:
- WorkerLiveMxAccessSmokeTests.ShutDownAsync: cancellation that the
gateway service correctly maps to RpcException(Cancelled) per gRPC
convention was being misclassified as a stream fault. Added a sibling
catch on RpcException with StatusCode.Cancelled.
- IntegrationTestEnvironment.ResolveRepositoryRoot: extracted IsRepositoryRoot
and made it accept either a .git marker OR a .sln/.slnx next to src/
so the worker-exe walker works in non-git working copies.
clients/proto/proto-inputs.json's protoRoot updated to point at
src/ZB.MOM.WW.MxGateway.Contracts/Protos.
Verified by `dotnet build` and a full `dotnet test` of the .slnx with
MXGATEWAY_RUN_LIVE_{MXACCESS,LDAP,GALAXY}_TESTS=1:
Tests: 472/472 pass
Worker.Tests: 280/280 pass (4 dev-rig [Fact(Skip=...)] skipped)
IntegrationTests: 18/18 pass
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
193 lines
7.2 KiB
C#
193 lines
7.2 KiB
C#
using Microsoft.Data.Sqlite;
|
|
|
|
namespace ZB.MOM.WW.MxGateway.Server.Security.Authentication;
|
|
|
|
public sealed class SqliteAuthStoreMigrator(AuthSqliteConnectionFactory connectionFactory) : IAuthStoreMigrator
|
|
{
|
|
/// <summary>Applies database migrations to the authentication store.</summary>
|
|
/// <param name="cancellationToken">Cancellation token.</param>
|
|
public async Task MigrateAsync(CancellationToken cancellationToken)
|
|
{
|
|
await using SqliteConnection connection = await connectionFactory.OpenConnectionAsync(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 ApplyVersionTwoAsync(connection, transaction, cancellationToken).ConfigureAwait(false);
|
|
await WriteSchemaVersionAsync(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,
|
|
constraints TEXT 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);
|
|
|
|
}
|
|
|
|
private static async Task ApplyVersionTwoAsync(
|
|
SqliteConnection connection,
|
|
SqliteTransaction transaction,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
if (await ColumnExistsAsync(connection, transaction, SqliteAuthSchema.ApiKeysTable, "constraints", cancellationToken)
|
|
.ConfigureAwait(false))
|
|
{
|
|
return;
|
|
}
|
|
|
|
await ExecuteNonQueryAsync(
|
|
connection,
|
|
transaction,
|
|
"""
|
|
ALTER TABLE api_keys
|
|
ADD COLUMN constraints TEXT NULL;
|
|
""",
|
|
cancellationToken).ConfigureAwait(false);
|
|
}
|
|
|
|
private static async Task WriteSchemaVersionAsync(
|
|
SqliteConnection connection,
|
|
SqliteTransaction transaction,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
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<bool> ColumnExistsAsync(
|
|
SqliteConnection connection,
|
|
SqliteTransaction transaction,
|
|
string tableName,
|
|
string columnName,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
await using SqliteCommand command = connection.CreateCommand();
|
|
command.Transaction = transaction;
|
|
command.CommandText = $"PRAGMA table_info({tableName});";
|
|
|
|
await using SqliteDataReader reader = await command.ExecuteReaderAsync(cancellationToken)
|
|
.ConfigureAwait(false);
|
|
|
|
while (await reader.ReadAsync(cancellationToken).ConfigureAwait(false))
|
|
{
|
|
if (string.Equals(reader.GetString(1), columnName, StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return 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);
|
|
}
|
|
}
|