Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/lib/db/exclusiveConnectionLeases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,25 @@ type LeaseUpdateResult<T extends string> =

const database = () => getDbInstance();
const ACTIVE_SQL = "SELECT * FROM exclusive_connection_leases WHERE state = 'ACTIVE' AND ";
const lease = (row: LeaseRow) => rowToCamel(row) as ExclusiveConnectionLease;
// Projection, not a cast: joined SELECTs (the status query) carry connection_*
// identity columns (email/display name) that must never escape on the lease object.
const lease = (row: LeaseRow): ExclusiveConnectionLease => {
const camel = rowToCamel(row) as ExclusiveConnectionLease;
return {
id: camel.id,
leaseOwnerHash: camel.leaseOwnerHash,
apiKeyId: camel.apiKeyId,
provider: camel.provider,
connectionId: camel.connectionId,
generation: camel.generation,
state: camel.state,
acquiredAt: camel.acquiredAt,
renewedAt: camel.renewedAt,
expiresAt: camel.expiresAt,
endedAt: camel.endedAt,
endReason: camel.endReason,
};
};
function timestamp(value?: string): string {
const parsed = Date.parse(value ?? new Date().toISOString());
if (!Number.isFinite(parsed)) throw new Error("now must be a valid ISO timestamp");
Expand Down
103 changes: 103 additions & 0 deletions tests/unit/exclusive-lease-status-projection.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
import assert from "node:assert/strict";
import fs from "node:fs";
import os from "node:os";
import path from "node:path";
import test from "node:test";

const TEST_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), "omniroute-lease-status-projection-"));
process.env.DATA_DIR = TEST_DATA_DIR;
process.env.DISABLE_SQLITE_AUTO_BACKUP = "true";

const core = await import("../../src/lib/db/core.ts");
const providersDb = await import("../../src/lib/db/providers.ts");
const leases = await import("../../src/lib/db/exclusiveConnectionLeases.ts");

const OWNER = "vlo_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
const EMAIL = "lease-connection-owner@example.com";
const DISPLAY_NAME = "Lease Connection Owner";

test.after(() => {
core.resetDbInstance();
fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
});

test("status lease object never carries the joined connection identity columns", async () => {
const connection = (await providersDb.createProviderConnection({
provider: "glm",
authType: "access_token",
accessToken: "lease-status-projection-token",
name: "Team GLM",
email: EMAIL,
displayName: DISPLAY_NAME,
isActive: true,
testStatus: "active",
})) as { id: string };

const acquired = leases.acquireExclusiveConnectionLease({
leaseOwnerId: OWNER,
apiKeyId: "key-status-projection",
provider: "glm",
connectionId: connection.id,
now: "2026-08-30T12:00:00.000Z",
});
assert.equal(acquired.kind, "ACQUIRED");
if (acquired.kind !== "ACQUIRED") return;

const status = leases.getExclusiveConnectionLeaseStatus({
leaseOwnerId: OWNER,
generation: acquired.lease.generation,
apiKeyId: "key-status-projection",
now: "2026-08-30T12:00:01.000Z",
});
assert.notEqual(status, null);
if (!status) return;

// Status-level fenced fields stay exactly as before: the configured (safe)
// name plus the joined connection's provider.
assert.equal(status.provider, "glm");
assert.equal(status.connectionName, "Team GLM");

// The lease object must be a projection of lease columns only — the joined
// connection_* identity values (owner email / display name) must never ride
// along on the runtime object, even though the current route consumer
// whitelists what it serializes.
for (const forbidden of [
"connectionEmail",
"connectionDisplayName",
"connectionName",
"connectionAuthType",
"connectionProvider",
]) {
assert.equal(forbidden in status.lease, false, `lease must not carry ${forbidden}`);
}
const serialized = JSON.stringify(status.lease);
assert.equal(serialized.includes(EMAIL), false);
assert.equal(serialized.includes(DISPLAY_NAME), false);

// Legitimate lease lifecycle fields are intact.
assert.equal(status.lease.state, "ACTIVE");
assert.equal(status.lease.generation, acquired.lease.generation);
assert.equal(status.lease.connectionId, connection.id);
assert.equal(status.lease.apiKeyId, "key-status-projection");
assert.equal(status.lease.provider, "glm");
assert.equal(status.lease.acquiredAt, "2026-08-30T12:00:00.000Z");
assert.equal(status.lease.renewedAt, "2026-08-30T12:00:00.000Z");
assert.equal(status.lease.expiresAt, "2026-08-30T12:02:00.000Z");
assert.equal(status.lease.leaseOwnerHash, leases.hashLeaseOwnerId(OWNER));
assert.equal(status.lease.endedAt, null);
assert.equal(status.lease.endReason, null);
assert.deepEqual(Object.keys(status.lease).sort(), [
"acquiredAt",
"apiKeyId",
"connectionId",
"endReason",
"endedAt",
"expiresAt",
"generation",
"id",
"leaseOwnerHash",
"provider",
"renewedAt",
"state",
]);
});
Loading