fix(cloud): harden edge gateways, api-server ssrf, supabase fail-closed quota, and web/admin lifecycle
This commit is contained in:
parent
2a009e421a
commit
c68e81e0aa
46 changed files with 2553 additions and 294 deletions
|
|
@ -9,11 +9,13 @@ function assert(condition: boolean, message: string): asserts condition {
|
|||
type Row = Record<string, unknown>
|
||||
type ServiceClient = ReturnType<typeof createClient>
|
||||
|
||||
type QueryError = { message: string; code?: string } | null
|
||||
|
||||
/** Minimal in-memory stand-in for the supabase-js query builder used by quota.ts. */
|
||||
class FakeQuery implements PromiseLike<{ data: unknown; error: null }> {
|
||||
class FakeQuery implements PromiseLike<{ data: unknown; error: QueryError }> {
|
||||
private filters: Array<(row: Row) => boolean> = []
|
||||
private singleRow = false
|
||||
constructor(private rows: Row[]) {}
|
||||
constructor(private rows: Row[], private error: QueryError = null) {}
|
||||
select(_columns: string): this {
|
||||
return this
|
||||
}
|
||||
|
|
@ -33,10 +35,13 @@ class FakeQuery implements PromiseLike<{ data: unknown; error: null }> {
|
|||
this.singleRow = true
|
||||
return this
|
||||
}
|
||||
then<T1 = { data: unknown; error: null }, T2 = never>(
|
||||
onfulfilled?: ((value: { data: unknown; error: null }) => T1 | PromiseLike<T1>) | null,
|
||||
then<T1 = { data: unknown; error: QueryError }, T2 = never>(
|
||||
onfulfilled?: ((value: { data: unknown; error: QueryError }) => T1 | PromiseLike<T1>) | null,
|
||||
onrejected?: ((reason: unknown) => T2 | PromiseLike<T2>) | null,
|
||||
): PromiseLike<T1 | T2> {
|
||||
if (this.error) {
|
||||
return Promise.resolve({ data: null, error: this.error }).then(onfulfilled, onrejected)
|
||||
}
|
||||
const matched = this.rows.filter((row) => this.filters.every((f) => f(row)))
|
||||
const data = this.singleRow ? (matched[0] ?? null) : matched
|
||||
return Promise.resolve({ data, error: null }).then(onfulfilled, onrejected)
|
||||
|
|
@ -45,6 +50,7 @@ class FakeQuery implements PromiseLike<{ data: unknown; error: null }> {
|
|||
|
||||
class FakeQuotaClient {
|
||||
tables: Record<string, Row[]> = { subscriptions: [], daily_usage: [] }
|
||||
tableErrors: Partial<Record<'subscriptions' | 'daily_usage', QueryError>> = {}
|
||||
rpcCalls: Array<{ name: string; args: Record<string, unknown> }> = []
|
||||
rpcResult: unknown = {
|
||||
allowed: true,
|
||||
|
|
@ -54,7 +60,10 @@ class FakeQuotaClient {
|
|||
consumed_from: 'overage',
|
||||
}
|
||||
from(table: string): FakeQuery {
|
||||
return new FakeQuery(this.tables[table] ?? [])
|
||||
const error = table === 'subscriptions' || table === 'daily_usage'
|
||||
? (this.tableErrors[table] ?? null)
|
||||
: null
|
||||
return new FakeQuery(this.tables[table] ?? [], error)
|
||||
}
|
||||
rpc(name: string, args: Record<string, unknown>): Promise<{ data: unknown; error: null }> {
|
||||
this.rpcCalls.push({ name, args })
|
||||
|
|
@ -149,3 +158,30 @@ Deno.test('RPC response parser rejects malformed payloads', () => {
|
|||
assert(threw, `accepted ${JSON.stringify(bad)}`)
|
||||
}
|
||||
})
|
||||
|
||||
Deno.test('checkQuota_사용량및구독DB오류_0으로허용하지않고예외로실패폐쇄한다', async () => {
|
||||
const usageFailClient = freeUserWithUsage([])
|
||||
usageFailClient.tableErrors.daily_usage = { message: 'connection refused', code: '08006' }
|
||||
let usageThrew = false
|
||||
try {
|
||||
await checkQuota(USER, 'llm_haiku', usageFailClient.asClient(), NOW)
|
||||
} catch {
|
||||
usageThrew = true
|
||||
}
|
||||
assert(usageThrew, 'daily_usage DB error must throw instead of silently returning usage=0')
|
||||
|
||||
const subFailClient = new FakeQuotaClient()
|
||||
subFailClient.tableErrors.subscriptions = { message: 'timeout', code: '57014' }
|
||||
let subThrew = false
|
||||
try {
|
||||
await checkQuota(USER, 'llm_haiku', subFailClient.asClient(), NOW)
|
||||
} catch {
|
||||
subThrew = true
|
||||
}
|
||||
assert(subThrew, 'subscriptions DB error must throw instead of silently falling back')
|
||||
|
||||
const notFoundClient = new FakeQuotaClient()
|
||||
notFoundClient.tableErrors.subscriptions = { message: 'no rows', code: 'PGRST116' }
|
||||
const missingRowCheck = await checkQuota(USER, 'llm_haiku', notFoundClient.asClient(), NOW)
|
||||
assert(missingRowCheck.tier === 'free' && missingRowCheck.overageCredits === 0, 'PGRST116 falls back cleanly to free tier')
|
||||
})
|
||||
|
|
|
|||
|
|
@ -209,11 +209,14 @@ async function readSubscriptionQuotaState(
|
|||
userId: string,
|
||||
serviceRoleClient: ReturnType<typeof createClient>,
|
||||
): Promise<SubscriptionQuotaState> {
|
||||
const { data: sub } = await serviceRoleClient
|
||||
const { data: sub, error } = await serviceRoleClient
|
||||
.from('subscriptions')
|
||||
.select('tier, overage_credits')
|
||||
.eq('user_id', userId)
|
||||
.single()
|
||||
if (error && error.code !== 'PGRST116') {
|
||||
throw new Error(`Failed to read subscription quota state: ${error.message ?? error.code ?? 'unknown'}`)
|
||||
}
|
||||
return {
|
||||
tier: (sub?.tier as Tier) ?? 'free',
|
||||
overageCredits: (sub?.overage_credits as number) ?? 0,
|
||||
|
|
@ -236,13 +239,16 @@ async function readWindowUsage(
|
|||
serviceRoleClient: ReturnType<typeof createClient>,
|
||||
now: Date,
|
||||
): Promise<number> {
|
||||
const { data: rows } = await serviceRoleClient
|
||||
const { data: rows, error } = await serviceRoleClient
|
||||
.from('daily_usage')
|
||||
.select('count')
|
||||
.eq('user_id', userId)
|
||||
.eq('feature', feature)
|
||||
.gte('date', quotaWindowStart(period, now))
|
||||
.lte('date', quotaUsageDate(now))
|
||||
if (error) {
|
||||
throw new Error(`Failed to read quota usage window: ${error.message ?? error.code ?? 'unknown'}`)
|
||||
}
|
||||
const usageRows = (rows ?? []) as Array<{ count: number | null }>
|
||||
return usageRows.reduce((sum, row) => sum + (row.count ?? 0), 0)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue