5ade3f4f48
Tests-003: temp auth-DB directories leaked under %TEMP%. Added the TempDatabaseDirectory IDisposable helper (clears the Sqlite connection pool, then recursively deletes); SqliteAuthStoreTests and ApiKeyAdminCliRunnerTests now dispose every directory they create. Tests-004: added end-to-end coverage composing the real authorization interceptor in front of the real MxAccessGatewayService, plus scope-resolver tests confirming an unmapped request type fails closed to the admin scope. Tests-005: added coverage for a worker faulting mid-command — a pipe disconnect and a worker fault while an InvokeAsync is in flight both fail the pending invoke. No product change needed. Tests-006 (re-triaged): the flaky ReadLoop_WhenClientFaults_KillsOwnedWorkerProcess is a test race, not a product bug — the kill runs synchronously inside SetFaulted. Rewrote it to await FakeWorkerProcess exit deterministically, and replaced fixed Task.Delay timing in the late-reply and heartbeat tests with FIFO ordering and an injected ManualTimeProvider. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
301 lines
12 KiB
C#
301 lines
12 KiB
C#
using System.Text.Json;
|
|
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using MxGateway.Server.Configuration;
|
|
using MxGateway.Server.Security.Authentication;
|
|
|
|
namespace MxGateway.Tests.Security.Authentication;
|
|
|
|
public sealed class ApiKeyAdminCliRunnerTests : IDisposable
|
|
{
|
|
private readonly List<TempDatabaseDirectory> _tempDirectories = [];
|
|
/// <summary>Verifies that CreateKeyAsync creates an authenticating key and audits the action.</summary>
|
|
[Fact]
|
|
public async Task CreateKeyAsync_CreatesAuthenticatingKeyAndAudits()
|
|
{
|
|
await using ServiceProvider services = BuildServices(CreateTempDatabasePath());
|
|
ApiKeyAdminCliRunner runner = services.GetRequiredService<ApiKeyAdminCliRunner>();
|
|
StringWriter output = new();
|
|
|
|
await runner.RunAsync(
|
|
new ApiKeyAdminCommand(
|
|
Kind: ApiKeyAdminCommandKind.CreateKey,
|
|
Json: true,
|
|
SqlitePath: null,
|
|
Pepper: null,
|
|
KeyId: "operator01",
|
|
DisplayName: "Operator",
|
|
Scopes: new HashSet<string>(StringComparer.Ordinal) { "session:open", "events:read" },
|
|
Constraints: ApiKeyConstraints.Empty),
|
|
output,
|
|
CancellationToken.None);
|
|
|
|
string apiKey = ReadApiKey(output.ToString());
|
|
|
|
IApiKeyVerifier verifier = services.GetRequiredService<IApiKeyVerifier>();
|
|
ApiKeyVerificationResult verification = await verifier.VerifyAsync($"Bearer {apiKey}", CancellationToken.None);
|
|
|
|
Assert.True(verification.Succeeded);
|
|
Assert.NotNull(verification.Identity);
|
|
Assert.Equal("operator01", verification.Identity.KeyId);
|
|
Assert.Contains("session:open", verification.Identity.Scopes);
|
|
|
|
IReadOnlyList<ApiKeyAuditRecord> auditRecords = await services
|
|
.GetRequiredService<IApiKeyAuditStore>()
|
|
.ListRecentAsync(10, CancellationToken.None);
|
|
|
|
Assert.Contains(auditRecords, record => record.EventType == "create-key" && record.KeyId == "operator01");
|
|
}
|
|
|
|
/// <summary>Verifies that ListKeysAsync does not print the raw secret.</summary>
|
|
[Fact]
|
|
public async Task ListKeysAsync_DoesNotPrintRawSecret()
|
|
{
|
|
await using ServiceProvider services = BuildServices(CreateTempDatabasePath());
|
|
ApiKeyAdminCliRunner runner = services.GetRequiredService<ApiKeyAdminCliRunner>();
|
|
string apiKey = await CreateKeyAsync(runner, "operator01");
|
|
StringWriter listOutput = new();
|
|
|
|
await runner.RunAsync(
|
|
new ApiKeyAdminCommand(
|
|
Kind: ApiKeyAdminCommandKind.ListKeys,
|
|
Json: true,
|
|
SqlitePath: null,
|
|
Pepper: null,
|
|
KeyId: null,
|
|
DisplayName: null,
|
|
Scopes: new HashSet<string>(StringComparer.Ordinal),
|
|
Constraints: ApiKeyConstraints.Empty),
|
|
listOutput,
|
|
CancellationToken.None);
|
|
|
|
string listJson = listOutput.ToString();
|
|
|
|
Assert.Contains("operator01", listJson, StringComparison.Ordinal);
|
|
Assert.DoesNotContain(apiKey, listJson, StringComparison.Ordinal);
|
|
Assert.DoesNotContain(ApiKeySecret(apiKey), listJson, StringComparison.Ordinal);
|
|
Assert.DoesNotContain("secret_hash", listJson, StringComparison.OrdinalIgnoreCase);
|
|
}
|
|
|
|
/// <summary>Verifies that RevokeKeyAsync causes the revoked key to fail verification and is audited.</summary>
|
|
[Fact]
|
|
public async Task RevokeKeyAsync_RevokedKeyFailsVerificationAndAudits()
|
|
{
|
|
await using ServiceProvider services = BuildServices(CreateTempDatabasePath());
|
|
ApiKeyAdminCliRunner runner = services.GetRequiredService<ApiKeyAdminCliRunner>();
|
|
string apiKey = await CreateKeyAsync(runner, "operator01");
|
|
|
|
await runner.RunAsync(
|
|
new ApiKeyAdminCommand(
|
|
Kind: ApiKeyAdminCommandKind.RevokeKey,
|
|
Json: true,
|
|
SqlitePath: null,
|
|
Pepper: null,
|
|
KeyId: "operator01",
|
|
DisplayName: null,
|
|
Scopes: new HashSet<string>(StringComparer.Ordinal),
|
|
Constraints: ApiKeyConstraints.Empty),
|
|
TextWriter.Null,
|
|
CancellationToken.None);
|
|
|
|
ApiKeyVerificationResult verification = await services
|
|
.GetRequiredService<IApiKeyVerifier>()
|
|
.VerifyAsync($"Bearer {apiKey}", CancellationToken.None);
|
|
|
|
Assert.False(verification.Succeeded);
|
|
Assert.Equal(ApiKeyVerificationFailure.KeyRevoked, verification.Failure);
|
|
|
|
IReadOnlyList<ApiKeyAuditRecord> auditRecords = await services
|
|
.GetRequiredService<IApiKeyAuditStore>()
|
|
.ListRecentAsync(10, CancellationToken.None);
|
|
|
|
Assert.Contains(auditRecords, record => record.EventType == "revoke-key" && record.KeyId == "operator01");
|
|
}
|
|
|
|
/// <summary>Verifies that RotateKeyAsync prints the new secret once and invalidates the old secret.</summary>
|
|
[Fact]
|
|
public async Task RotateKeyAsync_PrintsNewSecretOnceAndInvalidatesOldSecret()
|
|
{
|
|
await using ServiceProvider services = BuildServices(CreateTempDatabasePath());
|
|
ApiKeyAdminCliRunner runner = services.GetRequiredService<ApiKeyAdminCliRunner>();
|
|
string oldApiKey = await CreateKeyAsync(runner, "operator01");
|
|
StringWriter rotateOutput = new();
|
|
|
|
await runner.RunAsync(
|
|
new ApiKeyAdminCommand(
|
|
Kind: ApiKeyAdminCommandKind.RotateKey,
|
|
Json: true,
|
|
SqlitePath: null,
|
|
Pepper: null,
|
|
KeyId: "operator01",
|
|
DisplayName: null,
|
|
Scopes: new HashSet<string>(StringComparer.Ordinal),
|
|
Constraints: ApiKeyConstraints.Empty),
|
|
rotateOutput,
|
|
CancellationToken.None);
|
|
|
|
string rotateJson = rotateOutput.ToString();
|
|
string newApiKey = ReadApiKey(rotateJson);
|
|
|
|
Assert.NotEqual(oldApiKey, newApiKey);
|
|
Assert.Equal(1, CountOccurrences(rotateJson, newApiKey));
|
|
|
|
IApiKeyVerifier verifier = services.GetRequiredService<IApiKeyVerifier>();
|
|
ApiKeyVerificationResult oldVerification = await verifier.VerifyAsync($"Bearer {oldApiKey}", CancellationToken.None);
|
|
ApiKeyVerificationResult newVerification = await verifier.VerifyAsync($"Bearer {newApiKey}", CancellationToken.None);
|
|
|
|
Assert.False(oldVerification.Succeeded);
|
|
Assert.Equal(ApiKeyVerificationFailure.SecretMismatch, oldVerification.Failure);
|
|
Assert.True(newVerification.Succeeded);
|
|
}
|
|
|
|
/// <summary>Verifies that CreateKeyAsync prints the raw secret exactly once.</summary>
|
|
[Fact]
|
|
public async Task CreateKeyAsync_PrintsRawSecretExactlyOnce()
|
|
{
|
|
await using ServiceProvider services = BuildServices(CreateTempDatabasePath());
|
|
ApiKeyAdminCliRunner runner = services.GetRequiredService<ApiKeyAdminCliRunner>();
|
|
StringWriter output = new();
|
|
|
|
await runner.RunAsync(
|
|
new ApiKeyAdminCommand(
|
|
Kind: ApiKeyAdminCommandKind.CreateKey,
|
|
Json: true,
|
|
SqlitePath: null,
|
|
Pepper: null,
|
|
KeyId: "operator01",
|
|
DisplayName: "Operator",
|
|
Scopes: new HashSet<string>(StringComparer.Ordinal),
|
|
Constraints: ApiKeyConstraints.Empty),
|
|
output,
|
|
CancellationToken.None);
|
|
|
|
string json = output.ToString();
|
|
string apiKey = ReadApiKey(json);
|
|
|
|
Assert.Equal(1, CountOccurrences(json, apiKey));
|
|
Assert.Equal(1, CountOccurrences(json, ApiKeySecret(apiKey)));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task CreateKeyAsync_WithConstraints_PersistsConstraints()
|
|
{
|
|
await using ServiceProvider services = BuildServices(CreateTempDatabasePath());
|
|
ApiKeyAdminCliRunner runner = services.GetRequiredService<ApiKeyAdminCliRunner>();
|
|
StringWriter output = new();
|
|
|
|
await runner.RunAsync(
|
|
new ApiKeyAdminCommand(
|
|
Kind: ApiKeyAdminCommandKind.CreateKey,
|
|
Json: true,
|
|
SqlitePath: null,
|
|
Pepper: null,
|
|
KeyId: "operator01",
|
|
DisplayName: "Operator",
|
|
Scopes: new HashSet<string>(StringComparer.Ordinal) { "metadata:read" },
|
|
Constraints: ApiKeyConstraints.Empty with
|
|
{
|
|
BrowseSubtrees = ["Area1/*"],
|
|
ReadAlarmOnly = true,
|
|
}),
|
|
output,
|
|
CancellationToken.None);
|
|
|
|
string apiKey = ReadApiKey(output.ToString());
|
|
ApiKeyVerificationResult verification = await services
|
|
.GetRequiredService<IApiKeyVerifier>()
|
|
.VerifyAsync($"Bearer {apiKey}", CancellationToken.None);
|
|
|
|
Assert.True(verification.Succeeded);
|
|
Assert.Equal(["Area1/*"], verification.Identity!.EffectiveConstraints.BrowseSubtrees);
|
|
Assert.True(verification.Identity.EffectiveConstraints.ReadAlarmOnly);
|
|
}
|
|
|
|
|
|
private static async Task<string> CreateKeyAsync(ApiKeyAdminCliRunner runner, string keyId)
|
|
{
|
|
StringWriter output = new();
|
|
await runner.RunAsync(
|
|
new ApiKeyAdminCommand(
|
|
Kind: ApiKeyAdminCommandKind.CreateKey,
|
|
Json: true,
|
|
SqlitePath: null,
|
|
Pepper: null,
|
|
KeyId: keyId,
|
|
DisplayName: "Operator",
|
|
Scopes: new HashSet<string>(StringComparer.Ordinal) { "session:open" },
|
|
Constraints: ApiKeyConstraints.Empty),
|
|
output,
|
|
CancellationToken.None);
|
|
|
|
return ReadApiKey(output.ToString());
|
|
}
|
|
|
|
private static ServiceProvider BuildServices(string databasePath)
|
|
{
|
|
IConfigurationRoot configuration = new ConfigurationBuilder()
|
|
.AddInMemoryCollection(
|
|
new Dictionary<string, string?>
|
|
{
|
|
["MxGateway:Authentication:SqlitePath"] = databasePath,
|
|
["MxGateway:ApiKeyPepper"] = "test-pepper"
|
|
})
|
|
.Build();
|
|
|
|
ServiceCollection services = new();
|
|
services.AddSingleton<IConfiguration>(configuration);
|
|
services.AddGatewayConfiguration();
|
|
services.AddSqliteAuthStore();
|
|
|
|
return services.BuildServiceProvider(validateScopes: true);
|
|
}
|
|
|
|
/// <summary>Clears SQLite pools and deletes every temporary directory created by this test.</summary>
|
|
public void Dispose()
|
|
{
|
|
foreach (TempDatabaseDirectory directory in _tempDirectories)
|
|
{
|
|
directory.Dispose();
|
|
}
|
|
|
|
_tempDirectories.Clear();
|
|
}
|
|
|
|
private string CreateTempDatabasePath()
|
|
{
|
|
TempDatabaseDirectory directory = TempDatabaseDirectory.Create("mxgateway-auth-cli-tests");
|
|
_tempDirectories.Add(directory);
|
|
|
|
return directory.DatabasePath();
|
|
}
|
|
|
|
private static string ReadApiKey(string json)
|
|
{
|
|
using JsonDocument document = JsonDocument.Parse(json);
|
|
|
|
return document.RootElement.GetProperty("ApiKey").GetString()
|
|
?? throw new InvalidOperationException("API key was not present in command output.");
|
|
}
|
|
|
|
private static string ApiKeySecret(string apiKey)
|
|
{
|
|
string[] parts = apiKey.Split('_', 3);
|
|
|
|
return parts[2];
|
|
}
|
|
|
|
private static int CountOccurrences(string value, string pattern)
|
|
{
|
|
int count = 0;
|
|
int index = 0;
|
|
|
|
while ((index = value.IndexOf(pattern, index, StringComparison.Ordinal)) >= 0)
|
|
{
|
|
count++;
|
|
index += pattern.Length;
|
|
}
|
|
|
|
return count;
|
|
}
|
|
}
|