feat: ship Wave 5-6 multi-surface hygiene, optimization, and bug fixes
This commit is contained in:
parent
01ef3293cf
commit
66b6b45ba9
399 changed files with 17828 additions and 11330 deletions
|
|
@ -10,6 +10,7 @@ import { requireManager } from '@/lib/admin-guard'
|
|||
import Link from 'next/link'
|
||||
import { notFound } from 'next/navigation'
|
||||
import { AuditDiffViewer } from '@/components/audit-diff-viewer'
|
||||
import { DetailRow } from '@/components/detail-row'
|
||||
import { sanitizeAuditSnapshot } from '@/lib/audit-sanitize'
|
||||
|
||||
interface PageProps {
|
||||
|
|
@ -114,11 +115,11 @@ export default async function AuditLogDetailPage({ params }: PageProps): Promise
|
|||
Transaction Metadata
|
||||
</Typography>
|
||||
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 1.5, fontFamily: FONT_SANS, fontSize: '13px' }}>
|
||||
<Row label="EXECUTING ADMIN" value={adminName} />
|
||||
<Row label="ADMIN UID" value={typedLog.admin_id as string} isMono />
|
||||
<Row label="TARGET CLASSIFIER" value={typedLog.target_type as string} isMono />
|
||||
<Row label="TARGET ID" value={typedLog.target_id as string} isMono />
|
||||
<Row label="LOGGED TIMESTAMP" value={new Date(typedLog.created_at as string).toLocaleString()} />
|
||||
<DetailRow label="EXECUTING ADMIN" value={adminName} />
|
||||
<DetailRow label="ADMIN UID" value={typedLog.admin_id as string} isMono />
|
||||
<DetailRow label="TARGET CLASSIFIER" value={typedLog.target_type as string} isMono />
|
||||
<DetailRow label="TARGET ID" value={typedLog.target_id as string} isMono />
|
||||
<DetailRow label="LOGGED TIMESTAMP" value={new Date(typedLog.created_at as string).toLocaleString()} />
|
||||
</Box>
|
||||
</DoubleBezelCard>
|
||||
|
||||
|
|
@ -164,14 +165,3 @@ export default async function AuditLogDetailPage({ params }: PageProps): Promise
|
|||
</>
|
||||
)
|
||||
}
|
||||
|
||||
function Row({ label, value, isMono }: { label: string; value: string; isMono?: boolean }): React.ReactElement {
|
||||
return (
|
||||
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', py: 0.5, borderBottom: `1px solid ${C.border}` }}>
|
||||
<Typography sx={{ fontFamily: FONT_SANS, fontSize: '12px', color: C.dim }}>{label}</Typography>
|
||||
<Typography sx={{ fontFamily: isMono ? FONT_MONO : FONT_SANS, fontSize: '12px', fontWeight: 600, color: C.bright }}>
|
||||
{value}
|
||||
</Typography>
|
||||
</Box>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
// apps/admin/src/app/(admin)/models/page.tsx
|
||||
// D3RO Voice — Dynamic AI Models & Cloud STT Transcription Provider Manager (Midnight Glass v2)
|
||||
|
||||
import React, { useState, useEffect } from 'react'
|
||||
import React, { useState, useEffect, useRef } from 'react'
|
||||
import {
|
||||
Box,
|
||||
Typography,
|
||||
|
|
@ -111,19 +111,29 @@ export default function ServiceModelsPage(): React.ReactElement {
|
|||
const [llmCompletionCost, setLlmCompletionCost] = useState('0')
|
||||
const [llmMemo, setLlmMemo] = useState('')
|
||||
|
||||
const mountedRef = useRef(true)
|
||||
const loadSeqRef = useRef(0)
|
||||
|
||||
const loadData = async () => {
|
||||
const seq = ++loadSeqRef.current
|
||||
setDataError(null)
|
||||
try {
|
||||
const [sttData, llmData] = await Promise.all([fetchSttEndpointsClient(), fetchModelEndpointsClient()])
|
||||
if (!mountedRef.current || loadSeqRef.current !== seq) return
|
||||
setSttEndpoints(sttData)
|
||||
setLlmEndpoints(llmData)
|
||||
} catch (error) {
|
||||
if (!mountedRef.current || loadSeqRef.current !== seq) return
|
||||
setDataError(error instanceof Error ? error.message : '관리자 백엔드에서 엔드포인트를 불러오지 못했습니다.')
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
loadData()
|
||||
mountedRef.current = true
|
||||
void loadData()
|
||||
return () => {
|
||||
mountedRef.current = false
|
||||
}
|
||||
}, [])
|
||||
|
||||
// ── STT Handlers ──────────────────────────────────────────────────────────
|
||||
|
|
@ -160,11 +170,17 @@ export default function ServiceModelsPage(): React.ReactElement {
|
|||
setSttFallbackPriority(ep.fallbackPriority)
|
||||
setSttIsDefault(ep.isDefault)
|
||||
setSttTestModalResult(null)
|
||||
setSttMemo('')
|
||||
setSttModalOpen(true)
|
||||
}
|
||||
|
||||
const handleSaveSttEndpoint = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
const parsedCostPerMinute = parseFloat(sttCostPerMinute)
|
||||
if (!Number.isFinite(parsedCostPerMinute) || parsedCostPerMinute < 0) {
|
||||
alert('분당 비용은 0 이상의 유효한 숫자여야 합니다.')
|
||||
return
|
||||
}
|
||||
setSttLoading(true)
|
||||
|
||||
try {
|
||||
|
|
@ -178,8 +194,8 @@ export default function ServiceModelsPage(): React.ReactElement {
|
|||
language: sttLanguage,
|
||||
prompt: sttPrompt ? sttPrompt : undefined,
|
||||
temperature: 0.0,
|
||||
costPerMinute: parseFloat(sttCostPerMinute),
|
||||
costPerSecond: parseFloat(sttCostPerMinute) / 60,
|
||||
costPerMinute: parsedCostPerMinute,
|
||||
costPerSecond: parsedCostPerMinute / 60,
|
||||
isDefault: sttIsDefault,
|
||||
isActive: true,
|
||||
fallbackPriority: sttFallbackPriority,
|
||||
|
|
@ -193,11 +209,13 @@ export default function ServiceModelsPage(): React.ReactElement {
|
|||
}
|
||||
|
||||
await loadData()
|
||||
setSttModalOpen(false)
|
||||
if (mountedRef.current) setSttModalOpen(false)
|
||||
} catch (err) {
|
||||
alert('Error saving STT endpoint: ' + (err instanceof Error ? err.message : String(err)))
|
||||
if (mountedRef.current) {
|
||||
alert('Error saving STT endpoint: ' + (err instanceof Error ? err.message : String(err)))
|
||||
}
|
||||
} finally {
|
||||
setSttLoading(false)
|
||||
if (mountedRef.current) setSttLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -206,6 +224,7 @@ export default function ServiceModelsPage(): React.ReactElement {
|
|||
if (memo.length < 3) return
|
||||
try {
|
||||
await setDefaultSttEndpointClient(id, memo)
|
||||
if (!mountedRef.current) return
|
||||
setSttEndpoints((prev) =>
|
||||
prev.map((ep) => ({
|
||||
...ep,
|
||||
|
|
@ -213,7 +232,9 @@ export default function ServiceModelsPage(): React.ReactElement {
|
|||
}))
|
||||
)
|
||||
} catch (err) {
|
||||
alert('Error: ' + (err instanceof Error ? err.message : String(err)))
|
||||
if (mountedRef.current) {
|
||||
alert('Error: ' + (err instanceof Error ? err.message : String(err)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -221,11 +242,13 @@ export default function ServiceModelsPage(): React.ReactElement {
|
|||
setSttPingStatus((prev) => ({ ...prev, [id]: 'Testing...' }))
|
||||
try {
|
||||
const result = await testSttEndpointClient(id)
|
||||
if (!mountedRef.current) return
|
||||
setSttPingStatus((prev) => ({
|
||||
...prev,
|
||||
[id]: result.success ? `⚡ OK • ${result.latencyMs}ms` : `❌ ${result.message}`
|
||||
}))
|
||||
} catch (error) {
|
||||
if (!mountedRef.current) return
|
||||
setSttPingStatus((prev) => ({
|
||||
...prev,
|
||||
[id]: `❌ ${error instanceof Error ? error.message : 'Test failed'}`
|
||||
|
|
@ -238,19 +261,21 @@ export default function ServiceModelsPage(): React.ReactElement {
|
|||
setSttTestModalResult(null)
|
||||
try {
|
||||
const result = await testSttEndpointClient(sttEditingId ?? 0, sttApiKey, sttEndpointUrl)
|
||||
if (!mountedRef.current) return
|
||||
setSttTestModalResult({
|
||||
success: result.success,
|
||||
message: result.message,
|
||||
ms: result.latencyMs,
|
||||
})
|
||||
} catch (err) {
|
||||
if (!mountedRef.current) return
|
||||
setSttTestModalResult({
|
||||
success: false,
|
||||
message: err instanceof Error ? err.message : 'Test failed',
|
||||
ms: 0,
|
||||
})
|
||||
} finally {
|
||||
setTestingInModal(false)
|
||||
if (mountedRef.current) setTestingInModal(false)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -260,9 +285,13 @@ export default function ServiceModelsPage(): React.ReactElement {
|
|||
if (memo.length < 3) return
|
||||
try {
|
||||
await deleteSttEndpointClient(id, memo)
|
||||
setSttEndpoints((prev) => prev.filter((ep) => ep.id !== id))
|
||||
if (mountedRef.current) {
|
||||
setSttEndpoints((prev) => prev.filter((ep) => ep.id !== id))
|
||||
}
|
||||
} catch (err) {
|
||||
alert('Error: ' + (err instanceof Error ? err.message : String(err)))
|
||||
if (mountedRef.current) {
|
||||
alert('Error: ' + (err instanceof Error ? err.message : String(err)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -282,6 +311,15 @@ export default function ServiceModelsPage(): React.ReactElement {
|
|||
|
||||
const handleAddLlmEndpoint = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
const parsedPromptCost = parseFloat(llmPromptCost)
|
||||
const parsedCompletionCost = parseFloat(llmCompletionCost)
|
||||
if (
|
||||
!Number.isFinite(parsedPromptCost) || parsedPromptCost < 0
|
||||
|| !Number.isFinite(parsedCompletionCost) || parsedCompletionCost < 0
|
||||
) {
|
||||
alert('토큰 비용은 0 이상의 유효한 숫자여야 합니다.')
|
||||
return
|
||||
}
|
||||
setLlmLoading(true)
|
||||
|
||||
try {
|
||||
|
|
@ -291,11 +329,12 @@ export default function ServiceModelsPage(): React.ReactElement {
|
|||
provider: llmProvider,
|
||||
endpointUrl: llmEndpointUrl,
|
||||
apiKey: llmApiKey,
|
||||
costPer1kPromptTokens: parseFloat(llmPromptCost),
|
||||
costPer1kCompletionTokens: parseFloat(llmCompletionCost),
|
||||
costPer1kPromptTokens: parsedPromptCost,
|
||||
costPer1kCompletionTokens: parsedCompletionCost,
|
||||
memo: llmMemo.trim(),
|
||||
})
|
||||
await loadData()
|
||||
if (!mountedRef.current) return
|
||||
setLlmModalOpen(false)
|
||||
setLlmModelId('')
|
||||
setLlmModelName('')
|
||||
|
|
@ -303,9 +342,11 @@ export default function ServiceModelsPage(): React.ReactElement {
|
|||
setLlmApiKey('')
|
||||
setLlmMemo('')
|
||||
} catch (err) {
|
||||
alert('Error: ' + (err instanceof Error ? err.message : String(err)))
|
||||
if (mountedRef.current) {
|
||||
alert('Error: ' + (err instanceof Error ? err.message : String(err)))
|
||||
}
|
||||
} finally {
|
||||
setLlmLoading(false)
|
||||
if (mountedRef.current) setLlmLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -315,9 +356,13 @@ export default function ServiceModelsPage(): React.ReactElement {
|
|||
if (memo.length < 3) return
|
||||
try {
|
||||
await deleteModelEndpointClient(id, memo)
|
||||
setLlmEndpoints((current) => current.filter((endpoint) => endpoint.id !== id))
|
||||
if (mountedRef.current) {
|
||||
setLlmEndpoints((current) => current.filter((endpoint) => endpoint.id !== id))
|
||||
}
|
||||
} catch (error) {
|
||||
alert('Error: ' + (error instanceof Error ? error.message : String(error)))
|
||||
if (mountedRef.current) {
|
||||
alert('Error: ' + (error instanceof Error ? error.message : String(error)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ import { DoubleBezelCard, TactileBadge } from '@d3ro/ui/components/ds'
|
|||
import { getSupabaseAdminClient, isSupabaseAdminConfigured } from '@/lib/supabase-admin'
|
||||
import { UnavailableAdminPanel } from '@/components/unavailable-admin-panel'
|
||||
import { requireManager, hasMinRole } from '@/lib/admin-guard'
|
||||
import { ADMIN_UUID_PATTERN } from '@/lib/request-security'
|
||||
import { DetailRow } from '@/components/detail-row'
|
||||
import Link from 'next/link'
|
||||
import { notFound } from 'next/navigation'
|
||||
import { SubscriptionDetailClient } from './client'
|
||||
|
|
@ -16,6 +18,7 @@ interface PageProps {
|
|||
}
|
||||
|
||||
export default async function SubscriptionDetailPage({ params }: PageProps): Promise<React.ReactElement> {
|
||||
const admin = await requireManager()
|
||||
if (!isSupabaseAdminConfigured()) {
|
||||
return (
|
||||
<UnavailableAdminPanel
|
||||
|
|
@ -26,7 +29,7 @@ export default async function SubscriptionDetailPage({ params }: PageProps): Pro
|
|||
)
|
||||
}
|
||||
const { id: userId } = await params
|
||||
const admin = await requireManager()
|
||||
if (!ADMIN_UUID_PATTERN.test(userId)) notFound()
|
||||
const supabase = await getSupabaseAdminClient()
|
||||
|
||||
const [subRes, profileRes, auditRes] = await Promise.all([
|
||||
|
|
@ -123,9 +126,9 @@ export default async function SubscriptionDetailPage({ params }: PageProps): Pro
|
|||
Account Identifiers
|
||||
</Typography>
|
||||
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 1.5, fontFamily: FONT_SANS, fontSize: '13px' }}>
|
||||
<Row label="Customer Name" value={(profile.name as string) ?? '-'} />
|
||||
<Row label="Account UID" value={userId} isMono />
|
||||
<Row label="Assigned Role" value={((profile.role as string) ?? 'user').toUpperCase()} isMono />
|
||||
<DetailRow label="Customer Name" value={(profile.name as string) ?? '-'} />
|
||||
<DetailRow label="Account UID" value={userId} isMono />
|
||||
<DetailRow label="Assigned Role" value={((profile.role as string) ?? 'user').toUpperCase()} isMono />
|
||||
</Box>
|
||||
</DoubleBezelCard>
|
||||
|
||||
|
|
@ -135,11 +138,11 @@ export default async function SubscriptionDetailPage({ params }: PageProps): Pro
|
|||
Contract Status & Pricing
|
||||
</Typography>
|
||||
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 1.5, fontFamily: FONT_SANS, fontSize: '13px' }}>
|
||||
<Row label="Plan Level" value={isProPlus ? 'PRO+ VIP' : isPro ? 'PRO' : 'FREE'} />
|
||||
<Row label="Current Status" value={sub?.status ? String(sub.status).toUpperCase() : 'NO SUBSCRIPTION'} />
|
||||
<Row label="Payment Gateway" value={sub?.payment_provider ? String(sub.payment_provider).toUpperCase() : 'NOT ASSIGNED'} />
|
||||
<Row label="Contract Expires / Renews" value={sub?.current_period_end ? new Date(sub.current_period_end as string).toLocaleDateString() : 'NOT SET'} />
|
||||
<Row label="Overage Credits" value={sub ? String(sub.overage_credits) : 'NO SUBSCRIPTION'} isMono />
|
||||
<DetailRow label="Plan Level" value={isProPlus ? 'PRO+ VIP' : isPro ? 'PRO' : 'FREE'} />
|
||||
<DetailRow label="Current Status" value={sub?.status ? String(sub.status).toUpperCase() : 'NO SUBSCRIPTION'} />
|
||||
<DetailRow label="Payment Gateway" value={sub?.payment_provider ? String(sub.payment_provider).toUpperCase() : 'NOT ASSIGNED'} />
|
||||
<DetailRow label="Contract Expires / Renews" value={sub?.current_period_end ? new Date(sub.current_period_end as string).toLocaleDateString() : 'NOT SET'} />
|
||||
<DetailRow label="Overage Credits" value={sub ? String(sub.overage_credits) : 'NO SUBSCRIPTION'} isMono />
|
||||
</Box>
|
||||
</DoubleBezelCard>
|
||||
</Box>
|
||||
|
|
@ -215,14 +218,3 @@ export default async function SubscriptionDetailPage({ params }: PageProps): Pro
|
|||
</>
|
||||
)
|
||||
}
|
||||
|
||||
function Row({ label, value, isMono }: { label: string; value: string; isMono?: boolean }): React.ReactElement {
|
||||
return (
|
||||
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', py: 0.5, borderBottom: `1px solid ${C.border}` }}>
|
||||
<Typography sx={{ fontFamily: FONT_SANS, fontSize: '12px', color: C.dim }}>{label}</Typography>
|
||||
<Typography sx={{ fontFamily: isMono ? FONT_MONO : FONT_SANS, fontSize: '12px', fontWeight: 600, color: C.bright }}>
|
||||
{value}
|
||||
</Typography>
|
||||
</Box>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ import { DoubleBezelCard, TactileBadge } from '@d3ro/ui/components/ds'
|
|||
import { getSupabaseAdminClient, isSupabaseAdminConfigured } from '@/lib/supabase-admin'
|
||||
import { UnavailableAdminPanel } from '@/components/unavailable-admin-panel'
|
||||
import { requireManager, isAdmin } from '@/lib/admin-guard'
|
||||
import { ADMIN_UUID_PATTERN } from '@/lib/request-security'
|
||||
import { DetailRow } from '@/components/detail-row'
|
||||
import Link from 'next/link'
|
||||
import { notFound } from 'next/navigation'
|
||||
import { RoleChangeButton } from './role-change-button'
|
||||
|
|
@ -17,6 +19,7 @@ interface PageProps {
|
|||
}
|
||||
|
||||
export default async function AdminUserDetailPage({ params }: PageProps): Promise<React.ReactElement> {
|
||||
const admin = await requireManager()
|
||||
if (!isSupabaseAdminConfigured()) {
|
||||
return (
|
||||
<UnavailableAdminPanel
|
||||
|
|
@ -27,7 +30,7 @@ export default async function AdminUserDetailPage({ params }: PageProps): Promis
|
|||
)
|
||||
}
|
||||
const { id } = await params
|
||||
const admin = await requireManager()
|
||||
if (!ADMIN_UUID_PATTERN.test(id)) notFound()
|
||||
const supabase = await getSupabaseAdminClient()
|
||||
|
||||
const [authRes, profileRes, subRes, usageRes] = await Promise.all([
|
||||
|
|
@ -161,11 +164,11 @@ export default async function AdminUserDetailPage({ params }: PageProps): Promis
|
|||
</Box>
|
||||
|
||||
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 1.5, fontFamily: FONT_SANS, fontSize: '13px' }}>
|
||||
<Row label="Account UID" value={(profile.id as string) || id} isMono />
|
||||
<Row label="Assigned Role" value={userRole.toUpperCase()} valueColor={userRole === 'super_admin' ? C.purple400 : C.cyanLight} isMono />
|
||||
<Row label="Language Locale" value={(profile.locale as string) || 'Not reported'} isMono />
|
||||
<Row label="Created Date" value={new Date(profile.created_at as string).toLocaleDateString()} />
|
||||
<Row label="Last Active Session" value={profile.last_login ? new Date(profile.last_login as string).toLocaleString() : 'Never signed in'} />
|
||||
<DetailRow label="Account UID" value={(profile.id as string) || id} isMono />
|
||||
<DetailRow label="Assigned Role" value={userRole.toUpperCase()} valueColor={userRole === 'super_admin' ? C.purple400 : C.cyanLight} isMono />
|
||||
<DetailRow label="Language Locale" value={(profile.locale as string) || 'Not reported'} isMono />
|
||||
<DetailRow label="Created Date" value={new Date(profile.created_at as string).toLocaleDateString()} />
|
||||
<DetailRow label="Last Active Session" value={profile.last_login ? new Date(profile.last_login as string).toLocaleString() : 'Never signed in'} />
|
||||
</Box>
|
||||
</DoubleBezelCard>
|
||||
|
||||
|
|
@ -181,10 +184,10 @@ export default async function AdminUserDetailPage({ params }: PageProps): Promis
|
|||
</Box>
|
||||
|
||||
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 1.5, mb: 3 }}>
|
||||
<Row label="Plan Tier" value={isProPlus ? 'PRO+ VIP' : isPro ? 'PRO' : tier === 'free' ? 'FREE' : 'Unavailable'} />
|
||||
<Row label="Billing Provider" value={sub?.payment_provider ? String(sub.payment_provider) : 'Not assigned'} />
|
||||
<Row label="Current Period End" value={sub?.current_period_end ? new Date(sub.current_period_end as string).toLocaleDateString() : 'Not set'} />
|
||||
<Row label="Cancel Scheduled" value={sub?.cancel_at ? new Date(sub.cancel_at as string).toLocaleDateString() : 'Not scheduled'} />
|
||||
<DetailRow label="Plan Tier" value={isProPlus ? 'PRO+ VIP' : isPro ? 'PRO' : tier === 'free' ? 'FREE' : 'Unavailable'} />
|
||||
<DetailRow label="Billing Provider" value={sub?.payment_provider ? String(sub.payment_provider) : 'Not assigned'} />
|
||||
<DetailRow label="Current Period End" value={sub?.current_period_end ? new Date(sub.current_period_end as string).toLocaleDateString() : 'Not set'} />
|
||||
<DetailRow label="Cancel Scheduled" value={sub?.cancel_at ? new Date(sub.cancel_at as string).toLocaleDateString() : 'Not scheduled'} />
|
||||
</Box>
|
||||
|
||||
<Box sx={{ p: 2, borderRadius: '12px', bgcolor: 'var(--d3-bg-inset-soft)', border: `1px solid ${C.border}` }}>
|
||||
|
|
@ -280,19 +283,3 @@ export default async function AdminUserDetailPage({ params }: PageProps): Promis
|
|||
</>
|
||||
)
|
||||
}
|
||||
|
||||
function Row({ label, value, valueColor, isMono }: {
|
||||
label: string
|
||||
value: string
|
||||
valueColor?: string
|
||||
isMono?: boolean
|
||||
}): React.ReactElement {
|
||||
return (
|
||||
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', py: 0.5, borderBottom: `1px solid ${C.border}` }}>
|
||||
<Typography sx={{ fontFamily: FONT_SANS, fontSize: '12px', color: C.dim }}>{label}</Typography>
|
||||
<Typography sx={{ fontFamily: isMono ? FONT_MONO : FONT_SANS, fontSize: '12px', fontWeight: 600, color: valueColor ?? C.bright }}>
|
||||
{value}
|
||||
</Typography>
|
||||
</Box>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { AdminBackendError, fetchAdminBackend } from '@/lib/backend-session'
|
||||
import type { AdminRole } from '@/lib/admin-session'
|
||||
import { isSameOriginRequest, readBoundedTextBody } from '@/lib/request-security'
|
||||
|
||||
export const runtime = 'nodejs'
|
||||
|
||||
|
|
@ -40,26 +41,6 @@ function requiredRole(method: string, path: string): AdminRole | null {
|
|||
return null
|
||||
}
|
||||
|
||||
function isSameOrigin(request: NextRequest): boolean {
|
||||
const origin = request.headers.get('origin')
|
||||
if (!origin) return request.headers.get('sec-fetch-site') !== 'cross-site'
|
||||
try {
|
||||
const requestOrigin = new URL(origin).origin
|
||||
if (requestOrigin === request.nextUrl.origin) return true
|
||||
|
||||
const forwardedProto = request.headers.get('x-forwarded-proto')?.split(',')[0]?.trim().toLowerCase()
|
||||
const forwardedHost = request.headers.get('x-forwarded-host')?.split(',')[0]?.trim()
|
||||
?? request.headers.get('host')?.trim()
|
||||
if ((forwardedProto !== 'http' && forwardedProto !== 'https') ||
|
||||
!forwardedHost || !/^[A-Za-z0-9.:[\]-]+$/.test(forwardedHost)) {
|
||||
return false
|
||||
}
|
||||
return requestOrigin === `${forwardedProto}://${forwardedHost}`
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
async function proxy(
|
||||
request: NextRequest,
|
||||
context: { params: Promise<{ segments: string[] }> }
|
||||
|
|
@ -68,15 +49,19 @@ async function proxy(
|
|||
const path = pathFor(segments)
|
||||
const role = path ? requiredRole(request.method, path) : null
|
||||
if (!path || !role) return NextResponse.json({ error: 'admin_route_not_allowed' }, { status: 404 })
|
||||
if (request.method !== 'GET' && !isSameOrigin(request)) {
|
||||
if (request.method !== 'GET' && !isSameOriginRequest(request)) {
|
||||
return NextResponse.json({ error: 'cross_site_request_rejected' }, { status: 403 })
|
||||
}
|
||||
|
||||
let body: string | undefined
|
||||
if (request.method !== 'GET') {
|
||||
body = await request.text()
|
||||
if (new TextEncoder().encode(body).byteLength > 64 * 1024) {
|
||||
return NextResponse.json({ error: 'request_too_large' }, { status: 413 })
|
||||
try {
|
||||
body = await readBoundedTextBody(request, 64 * 1024)
|
||||
} catch (error) {
|
||||
if (error instanceof AdminBackendError) {
|
||||
return NextResponse.json({ error: error.message }, { status: error.status })
|
||||
}
|
||||
return NextResponse.json({ error: 'invalid_request' }, { status: 400 })
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import { NextRequest, NextResponse } from 'next/server'
|
|||
import { issueSignedLicenseKey, type SignedLicensePayload } from '@d3ro/core/utils/crypto-license'
|
||||
import type { LicenseTier } from '@d3ro/core/types'
|
||||
import { AdminBackendError, fetchAdminBackend, requireVerifiedBackendSession } from '@/lib/backend-session'
|
||||
import { isSameOriginRequest, readBoundedJsonObject } from '@/lib/request-security'
|
||||
|
||||
export const runtime = 'nodejs'
|
||||
|
||||
|
|
@ -32,19 +33,12 @@ function resolveSigningKey(): string | null {
|
|||
return null
|
||||
}
|
||||
|
||||
function isSameOrigin(request: NextRequest): boolean {
|
||||
const origin = request.headers.get('origin')
|
||||
if (!origin) return request.headers.get('sec-fetch-site') !== 'cross-site'
|
||||
try {
|
||||
return new URL(origin).origin === request.nextUrl.origin
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
export async function POST(request: NextRequest): Promise<NextResponse> {
|
||||
if (!isSameOrigin(request)) {
|
||||
return NextResponse.json({ error: 'cross_site_request_rejected' }, { status: 403 })
|
||||
if (!isSameOriginRequest(request)) {
|
||||
return NextResponse.json(
|
||||
{ error: 'cross_site_request_rejected' },
|
||||
{ status: 403, headers: { 'Cache-Control': 'no-store' } }
|
||||
)
|
||||
}
|
||||
|
||||
try {
|
||||
|
|
@ -52,20 +46,24 @@ export async function POST(request: NextRequest): Promise<NextResponse> {
|
|||
} catch (error) {
|
||||
const status = error instanceof AdminBackendError ? error.status : 401
|
||||
const message = error instanceof AdminBackendError ? error.message : 'admin_session_invalid'
|
||||
return NextResponse.json({ error: message }, { status })
|
||||
return NextResponse.json({ error: message }, { status, headers: { 'Cache-Control': 'no-store' } })
|
||||
}
|
||||
|
||||
let body: unknown
|
||||
let candidate: Record<string, unknown>
|
||||
try {
|
||||
body = await request.json()
|
||||
} catch {
|
||||
return NextResponse.json({ error: 'invalid_request' }, { status: 400 })
|
||||
candidate = await readBoundedJsonObject(request, 16 * 1024)
|
||||
} catch (error) {
|
||||
if (error instanceof AdminBackendError) {
|
||||
return NextResponse.json(
|
||||
{ error: error.message },
|
||||
{ status: error.status, headers: { 'Cache-Control': 'no-store' } }
|
||||
)
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'invalid_request' },
|
||||
{ status: 400, headers: { 'Cache-Control': 'no-store' } }
|
||||
)
|
||||
}
|
||||
if (!body || typeof body !== 'object' || Array.isArray(body)) {
|
||||
return NextResponse.json({ error: 'invalid_request' }, { status: 400 })
|
||||
}
|
||||
|
||||
const candidate = body as Record<string, unknown>
|
||||
const customerEmail = typeof candidate.customerEmail === 'string' ? candidate.customerEmail.trim().toLowerCase() : ''
|
||||
const tier = candidate.tier
|
||||
const validity = typeof candidate.validity === 'string' ? candidate.validity : ''
|
||||
|
|
@ -139,5 +137,5 @@ export async function POST(request: NextRequest): Promise<NextResponse> {
|
|||
licenseId: payload.licenseId,
|
||||
expiresAt: payload.expiresAt,
|
||||
auditRecorded
|
||||
})
|
||||
}, { headers: { 'Cache-Control': 'no-store' } })
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,46 +1,17 @@
|
|||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { AdminBackendError, requireVerifiedBackendSession } from '@/lib/backend-session'
|
||||
import { ADMIN_UUID_PATTERN, isSameOriginRequest, readBoundedJsonObject } from '@/lib/request-security'
|
||||
import { getSupabaseAdminClient } from '@/lib/supabase-admin'
|
||||
|
||||
export const runtime = 'nodejs'
|
||||
|
||||
const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i
|
||||
const UUID = ADMIN_UUID_PATTERN
|
||||
const ROLES = new Set(['user', 'manager', 'admin', 'super_admin'])
|
||||
const TIERS = new Set(['free', 'pro', 'pro_plus'])
|
||||
const STATUSES = new Set(['active', 'canceled', 'past_due', 'expired'])
|
||||
|
||||
function sameOrigin(request: NextRequest): boolean {
|
||||
const origin = request.headers.get('origin')
|
||||
if (!origin) return request.headers.get('sec-fetch-site') !== 'cross-site'
|
||||
try {
|
||||
const requestOrigin = new URL(origin).origin
|
||||
if (requestOrigin === request.nextUrl.origin) return true
|
||||
const forwardedProto = request.headers.get('x-forwarded-proto')?.split(',')[0]?.trim().toLowerCase()
|
||||
const forwardedHost = request.headers.get('x-forwarded-host')?.split(',')[0]?.trim()
|
||||
?? request.headers.get('host')?.trim()
|
||||
if ((forwardedProto !== 'http' && forwardedProto !== 'https') ||
|
||||
!forwardedHost || !/^[A-Za-z0-9.:[\]-]+$/.test(forwardedHost)) {
|
||||
return false
|
||||
}
|
||||
return requestOrigin === `${forwardedProto}://${forwardedHost}`
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
async function bodyObject(request: NextRequest): Promise<Record<string, unknown>> {
|
||||
if (request.headers.get('content-type')?.split(';', 1)[0]?.trim().toLowerCase() !== 'application/json') {
|
||||
throw new AdminBackendError('application_json_required', 415)
|
||||
}
|
||||
const text = await request.text()
|
||||
if (new TextEncoder().encode(text).byteLength > 32 * 1024) throw new AdminBackendError('request_too_large', 413)
|
||||
try {
|
||||
const parsed = JSON.parse(text) as unknown
|
||||
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) throw new Error()
|
||||
return parsed as Record<string, unknown>
|
||||
} catch {
|
||||
throw new AdminBackendError('invalid_request', 400)
|
||||
}
|
||||
return await readBoundedJsonObject(request, 32 * 1024, { requireJsonContentType: true })
|
||||
}
|
||||
|
||||
function onlyKeys(body: Record<string, unknown>, allowed: readonly string[]): void {
|
||||
|
|
@ -220,7 +191,7 @@ async function handlePayments(request: NextRequest): Promise<NextResponse> {
|
|||
}
|
||||
|
||||
async function route(request: NextRequest, context: { params: Promise<{ operation: string }> }): Promise<NextResponse> {
|
||||
if (request.method !== 'GET' && !sameOrigin(request)) {
|
||||
if (request.method !== 'GET' && !isSameOriginRequest(request)) {
|
||||
return NextResponse.json({ error: 'cross_site_request_rejected' }, { status: 403 })
|
||||
}
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
import { NextResponse } from 'next/server'
|
||||
import { AdminBackendError } from '@/lib/backend-session'
|
||||
import { readBoundedJsonObject } from '@/lib/request-security'
|
||||
import {
|
||||
checkRateLimit,
|
||||
recordFailedAttempt,
|
||||
|
|
@ -52,23 +54,24 @@ function failure(key: string, status: number, retryAfterSeconds?: number): NextR
|
|||
},
|
||||
{
|
||||
status,
|
||||
headers: retryAfterSeconds ? { 'Retry-After': String(retryAfterSeconds) } : undefined
|
||||
headers: {
|
||||
'Cache-Control': 'no-store',
|
||||
...(retryAfterSeconds ? { 'Retry-After': String(retryAfterSeconds) } : {})
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
export async function POST(request: Request): Promise<NextResponse> {
|
||||
let body: unknown
|
||||
let candidate: Record<string, unknown>
|
||||
try {
|
||||
body = await request.json()
|
||||
} catch {
|
||||
candidate = await readBoundedJsonObject(request, 16 * 1024)
|
||||
} catch (error) {
|
||||
if (error instanceof AdminBackendError) {
|
||||
return failure(error.message, error.status)
|
||||
}
|
||||
return failure('invalid_request', 400)
|
||||
}
|
||||
if (!body || typeof body !== 'object' || Array.isArray(body)) {
|
||||
return failure('invalid_request', 400)
|
||||
}
|
||||
|
||||
const candidate = body as Record<string, unknown>
|
||||
if (candidate.trap) return failure('access_denied', 403)
|
||||
const email =
|
||||
typeof candidate.usernameOrEmail === 'string'
|
||||
|
|
@ -132,10 +135,13 @@ export async function POST(request: Request): Promise<NextResponse> {
|
|||
expiresAt
|
||||
})
|
||||
|
||||
const response = NextResponse.json({
|
||||
success: true,
|
||||
user: { email: authenticatedEmail, role }
|
||||
})
|
||||
const response = NextResponse.json(
|
||||
{
|
||||
success: true,
|
||||
user: { email: authenticatedEmail, role }
|
||||
},
|
||||
{ headers: { 'Cache-Control': 'no-store' } }
|
||||
)
|
||||
response.cookies.set({
|
||||
name: 'd3ro_admin_session',
|
||||
value: signedCookieValue,
|
||||
|
|
|
|||
|
|
@ -1,40 +1,49 @@
|
|||
// apps/admin/src/app/api/auth/logout/route.ts
|
||||
// D3RO Voice — Admin Session Logout Handler
|
||||
|
||||
import { NextResponse } from 'next/server'
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { adminCookieSecure } from '@/lib/admin-session'
|
||||
import { isSameOriginRequest } from '@/lib/request-security'
|
||||
|
||||
export async function POST(): Promise<NextResponse> {
|
||||
const response = NextResponse.json({ success: true, message: 'Logged out successfully' })
|
||||
|
||||
function clearAdminSessionCookie(response: NextResponse): NextResponse {
|
||||
response.cookies.set({
|
||||
name: 'd3ro_admin_session',
|
||||
value: '',
|
||||
httpOnly: true,
|
||||
secure: adminCookieSecure(),
|
||||
sameSite: 'lax',
|
||||
sameSite: 'strict',
|
||||
path: '/',
|
||||
maxAge: 0,
|
||||
expires: new Date(0),
|
||||
})
|
||||
|
||||
return response
|
||||
}
|
||||
|
||||
export async function GET(request: Request): Promise<NextResponse> {
|
||||
export async function POST(request: NextRequest): Promise<NextResponse> {
|
||||
if (!isSameOriginRequest(request)) {
|
||||
return NextResponse.json(
|
||||
{ error: 'cross_site_request_rejected' },
|
||||
{ status: 403, headers: { 'Cache-Control': 'no-store' } }
|
||||
)
|
||||
}
|
||||
|
||||
const response = NextResponse.json(
|
||||
{ success: true, message: 'Logged out successfully' },
|
||||
{ headers: { 'Cache-Control': 'no-store' } }
|
||||
)
|
||||
return clearAdminSessionCookie(response)
|
||||
}
|
||||
|
||||
export async function GET(request: NextRequest): Promise<NextResponse> {
|
||||
if (request.headers.get('sec-fetch-site') === 'cross-site') {
|
||||
return NextResponse.json(
|
||||
{ error: 'cross_site_request_rejected' },
|
||||
{ status: 403, headers: { 'Cache-Control': 'no-store' } }
|
||||
)
|
||||
}
|
||||
|
||||
const url = new URL(request.url)
|
||||
const response = NextResponse.redirect(new URL('/login', url.origin))
|
||||
|
||||
response.cookies.set({
|
||||
name: 'd3ro_admin_session',
|
||||
value: '',
|
||||
httpOnly: true,
|
||||
secure: adminCookieSecure(),
|
||||
sameSite: 'lax',
|
||||
path: '/',
|
||||
maxAge: 0,
|
||||
expires: new Date(0),
|
||||
})
|
||||
|
||||
return response
|
||||
response.headers.set('Cache-Control', 'no-store')
|
||||
return clearAdminSessionCookie(response)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
'use client'
|
||||
|
||||
import { useState } from 'react'
|
||||
import { useEffect, useRef, useState } from 'react'
|
||||
import { Box, Tooltip } from '@mui/material'
|
||||
import { Check, Copy } from 'lucide-react'
|
||||
import { C, FONT_MONO } from '@/lib/console-theme'
|
||||
|
|
@ -11,12 +11,33 @@ interface ChecksumCopyProps {
|
|||
|
||||
export function ChecksumCopy({ value }: ChecksumCopyProps): React.ReactElement {
|
||||
const [copied, setCopied] = useState(false)
|
||||
const mountedRef = useRef(true)
|
||||
const resetTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
|
||||
|
||||
useEffect(() => {
|
||||
mountedRef.current = true
|
||||
return () => {
|
||||
mountedRef.current = false
|
||||
if (resetTimerRef.current !== null) {
|
||||
clearTimeout(resetTimerRef.current)
|
||||
resetTimerRef.current = null
|
||||
}
|
||||
}
|
||||
}, [])
|
||||
|
||||
const handleCopy = (): void => {
|
||||
void navigator.clipboard.writeText(value).then(() => {
|
||||
setCopied(true)
|
||||
setTimeout(() => setCopied(false), 2000)
|
||||
})
|
||||
if (!navigator.clipboard?.writeText) return
|
||||
void navigator.clipboard.writeText(value)
|
||||
.then(() => {
|
||||
if (!mountedRef.current) return
|
||||
setCopied(true)
|
||||
if (resetTimerRef.current !== null) clearTimeout(resetTimerRef.current)
|
||||
resetTimerRef.current = setTimeout(() => {
|
||||
resetTimerRef.current = null
|
||||
if (mountedRef.current) setCopied(false)
|
||||
}, 2000)
|
||||
})
|
||||
.catch(() => undefined)
|
||||
}
|
||||
|
||||
return (
|
||||
|
|
|
|||
37
apps/admin/src/components/detail-row.tsx
Normal file
37
apps/admin/src/components/detail-row.tsx
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
import { Box, Typography } from '@mui/material'
|
||||
import { C, FONT_MONO, FONT_SANS } from '@/lib/console-theme'
|
||||
|
||||
interface DetailRowProps {
|
||||
label: string
|
||||
value: string
|
||||
valueColor?: string
|
||||
isMono?: boolean
|
||||
}
|
||||
|
||||
export function DetailRow({ label, value, valueColor, isMono }: DetailRowProps): React.ReactElement {
|
||||
return (
|
||||
<Box
|
||||
sx={{
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
py: 0.5,
|
||||
borderBottom: `1px solid ${C.border}`,
|
||||
}}
|
||||
>
|
||||
<Typography sx={{ fontFamily: FONT_SANS, fontSize: '12px', color: C.dim }}>
|
||||
{label}
|
||||
</Typography>
|
||||
<Typography
|
||||
sx={{
|
||||
fontFamily: isMono ? FONT_MONO : FONT_SANS,
|
||||
fontSize: '12px',
|
||||
fontWeight: 600,
|
||||
color: valueColor ?? C.bright,
|
||||
}}
|
||||
>
|
||||
{value}
|
||||
</Typography>
|
||||
</Box>
|
||||
)
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
// apps/admin/src/components/license-issuer-dialog.tsx
|
||||
// Ed25519 라이선스 발급 다이얼로그 — 서명은 서버(/api/admin/license)에서만 수행한다.
|
||||
|
||||
import { useState } from 'react'
|
||||
import { useEffect, useRef, useState } from 'react'
|
||||
import {
|
||||
Dialog,
|
||||
DialogTitle,
|
||||
|
|
@ -52,6 +52,19 @@ export function LicenseIssuerDialog({ open, onClose }: LicenseIssuerDialogProps)
|
|||
const [loading, setLoading] = useState(false)
|
||||
const [copied, setCopied] = useState(false)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const mountedRef = useRef(true)
|
||||
const copyTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
|
||||
|
||||
useEffect(() => {
|
||||
mountedRef.current = true
|
||||
return () => {
|
||||
mountedRef.current = false
|
||||
if (copyTimerRef.current !== null) {
|
||||
clearTimeout(copyTimerRef.current)
|
||||
copyTimerRef.current = null
|
||||
}
|
||||
}
|
||||
}, [])
|
||||
|
||||
const handleGenerate = async (): Promise<void> => {
|
||||
setError(null)
|
||||
|
|
@ -78,20 +91,31 @@ export function LicenseIssuerDialog({ open, onClose }: LicenseIssuerDialogProps)
|
|||
if (!response.ok || data.success !== true || typeof data.licenseKey !== 'string') {
|
||||
throw new Error(describeIssueError(data.error))
|
||||
}
|
||||
if (!mountedRef.current) return
|
||||
setGeneratedKey(data.licenseKey)
|
||||
setAuditRecorded(data.auditRecorded !== false)
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Failed to generate license key')
|
||||
if (mountedRef.current) {
|
||||
setError(err instanceof Error ? err.message : 'Failed to generate license key')
|
||||
}
|
||||
} finally {
|
||||
setLoading(false)
|
||||
if (mountedRef.current) setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
const handleCopy = (): void => {
|
||||
if (!generatedKey) return
|
||||
if (!generatedKey || !navigator.clipboard?.writeText) return
|
||||
void navigator.clipboard.writeText(generatedKey)
|
||||
setCopied(true)
|
||||
setTimeout(() => setCopied(false), 3000)
|
||||
.then(() => {
|
||||
if (!mountedRef.current) return
|
||||
setCopied(true)
|
||||
if (copyTimerRef.current !== null) clearTimeout(copyTimerRef.current)
|
||||
copyTimerRef.current = setTimeout(() => {
|
||||
copyTimerRef.current = null
|
||||
if (mountedRef.current) setCopied(false)
|
||||
}, 3000)
|
||||
})
|
||||
.catch(() => undefined)
|
||||
}
|
||||
|
||||
const inputSx = {
|
||||
|
|
|
|||
|
|
@ -36,17 +36,25 @@ export function PaymentHistory({ userId }: PaymentHistoryProps): React.ReactElem
|
|||
const [error, setError] = useState<string | null>(null)
|
||||
|
||||
useEffect(() => {
|
||||
let active = true
|
||||
setLoading(true)
|
||||
setError(null)
|
||||
const load = async (): Promise<void> => {
|
||||
try {
|
||||
const result = await callAdminApi<PaymentData>(`admin-payments?userId=${userId}`)
|
||||
const result = await callAdminApi<PaymentData>(`admin-payments?userId=${encodeURIComponent(userId)}`)
|
||||
if (!active) return
|
||||
setData(result)
|
||||
} catch (caught) {
|
||||
if (!active) return
|
||||
setError(caught instanceof Error ? caught.message : 'Failed to load payment data')
|
||||
} finally {
|
||||
setLoading(false)
|
||||
if (active) setLoading(false)
|
||||
}
|
||||
}
|
||||
void load()
|
||||
return () => {
|
||||
active = false
|
||||
}
|
||||
}, [userId])
|
||||
|
||||
if (loading) {
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
import { cookies } from 'next/headers'
|
||||
import { redirect } from 'next/navigation'
|
||||
import { hasMinimumAdminRole } from '@d3ro/core/admin-roles'
|
||||
import { verifySession } from './security'
|
||||
import type { AdminRole } from './admin-session'
|
||||
|
||||
|
|
@ -57,9 +58,7 @@ export async function requireSuperAdmin(): Promise<AdminUser> {
|
|||
|
||||
export function hasMinRole(user?: AdminUser | null, minRole: AdminRole = 'manager'): boolean {
|
||||
if (!user) return false
|
||||
if (user.role === 'super_admin') return true
|
||||
if (user.role === 'admin' && minRole !== 'super_admin') return true
|
||||
return user.role === minRole
|
||||
return hasMinimumAdminRole(user.role, minRole)
|
||||
}
|
||||
|
||||
export function isSuperAdmin(user?: AdminUser | null): boolean {
|
||||
|
|
|
|||
94
apps/admin/src/lib/request-security.ts
Normal file
94
apps/admin/src/lib/request-security.ts
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
import 'server-only'
|
||||
|
||||
import type { NextRequest } from 'next/server'
|
||||
import { AdminBackendError } from '@/lib/backend-session'
|
||||
|
||||
export const ADMIN_UUID_PATTERN =
|
||||
/^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i
|
||||
|
||||
export function isSameOriginRequest(request: Pick<NextRequest, 'headers' | 'nextUrl'>): boolean {
|
||||
const origin = request.headers.get('origin')
|
||||
if (!origin) return request.headers.get('sec-fetch-site') !== 'cross-site'
|
||||
try {
|
||||
const requestOrigin = new URL(origin).origin
|
||||
if (requestOrigin === request.nextUrl.origin) return true
|
||||
|
||||
const forwardedProto = request.headers.get('x-forwarded-proto')?.split(',')[0]?.trim().toLowerCase()
|
||||
const forwardedHost = request.headers.get('x-forwarded-host')?.split(',')[0]?.trim()
|
||||
?? request.headers.get('host')?.trim()
|
||||
if (
|
||||
(forwardedProto !== 'http' && forwardedProto !== 'https')
|
||||
|| !forwardedHost
|
||||
|| !/^[A-Za-z0-9.:[\]-]+$/.test(forwardedHost)
|
||||
) {
|
||||
return false
|
||||
}
|
||||
return requestOrigin === `${forwardedProto}://${forwardedHost}`
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
export async function readBoundedTextBody(request: Request, maxBytes: number): Promise<string> {
|
||||
const contentLengthHeader = request.headers.get('content-length')?.trim()
|
||||
if (contentLengthHeader) {
|
||||
const declaredLength = Number(contentLengthHeader)
|
||||
if (Number.isFinite(declaredLength) && declaredLength > maxBytes) {
|
||||
throw new AdminBackendError('request_too_large', 413)
|
||||
}
|
||||
}
|
||||
|
||||
if (!request.body) {
|
||||
return ''
|
||||
}
|
||||
|
||||
const reader = request.body.getReader()
|
||||
const chunks: Uint8Array[] = []
|
||||
let totalBytes = 0
|
||||
|
||||
try {
|
||||
for (let next = await reader.read(); !next.done; next = await reader.read()) {
|
||||
const { value } = next
|
||||
totalBytes += value.byteLength
|
||||
if (totalBytes > maxBytes) {
|
||||
await reader.cancel().catch(() => undefined)
|
||||
throw new AdminBackendError('request_too_large', 413)
|
||||
}
|
||||
chunks.push(value)
|
||||
}
|
||||
} finally {
|
||||
reader.releaseLock()
|
||||
}
|
||||
|
||||
const combined = new Uint8Array(totalBytes)
|
||||
let offset = 0
|
||||
for (const chunk of chunks) {
|
||||
combined.set(chunk, offset)
|
||||
offset += chunk.byteLength
|
||||
}
|
||||
return new TextDecoder().decode(combined)
|
||||
}
|
||||
|
||||
export async function readBoundedJsonObject(
|
||||
request: Request,
|
||||
maxBytes: number,
|
||||
options: { requireJsonContentType?: boolean } = {},
|
||||
): Promise<Record<string, unknown>> {
|
||||
if (options.requireJsonContentType) {
|
||||
const contentType = request.headers.get('content-type')?.split(';', 1)[0]?.trim().toLowerCase()
|
||||
if (contentType !== 'application/json') {
|
||||
throw new AdminBackendError('application_json_required', 415)
|
||||
}
|
||||
}
|
||||
|
||||
const text = await readBoundedTextBody(request, maxBytes)
|
||||
try {
|
||||
const parsed = JSON.parse(text) as unknown
|
||||
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
||||
throw new Error('non_object_json')
|
||||
}
|
||||
return parsed as Record<string, unknown>
|
||||
} catch {
|
||||
throw new AdminBackendError('invalid_request', 400)
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue