mirror of
https://github.com/simstudioai/sim.git
synced 2026-02-18 18:25:14 -05:00
* feat(audit-log): add persistent audit log system with comprehensive route instrumentation
* fix(audit-log): address PR review — nullable workspaceId, enum usage, remove redundant queries
- Make audit_log.workspace_id nullable with ON DELETE SET NULL (logs survive workspace/user deletion)
- Make audit_log.actor_id nullable with ON DELETE SET NULL
- Replace all 53 routes' string literal action/resourceType with AuditAction.X and AuditResourceType.X enums
- Fix empty workspaceId ('') → null for OAuth, form, and org routes to avoid FK violations
- Remove redundant DB queries in chat manage route (use checkChatAccess return data)
- Fix organization routes to pass workspaceId: null instead of organizationId
* fix(audit-log): replace remaining workspaceId '' fallbacks with null
* fix(audit-log): credential-set org IDs, workspace deletion FK, actorId fallback, string literal action
* reran migrations
* fix(mcp,audit): tighten env var domain bypass, add post-resolution check, form workspaceId
- Only bypass MCP domain check when env var is in hostname/authority, not path/query
- Add post-resolution validateMcpDomain call in test-connection endpoint
- Match client-side isDomainAllowed to same hostname-only bypass logic
- Return workspaceId from checkFormAccess, use in form audit logs
- Add 49 comprehensive domain-check tests covering all edge cases
* fix(mcp): stateful regex lastIndex bug, RFC 3986 authority parsing
- Remove /g flag from module-level ENV_VAR_PATTERN to avoid lastIndex state
- Create fresh regex instances per call in server-side hasEnvVarInHostname
- Fix authority extraction to terminate at /, ?, or # per RFC 3986
- Prevents bypass via https://evil.com?token={{SECRET}} (no path)
- Add test cases for query-only and fragment-only env var URLs (53 total)
* fix(audit-log): try/catch for never-throw contract, accept null actorName/Email, fix misleading action
- Wrap recordAudit body in try/catch so nanoid() or header extraction can't throw
- Accept string | null for actorName and actorEmail (session.user.name can be null)
- Normalize null -> undefined before insert to match DB column types
- Fix org members route: ORG_MEMBER_ADDED -> ORG_INVITATION_CREATED (sends invite, not adds member)
* improvement(audit-log): add resource names and specific invitation actions
* fix(audit-log): use validated chat record, add mock sync tests
191 lines
5.8 KiB
TypeScript
191 lines
5.8 KiB
TypeScript
import { db } from '@sim/db'
|
|
import { credentialSet, credentialSetMember, member, organization, user } from '@sim/db/schema'
|
|
import { createLogger } from '@sim/logger'
|
|
import { and, count, desc, eq } from 'drizzle-orm'
|
|
import { NextResponse } from 'next/server'
|
|
import { z } from 'zod'
|
|
import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
|
|
import { getSession } from '@/lib/auth'
|
|
import { hasCredentialSetsAccess } from '@/lib/billing'
|
|
|
|
const logger = createLogger('CredentialSets')
|
|
|
|
const createCredentialSetSchema = z.object({
|
|
organizationId: z.string().min(1),
|
|
name: z.string().trim().min(1).max(100),
|
|
description: z.string().max(500).optional(),
|
|
providerId: z.enum(['google-email', 'outlook']),
|
|
})
|
|
|
|
export async function GET(req: Request) {
|
|
const session = await getSession()
|
|
|
|
if (!session?.user?.id) {
|
|
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
|
}
|
|
|
|
// Check plan access (team/enterprise) or env var override
|
|
const hasAccess = await hasCredentialSetsAccess(session.user.id)
|
|
if (!hasAccess) {
|
|
return NextResponse.json(
|
|
{ error: 'Credential sets require a Team or Enterprise plan' },
|
|
{ status: 403 }
|
|
)
|
|
}
|
|
|
|
const { searchParams } = new URL(req.url)
|
|
const organizationId = searchParams.get('organizationId')
|
|
|
|
if (!organizationId) {
|
|
return NextResponse.json({ error: 'organizationId is required' }, { status: 400 })
|
|
}
|
|
|
|
const membership = await db
|
|
.select({ id: member.id, role: member.role })
|
|
.from(member)
|
|
.where(and(eq(member.userId, session.user.id), eq(member.organizationId, organizationId)))
|
|
.limit(1)
|
|
|
|
if (membership.length === 0) {
|
|
return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
|
}
|
|
|
|
const sets = await db
|
|
.select({
|
|
id: credentialSet.id,
|
|
name: credentialSet.name,
|
|
description: credentialSet.description,
|
|
providerId: credentialSet.providerId,
|
|
createdBy: credentialSet.createdBy,
|
|
createdAt: credentialSet.createdAt,
|
|
updatedAt: credentialSet.updatedAt,
|
|
creatorName: user.name,
|
|
creatorEmail: user.email,
|
|
})
|
|
.from(credentialSet)
|
|
.leftJoin(user, eq(credentialSet.createdBy, user.id))
|
|
.where(eq(credentialSet.organizationId, organizationId))
|
|
.orderBy(desc(credentialSet.createdAt))
|
|
|
|
const setsWithCounts = await Promise.all(
|
|
sets.map(async (set) => {
|
|
const [memberCount] = await db
|
|
.select({ count: count() })
|
|
.from(credentialSetMember)
|
|
.where(
|
|
and(
|
|
eq(credentialSetMember.credentialSetId, set.id),
|
|
eq(credentialSetMember.status, 'active')
|
|
)
|
|
)
|
|
|
|
return {
|
|
...set,
|
|
memberCount: memberCount?.count ?? 0,
|
|
}
|
|
})
|
|
)
|
|
|
|
return NextResponse.json({ credentialSets: setsWithCounts })
|
|
}
|
|
|
|
export async function POST(req: Request) {
|
|
const session = await getSession()
|
|
|
|
if (!session?.user?.id) {
|
|
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
|
}
|
|
|
|
// Check plan access (team/enterprise) or env var override
|
|
const hasAccess = await hasCredentialSetsAccess(session.user.id)
|
|
if (!hasAccess) {
|
|
return NextResponse.json(
|
|
{ error: 'Credential sets require a Team or Enterprise plan' },
|
|
{ status: 403 }
|
|
)
|
|
}
|
|
|
|
try {
|
|
const body = await req.json()
|
|
const { organizationId, name, description, providerId } = createCredentialSetSchema.parse(body)
|
|
|
|
const membership = await db
|
|
.select({ id: member.id, role: member.role })
|
|
.from(member)
|
|
.where(and(eq(member.userId, session.user.id), eq(member.organizationId, organizationId)))
|
|
.limit(1)
|
|
|
|
const role = membership[0]?.role
|
|
if (membership.length === 0 || (role !== 'admin' && role !== 'owner')) {
|
|
return NextResponse.json(
|
|
{ error: 'Admin or owner permissions required to create credential sets' },
|
|
{ status: 403 }
|
|
)
|
|
}
|
|
|
|
const orgExists = await db
|
|
.select({ id: organization.id })
|
|
.from(organization)
|
|
.where(eq(organization.id, organizationId))
|
|
.limit(1)
|
|
|
|
if (orgExists.length === 0) {
|
|
return NextResponse.json({ error: 'Organization not found' }, { status: 404 })
|
|
}
|
|
|
|
const existingSet = await db
|
|
.select({ id: credentialSet.id })
|
|
.from(credentialSet)
|
|
.where(and(eq(credentialSet.organizationId, organizationId), eq(credentialSet.name, name)))
|
|
.limit(1)
|
|
|
|
if (existingSet.length > 0) {
|
|
return NextResponse.json(
|
|
{ error: 'A credential set with this name already exists' },
|
|
{ status: 409 }
|
|
)
|
|
}
|
|
|
|
const now = new Date()
|
|
const newCredentialSet = {
|
|
id: crypto.randomUUID(),
|
|
organizationId,
|
|
name,
|
|
description: description || null,
|
|
providerId,
|
|
createdBy: session.user.id,
|
|
createdAt: now,
|
|
updatedAt: now,
|
|
}
|
|
|
|
await db.insert(credentialSet).values(newCredentialSet)
|
|
|
|
logger.info('Created credential set', {
|
|
credentialSetId: newCredentialSet.id,
|
|
organizationId,
|
|
userId: session.user.id,
|
|
})
|
|
|
|
recordAudit({
|
|
workspaceId: null,
|
|
actorId: session.user.id,
|
|
action: AuditAction.CREDENTIAL_SET_CREATED,
|
|
resourceType: AuditResourceType.CREDENTIAL_SET,
|
|
resourceId: newCredentialSet.id,
|
|
actorName: session.user.name ?? undefined,
|
|
actorEmail: session.user.email ?? undefined,
|
|
resourceName: name,
|
|
description: `Created credential set "${name}"`,
|
|
request: req,
|
|
})
|
|
|
|
return NextResponse.json({ credentialSet: newCredentialSet }, { status: 201 })
|
|
} catch (error) {
|
|
if (error instanceof z.ZodError) {
|
|
return NextResponse.json({ error: error.errors[0].message }, { status: 400 })
|
|
}
|
|
logger.error('Error creating credential set', error)
|
|
return NextResponse.json({ error: 'Failed to create credential set' }, { status: 500 })
|
|
}
|
|
}
|