feat(connect): hosted connector-key registry + validate RPC + entitlements endpoint; instance sync writes connector grants hourly (#1748)
* feat(entitlements): partition the self-host bypass so connector capabilities fall through to grants; capability_grants.source accepts 'connector' Sovereign plan WS3 PR3: ships dark, nothing changes for hosted. - lib/entitlements/keys.ts: CONNECTOR_CAPABILITIES = bank_sync, skatteverket, org_lookup, migration (services Accounted operates that a self-hosted instance cannot provide itself) + isConnectorCapability(). Separate from PAID_CAPABILITIES and outside the trial-seed trigger on purpose: a hosted company can never hold a connector grant. - lib/entitlements/has-capability.ts: isPaywallBypassed() -> isBypassedFor(key). Hosted: byte-identical (dev / DISABLE_PAYWALL bypass, FORCE_PAYWALL wins, else the grant lookup). Self-host: local capabilities always on (FORCE_PAYWALL included, as the existing test demands); connector capabilities behave like hosted, i.e. dev bypass, FORCE_PAYWALL, else the grant lookup where the connector sync will write source='connector' rows. getCompanyEntitlements on a self-host: local paid keys + active connector keys, state 'paid' with an active connector grant else 'none' (never the hosted trial copy). - Migration 20260820122000: capability_grants.source CHECK gains 'connector', found through pg_constraint (the CHECK was declared inline and auto-named; Postgres stores IN as = ANY, matched accordingly). pg-real test: connector accepted, unknown source rejected, upsert on the (scope, key, source) identity, trial seed writes no connector rows. - Tests: self-hosted connector matrix (local all-on without DB, connector gated by grant/expiry, dev bypass all-on, FORCE_PAYWALL gates connector keys only, bulk resolution, entitlements shape); two pre-existing tests that asserted the old "self-host holds connector keys" contract updated to the new one. Verified: full unit suite green, pg-real suite for lib/entitlements green against a local supabase/postgres with every migration applied, lint ratchet, guards. Deferred to the instance-wiring PR: adding the connector extensions to the self-host Docker preset (dead-end upsells until a key can be issued). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor(entitlements): fold the self-host branch into the existing grants query One .or(scopeFilter), not two: the duplicated helper pushed the no-phantom-columns unresolvable-expression count to 380/379. Behaviour is unchanged; the self-host matrix tests still pass. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(connect): hosted connector-key registry + validate RPC + entitlements endpoint; instance sync writes connector grants hourly Sovereign plan WS3 PR4 ("key infra enabling manual sales"), stacked on the entitlement partition (#1747). Nothing is purchasable yet; this is the plumbing both ends need before the first manually issued key. Hosted side: - Migration 20260820123000: connector_keys (SHA-256 key_hash, prefix, org_number, pinned instance_url, scopes, status, Stripe ids, current_period_end, per-minute rate limit, active_company_count, last_seen/synced) and connector_usage_events (per-request metering, separate from metered_events whose company_id references hosted companies). RLS on, NO policies: service role only. RPC validate_and_increment_connector_key copies the api_keys pattern (FOR UPDATE, minute window, suspended reported not counted, revoked = no row) and is REVOKEd from PUBLIC/anon/authenticated, GRANTed to service_role. pg-real test covers validate/count, unknown+revoked, suspended, rate limit, execute privileges per role, RLS invisibility, usage cascade. - lib/connect/contract.ts (shared wire types), lib/connect/hosted/keys.ts (generate/hash/validate -> 401/403/429 mapping), with-connector-auth.ts (Bearer or X-Connector-Key, one usage row per request, 500 envelope on handler throw), /api/connect/entitlements GET + POST (records active_company_count, pins instance_url on first report, never moves a pinned one), scripts/issue-connector-key.ts (dry run unless --confirm, prints the key once + the .env lines). Instance side: - lib/connect/instance/config.ts (GNUBOK_CONNECTOR_KEY, GNUBOK_CONNECT_URL default https://app.gnubok.se), sync.ts: reports the active company count and writes source='connector' grants for every company x covered scope, expires_at = min(now+72h, period_end+3d); 401/403 or a non-active status deletes them (freeze-and-retain); network/5xx/429 leave them alone. /api/connector/sync/cron (hourly) runs it; not_configured without a key. - Crontab generator gains EXTRA_JOBS (variant-only jobs not in vercel.json, with reasons) + drift tests; docker/crontab.self-hosted regenerated with the hourly sync. Docs (SELF-HOSTING connector section, env templates), DECISIONS. Tests: 52 new unit tests (keys, auth wrapper, route, config, sync outcomes and grant arithmetic, cron route, crontab EXTRA_JOBS) + 7 pg-real tests run locally against supabase/postgres with every migration applied. no-phantom-columns ceiling +1 with a reason (the bulk grant upsert). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore(connect): update pg test to re-versioned migration 20260831190000 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UzNkSsR18pLFitJdYn8QEb * fix(connect): RPC errors answer 503 not 401; X-Connector-Key wins over Authorization A hosted DB error mapped to 401 made the instance sync treat a pooler blip as key revocation and delete its entire connector grant cache, zeroing the 72h offline grace. 503 lands in the sync's keep-grants branch (already test-pinned). Bearer-first extraction hashed the upstream token on dual-header proxied calls, 401ing the exact shape X-Connector-Key exists for. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UzNkSsR18pLFitJdYn8QEb * fix(connect): sync deletes grants only on a body-proven connector rejection, never bare 401/403 A WAF challenge page, edge deployment protection, or an egress proxy answers 401/403 without the hosted app ever running; trusting status alone wiped the instance's 72h offline grant cache within the hour. Deletion now requires the hosted route's own rejection code in the JSON body; codeless 401/403 keeps grants (server_error branch). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UzNkSsR18pLFitJdYn8QEb * fix(connect): PR #1748 review batch: https-only connect URL, atomic pin, prefix-gated Bearer, deferred metering, entitlements validation, integer months - GNUBOK_CONNECT_URL must be https (http only for loopback); invalid or plaintext URLs disable the connector instead of sending the key. - instance_url pin update filters on IS NULL; a lost race re-reads and reports the winner's pin. - extractConnectorKey: a Bearer is the connector credential only with the gnubok_ck_ prefix; upstream Bearer falls through to X-Connector-Key. - Usage metering runs via after() off the response path (inline outside a request scope). - Sync validates entitlements shape: unknown status or malformed current_period_end keeps grants (server_error), never deletes. - issue-connector-key rejects fractional --months. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UzNkSsR18pLFitJdYn8QEb --------- Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: Emil <emilmattsson14@gmail.com>
This commit is contained in:
co-authored by
Claude Fable 5
Jakob Wennberg
Emil
parent
cfce2de925
commit
0ff1b05553
@@ -111,6 +111,37 @@ export const SCHEDULE_OVERRIDES: Readonly<
|
||||
'self-hosted': {},
|
||||
}
|
||||
|
||||
/**
|
||||
* Jobs that exist in ONE variant only and therefore have no vercel.json entry
|
||||
* (vercel.json is the hosted schedule). Each carries its reason, the same
|
||||
* discipline as EXCLUDED_PATHS: a self-hosted-only endpoint that silently
|
||||
* lacked a schedule would be dead code that looks alive.
|
||||
*
|
||||
* Rendered after the vercel.json jobs under their own comment line. The
|
||||
* crontab drift test checks both halves: the vercel.json mirror AND that
|
||||
* every EXTRA_JOBS path is a real cron route that vercel.json does NOT
|
||||
* schedule (the moment it does, the entry must go).
|
||||
*/
|
||||
export interface ExtraJob {
|
||||
path: string
|
||||
schedule: string
|
||||
reason: string
|
||||
}
|
||||
|
||||
export const EXTRA_JOBS: Readonly<Record<CrontabVariant, readonly ExtraJob[]>> = {
|
||||
hosted: [],
|
||||
'self-hosted': [
|
||||
{
|
||||
path: '/api/connector/sync/cron',
|
||||
schedule: '17 * * * *',
|
||||
reason:
|
||||
'Self-hosted only: refreshes the source=connector capability grants from the instance\'s ' +
|
||||
'GNUBOK_CONNECTOR_KEY (hourly; grants carry a 72h offline grace). Hosted has no connector ' +
|
||||
'key, so the route is not in vercel.json; an instance without a key answers not_configured.',
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
/** Read and shape-check the `crons` array. */
|
||||
export function readVercelCrons(vercelJson: string): VercelCron[] {
|
||||
const parsed = JSON.parse(vercelJson) as { crons?: VercelCron[] }
|
||||
@@ -178,6 +209,7 @@ export function buildCrontab(
|
||||
options: {
|
||||
excluded?: Readonly<Record<string, string>>
|
||||
overrides?: Readonly<Record<CrontabVariant, Readonly<Record<string, string>>>>
|
||||
extraJobs?: Readonly<Record<CrontabVariant, readonly ExtraJob[]>>
|
||||
} = {},
|
||||
): string {
|
||||
const excluded = options.excluded ?? EXCLUDED_PATHS
|
||||
@@ -190,13 +222,22 @@ export function buildCrontab(
|
||||
schedule: overrides[variant][cron.path] ?? cron.schedule,
|
||||
}))
|
||||
|
||||
const extraJobs = (options.extraJobs ?? EXTRA_JOBS)[variant]
|
||||
|
||||
// Align the commands: pad to the widest schedule plus two spaces, the same
|
||||
// column convention the hand-written files used.
|
||||
const width = jobs.reduce((max, job) => Math.max(max, job.schedule.length), 0) + 2
|
||||
const width = [...jobs, ...extraJobs].reduce((max, job) => Math.max(max, job.schedule.length), 0) + 2
|
||||
|
||||
const lines = [
|
||||
...buildHeader(variant),
|
||||
...jobs.map((job) => `${job.schedule.padEnd(width)}${CURL_PREFIX}${job.path}`),
|
||||
...(extraJobs.length > 0
|
||||
? [
|
||||
'',
|
||||
`# ${variant}-only jobs, not in vercel.json: see EXTRA_JOBS in scripts/generate-crontabs.ts`,
|
||||
...extraJobs.map((job) => `${job.schedule.padEnd(width)}${CURL_PREFIX}${job.path}`),
|
||||
]
|
||||
: []),
|
||||
]
|
||||
|
||||
return `${lines.join('\n')}\n`
|
||||
@@ -220,10 +261,20 @@ function main(): void {
|
||||
}
|
||||
}
|
||||
|
||||
for (const variant of VARIANTS) {
|
||||
for (const job of EXTRA_JOBS[variant]) {
|
||||
if (crons.some((cron) => cron.path === job.path)) {
|
||||
throw new Error(
|
||||
`EXTRA_JOBS.${variant} lists ${job.path}, which vercel.json now schedules. Remove the extra entry.`,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (const variant of VARIANTS) {
|
||||
const target = join(DOCKER_DIR, `crontab.${variant}`)
|
||||
writeFileSync(target, buildCrontab(crons, variant), 'utf8')
|
||||
const emitted = crons.filter((cron) => !(cron.path in EXCLUDED_PATHS)).length
|
||||
const emitted = crons.filter((cron) => !(cron.path in EXCLUDED_PATHS)).length + EXTRA_JOBS[variant].length
|
||||
const overridden = Object.keys(SCHEDULE_OVERRIDES[variant]).length
|
||||
console.log(
|
||||
`Wrote docker/crontab.${variant}: ${emitted} jobs` +
|
||||
|
||||
Reference in New Issue
Block a user