From 476e3d93dd33d8787216ac1d424e79287fedad38 Mon Sep 17 00:00:00 2001 From: que01 Date: Thu, 15 Oct 2026 13:42:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20API=20=E5=89=8D?= =?UTF-8?q?=E7=BC=80=E4=B8=8B=E7=9A=84=E7=AE=A1=E7=90=86=E7=AB=AF=E9=89=B4?= =?UTF-8?q?=E6=9D=83=E7=BB=95=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/api/src/admin-membership.guard.ts | 17 +++++++++++------ apps/api/test/http.integration.test.js | 26 ++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/apps/api/src/admin-membership.guard.ts b/apps/api/src/admin-membership.guard.ts index d9f2887..b20258e 100644 --- a/apps/api/src/admin-membership.guard.ts +++ b/apps/api/src/admin-membership.guard.ts @@ -3,20 +3,25 @@ import type { CanActivate, ExecutionContext } from "@nestjs/common"; import type { FastifyRequest } from "fastify"; import { AdminAccessService } from "./admin-access.service.js"; +const PATH_METADATA = "path"; + @Injectable() export class AdminMembershipGuard implements CanActivate { constructor(private readonly access: AdminAccessService) {} canActivate(context: ExecutionContext): Promise { const request = context.switchToHttp().getRequest(); - if (request.url.startsWith("/admin/session/login")) return Promise.resolve(true); - if (request.url.startsWith("/admin/session/change-password")) return Promise.resolve(true); - if (!request.url.startsWith("/admin/")) return Promise.resolve(true); + const handlerPath = Reflect.getMetadata(PATH_METADATA, context.getHandler()); + const controllerPath = Reflect.getMetadata(PATH_METADATA, context.getClass()); + const routePath = `${controllerPath ?? ""}/${handlerPath ?? ""}`.replace(/^\/+|\/+$/g, ""); + if (routePath === "admin/session/login") return Promise.resolve(true); + if (routePath === "admin/session/change-password") return Promise.resolve(true); + if (!routePath.startsWith("admin/")) return Promise.resolve(true); if ( - /^\/admin\/workspace\/(install|capabilities(?:\/|$)|template(?:\/|$)|fields(?:\/|$))/.test( - request.url, + /^admin\/workspace\/(install|capabilities(?:\/|$)|template(?:\/|$)|fields(?:\/|$))/.test( + routePath, ) || - /^\/admin\/config\/visual-template(?:\/|$)/.test(request.url) + /^admin\/config\/visual-template(?:\/|$)/.test(routePath) ) { return this.access.requireRole(request, ["owner", "admin", "platform-admin"]); } diff --git a/apps/api/test/http.integration.test.js b/apps/api/test/http.integration.test.js index e42d30b..c9e6df3 100644 --- a/apps/api/test/http.integration.test.js +++ b/apps/api/test/http.integration.test.js @@ -21,6 +21,32 @@ before(async () => { await app.init(); }); +test("admin routes remain guarded when an API prefix is configured", async () => { + process.env.API_PREFIX = "api"; + try { + const prefixedApp = await createApp(); + await prefixedApp.init(); + const injected = prefixedApp.getHttpAdapter().getInstance(); + const missingAuth = await injected.inject({ method: "GET", url: "/api/admin/bookings" }); + assert.equal(missingAuth.statusCode, 401); + const customerAuth = await injected.inject({ + method: "GET", + url: "/api/admin/bookings", + headers: { authorization: `Bearer ${customerToken}` }, + }); + assert.equal(customerAuth.statusCode, 403); + const login = await injected.inject({ + method: "POST", + url: "/api/admin/session/login", + payload: { username: "admin", password: process.env.SEED_ADMIN_PASSWORD }, + }); + assert.equal(login.statusCode, 201); + await prefixedApp.close(); + } finally { + process.env.API_PREFIX = ""; + } +}); + after(async () => { await app.close(); await prisma.brandRelease.deleteMany({ where: { brandId } });