From 5ae7e408ecdc04362d8dbfda846c4d40188ad076 Mon Sep 17 00:00:00 2001 From: yiling Date: Wed, 3 Jun 2026 10:18:15 +0800 Subject: [PATCH 1/2] feat(auth): remove enablePublicSignup and disable public signup in UI --- packages/api/src/api/authn.test.ts | 2 -- packages/api/src/api/authn.ts | 1 - packages/core/src/auth/auth.ts | 2 +- .../core/src/collection/collection.test.ts | 1 - packages/core/src/team/team.ts | 6 ---- packages/db/src/prisma-json-types.ts | 1 - packages/dtos/src/auth.ts | 1 - packages/webui/routes/signup.tsx | 2 +- .../webui/routes/teams/$teamId/settings.tsx | 33 ------------------- 9 files changed, 2 insertions(+), 47 deletions(-) diff --git a/packages/api/src/api/authn.test.ts b/packages/api/src/api/authn.test.ts index 87832439..6dd981f6 100644 --- a/packages/api/src/api/authn.test.ts +++ b/packages/api/src/api/authn.test.ts @@ -18,7 +18,6 @@ describe('authn api', () => { it('GET /signup-info', async () => { mockGetSignupInfo.mockResolvedValue({ userCount: 5, - enablePublicSignup: true, }) const app = new Hono().route('/', authnRoute) @@ -27,7 +26,6 @@ describe('authn api', () => { expect(res.status).toBe(200) expect(await res.json()).toEqual({ userCount: 5, - enablePublicSignup: true, }) }) }) diff --git a/packages/api/src/api/authn.ts b/packages/api/src/api/authn.ts index 1073c232..4528a166 100644 --- a/packages/api/src/api/authn.ts +++ b/packages/api/src/api/authn.ts @@ -18,7 +18,6 @@ const route = app const info = await teamService.getSignupInfo() return c.json({ userCount: info.userCount, - enablePublicSignup: info.enablePublicSignup, }) }) .get('/me', async (c) => { diff --git a/packages/core/src/auth/auth.ts b/packages/core/src/auth/auth.ts index 5ca9f398..71519f54 100644 --- a/packages/core/src/auth/auth.ts +++ b/packages/core/src/auth/auth.ts @@ -31,7 +31,7 @@ export const auth = betterAuth({ const info = await teamService.getSignupInfo() if (info.userCount > 0) { - if (!inviteCode && !info.enablePublicSignup) { + if (!inviteCode) { console.log('[Better Auth Hook] Public signup is disabled') return ctx.json( { diff --git a/packages/core/src/collection/collection.test.ts b/packages/core/src/collection/collection.test.ts index cdfcac37..cc61942e 100644 --- a/packages/core/src/collection/collection.test.ts +++ b/packages/core/src/collection/collection.test.ts @@ -15,7 +15,6 @@ describe('CollectionService', () => { data: { name: 'Test Team', settings: { - enablePublicSignup: true, transcode: { videoStrategy: 'best_match' }, }, sandbox: { create: {} }, diff --git a/packages/core/src/team/team.ts b/packages/core/src/team/team.ts index c87a9e7d..ae36c12c 100644 --- a/packages/core/src/team/team.ts +++ b/packages/core/src/team/team.ts @@ -26,7 +26,6 @@ export class TeamService { data: { name: 'Default Team', settings: { - enablePublicSignup: true, transcode: { videoStrategy: 'best_match' }, }, sandbox: { create: {} }, @@ -249,14 +248,9 @@ export class TeamService { async getSignupInfo() { const count = await prisma.user.count() - const defaultTeam = await this.ensureDefaultTeam() - const settings = defaultTeam.settings as { - enablePublicSignup?: boolean - } | null return { userCount: count, - enablePublicSignup: settings?.enablePublicSignup ?? false, } } diff --git a/packages/db/src/prisma-json-types.ts b/packages/db/src/prisma-json-types.ts index f66098a5..47d3e13d 100644 --- a/packages/db/src/prisma-json-types.ts +++ b/packages/db/src/prisma-json-types.ts @@ -59,7 +59,6 @@ declare global { export interface Settings { transcode: TranscodeSettings - enablePublicSignup: boolean } // ---------------------------------------------------------------------- diff --git a/packages/dtos/src/auth.ts b/packages/dtos/src/auth.ts index 5b877f4e..e1b06479 100644 --- a/packages/dtos/src/auth.ts +++ b/packages/dtos/src/auth.ts @@ -2,7 +2,6 @@ import { z } from 'zod' export const signupInfoResponseSchema = z.object({ userCount: z.number(), - enablePublicSignup: z.boolean(), }) export type SignupInfoResponse = z.infer diff --git a/packages/webui/routes/signup.tsx b/packages/webui/routes/signup.tsx index 3c33bd89..4edc0dd1 100644 --- a/packages/webui/routes/signup.tsx +++ b/packages/webui/routes/signup.tsx @@ -96,7 +96,7 @@ function SignupPage() { } const isFirstUser = signupInfo?.userCount === 0 - const isPublicSignupDisabled = !isFirstUser && !signupInfo?.enablePublicSignup && !inviteCode + const isPublicSignupDisabled = !isFirstUser && !inviteCode if (isPublicSignupDisabled) { return ( diff --git a/packages/webui/routes/teams/$teamId/settings.tsx b/packages/webui/routes/teams/$teamId/settings.tsx index c673a612..2c6c7987 100644 --- a/packages/webui/routes/teams/$teamId/settings.tsx +++ b/packages/webui/routes/teams/$teamId/settings.tsx @@ -6,7 +6,6 @@ import { SandboxSettings } from '@/ui/components/settings/SandboxSettings' import { SkillsConfigCard } from '@/ui/components/settings/SkillsConfigCard' import { NotificationSettings } from '@/ui/components/settings/NotificationSettings' import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/ui/components/ui/card' -import { Switch } from '@/ui/components/ui/switch' import { cn } from '@/ui/lib/utils' import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { createFileRoute } from '@tanstack/react-router' @@ -275,38 +274,6 @@ function TeamSettingsPage() { - - {me?.role === 'owner' && ( - - - Team Settings - Manage your team's general settings. - - -
-
-

Enable Public Signup

-

- Allow users to sign up without an invite code. -

-
- - updateSettings({ - teamId, - data: { - key: 'enablePublicSignup', - value: checked, - }, - }) - } - /> -
-
-
- )} )} From 6e933a9970b86a84245d9fbe98a6bed747e3fce3 Mon Sep 17 00:00:00 2001 From: yiling Date: Wed, 3 Jun 2026 10:33:14 +0800 Subject: [PATCH 2/2] fix(auth): fix invite code bypass vulnerability --- packages/core/src/auth/auth.ts | 12 ++++++++++++ packages/core/src/invite/invite.ts | 16 ++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/packages/core/src/auth/auth.ts b/packages/core/src/auth/auth.ts index 71519f54..b3966f6c 100644 --- a/packages/core/src/auth/auth.ts +++ b/packages/core/src/auth/auth.ts @@ -42,6 +42,18 @@ export const auth = betterAuth({ }, ) } + + const isValid = await inviteService.validateInvite(inviteCode) + if (!isValid) { + return ctx.json( + { + error: 'Invalid or expired invite code', + }, + { + status: 400, + }, + ) + } } } }), diff --git a/packages/core/src/invite/invite.ts b/packages/core/src/invite/invite.ts index 8f8f8289..140a43b0 100644 --- a/packages/core/src/invite/invite.ts +++ b/packages/core/src/invite/invite.ts @@ -61,6 +61,22 @@ export class InviteService { return inv } + async validateInvite(code: string): Promise { + const inv = await prisma.invite.findUnique({ + where: { code }, + }) + + if (!inv) { + return false + } + + if (inv.used) { + return false + } + + return true + } + async consumeInvite(code: string, userId: string): Promise { await prisma.$transaction(async (tx) => { const inv = await tx.invite.findUniqueOrThrow({