544a6ddb77
Resolves the 35 findings from the 2026-06-01 baseline (commit 26ba1c7),
test-first for every behavioral change. +51 tests (331 -> 382 passing, 0 failed).
- Telemetry-001 (HIGH): RedactionEnricher now honours property removal, so a
redactor that drops a key actually scrubs the secret from the event.
- Auth: LDAP validator ValidateOnStart; API-key verify no longer fails on a
best-effort MarkUsed write or a corrupt scopes column (fail-closed); LDAP cert
validation hook; KeyPrefix persistence aligned; README algorithm corrected.
- Health: Akka checks return Degraded (not throw) when the cluster isn't up yet;
GrpcDependencyHealthCheck catch-all; null 'description' rendered; composite
endpoint builder; XML docs shipped.
- Audit: CompositeAuditWriter no longer re-throws OperationCanceledException;
TruncatingAuditRedactor over-redact scrubs Target + safe negative max; options
record; XML docs shipped.
- Configuration: TryAddEnumerable idempotent registration; consistent port
quoting; strict invariant port parsing; XML docs + README packaged.
- Theme: mobile toggle is now CSS-only (no Bootstrap JS); token/CSS hygiene;
XML docs on the public parameter surface.
Shared-contract/spec docs updated where the code was the source of truth
(observability service.instance.id, MapZbMetrics, redactor reach). All changes
additive/back-compatible at v0.1.0. code-reviews bookkeeping follows separately.
138 lines
4.9 KiB
C#
138 lines
4.9 KiB
C#
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Hosting;
|
|
using Microsoft.Extensions.Options;
|
|
using ZB.MOM.WW.Auth.Abstractions.Ldap;
|
|
using ZB.MOM.WW.Auth.AspNetCore;
|
|
using ZB.MOM.WW.Auth.Ldap;
|
|
|
|
namespace ZB.MOM.WW.Auth.AspNetCore.Tests;
|
|
|
|
public class ServiceCollectionExtensionsTests
|
|
{
|
|
private const string LdapSection = "Auth:Ldap";
|
|
|
|
private const string LdapServer = "ldap.example.com";
|
|
|
|
private static IConfiguration BuildConfiguration() =>
|
|
new ConfigurationBuilder()
|
|
.AddInMemoryCollection(new Dictionary<string, string?>
|
|
{
|
|
[$"{LdapSection}:Server"] = LdapServer,
|
|
[$"{LdapSection}:SearchBase"] = "dc=example,dc=com",
|
|
[$"{LdapSection}:ServiceAccountDn"] = "cn=svc,dc=example,dc=com",
|
|
[$"{LdapSection}:Transport"] = nameof(LdapTransport.Ldaps),
|
|
})
|
|
.Build();
|
|
|
|
[Fact]
|
|
public void AddZbLdapAuth_ResolvesLdapAuthService()
|
|
{
|
|
IConfiguration config = BuildConfiguration();
|
|
var services = new ServiceCollection();
|
|
|
|
services.AddZbLdapAuth(config, LdapSection);
|
|
|
|
using ServiceProvider provider = services.BuildServiceProvider();
|
|
|
|
var service = provider.GetRequiredService<ILdapAuthService>();
|
|
|
|
Assert.NotNull(service);
|
|
}
|
|
|
|
[Fact]
|
|
public void AddZbLdapAuth_ILdapAuthService_IsSingleton()
|
|
{
|
|
IConfiguration config = BuildConfiguration();
|
|
var services = new ServiceCollection();
|
|
|
|
services.AddZbLdapAuth(config, LdapSection);
|
|
|
|
using ServiceProvider provider = services.BuildServiceProvider();
|
|
|
|
var first = provider.GetRequiredService<ILdapAuthService>();
|
|
var second = provider.GetRequiredService<ILdapAuthService>();
|
|
|
|
Assert.Same(first, second);
|
|
}
|
|
|
|
[Fact]
|
|
public void AddZbLdapAuth_BindsOptionsFromSection()
|
|
{
|
|
IConfiguration config = BuildConfiguration();
|
|
var services = new ServiceCollection();
|
|
|
|
services.AddZbLdapAuth(config, LdapSection);
|
|
|
|
using ServiceProvider provider = services.BuildServiceProvider();
|
|
var options = provider.GetRequiredService<IOptions<LdapOptions>>();
|
|
|
|
Assert.Equal(LdapServer, options.Value.Server);
|
|
Assert.Equal("dc=example,dc=com", options.Value.SearchBase);
|
|
Assert.Equal(LdapTransport.Ldaps, options.Value.Transport);
|
|
}
|
|
|
|
[Fact]
|
|
public void AddZbLdapAuth_RegistersOptionsValidator()
|
|
{
|
|
IConfiguration config = BuildConfiguration();
|
|
var services = new ServiceCollection();
|
|
|
|
services.AddZbLdapAuth(config, LdapSection);
|
|
|
|
using ServiceProvider provider = services.BuildServiceProvider();
|
|
|
|
var validators = provider.GetServices<IValidateOptions<LdapOptions>>().ToList();
|
|
|
|
Assert.Contains(validators, v => v is LdapOptionsValidator);
|
|
}
|
|
|
|
// --- Auth-001: ValidateOnStart must run options validation at host startup, not first login ---
|
|
|
|
private static IConfiguration BuildInsecureConfiguration() =>
|
|
new ConfigurationBuilder()
|
|
.AddInMemoryCollection(new Dictionary<string, string?>
|
|
{
|
|
[$"{LdapSection}:Server"] = LdapServer,
|
|
[$"{LdapSection}:SearchBase"] = "dc=example,dc=com",
|
|
[$"{LdapSection}:ServiceAccountDn"] = "cn=svc,dc=example,dc=com",
|
|
// Plaintext transport without AllowInsecure: the validator must reject this.
|
|
[$"{LdapSection}:Transport"] = nameof(LdapTransport.None),
|
|
[$"{LdapSection}:AllowInsecure"] = "false",
|
|
})
|
|
.Build();
|
|
|
|
[Fact]
|
|
public async Task AddZbLdapAuth_StartingHost_FailsForInsecureConfig()
|
|
{
|
|
// The misconfiguration must surface at host start, not deferred until the first login
|
|
// (i.e. the first ILdapAuthService resolution). ValidateOnStart wires the host's
|
|
// start-time options validation, so StartAsync must throw OptionsValidationException.
|
|
IConfiguration config = BuildInsecureConfiguration();
|
|
|
|
using IHost host = new HostBuilder()
|
|
.ConfigureServices(services => services.AddZbLdapAuth(config, LdapSection))
|
|
.Build();
|
|
|
|
OptionsValidationException ex =
|
|
await Assert.ThrowsAsync<OptionsValidationException>(() => host.StartAsync());
|
|
|
|
Assert.Contains(nameof(LdapOptions.Transport), string.Join(" ", ex.Failures));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task AddZbLdapAuth_StartingHost_SucceedsForSecureConfig()
|
|
{
|
|
// A valid (secure) config must start cleanly — proving ValidateOnStart does not reject
|
|
// well-formed options.
|
|
IConfiguration config = BuildConfiguration();
|
|
|
|
using IHost host = new HostBuilder()
|
|
.ConfigureServices(services => services.AddZbLdapAuth(config, LdapSection))
|
|
.Build();
|
|
|
|
await host.StartAsync();
|
|
await host.StopAsync();
|
|
}
|
|
}
|