docs(archreview): P2 doc-drift sweep (IPC-06/07/17/21, SEC-09/22, CLI-12/16, TST-13)
Reconcile load-bearing docs with shipped behavior: - IPC-06: gateway.md Worker Envelope sketch -> points to mxaccess_worker.proto as source of truth (string correlation_id, real oneof arms incl. worker_shutdown_ack/worker_ready). - IPC-07: docs/Grpc.md six RPCs -> seven; document QueryActiveAlarms handler + validation row. - IPC-21: gateway.md Session RPC moved from live API into a 'Future work: not implemented' subsection. - TST-13: drop stale design-era sketches from gateway.md; correct the single-subscriber-default (config-gated fan-out) note. - SEC-09: dashboard GroupToRole sample GwAdmin:Admin -> Administrator so it passes GatewayOptionsValidator; clarify Administrator is the canonical role. - SEC-22: rewrite docs/Authentication.md to the pipeline that actually ships (ZB.MOM.WW.Auth.ApiKeys package + gateway-owned CachingApiKeyVerifier, CoalescingMarkApiKeyStore, CanonicalForwardingApiKeyAuditStore, etc.); remove 18 stale type names (grep-verified absent). - IPC-17: correct wrong Python generated dir (mxgateway -> zb_mom_ww_mxgateway) in CLAUDE.md + 3 docs. - CLI-12: Java docs Java 21 -> Java 17 (JDK17 retarget for Ignition 8.3). - CLI-16: docs/ClientPackaging.md reconciled with real .slnx, Python package name, and gradle project names; fix stale generateProto task name. Docs-only; type/path/version claims verified against source. Claude-Session: https://claude.ai/code/session_01DMXXvNuPekkkrTEyPNxEkW
This commit is contained in:
+179
-235
@@ -1,227 +1,215 @@
|
||||
# Gateway Authentication
|
||||
|
||||
The gateway authentication subsystem verifies inbound API key credentials against a SQLite-backed key store, hashes secrets with a configurable pepper, and records administrative and verification events to an audit trail.
|
||||
The gateway authenticates inbound gRPC callers with API keys: a bearer token is
|
||||
parsed, its secret is hashed with a peppered HMAC and compared in constant time
|
||||
against a stored hash, and administrative and verification events are recorded to
|
||||
an audit trail.
|
||||
|
||||
The peppered-HMAC pipeline itself — token parsing, secret generation, hashing,
|
||||
constant-time compare, the SQLite schema, the key store, the verifier, and schema
|
||||
migration — lives in the shared **`ZB.MOM.WW.Auth.ApiKeys`** package, of which
|
||||
this gateway is the donor. The gateway does not reimplement or fork those types;
|
||||
it binds the library through `AddZbApiKeyAuth` and layers gateway-specific
|
||||
concerns on top: constraint enforcement, the gRPC authorization interceptor,
|
||||
hot-path decorators, the admin CLI, the dashboard, and a canonical audit store
|
||||
that supersedes the library's own audit table. This document describes the
|
||||
consumer side — the token format, the options the gateway binds, the pieces it
|
||||
adds, and where the library boundary sits. For the library internals (the concrete
|
||||
`ApiKeyVerifier`, the SQLite stores, the schema and migrator), read the
|
||||
`ZB.MOM.WW.Auth.ApiKeys` sources; they are not duplicated in this repository.
|
||||
|
||||
## Token Format
|
||||
|
||||
API keys travel in the HTTP `Authorization` header as a bearer token shaped `mxgw_<keyId>_<secret>`. The `mxgw_` prefix scopes parsing to gateway tokens, the `<keyId>` segment is the public identifier used for lookup, and `<secret>` is the high-entropy portion that the gateway verifies against a stored hash.
|
||||
API keys travel in the HTTP `Authorization` header as a bearer token shaped
|
||||
`mxgw_<keyId>_<secret>`. The `mxgw_` prefix scopes parsing to gateway tokens, the
|
||||
`<keyId>` segment is the public identifier used for lookup, and `<secret>` is the
|
||||
high-entropy portion verified against a stored hash. The prefix and the pepper
|
||||
configuration key the gateway pins are constants on
|
||||
`AuthStoreServiceCollectionExtensions`
|
||||
(`TokenPrefix = "mxgw"`, `PepperSecretName = "MxGateway:ApiKeyPepper"`); they are
|
||||
supplied to the library at registration so the library's parser and pepper
|
||||
provider use the gateway's contract. The library parser rejects a malformed token
|
||||
before any database round-trip, and only a well-formed `mxgw_<keyId>_<secret>`
|
||||
token reaches the store lookup.
|
||||
|
||||
`ApiKeyParser` enforces the format and rejects malformed tokens before any database round-trip:
|
||||
## Secrets And Peppered Hashing
|
||||
|
||||
```csharp
|
||||
public bool TryParseAuthorizationHeader(string? authorizationHeader, out ParsedApiKey? apiKey)
|
||||
{
|
||||
apiKey = null;
|
||||
New secret material is high-entropy: the library generates 32 random bytes and
|
||||
encodes them URL-safe base64 (no padding) so a secret embeds in a header without
|
||||
escaping. The gateway never persists a plaintext secret — only its hash.
|
||||
|
||||
if (string.IsNullOrWhiteSpace(authorizationHeader)
|
||||
|| !authorizationHeader.StartsWith(BearerPrefix, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
Secrets are hashed with `HMAC-SHA256` keyed by a server-side **pepper**. The
|
||||
pepper lives outside the database and is resolved from configuration under the
|
||||
`MxGateway:ApiKeyPepper` key (the library's pepper provider reads it). Keeping the
|
||||
pepper out of the SQLite file means an attacker who exfiltrates only the database
|
||||
holds the hashes but lacks the keying material to brute-force candidate secrets,
|
||||
even if the hash algorithm is known.
|
||||
|
||||
string token = authorizationHeader[BearerPrefix.Length..].Trim();
|
||||
|
||||
if (!token.StartsWith(TokenPrefix, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
||||
A successful parse produces a `ParsedApiKey(KeyId, Secret)` record. The `IApiKeyParser` interface exists so verification consumers can be tested without depending on header-format details.
|
||||
|
||||
## Parsing and Secrets
|
||||
|
||||
### Secret generation
|
||||
|
||||
`ApiKeySecretGenerator.Generate()` is the single source of new secret material. It uses 32 bytes from `RandomNumberGenerator.Fill` and encodes with URL-safe base64 (no padding) so secrets can be embedded in headers without escaping:
|
||||
|
||||
```csharp
|
||||
public static string Generate()
|
||||
{
|
||||
Span<byte> bytes = stackalloc byte[32];
|
||||
RandomNumberGenerator.Fill(bytes);
|
||||
|
||||
return Convert.ToBase64String(bytes)
|
||||
.TrimEnd('=')
|
||||
.Replace('+', '-')
|
||||
.Replace('/', '_');
|
||||
}
|
||||
```
|
||||
|
||||
### Peppered hashing
|
||||
|
||||
`ApiKeySecretHasher` (registered behind `IApiKeySecretHasher`) hashes secrets with `HMACSHA256` keyed by a server-side pepper. The pepper lives outside the database and is resolved by `IConfiguration` lookup against the configured `PepperSecretName`:
|
||||
|
||||
```csharp
|
||||
public byte[] HashSecret(string secret)
|
||||
{
|
||||
string pepper = GetPepper();
|
||||
byte[] pepperBytes = Encoding.UTF8.GetBytes(pepper);
|
||||
byte[] secretBytes = Encoding.UTF8.GetBytes(secret);
|
||||
|
||||
using HMACSHA256 hmac = new(pepperBytes);
|
||||
|
||||
return hmac.ComputeHash(secretBytes);
|
||||
}
|
||||
```
|
||||
|
||||
The pepper is intentionally not stored alongside the hash: an attacker who exfiltrates only the SQLite file holds the hashes but lacks the keying material to brute-force candidate secrets, even if the stored hash algorithm and salt scheme are known. If the pepper is missing the hasher throws `ApiKeyPepperUnavailableException`, which the verifier converts to a distinct failure code rather than treating it as a credential mismatch.
|
||||
When the pepper is not configured, the library surfaces the failure as an
|
||||
`InvalidOperationException` whose message reports the pepper is unavailable rather
|
||||
than persisting a key with an unkeyed hash. The dashboard management path
|
||||
(`DashboardApiKeyManagementService`) catches that condition and returns the
|
||||
friendly "API key pepper is not configured." result instead of faulting the Blazor
|
||||
circuit; it currently matches on the message text, so a library wording change
|
||||
would need to be reflected there (a typed pepper-unavailable exception is a pending
|
||||
library improvement).
|
||||
|
||||
## Verification
|
||||
|
||||
`ApiKeyVerifier` (`IApiKeyVerifier`) implements the verification flow:
|
||||
The gateway consumes the library's `IApiKeyVerifier` from
|
||||
`GatewayGrpcAuthorizationInterceptor`. The verifier's flow is:
|
||||
|
||||
1. Parse the `Authorization` header into a `ParsedApiKey`.
|
||||
2. Look up the `ApiKeyRecord` by `KeyId` through `IApiKeyStore.FindByKeyIdAsync`.
|
||||
3. Reject revoked records (`RevokedUtc is not null`) and expired records (`ExpiresUtc` in the past). Expiry is opt-in — keys created without an expiry never expire; an expired key fails opaquely, indistinguishable to the client from any other auth failure.
|
||||
1. Parse the `Authorization` header into the key id and presented secret.
|
||||
2. Look up the stored key record by key id.
|
||||
3. Reject a revoked record, and reject an expired record whose `ExpiresUtc` is in
|
||||
the past. Expiry is opt-in — keys created without an expiry never expire; an
|
||||
expired key fails opaquely, indistinguishable to the client from any other auth
|
||||
failure.
|
||||
4. Hash the presented secret with the configured pepper.
|
||||
5. Compare hashes with `CryptographicOperations.FixedTimeEquals` to avoid timing oracles.
|
||||
6. Record a `LastUsedUtc` timestamp via `MarkKeyUsedAsync` and return an `ApiKeyIdentity`.
|
||||
5. Compare hashes in constant time to avoid a timing oracle.
|
||||
6. Stamp a `LastUsedUtc` timestamp and return a shared `ApiKeyIdentity` carrying
|
||||
the key id, key prefix, display name, scopes, and the opaque constraints JSON.
|
||||
|
||||
```csharp
|
||||
if (!CryptographicOperations.FixedTimeEquals(presentedHash, storedKey.SecretHash))
|
||||
{
|
||||
return ApiKeyVerificationResult.Fail(ApiKeyVerificationFailure.SecretMismatch);
|
||||
}
|
||||
A verification failure is opaque to the client: the interceptor returns
|
||||
`Unauthenticated`/`PermissionDenied` without disclosing which check failed, while
|
||||
the failure detail is available server-side for audit.
|
||||
|
||||
await keyStore.MarkKeyUsedAsync(storedKey.KeyId, DateTimeOffset.UtcNow, cancellationToken)
|
||||
.ConfigureAwait(false);
|
||||
|
||||
return ApiKeyVerificationResult.Success(new ApiKeyIdentity(
|
||||
KeyId: storedKey.KeyId,
|
||||
KeyPrefix: storedKey.KeyPrefix,
|
||||
DisplayName: storedKey.DisplayName,
|
||||
Scopes: storedKey.Scopes,
|
||||
Constraints: storedKey.Constraints));
|
||||
```
|
||||
|
||||
`ApiKeyVerificationResult` carries either an `ApiKeyIdentity` or a discriminated `ApiKeyVerificationFailure` value. The failure enum distinguishes parse errors, missing pepper, missing or revoked keys, and secret mismatch so the calling middleware can emit precise audit detail without leaking which check failed to the client.
|
||||
|
||||
`ApiKeyIdentity` exposes only non-secret fields (`KeyId`, `KeyPrefix`,
|
||||
`DisplayName`, `Scopes`, and `Constraints`) and is the type downstream
|
||||
authorization code consumes.
|
||||
`GatewayApiKeyIdentityMapper.ToGatewayIdentity` maps the library's shared
|
||||
`ApiKeyIdentity` onto the gateway's own `ApiKeyIdentity`
|
||||
(`Security/Authentication/ApiKeyIdentity.cs`), which exposes the deserialized
|
||||
`ApiKeyConstraints` — parsed from the opaque constraints JSON via
|
||||
`ApiKeyConstraintSerializer` — that the downstream `ConstraintEnforcer` and the
|
||||
request-identity accessor enforce. The gateway identity exposes only non-secret
|
||||
fields (`KeyId`, `KeyPrefix`, `DisplayName`, `Scopes`, `Constraints`).
|
||||
|
||||
### Hot-path caching and last-used coalescing
|
||||
|
||||
Left unmediated, every authenticated gRPC call costs a SQLite read plus a
|
||||
`last_used_utc` **write** (the library verifier couples `MarkKeyUsed` into
|
||||
`last_used_utc` **write** (the library verifier couples `MarkUsed` into
|
||||
`VerifyAsync`), which makes the auth store the throughput ceiling on the
|
||||
bulk-read workload. The gateway layers two decorators over the shared library's
|
||||
registrations (in `AuthStoreServiceCollectionExtensions`) — it does not edit the
|
||||
library:
|
||||
|
||||
- **`CachingApiKeyVerifier`** wraps `IApiKeyVerifier` with an `IMemoryCache`
|
||||
entry per successful verification, keyed on a SHA-256 hash of the presented
|
||||
token (never the plaintext secret). A cache hit within
|
||||
- **`CachingApiKeyVerifier`** wraps the library `IApiKeyVerifier` with an
|
||||
`IMemoryCache` entry per successful verification, keyed on a SHA-256 hash of the
|
||||
presented token (never the plaintext secret). A cache hit within
|
||||
`MxGateway:Security:ApiKeyVerificationCacheSeconds` (default 15 s) returns the
|
||||
cached result without touching the store, so both the read and the coupled
|
||||
write are skipped. Only successes are cached; failures always reach the inner
|
||||
verifier. On a gateway-initiated revoke/rotate/delete the dashboard admin
|
||||
service calls `IApiKeyCacheInvalidator.Invalidate(keyId)`, evicting the cached
|
||||
entry immediately. The short TTL is the backstop for out-of-band mutations
|
||||
(a direct DB edit, or a revoke run by the separate `apikey` CLI process, whose
|
||||
in-memory cache is not the running gateway's cache).
|
||||
- **`CoalescingMarkApiKeyStore`** wraps `IApiKeyStore` and forwards at most one
|
||||
`MarkUsed` write per key per `MxGateway:Security:ApiKeyLastUsedCoalesceSeconds`
|
||||
(default 60 s), so even under a cache miss the `last_used_utc` write is bounded
|
||||
to roughly one per key per minute rather than one per RPC. `last_used_utc` is a
|
||||
coarse staleness hint, not an audit record (audit rows are written separately),
|
||||
so bounded staleness of up to one window is acceptable.
|
||||
cached result without touching the store, so both the read and the coupled write
|
||||
are skipped. Only successes are cached; failures always reach the inner verifier.
|
||||
On a gateway-initiated revoke/rotate/delete the dashboard admin service calls
|
||||
`IApiKeyCacheInvalidator.Invalidate(keyId)`, evicting the cached entry
|
||||
immediately. The short TTL is the backstop for out-of-band mutations (a direct DB
|
||||
edit, or a revoke run by the separate `apikey` CLI process, whose in-memory cache
|
||||
is not the running gateway's cache).
|
||||
- **`CoalescingMarkApiKeyStore`** wraps the library `IApiKeyStore` and forwards at
|
||||
most one `MarkUsed` write per key per
|
||||
`MxGateway:Security:ApiKeyLastUsedCoalesceSeconds` (default 60 s), so even under a
|
||||
cache miss the `last_used_utc` write is bounded to roughly one per key per minute
|
||||
rather than one per RPC. `last_used_utc` is a coarse staleness hint, not an audit
|
||||
record (audit rows are written separately), so bounded staleness of up to one
|
||||
window is acceptable.
|
||||
|
||||
`GatewayApiKeyIdentityMapper` additionally memoizes the constraints-JSON
|
||||
deserialization by blob, so the per-call parse on the mapped identity collapses to
|
||||
a dictionary lookup. Both windows are configurable and may be set to `0` to
|
||||
disable the respective mechanism; see [GatewayConfiguration](./GatewayConfiguration.md).
|
||||
a dictionary lookup. Both windows are configurable and may be set to `0` to disable
|
||||
the respective mechanism; see
|
||||
[GatewayConfiguration](./GatewayConfiguration.md).
|
||||
|
||||
## Storage
|
||||
|
||||
The gateway keeps API key state in a dedicated SQLite database. SQLite is sufficient because credential volume is small, the gateway runs as a single process, and the file is straightforward to back up and rotate independently of the main application data.
|
||||
API-key state lives in a dedicated SQLite database owned by the shared library.
|
||||
SQLite is sufficient because credential volume is small, the gateway runs as a
|
||||
single process, and the file is straightforward to back up and rotate independently
|
||||
of the main application data.
|
||||
|
||||
The database path is `GatewayOptions.Authentication.SqlitePath`. Its code default is derived from `Environment.GetFolderPath(SpecialFolder.CommonApplicationData)` (`C:\ProgramData\MxGateway\gateway-auth.db` on Windows, `/usr/share/MxGateway/gateway-auth.db` or the container equivalent elsewhere) so the credential store is never written relative to the launch working directory on a non-Windows host. The production hosts pin the explicit Windows path in `appsettings.json`. `GatewayOptionsValidator` rejects a non-rooted (relative) `SqlitePath` so a bad override fails fast at startup rather than scattering the store by launch CWD (SEC-01).
|
||||
The database path is `GatewayOptions.Authentication.SqlitePath`. Its code default
|
||||
is derived from `Environment.GetFolderPath(SpecialFolder.CommonApplicationData)`
|
||||
(`C:\ProgramData\MxGateway\gateway-auth.db` on Windows,
|
||||
`/usr/share/MxGateway/gateway-auth.db` or the container equivalent elsewhere) so the
|
||||
credential store is never written relative to the launch working directory on a
|
||||
non-Windows host. The production hosts pin the explicit Windows path in
|
||||
`appsettings.json`. `GatewayOptionsValidator` rejects a non-rooted (relative)
|
||||
`SqlitePath` so a bad override fails fast at startup rather than scattering the store
|
||||
by launch CWD (SEC-01).
|
||||
|
||||
### Connection factory
|
||||
|
||||
`AuthSqliteConnectionFactory` reads `GatewayOptions.Authentication.SqlitePath`, ensures the parent directory exists, and builds a connection string in `ReadWriteCreate` mode so first-run installations can create the file without manual provisioning. Connection pooling is enabled and the connection string carries a non-zero `DefaultTimeout`:
|
||||
|
||||
```csharp
|
||||
SqliteConnectionStringBuilder builder = new()
|
||||
{
|
||||
DataSource = sqlitePath,
|
||||
Mode = SqliteOpenMode.ReadWriteCreate,
|
||||
Pooling = true,
|
||||
DefaultTimeout = (int)BusyTimeout.TotalSeconds,
|
||||
};
|
||||
```
|
||||
|
||||
Every store opens its connection through `OpenConnectionAsync`, which opens the connection and then applies `PRAGMA journal_mode=WAL` and `PRAGMA busy_timeout`. WAL is a persistent database-level setting so re-applying it per connection is a cheap no-op; `busy_timeout` is per-connection state. Because `MarkKeyUsedAsync` runs on every authenticated request and `SqliteApiKeyAuditStore` appends on every denial, this lets concurrent readers and writers retry briefly instead of surfacing `SQLITE_BUSY` as a hard failure on the request path.
|
||||
|
||||
### Schema
|
||||
|
||||
`SqliteAuthSchema` declares table names and the current schema version as constants. Three tables are involved:
|
||||
|
||||
- `api_keys` stores `key_id`, `key_prefix`, the `secret_hash` blob,
|
||||
`display_name`, serialized `scopes`, optional serialized `constraints`, and
|
||||
the `created_utc`, `last_used_utc`, and `revoked_utc` timestamps.
|
||||
- `api_key_audit` is an append-only log keyed by an autoincrement `audit_id` with `key_id`, `event_type`, `remote_address`, `created_utc`, and `details` columns.
|
||||
- `schema_version` carries a single row whose `version` column is matched against `SqliteAuthSchema.CurrentVersion`.
|
||||
|
||||
### Read paths
|
||||
|
||||
`SqliteApiKeyStore` (`IApiKeyStore`) handles the two reads needed at request time: `FindByKeyIdAsync` returns any record (so revoked keys can be reported distinctly) and `FindActiveByKeyIdAsync` filters to non-revoked rows. `MarkKeyUsedAsync` updates `last_used_utc` only for non-revoked rows so a freshly revoked key cannot have its timestamp refreshed by a racing verification.
|
||||
|
||||
`ApiKeyRecord` is the in-memory projection. `ApiKeyRecordReader.Read` is shared by every read path so column ordering is defined in one place:
|
||||
|
||||
```csharp
|
||||
public static ApiKeyRecord Read(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)),
|
||||
Constraints: ApiKeyConstraintSerializer.Deserialize(reader.IsDBNull(5) ? null : reader.GetString(5)),
|
||||
CreatedUtc: DateTimeOffset.Parse(reader.GetString(6), System.Globalization.CultureInfo.InvariantCulture),
|
||||
LastUsedUtc: ReadNullableDateTimeOffset(reader, 7),
|
||||
RevokedUtc: ReadNullableDateTimeOffset(reader, 8));
|
||||
}
|
||||
```
|
||||
|
||||
### Write paths
|
||||
|
||||
`SqliteApiKeyAdminStore` (`IApiKeyAdminStore`) implements administrative mutations: `CreateAsync` accepts an `ApiKeyCreateRequest`, `RevokeAsync` sets `revoked_utc` only when not already revoked, `RotateAsync` replaces `secret_hash`, clears `last_used_utc`, and clears `revoked_utc` so a rotated key is immediately usable, and `DeleteAsync` permanently removes a row but only when `revoked_utc IS NOT NULL` — active keys are untouched (returns false) so the revoke event lands in the audit log before the row disappears.
|
||||
|
||||
Because `RotateAsync` clears `revoked_utc`, rotating a previously revoked key reactivates it. The dashboard API Keys page therefore offers the Rotate (and Revoke) actions only for keys whose status is `Active`; revoked keys instead show a Delete action that calls `DeleteAsync`, so an operator can permanently remove a revoked row without ever risking un-revocation as a side effect of a rotation.
|
||||
|
||||
The dashboard API Keys page also surfaces expiry: each row shows an `Expires` column (`Never` when unset) and a status badge that reads `Expired` (past expiry, red), `Expiring` (within seven days, amber), `Revoked`, or `Active`. This is display-only staleness surfacing; expiry is set at creation time via the `apikey create-key --expires` CLI, not from the dashboard.
|
||||
The library owns the SQLite schema and connection factory. The `api_keys` table
|
||||
carries the key id, key prefix, secret-hash blob, display name, serialized scopes,
|
||||
optional serialized constraints, and the `created_utc`, `last_used_utc`,
|
||||
`revoked_utc`, and `expires_utc` timestamps. Because the schema, stores, and migrator
|
||||
belong to `ZB.MOM.WW.Auth.ApiKeys`, this document does not restate their column
|
||||
readers or SQL; consult the library for that detail.
|
||||
|
||||
### Audit trail
|
||||
|
||||
`SqliteApiKeyAuditStore` (`IApiKeyAuditStore`) appends `ApiKeyAuditEntry` values to the `api_key_audit` table and stamps each row with a UTC timestamp inside the store rather than trusting the caller. `ListRecentAsync` returns the most recent rows ordered by `audit_id` descending and projects them into `ApiKeyAuditRecord`. Rows are kept even after the referenced key is revoked because the audit history is the durable record of administrative action; the `key_id` column is nullable to accommodate non-key-scoped events such as `init-db`.
|
||||
The library emits its own API-key audit entries (from the admin verbs — create,
|
||||
revoke, rotate, `init-db`, and constraint denials), but the gateway **overrides**
|
||||
the library's `IApiKeyAuditStore` registration with
|
||||
`CanonicalForwardingApiKeyAuditStore`. That adapter canonicalizes every
|
||||
library-emitted `ApiKeyAuditEntry` onto the gateway's `AuditEvent` shape and routes
|
||||
it through `IAuditWriter` (`CanonicalAuditWriter`) into `SqliteCanonicalAuditStore`,
|
||||
which persists to a single **`audit_event`** table (columns `event_id`,
|
||||
`occurred_at_utc`, `actor`, `action`, `outcome`, `category`, `target`,
|
||||
`source_node`, `correlation_id`, `details_json`). Reads for the dashboard "recent
|
||||
audit" view go back through the same adapter, which maps `audit_event` rows back to
|
||||
`ApiKeyAuditEntry` values so the existing view keeps working unchanged.
|
||||
|
||||
## Migration
|
||||
Consequently the library's own `api_key_audit` table is left in place but
|
||||
**unused** after adoption — nothing writes to it once the override is registered.
|
||||
The canonical `audit_event` table is the single durable record of both API-key
|
||||
administrative actions and the dashboard's own audit vocabulary
|
||||
(`dashboard-create-key`, `dashboard-rotate-key`, `dashboard-revoke-key`,
|
||||
`dashboard-delete-key`, and the session Close/Kill actions). This is why any prose
|
||||
that describes credential audits as landing in `api_key_audit` is stale: the
|
||||
canonical store is `audit_event`.
|
||||
|
||||
Schema bring-up is centralised behind `IAuthStoreMigrator`. `SqliteAuthStoreMigrator` executes the migration inside a single transaction so a partial failure leaves the database untouched, refuses to start when the on-disk schema version is newer than the binary supports, and idempotently creates the v1 schema:
|
||||
## Registration
|
||||
|
||||
`AuthStoreServiceCollectionExtensions.AddSqliteAuthStore(IConfiguration)` wires the
|
||||
whole subsystem. It does not register the library types directly — it delegates to
|
||||
the shared provider and then layers the gateway concerns:
|
||||
|
||||
```csharp
|
||||
if (existingVersion > SqliteAuthSchema.CurrentVersion)
|
||||
public static IServiceCollection AddSqliteAuthStore(
|
||||
this IServiceCollection services,
|
||||
IConfiguration configuration)
|
||||
{
|
||||
throw new AuthStoreMigrationException(
|
||||
$"Auth database schema version {existingVersion} is newer than supported version {SqliteAuthSchema.CurrentVersion}.");
|
||||
// Pin the gateway's token prefix ("mxgw") and pepper key ("MxGateway:ApiKeyPepper")
|
||||
// as fallback defaults UNDER the supplied configuration, then register the shared
|
||||
// provider: it binds ApiKeyOptions from MxGateway:Authentication and wires the SQLite
|
||||
// stores, the configuration-backed pepper provider, the verifier, the migrator, and
|
||||
// the migration hosted service.
|
||||
services.AddZbApiKeyAuth(effectiveConfig, AuthenticationSectionPath);
|
||||
|
||||
// SEC-08 hot-path decorators layered over the library registrations.
|
||||
services.AddMemoryCache();
|
||||
// CoalescingMarkApiKeyStore decorates IApiKeyStore; CachingApiKeyVerifier decorates
|
||||
// IApiKeyVerifier and also serves as IApiKeyCacheInvalidator.
|
||||
|
||||
// Canonical audit: override the library's IApiKeyAuditStore so every API-key audit
|
||||
// event is forwarded through IAuditWriter into the audit_event table.
|
||||
services.AddSingleton<IApiKeyAuditStore, CanonicalForwardingApiKeyAuditStore>();
|
||||
|
||||
// The shared admin command set (ApiKeyAdminCommands) and the gateway CLI runner.
|
||||
services.AddSingleton<ApiKeyAdminCliRunner>();
|
||||
|
||||
return services;
|
||||
}
|
||||
|
||||
await ApplyVersionOneAsync(connection, transaction, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
|
||||
```
|
||||
|
||||
`AuthStoreMigrationHostedService` runs the migrator at startup, but only when API-key authentication is enabled and `RunMigrationsOnStartup` is true. Operators who manage schema out-of-band can disable the hosted run and use the admin CLI's `init-db` command instead.
|
||||
|
||||
`AuthStoreMigrationException` is a sealed `InvalidOperationException` so it can be caught precisely without swallowing unrelated failures.
|
||||
The decorators wrap the library's last registration for each interface rather than
|
||||
replacing the library types, preserving singleton semantics; the audit override is
|
||||
registered after `AddZbApiKeyAuth` so it wins as the resolved `IApiKeyAuditStore`.
|
||||
|
||||
## Admin CLI
|
||||
|
||||
`ApiKeyAdminCommandLineParser.Parse` recognises a leading `apikey` argument and dispatches to one of the subcommands declared by `ApiKeyAdminCommandKind`. Each parsed invocation produces an `ApiKeyAdminCommand` (or an `ApiKeyAdminParseResult` carrying an error). `ApiKeyAdminCliRunner` then executes the command, runs the migrator first, calls the relevant store method, appends an audit row, and writes either text or JSON output via `ApiKeyAdminOutput`. The returned `ApiKeyAdminListedKey` projection deliberately omits the `secret_hash` so listing a database does not surface hash material.
|
||||
`ApiKeyAdminCommandLineParser.Parse` recognises a leading `apikey` argument and
|
||||
dispatches to one of the subcommands declared by `ApiKeyAdminCommandKind`. Each
|
||||
parsed invocation produces an `ApiKeyAdminCommand` (or an `ApiKeyAdminParseResult`
|
||||
carrying an error). `ApiKeyAdminCliRunner` then runs the migrator, invokes the shared
|
||||
`ApiKeyAdminCommands` verb, and writes text or JSON output via `ApiKeyAdminOutput`.
|
||||
The returned `ApiKeyAdminListedKey` projection deliberately omits the secret hash so
|
||||
listing a database never surfaces hash material.
|
||||
|
||||
The supported subcommands match `ApiKeyAdminCommandKind` exactly:
|
||||
|
||||
@@ -230,7 +218,7 @@ The supported subcommands match `ApiKeyAdminCommandKind` exactly:
|
||||
| `init-db` | none | Runs the migrator and records an audit entry. |
|
||||
| `create-key` | `--key-id`, `--display-name` | Generates a new secret, stores its peppered hash and optional constraints, and prints the assembled `mxgw_<keyId>_<secret>` token. Optional `--expires` sets an expiry (absolute ISO-8601 UTC, or a relative `<N>d`/`<N>h` from now); omit it for a non-expiring key. |
|
||||
| `list-keys` | none | Lists every stored key with its scopes, constraints, revocation state, and expiry (`active`/`expired`/`revoked`). |
|
||||
| `revoke-key` | `--key-id` | Sets `revoked_utc` if the key is currently active. |
|
||||
| `revoke-key` | `--key-id` | Marks the key revoked if it is currently active. |
|
||||
| `rotate-key` | `--key-id` | Replaces the secret hash and prints the new token. |
|
||||
|
||||
Examples:
|
||||
@@ -249,68 +237,24 @@ mxgateway apikey rotate-key --key-id ops.alice
|
||||
Constraint flags are optional. `--read-subtree`, `--write-subtree`,
|
||||
`--read-tag-glob`, `--write-tag-glob`, and `--browse-subtree` are repeatable.
|
||||
`--max-write-classification` accepts one integer. `--read-alarm-only` and
|
||||
`--read-historized-only` are boolean flags. Existing rows with null
|
||||
constraints remain fully unconstrained after migration.
|
||||
`--read-historized-only` are boolean flags. Existing rows with null constraints
|
||||
remain fully unconstrained after migration.
|
||||
|
||||
Key ids are restricted by the parser to ASCII letters, digits, periods, and hyphens so they remain safe to embed in the token format and in URL paths used by administrative tooling.
|
||||
Key ids are restricted by the parser to ASCII letters, digits, periods, and hyphens
|
||||
so they remain safe to embed in the token format and in URL paths used by
|
||||
administrative tooling.
|
||||
|
||||
The CLI is not the only management surface: the dashboard API Keys page
|
||||
creates, rotates, revokes, and deletes (revoked-only) keys through the same
|
||||
`IApiKeyAdminStore`. Every destructive dashboard action is gated by a
|
||||
confirmation dialog and emits its own audit event
|
||||
(`dashboard-create-key`, `dashboard-rotate-key`, `dashboard-revoke-key`,
|
||||
`dashboard-delete-key`). See
|
||||
The CLI is not the only management surface: the dashboard API Keys page creates,
|
||||
rotates, revokes, and deletes (revoked-only) keys through the same shared admin
|
||||
command set. Every destructive dashboard action is gated by a confirmation dialog
|
||||
and emits its own audit event (`dashboard-create-key`, `dashboard-rotate-key`,
|
||||
`dashboard-revoke-key`, `dashboard-delete-key`) into the canonical `audit_event`
|
||||
store. The page also surfaces expiry: each row shows an `Expires` column (`Never`
|
||||
when unset) and a status badge that reads `Expired`, `Expiring` (within seven days),
|
||||
`Revoked`, or `Active`. This staleness surfacing is display-only; expiry is set at
|
||||
creation time via `apikey create-key --expires`, not from the dashboard. See
|
||||
[Gateway Dashboard Design](./GatewayDashboardDesign.md#api-keys-page).
|
||||
|
||||
## Scope Serialization
|
||||
|
||||
Scopes are persisted as a single TEXT column rather than a join table because the set is small, never queried by membership at the database level, and changes atomically with the owning row. `ApiKeyScopeSerializer.Serialize` writes a JSON array sorted with `StringComparer.Ordinal` so equivalent scope sets produce byte-identical column values, which makes audit diffing and database comparisons deterministic:
|
||||
|
||||
```csharp
|
||||
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);
|
||||
}
|
||||
```
|
||||
|
||||
`Deserialize` tolerates an empty column by returning an empty set so older rows or hand-edited records do not crash the verifier.
|
||||
|
||||
## Registration
|
||||
|
||||
`AuthStoreServiceCollectionExtensions.AddSqliteAuthStore` wires every service in this subsystem as a singleton and registers the migration hosted service:
|
||||
|
||||
```csharp
|
||||
public static IServiceCollection AddSqliteAuthStore(this IServiceCollection services)
|
||||
{
|
||||
services.AddSingleton<IApiKeyParser, ApiKeyParser>();
|
||||
services.AddSingleton<IApiKeySecretHasher, ApiKeySecretHasher>();
|
||||
services.AddSingleton<IApiKeyVerifier, ApiKeyVerifier>();
|
||||
services.AddSingleton<ApiKeyAdminCliRunner>();
|
||||
services.AddSingleton<AuthSqliteConnectionFactory>();
|
||||
services.AddSingleton<IAuthStoreMigrator, SqliteAuthStoreMigrator>();
|
||||
services.AddSingleton<IApiKeyStore, SqliteApiKeyStore>();
|
||||
services.AddSingleton<IApiKeyAdminStore, SqliteApiKeyAdminStore>();
|
||||
services.AddSingleton<IApiKeyAuditStore, SqliteApiKeyAuditStore>();
|
||||
services.AddHostedService<AuthStoreMigrationHostedService>();
|
||||
|
||||
return services;
|
||||
}
|
||||
```
|
||||
|
||||
Singletons are safe because each operation opens its own short-lived `SqliteConnection` through the factory; there is no shared mutable state inside the services.
|
||||
|
||||
## Related Documentation
|
||||
|
||||
- [Gateway Configuration](./GatewayConfiguration.md)
|
||||
|
||||
Reference in New Issue
Block a user