* fix(security): bind api_keys to the caller, lock hash-as-bearer RPCs and provider token tables Security audit 2026-09-01, critical items. - api_keys INSERT requires user_id = auth.uid() again (an admin could forge a key for any co-member and act as them in every company they belong to); SELECT is own-keys-or-admin; a BEFORE trigger freezes the identity and credential columns against user-session UPDATEs. - rotate_mcp_refresh_token and validate_and_increment_api_key become service_role only: they match rows by a presented SHA-256, so a hash readable by co-members was a bearer credential. - validate_and_increment_api_key fails closed when the key's user is no longer a member of the key's company. - provider_consent_tokens and provider_otc: the DELETE policies collapsed to "caller has any team row" (correlated subquery on a non-existent team_members.company_id). All member policies dropped; service_role only, matching every existing code path. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(security): role gates, ownership guards and posting integrity in the database Security audit 2026-09-01, high items at the database layer. - One table-level guard, enforce_company_writer_role(), blocks the read-only viewer role on 55 company-scoped tables including through the 15 membership-only SECURITY DEFINER writers. Keyed on the JWT role claim so it fires inside definer bodies; no-op for service_role and trigger cascades. - company_members user_id/company_id immutable from user sessions; invitations can never grant owner; team_members gains a transition guard (admins keep non-owner role moves); companies team_id and archiving are owner-only and team attachment needs team membership. - Direct statements (current_user = authenticated) can no longer insert posted headers, add lines under posted verifikat, or post a draft with a voucher number the sequence never issued. Sanctioned RPCs run as the definer and are untouched; the engine's own draft-then-post shapes still pass. - create_document_version refuses viewers and foreign storage paths; validate_version_chain needs membership and loses anon EXECUTE; match_documents / match_booking_templates lose anon; cron maintenance RPCs become service_role only; the production-only seed_asset_categories is dropped. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * build: pin tsx as an exact devDependency instead of fetching it with npx at build time prebuild ran "npx tsx" with no lockfile entry, so every Vercel, Docker and CI build downloaded tsx@latest and its transitive tree from the registry with no integrity check, inside the build environment. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(security): refuse the viewer role on API-key and MCP write paths The v1 wrapper and the MCP company routing checked company membership but never role, and both run as service role, so a read-only viewer holding an API key could post vouchers and change settings through the API. Mutating methods and non-read scopes now return 403 ROLE_READ_ONLY for viewers on v1; MCP write tools refuse viewers the same way. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(security): stop serving uploaded SVG, XML and HTML as executable content on the app origin Uploads persisted the browser-declared mime type and the inline proxy served it verbatim, sandboxing only text/html; the storage proxy forwarded the uploader's Content-Type. Any writer, or any Peppol sender, could plant a scripted SVG or XHTML that executed on app.gnubok.se. - inline route: allow-list of natively safe types (PDF, raster images) served as before; everything else gets the opaque sandbox CSP. - storage proxy: octet-stream + attachment + sandbox unless the DB mime for the key is on the allow-list. - document-service: the stored mime is the magic-byte validated type. - logo upload: magic-byte validation, SVG refused. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(security): byrå brand logo upload decides the type by magic bytes and drops SVG Same pattern as the company logo route: the logos bucket is public, so a scripted SVG (or anything declared as an image) must never land there. The upload pickers stop advertising SVG. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(security): bind Enable Banking, Stripe and WooCommerce callbacks to the initiating user The callbacks resolved the pending row by oauth_state alone, so a victim who completed an attacker-initiated consent had their bank account, merchant account or store attached to the attacker's company. requireFlowInitiator() now requires the cookie session of the user who started the flow: no session redirects to login with the callback URL preserved, a different user is refused and nothing is exchanged. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(security): guard tenant-controlled outbound fetches and surface the disabled rate limiter WooCommerce and Shopify syncs fetched a member-editable store URL with plain fetch() and redirect following under the service role, and the invoice PDF renderer fetched company_settings.logo_url unguarded. All three go through a new safeFetch() (public-IP validation via url-guard, https only, redirect: 'manual', body size cap) and re-normalise the stored host at use time. checkRateLimit() keeps failing open on hosted but logs one error per process when Upstash is not configured and exports isRateLimiterConfigured(). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(security): decide the API MFA gate from server-authenticated factors, not the session cookie getAuthenticatorAssuranceLevel() without arguments derives nextLevel from session.user.factors, which comes from the unsigned sb-*-auth-token cookie. Deleting factors from the cookie made an enrolled account look like it had nothing to step up to, on every /api route and in requireAuth. Both gates now read factors from the getUser() result or listFactors() and the level from the verified JWT claim, and fail closed on errors. Page-branch gate hardened the same way. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(security): bind Fortnox/Visma, Gmail and Skatteverket callbacks to the initiating user The arcim-migration callback exchanged the provider code onto whatever consent the one-time state named, with no check of who completed the flow and no org-number comparison, so a phished Fortnox admin handed their ledger to the attacker's company. provider_otc now records the initiating user (migration 20260902100000); the callback requires that session and, after the exchange, refuses a provider company whose org number differs from the consent's company. The Gmail and Skatteverket callbacks enforce the same initiator check. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(security): BankID signup confirms the email before linking the identity Signup created an email-confirmed, MFA-exempt account for any address the caller typed and returned a magic link, so an attacker could pre-register a victim's email and keep a permanent BankID login into the account the victim later adopted. The user is now created unconfirmed, the identity carries email_verified_at NULL (migration 20260902101000), bankid_linked is not set until the mailed confirmation is clicked, and BankID login of a pending identity is refused with the confirmation re-sent. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(security): bind MCP OAuth redirect URIs to the consenting user and cap scopes A user-registered redirect URI was allowlisted globally, the consent page named no client, and all scopes were pre-checked, so one phishing link handed an attacker a full-scope key for the victim's company. Registered URIs now resolve only for the registrant or a colleague sharing a company; the consent page shows the client identity and redirect host; non-built-in clients default to read-only pre-checks; scopes are capped by the user's role (viewer: read only) at consent and at /token. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(auth): client follow-ups for BankID confirmation, callback mismatch copy and decision log - register client handles the new confirmation_sent response from BankID signup with the existing inbox screen instead of calling verifyOtp. - BankID login surfaces the email_unconfirmed explanation. - WooCommerce settings map woocommerce_error=wrong_user to its own copy. - Logo help text no longer advertises SVG. - DECISIONS.md records the audit remediation choices. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(mcp-oauth): literal SoD columns in the api_keys insert so the phantom-column scanner resolves them Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * test(logo): type the upload fixtures as Uint8Array<ArrayBuffer> so they are valid BlobParts Fixes the typecheck ratchet on PR #2155 and ratchets the baseline down by the one legacy error the change removed. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> --------- Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
310 lines
11 KiB
TypeScript
310 lines
11 KiB
TypeScript
import { NextResponse } from 'next/server'
|
|
import { decryptAuthCode, verifyPkce, hashAuthCode } from '@/lib/auth/oauth-codes'
|
|
import {
|
|
generateApiKey,
|
|
OAUTH_MCP_KEY_NAME,
|
|
generateRefreshToken,
|
|
hashRefreshToken,
|
|
createServiceClientNoCookies,
|
|
validateScopes,
|
|
findStageApproveConflict,
|
|
DEFAULT_OAUTH_SCOPES,
|
|
type ApiKeyScope,
|
|
} from '@/lib/auth/api-keys'
|
|
import { capScopesForRole, lookupCompanyRole } from '@/lib/auth/oauth-allowlist'
|
|
import { getActiveCompanyId } from '@/lib/company/context'
|
|
|
|
const ACCESS_TOKEN_TTL_SECONDS = 3600
|
|
|
|
// Grace window (seconds) during which a just-superseded access token and refresh
|
|
// token stay valid after a rotation. Lets a client that cannot reliably persist
|
|
// the rotated refresh token, or that fires concurrent refreshes: recover via
|
|
// idempotent replay instead of being forced into a re-auth loop (issue #710).
|
|
// Reuse of a previous refresh token AFTER this window revokes the grant.
|
|
const REFRESH_GRACE_SECONDS = 120
|
|
|
|
/**
|
|
* OAuth 2.0 Token Endpoint.
|
|
*
|
|
* Supports two grant types:
|
|
* - authorization_code: exchange a PKCE-protected auth code for a fresh
|
|
* api_key (access_token) plus a refresh_token.
|
|
* - refresh_token: rotate the refresh_token and return the same api_key
|
|
* with a fresh expires_in. The api_key itself does not expire
|
|
* server-side; expires_in is a hint so clients refresh on a cadence.
|
|
*/
|
|
export async function POST(request: Request) {
|
|
let params: URLSearchParams
|
|
|
|
const contentType = request.headers.get('content-type') || ''
|
|
if (contentType.includes('application/x-www-form-urlencoded')) {
|
|
const text = await request.text()
|
|
params = new URLSearchParams(text)
|
|
} else if (contentType.includes('application/json')) {
|
|
const json = await request.json()
|
|
params = new URLSearchParams(json as Record<string, string>)
|
|
} else {
|
|
return NextResponse.json({ error: 'unsupported_content_type' }, { status: 400 })
|
|
}
|
|
|
|
const grantType = params.get('grant_type')
|
|
|
|
if (grantType === 'authorization_code') {
|
|
return handleAuthorizationCodeGrant(params)
|
|
}
|
|
|
|
if (grantType === 'refresh_token') {
|
|
return handleRefreshTokenGrant(params)
|
|
}
|
|
|
|
return NextResponse.json(
|
|
{
|
|
error: 'unsupported_grant_type',
|
|
error_description: 'Only authorization_code and refresh_token are supported',
|
|
},
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
async function handleAuthorizationCodeGrant(params: URLSearchParams) {
|
|
const code = params.get('code')
|
|
const codeVerifier = params.get('code_verifier')
|
|
const redirectUri = params.get('redirect_uri')
|
|
|
|
if (!code) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_request', error_description: 'Missing code parameter' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
const payload = decryptAuthCode(code)
|
|
if (!payload) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_grant', error_description: 'Invalid or expired authorization code' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
if (redirectUri && redirectUri !== payload.redirectUri) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_grant', error_description: 'redirect_uri mismatch' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
if (!codeVerifier) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_request', error_description: 'code_verifier is required' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
if (!verifyPkce(codeVerifier, payload.codeChallenge)) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_grant', error_description: 'PKCE verification failed' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
const codeHash = hashAuthCode(code)
|
|
const supabase = createServiceClientNoCookies()
|
|
|
|
const { error: replayError } = await supabase
|
|
.from('oauth_used_codes')
|
|
.insert({ code_hash: codeHash })
|
|
|
|
if (replayError) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_grant', error_description: 'Authorization code already used' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
// Clean up expired codes (non-blocking, best-effort)
|
|
supabase
|
|
.from('oauth_used_codes')
|
|
.delete()
|
|
.lt('created_at', new Date(Date.now() - 10 * 60 * 1000).toISOString())
|
|
.then(() => {})
|
|
|
|
// Bind the key to the company the consent page showed (carried in the code
|
|
// payload), so the role cap below is checked against the company the user
|
|
// actually consented for. Codes minted before the field existed, and
|
|
// companyless consents (signed up from the OAuth popup, issue #1814),
|
|
// resolve the active company here instead; null leaves the key unbound and
|
|
// validateApiKey binds it on the first call after a company exists.
|
|
const companyId =
|
|
typeof payload.companyId === 'string' && payload.companyId.length > 0
|
|
? payload.companyId
|
|
: await getActiveCompanyId(supabase, payload.userId)
|
|
|
|
const { key, hash, prefix } = generateApiKey()
|
|
const refresh = generateRefreshToken()
|
|
|
|
// Use the scopes the user consented to during /authorize. Re-validate
|
|
// every value against API_KEY_SCOPES even though /authorize already did:
|
|
// the auth code is AEAD-encrypted but we treat the boundary as
|
|
// hostile by default (V9.2.1, defense-in-depth).
|
|
let grantedScopes: ApiKeyScope[]
|
|
if (payload.scopes && Array.isArray(payload.scopes) && payload.scopes.length > 0) {
|
|
const revalidated = validateScopes(payload.scopes)
|
|
if (!revalidated) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_grant', error_description: 'Authorization code carried no valid scopes' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
grantedScopes = revalidated
|
|
} else {
|
|
// Code minted with no scope (Claude's existing flow). Fall back to the
|
|
// read-only OAuth defaults: destructive scopes must be requested
|
|
// explicitly (GDPR Art. 25(2)).
|
|
grantedScopes = DEFAULT_OAUTH_SCOPES
|
|
}
|
|
|
|
// Re-apply the role cap /authorize computed, against the live membership:
|
|
// a viewer's key is read-only even if the code payload says otherwise, and
|
|
// a role demoted between consent and exchange is honoured. A failed lookup
|
|
// is a hard stop rather than a silent downgrade or widening.
|
|
if (companyId) {
|
|
const lookup = await lookupCompanyRole(supabase, payload.userId, companyId)
|
|
if (lookup.error) {
|
|
console.error('[mcp-oauth/token] role lookup failed', { message: lookup.error })
|
|
return NextResponse.json(
|
|
{ error: 'server_error', error_description: 'Failed to resolve company role' },
|
|
{ status: 500 }
|
|
)
|
|
}
|
|
const capped = capScopesForRole(grantedScopes, lookup.role)
|
|
grantedScopes = capped.length > 0 ? capped : capScopesForRole(DEFAULT_OAUTH_SCOPES, lookup.role)
|
|
}
|
|
|
|
// Segregation of duties, mirrored from app/api/settings/api-keys: a key
|
|
// that can both stage and approve is recorded as an acknowledged risk
|
|
// acceptance. The consent page states the rule above the Allow button, so
|
|
// the consent click is the self-attestation (ASVS V16.1.1 / SOC 2 CC6.1).
|
|
const conflictingScope = findStageApproveConflict(grantedScopes)
|
|
const sodAcknowledgedAt = conflictingScope ? new Date().toISOString() : null
|
|
|
|
const { error: insertError } = await supabase
|
|
.from('api_keys')
|
|
.insert({
|
|
user_id: payload.userId,
|
|
company_id: companyId,
|
|
key_hash: hash,
|
|
key_prefix: prefix,
|
|
name: OAUTH_MCP_KEY_NAME,
|
|
scopes: grantedScopes,
|
|
refresh_token_hash: refresh.hash,
|
|
// Literal keys (null when no conflict): the no-phantom-columns scanner
|
|
// resolves object literals only, never spreads.
|
|
sod_acknowledged_at: sodAcknowledgedAt,
|
|
sod_acknowledged_by: sodAcknowledgedAt ? payload.userId : null,
|
|
})
|
|
|
|
if (insertError) {
|
|
// This 500 was silent while api_keys.company_id was NOT NULL and every
|
|
// companyless signup died here (2026-08-26): always log the DB error.
|
|
console.error('[mcp-oauth/token] api key insert failed', {
|
|
code: insertError.code,
|
|
message: insertError.message,
|
|
companyless: companyId === null,
|
|
})
|
|
return NextResponse.json(
|
|
{ error: 'server_error', error_description: 'Failed to create API key' },
|
|
{ status: 500 }
|
|
)
|
|
}
|
|
|
|
if (conflictingScope) {
|
|
// High-risk security event, same shape the manual create route logs.
|
|
console.warn('[mcp-oauth/token] api_key.sod_acknowledged', {
|
|
keyPrefix: prefix,
|
|
conflictingScope,
|
|
scopes: grantedScopes,
|
|
acknowledgedBy: payload.userId,
|
|
companyId,
|
|
})
|
|
}
|
|
|
|
return NextResponse.json({
|
|
access_token: key,
|
|
token_type: 'Bearer',
|
|
expires_in: ACCESS_TOKEN_TTL_SECONDS,
|
|
refresh_token: refresh.token,
|
|
scope: grantedScopes.join(' '),
|
|
})
|
|
}
|
|
|
|
async function handleRefreshTokenGrant(params: URLSearchParams) {
|
|
const refreshToken = params.get('refresh_token')
|
|
if (!refreshToken) {
|
|
return NextResponse.json(
|
|
{ error: 'invalid_request', error_description: 'refresh_token is required' },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
const supabase = createServiceClientNoCookies()
|
|
const presentedHash = hashRefreshToken(refreshToken)
|
|
|
|
// Pre-generate the candidate credentials; the RPC decides whether to use them
|
|
// (rotate / idempotent replay) or ignore them (reuse / revoked / invalid).
|
|
// Doing lookup + rotate + demote in ONE SECURITY DEFINER RPC closes the
|
|
// TOCTOU gap the old SELECT-then-CAS had, and lets a just-superseded refresh
|
|
// token stay valid for a grace window so a client that cannot persist the
|
|
// rotated token, or fires concurrent refreshes: recovers instead of being
|
|
// forced into a re-auth loop (issue #710). Reuse AFTER the grace window
|
|
// revokes the grant (RFC 9700 §4.14.2 reuse detection).
|
|
const rotated = generateRefreshToken()
|
|
const { key: newKey, hash: newKeyHash, prefix: newKeyPrefix } = generateApiKey()
|
|
|
|
const { data, error } = await supabase.rpc('rotate_mcp_refresh_token', {
|
|
p_presented_hash: presentedHash,
|
|
p_new_refresh_hash: rotated.hash,
|
|
p_new_key_hash: newKeyHash,
|
|
p_new_key_prefix: newKeyPrefix,
|
|
p_grace_seconds: REFRESH_GRACE_SECONDS,
|
|
})
|
|
|
|
if (error) {
|
|
console.error('[mcp-oauth/token] refresh rotation failed', { code: error.code, message: error.message })
|
|
return NextResponse.json(
|
|
{ error: 'server_error', error_description: 'Failed to rotate refresh token' },
|
|
{ status: 500 }
|
|
)
|
|
}
|
|
|
|
const result = (Array.isArray(data) ? data[0] : data) as
|
|
| { outcome: string; scopes: string[] | null }
|
|
| undefined
|
|
const outcome = result?.outcome
|
|
|
|
// 'rotated' (normal) and 'replayed' (idempotent in-grace retry/concurrent)
|
|
// both succeed and return the freshly minted pair. Everything else maps to
|
|
// invalid_grant; for 'reuse_revoked' the grant was already revoked in the RPC.
|
|
if (outcome !== 'rotated' && outcome !== 'replayed') {
|
|
return NextResponse.json(
|
|
{
|
|
error: 'invalid_grant',
|
|
error_description:
|
|
outcome === 'revoked' ? 'Refresh token revoked' : 'Invalid or expired refresh token',
|
|
},
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
// Carry the granular scopes the key was minted with (read-only OAuth defaults
|
|
// for legacy keys with null scopes) so clients don't re-authorize on refresh.
|
|
const persistedScopes = validateScopes(result?.scopes ?? null) ?? DEFAULT_OAUTH_SCOPES
|
|
|
|
return NextResponse.json({
|
|
access_token: newKey,
|
|
token_type: 'Bearer',
|
|
expires_in: ACCESS_TOKEN_TTL_SECONDS,
|
|
refresh_token: rotated.token,
|
|
scope: persistedScopes.join(' '),
|
|
})
|
|
}
|