diff --git a/.codex-tasks/template-audit-execution/raw/completion-evidence.json b/.codex-tasks/template-audit-execution/raw/completion-evidence.json index 2130f5e..2b3c673 100644 --- a/.codex-tasks/template-audit-execution/raw/completion-evidence.json +++ b/.codex-tasks/template-audit-execution/raw/completion-evidence.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "scope": "模板完成证据登记,保留命令、日志与产物哈希", - "generatedAt": "2026-10-23T09:54:31.191Z", + "generatedAt": "2026-10-23T14:07:47.923Z", "templates": { "acheng-campus-food": { "real-manifest-interaction": { @@ -256,5 +256,5 @@ } } }, - "sourceTreeHash": "f07ae4270ab0424e283142ebdf72fd9d31a9222323ef677150b59a77f573a50b" + "sourceTreeHash": "9394ffb025e5f6b777f2dd991cbb8b56026d5d63d9161a8639cc612bcc39f730" } diff --git a/.env.example b/.env.example index 8f06002..3896144 100644 --- a/.env.example +++ b/.env.example @@ -19,19 +19,18 @@ OBJECT_STORAGE_PUBLIC_URL=http://localhost:9000/personal-brand-media OBJECT_STORAGE_BUCKET=personal-brand-media OBJECT_STORAGE_ACCESS_KEY=minioadmin OBJECT_STORAGE_SECRET_KEY=minioadmin -WECHAT_APP_ID= -WECHAT_APP_SECRET= +# 微信 AppID 与 AppSecret 按品牌在后台「小程序配置」维护,不使用全局环境变量 WECHAT_UPLOAD_PRIVATE_KEY= MINIAPP_CREDENTIAL_ENCRYPTION_KEY=replace-with-32-byte-random-secret # 小程序代码构建产物根目录,相对路径按仓库根目录解析;默认 apps/taro/dist # MINIAPP_ARTIFACT_ROOT=apps/taro/dist # 构建超过该毫秒数没有进度更新即视为中断,允许重新上传;默认 15 分钟 # MINIAPP_BUILD_STALE_MS=900000 -# 小程序请求地址在后台「小程序上传配置」维护,这里仅为回落值; +# 小程序请求地址在后台「小程序配置」维护,这里仅为回落值; # 未设置时由 PUBLIC_BASE_URL + MINIAPP_API_PATH 推导 # MINIAPP_API_BASE_URL=https://wechat.app.que01.top/api # MINIAPP_API_PATH=/api -# 单个品牌的 AppID 在后台“小程序上传配置”维护,这里只作为回落值 +# 单个品牌的 AppID 在后台“小程序配置”维护,这里只作为回落值 # WEAPP_APP_ID= # 上传子进程工作目录;miniprogram-ci 的编译缓存放这里,默认系统临时目录 # MINIAPP_UPLOAD_WORKSPACE=/tmp/personal-brand-miniapp-upload diff --git a/.env.production.example b/.env.production.example index e8a0155..0cf7359 100644 --- a/.env.production.example +++ b/.env.production.example @@ -6,6 +6,9 @@ POSTGRES_PORT=5432 DATABASE_URL=postgresql://personal_brand:replace-with-a-long-database-password@127.0.0.1:5432/personal_brand?schema=public SESSION_SECRET=replace-with-at-least-32-random-characters +# 建议单独配置并长期保持不变;未设置时回退 SESSION_SECRET。 +# 轮换该密钥后,已保存的上传私钥和 AppSecret 都需要在后台重新填写。 +# MINIAPP_CREDENTIAL_ENCRYPTION_KEY=replace-with-32-byte-random-secret # 单实例使用 memory;多实例部署改用 postgres 并先执行数据库迁移 CLIENT_ERROR_THROTTLE_STORE=memory DEFAULT_BRAND_ID=00000000-0000-0000-0000-000000000001 @@ -31,10 +34,9 @@ OBJECT_STORAGE_ACCESS_KEY= OBJECT_STORAGE_SECRET_KEY= OBJECT_STORAGE_REGION=us-east-1 -WECHAT_APP_ID= -WECHAT_APP_SECRET= +# 微信 AppID 与 AppSecret 按品牌在后台「小程序配置」维护,不使用全局环境变量 -# 小程序请求地址正常情况下在后台「小程序上传配置」维护; +# 小程序请求地址正常情况下在后台「小程序配置」维护; # 这里仅作为后台未配置时的回落值(否则由 PUBLIC_BASE_URL + /api 推导) # MINIAPP_API_BASE_URL=https://wechat.app.que01.top/api # MINIAPP_BUILD_STALE_MS=900000 diff --git a/apps/admin/src/features/publication/MiniAppSettingsTab.tsx b/apps/admin/src/features/publication/MiniAppSettingsTab.tsx index 67d0125..77e1264 100644 --- a/apps/admin/src/features/publication/MiniAppSettingsTab.tsx +++ b/apps/admin/src/features/publication/MiniAppSettingsTab.tsx @@ -9,6 +9,7 @@ export type MiniAppSettingsValues = { appId: string; apiBaseUrl: string; privateKey?: string; + appSecret?: string; }; interface MiniAppSettingsTabProps { @@ -27,14 +28,15 @@ export function MiniAppSettingsTab({ settings, saving, error, onSave }: MiniAppS appId: settings.appId, apiBaseUrl: settings.apiBaseUrl, privateKey: "", + appSecret: "", }); }, [form, settings]); return (
{settings?.buildError ? ( - + + + + !value || /^[A-Za-z0-9]{16,64}$/.test(value.trim()) + ? Promise.resolve() + : Promise.reject(new Error("AppSecret 应为 16-64 位字母或数字,请复制完整值")), + }, + ]} + > + - + {!settings?.loginConfigured ? ( + + ) : null} + {settings?.hasStoredCredentials ? ( ) : ( )} + {settings?.hasStoredAppSecret ? ( + + ) : ( + + )} diff --git a/apps/admin/src/features/publication/use-publication-mutations.ts b/apps/admin/src/features/publication/use-publication-mutations.ts index d2c3c71..c9df112 100644 --- a/apps/admin/src/features/publication/use-publication-mutations.ts +++ b/apps/admin/src/features/publication/use-publication-mutations.ts @@ -56,14 +56,20 @@ export function usePublicationMutations({ }, }); const saveMiniAppSettings = useMutation({ - mutationFn: (values: { appId: string; apiBaseUrl: string; privateKey?: string }) => + mutationFn: (values: { + appId: string; + apiBaseUrl: string; + privateKey?: string; + appSecret?: string; + }) => client.updateAdminMiniAppSettings({ appId: values.appId, apiBaseUrl: values.apiBaseUrl, ...(values.privateKey ? { privateKey: values.privateKey } : {}), + ...(values.appSecret ? { appSecret: values.appSecret } : {}), }), onSuccess: () => { - message.success("小程序上传配置已保存"); + message.success("小程序配置已保存"); void queryClient.invalidateQueries({ queryKey: ["publication-miniapp-settings"] }); }, }); diff --git a/apps/api/src/modules/admin/miniapp-credential-crypto.ts b/apps/api/src/miniapp-credential-crypto.ts similarity index 95% rename from apps/api/src/modules/admin/miniapp-credential-crypto.ts rename to apps/api/src/miniapp-credential-crypto.ts index 87f5971..2f2329b 100644 --- a/apps/api/src/modules/admin/miniapp-credential-crypto.ts +++ b/apps/api/src/miniapp-credential-crypto.ts @@ -38,7 +38,7 @@ export function decryptMiniAppCredential(value: unknown): string { typeof payload.iv !== "string" || typeof payload.authTag !== "string" ) - throw new UnauthorizedException("小程序上传凭据不可用"); + throw new UnauthorizedException("小程序凭据不可用"); const decipher = createDecipheriv(ALGORITHM, encryptionKey(), Buffer.from(payload.iv, "base64")); decipher.setAuthTag(Buffer.from(payload.authTag, "base64")); return Buffer.concat([ diff --git a/apps/api/src/modules/admin/admin-miniapp-settings.dto.ts b/apps/api/src/modules/admin/admin-miniapp-settings.dto.ts index fcbcd9a..b994ff8 100644 --- a/apps/api/src/modules/admin/admin-miniapp-settings.dto.ts +++ b/apps/api/src/modules/admin/admin-miniapp-settings.dto.ts @@ -18,4 +18,9 @@ export class UpdateMiniAppSettingsDto { @IsOptional() @IsString() privateKey?: string; + + @IsOptional() + @IsString() + @MaxLength(128) + appSecret?: string; } diff --git a/apps/api/src/modules/admin/admin-miniapp-settings.service.ts b/apps/api/src/modules/admin/admin-miniapp-settings.service.ts index b356ec6..bd84fa5 100644 --- a/apps/api/src/modules/admin/admin-miniapp-settings.service.ts +++ b/apps/api/src/modules/admin/admin-miniapp-settings.service.ts @@ -3,7 +3,7 @@ import { Prisma } from "@prisma/client"; import { AdminMiniAppReleaseService } from "./admin-miniapp-release.service.js"; import { miniappArtifactRoot } from "./miniapp-artifact.js"; import { miniappApiBaseUrl, validateApiBaseUrl, weappAppId } from "./miniapp-build-config.js"; -import { encryptMiniAppCredential } from "./miniapp-credential-crypto.js"; +import { encryptMiniAppCredential } from "../../miniapp-credential-crypto.js"; import { inspectPrivateKey, normalizePrivateKey } from "./miniapp-private-key.js"; import type { UpdateMiniAppSettingsDto } from "./admin-miniapp-settings.dto.js"; @@ -18,10 +18,17 @@ export class AdminMiniAppSettingsService { async update(brandId: string, body: UpdateMiniAppSettingsDto & { privateKey?: string }) { if (body.privateKey !== undefined) this.validatePrivateKey(body.privateKey); + if (body.appSecret !== undefined) this.validateAppSecret(body.appSecret); const current = this.jsonObject(await this.releases.settings(brandId)); + const currentAppId = typeof current.appId === "string" ? current.appId : ""; + const nextAppId = body.appId === undefined ? currentAppId : body.appId.trim(); + if (currentAppId && nextAppId !== currentAppId && body.appSecret === undefined) + throw new BadRequestException( + "修改微信 AppID 时必须同时填写该 AppID 对应的 AppSecret,避免登录凭据与小程序不匹配", + ); const settings = { ...current, - appId: body.appId ?? current.appId ?? "", + appId: nextAppId, apiBaseUrl: body.apiBaseUrl === undefined ? (current.apiBaseUrl ?? "") : this.apiBaseUrl(body), build: { @@ -31,6 +38,9 @@ export class AdminMiniAppSettingsService { ...(body.privateKey === undefined ? {} : { credential: encryptMiniAppCredential(normalizePrivateKey(body.privateKey)) }), + ...(body.appSecret === undefined + ? {} + : { appSecretCredential: encryptMiniAppCredential(body.appSecret.trim()) }), templateKey: current.templateKey ?? null, } satisfies Prisma.InputJsonObject; await this.releases.saveSettings(brandId, settings); @@ -47,6 +57,14 @@ export class AdminMiniAppSettingsService { ); } + private validateAppSecret(appSecret: string) { + const trimmed = appSecret.trim(); + if (!/^[A-Za-z0-9]{16,64}$/.test(trimmed)) + throw new BadRequestException( + "微信登录 AppSecret 格式无效:应为 16-64 位字母或数字,请从微信公众平台复制完整值", + ); + } + private apiBaseUrl(body: UpdateMiniAppSettingsDto) { const trimmed = body.apiBaseUrl?.trim(); if (!trimmed) throw new BadRequestException("小程序请求地址不能为空"); @@ -58,16 +76,21 @@ export class AdminMiniAppSettingsService { } private present(settings: Record) { + const { credential, appSecretCredential, ...rest } = settings; + delete rest.appSecret; + const appId = typeof rest.appId === "string" ? rest.appId : ""; return { appId: "", artifactPath: miniappArtifactRoot(), build: {}, - ...settings, - apiBaseUrl: this.effectiveApiBaseUrl(settings.apiBaseUrl), + ...rest, + apiBaseUrl: this.effectiveApiBaseUrl(rest.apiBaseUrl), privateKey: undefined, - credential: settings.credential ? { algorithm: "aes-256-gcm" } : null, - hasStoredCredentials: Boolean(settings.credential), - ...this.buildConfigSummary(settings.apiBaseUrl, settings.appId), + credential: credential ? { algorithm: "aes-256-gcm" } : null, + hasStoredCredentials: Boolean(credential), + hasStoredAppSecret: Boolean(appSecretCredential), + loginConfigured: Boolean(appId && appSecretCredential), + ...this.buildConfigSummary(rest.apiBaseUrl, rest.appId), }; } diff --git a/apps/api/src/modules/admin/admin-miniapp-upload.service.ts b/apps/api/src/modules/admin/admin-miniapp-upload.service.ts index c1646cd..a27747f 100644 --- a/apps/api/src/modules/admin/admin-miniapp-upload.service.ts +++ b/apps/api/src/modules/admin/admin-miniapp-upload.service.ts @@ -15,7 +15,7 @@ import { import { miniappReleaseProjectPath, miniappTaroOutputRoot } from "./miniapp-artifact.js"; import { miniappApiBaseUrl, weappAppId } from "./miniapp-build-config.js"; import { buildingStaleMs, isStaleBuilding } from "./miniapp-build-status.js"; -import { decryptMiniAppCredential } from "./miniapp-credential-crypto.js"; +import { decryptMiniAppCredential } from "../../miniapp-credential-crypto.js"; import { inspectPrivateKey, normalizePrivateKey } from "./miniapp-private-key.js"; import { runMiniAppUpload } from "./miniapp-upload.js"; @@ -68,7 +68,7 @@ export class AdminMiniAppUploadService { const keyInspection = inspectPrivateKey(normalizedPrivateKey); if (!keyInspection.valid) throw new BadRequestException( - `上传私钥无法解析(${keyInspection.reason ?? "PEM 格式错误"})。请在“小程序上传配置”里重新粘贴完整私钥。`, + `上传私钥无法解析(${keyInspection.reason ?? "PEM 格式错误"})。请在“小程序配置”里重新粘贴完整私钥。`, ); const templateManifest = miniAppTemplateManifest(brand.templateKey); diff --git a/apps/api/src/modules/admin/miniapp-build-config.ts b/apps/api/src/modules/admin/miniapp-build-config.ts index 90c5378..e70576e 100644 --- a/apps/api/src/modules/admin/miniapp-build-config.ts +++ b/apps/api/src/modules/admin/miniapp-build-config.ts @@ -26,7 +26,7 @@ export function miniappApiBaseUrl( normalizeBaseUrl(`${normalizeBaseUrl(publicBase)}${env.MINIAPP_API_PATH ?? "/api"}`), ); throw new Error( - "未配置小程序请求地址:请在“配置与发布 → 小程序上传配置”里填写“小程序请求地址”,例如 https://wechat.app.que01.top/api", + "未配置小程序请求地址:请在“配置与发布 → 小程序配置”里填写“小程序请求地址”,例如 https://wechat.app.que01.top/api", ); } @@ -53,6 +53,6 @@ export function weappAppId(storedAppId: unknown, env: NodeJS.ProcessEnv = proces ? storedAppId.trim() : (env.WEAPP_APP_ID?.trim() ?? ""); if (!candidate || candidate === "undefined" || candidate === "touristappid") - throw new Error("未配置微信 AppID:请在“小程序上传配置”里填写或设置 WEAPP_APP_ID"); + throw new Error("未配置微信 AppID:请在“小程序配置”里填写或设置 WEAPP_APP_ID"); return candidate; } diff --git a/apps/api/src/modules/session/customer-session.service.ts b/apps/api/src/modules/session/customer-session.service.ts index 751679b..deb7c63 100644 --- a/apps/api/src/modules/session/customer-session.service.ts +++ b/apps/api/src/modules/session/customer-session.service.ts @@ -1,7 +1,11 @@ import { BadRequestException, Injectable } from "@nestjs/common"; import { PrismaService } from "../../prisma.service.js"; import { signIdentity } from "../../auth.js"; -import type { WechatSession } from "../../wechat-auth.js"; +import { + WechatAuthService, + resolveWechatLoginCredentials, + type WechatSession, +} from "../../wechat-auth.js"; import { PublicBrandContextService } from "../public/public-brand-context.service.js"; @Injectable() @@ -9,15 +13,18 @@ export class CustomerSessionService { constructor( private readonly prisma: PrismaService, private readonly brandContext: PublicBrandContextService, + private readonly wechatAuth: WechatAuthService, ) {} - async loginWithWechat(session: WechatSession, brandSlug?: string): Promise<{ token: string }> { + async loginWithWechat(code: string, brandSlug?: string): Promise<{ token: string }> { const brandId = await this.brandContext.resolveId(brandSlug); const brand = await this.prisma.brandProfile.findUnique({ where: { id: brandId }, - select: { id: true }, + select: { id: true, miniAppSettings: true }, }); if (!brand) throw new BadRequestException("品牌尚未初始化"); + const credentials = resolveWechatLoginCredentials(brand.miniAppSettings); + const session: WechatSession = await this.wechatAuth.exchangeCode(code, credentials); const customer = await this.prisma.customerUser.upsert({ where: { brandId_openid: { brandId: brand.id, openid: session.openid } }, update: { lastLoginAt: new Date() }, diff --git a/apps/api/src/modules/session/session.controller.ts b/apps/api/src/modules/session/session.controller.ts index b7bce99..4a9a92f 100644 --- a/apps/api/src/modules/session/session.controller.ts +++ b/apps/api/src/modules/session/session.controller.ts @@ -1,6 +1,5 @@ import { Body, Controller, Get, Post, Query, Req, Res } from "@nestjs/common"; import type { FastifyReply, FastifyRequest } from "fastify"; -import { WechatAuthService } from "../../wechat-auth.js"; import { AdminPublic, AdminTokenOnly } from "../../admin-auth.decorators.js"; import { clearAdminSessionCookie, setAdminSessionCookie } from "../../admin-session-cookie.js"; import { AdminAuthService } from "../../admin-auth.service.js"; @@ -11,18 +10,14 @@ import { ChangeAdminPasswordDto } from "../../admin.dto.js"; @Controller("customer/session") export class CustomerSessionController { - constructor( - private readonly wechatAuth: WechatAuthService, - private readonly sessions: CustomerSessionService, - ) {} + constructor(private readonly sessions: CustomerSessionService) {} @Post("wechat") async wechatLogin( @Body() body: WechatLoginDto, @Query("brandSlug") brandSlug?: string, ): Promise<{ token: string }> { - const session = await this.wechatAuth.exchangeCode(body.code); - return this.sessions.loginWithWechat(session, brandSlug); + return this.sessions.loginWithWechat(body.code, brandSlug); } } diff --git a/apps/api/src/wechat-auth.ts b/apps/api/src/wechat-auth.ts index 3ac8964..63b2807 100644 --- a/apps/api/src/wechat-auth.ts +++ b/apps/api/src/wechat-auth.ts @@ -1,4 +1,5 @@ import { Injectable, ServiceUnavailableException, UnauthorizedException } from "@nestjs/common"; +import { decryptMiniAppCredential } from "./miniapp-credential-crypto.js"; interface WechatSessionResponse { openid?: string; @@ -14,17 +15,45 @@ export interface WechatSession { unionid?: string; } +export interface WechatLoginCredentials { + appId: string; + appSecret: string; +} + +/** + * 每个品牌对应自己的小程序,登录凭据必须来自该品牌的后台上传配置。 + * 不使用全局环境变量或跨品牌回退,避免把 A 品牌的 OpenID 登录到 B 品牌。 + */ +export function resolveWechatLoginCredentials(settings: unknown): WechatLoginCredentials { + const payload = + settings && typeof settings === "object" && !Array.isArray(settings) + ? (settings as Record) + : {}; + const appId = typeof payload.appId === "string" ? payload.appId.trim() : ""; + if (!appId) throw new ServiceUnavailableException("该品牌尚未配置微信 AppID"); + if (!payload.appSecretCredential) + throw new ServiceUnavailableException("该品牌尚未配置微信登录 AppSecret"); + let appSecret: string; + try { + appSecret = decryptMiniAppCredential(payload.appSecretCredential); + } catch { + throw new ServiceUnavailableException("该品牌微信登录凭据不可用,请重新保存 AppSecret"); + } + if (!appSecret) + throw new ServiceUnavailableException("该品牌微信登录 AppSecret 为空,请重新保存"); + return { appId, appSecret }; +} + @Injectable() export class WechatAuthService { - async exchangeCode(code: string): Promise { + async exchangeCode(code: string, credentials: WechatLoginCredentials): Promise { if (!code.trim()) throw new UnauthorizedException("微信登录 code 不能为空"); - const appId = process.env.WECHAT_APP_ID; - const appSecret = process.env.WECHAT_APP_SECRET; - if (!appId || !appSecret) throw new ServiceUnavailableException("微信登录尚未配置"); + if (!credentials.appId || !credentials.appSecret) + throw new ServiceUnavailableException("微信登录尚未配置"); const query = new URLSearchParams({ - appid: appId, - secret: appSecret, + appid: credentials.appId, + secret: credentials.appSecret, js_code: code, grant_type: "authorization_code", }); diff --git a/apps/api/test/admin-miniapp-settings.service.test.ts b/apps/api/test/admin-miniapp-settings.service.test.ts index cd94910..dda7006 100644 --- a/apps/api/test/admin-miniapp-settings.service.test.ts +++ b/apps/api/test/admin-miniapp-settings.service.test.ts @@ -4,7 +4,10 @@ import { BadRequestException } from "@nestjs/common"; import { generateKeyPairSync } from "node:crypto"; import { AdminMiniAppSettingsService } from "../src/modules/admin/admin-miniapp-settings.service.js"; import type { AdminMiniAppReleaseService } from "../src/modules/admin/admin-miniapp-release.service.js"; -import { decryptMiniAppCredential } from "../src/modules/admin/miniapp-credential-crypto.js"; +import { + decryptMiniAppCredential, + encryptMiniAppCredential, +} from "../src/miniapp-credential-crypto.js"; process.env.SESSION_SECRET = "settings-service-test-secret-1234567890"; @@ -25,12 +28,19 @@ function createService(settings: Record = {}) { return { service: new AdminMiniAppSettingsService(releases), saved }; } -test("settings presentation never exposes plaintext credentials", async () => { +test("settings presentation never exposes encrypted credential payloads", async () => { const credential = { algorithm: "aes-256-gcm" }; + const appSecretCredential = { + algorithm: "aes-256-gcm", + ciphertext: "encrypted-secret", + iv: "iv", + authTag: "tag", + }; const { service } = createService({ appId: "wxtestsettings", apiBaseUrl: "https://wechat.example.com/api", credential, + appSecretCredential, build: { keep: true }, }); const result = (await service.get("brand-1")) as Record; @@ -38,8 +48,12 @@ test("settings presentation never exposes plaintext credentials", async () => { assert.equal(result.apiBaseUrl, "https://wechat.example.com/api"); assert.equal(result.requestDomain, "wechat.example.com"); assert.equal(result.hasStoredCredentials, true); + assert.equal(result.hasStoredAppSecret, true); + assert.equal(result.loginConfigured, true); assert.deepEqual(result.credential, { algorithm: "aes-256-gcm" }); assert.equal(result.privateKey, undefined); + assert.equal("appSecretCredential" in result, false); + assert.equal(JSON.stringify(result).includes("encrypted-secret"), false); }); test("update validates URL and private key before persistence", async () => { @@ -67,6 +81,7 @@ test("update encrypts a valid private key and preserves existing settings", asyn appId: "wxnew", apiBaseUrl: "https://new.example.com/api/", privateKey, + appSecret: "0123456789abcdef0123456789abcdef", build: { extra: true }, })) as Record; assert.equal(saved.length, 1); @@ -82,3 +97,54 @@ test("update encrypts a valid private key and preserves existing settings", asyn assert.ok(!JSON.stringify(saved[0]).includes(privateKey)); assert.equal(result.hasStoredCredentials, true); }); + +test("update encrypts the WeChat login AppSecret without exposing it", async () => { + const appSecret = "0123456789abcdef0123456789abcdef"; + const { service, saved } = createService({ + appId: "wxtestsettings", + apiBaseUrl: "https://wechat.example.com/api", + }); + const result = (await service.update("brand-1", { appSecret })) as Record; + assert.equal(saved.length, 1); + const appSecretCredential = saved[0]?.appSecretCredential as Record; + assert.equal(appSecretCredential.algorithm, "aes-256-gcm"); + assert.equal(decryptMiniAppCredential(appSecretCredential), appSecret); + assert.equal(JSON.stringify(saved[0]).includes(appSecret), false); + assert.equal(result.hasStoredAppSecret, true); + assert.equal(result.loginConfigured, true); + assert.equal("appSecretCredential" in result, false); +}); + +test("update rejects malformed WeChat login AppSecret", async () => { + const { service, saved } = createService(); + await assert.rejects( + () => service.update("brand-1", { appSecret: "not-a-valid-secret!" }), + BadRequestException, + ); + assert.equal(saved.length, 0); +}); + +test("changing AppID requires the matching AppSecret", async () => { + const appSecret = "0123456789abcdef0123456789abcdef"; + const { service, saved } = createService({ + appId: "wxold", + appSecretCredential: encryptMiniAppCredential(appSecret), + }); + await assert.rejects( + () => service.update("brand-1", { appId: "wxnew" }), + /必须同时填写该 AppID 对应的 AppSecret/, + ); + assert.equal(saved.length, 0); +}); + +test("leaving AppSecret empty preserves the stored credential", async () => { + const appSecret = "0123456789abcdef0123456789abcdef"; + const storedCredential = encryptMiniAppCredential(appSecret); + const { service, saved } = createService({ + appId: "wxtestsettings", + appSecretCredential: storedCredential, + }); + await service.update("brand-1", { appId: "wxtestsettings" }); + assert.equal(saved.length, 1); + assert.deepEqual(saved[0]?.appSecretCredential, storedCredential); +}); diff --git a/apps/api/test/admin-miniapp-upload.service.test.ts b/apps/api/test/admin-miniapp-upload.service.test.ts index 81d410b..1195318 100644 --- a/apps/api/test/admin-miniapp-upload.service.test.ts +++ b/apps/api/test/admin-miniapp-upload.service.test.ts @@ -8,7 +8,7 @@ import { tmpdir } from "node:os"; import { join, resolve } from "node:path"; import { AdminMiniAppUploadService } from "../src/modules/admin/admin-miniapp-upload.service.js"; import type { AdminMiniAppReleaseService } from "../src/modules/admin/admin-miniapp-release.service.js"; -import { encryptMiniAppCredential } from "../src/modules/admin/miniapp-credential-crypto.js"; +import { encryptMiniAppCredential } from "../src/miniapp-credential-crypto.js"; process.env.SESSION_SECRET = "upload-service-test-secret-1234567890"; diff --git a/apps/api/test/http.integration.test.js b/apps/api/test/http.integration.test.js index 79ac6c4..f468ea0 100644 --- a/apps/api/test/http.integration.test.js +++ b/apps/api/test/http.integration.test.js @@ -11,6 +11,7 @@ import { getTemplatePackageManifest, getVisualTemplateManifest } from "@personal import { createApp } from "../dist/main.js"; import { readIdentity, signIdentity } from "../dist/auth.js"; import { WechatAuthService } from "../dist/wechat-auth.js"; +import { encryptMiniAppCredential } from "../dist/miniapp-credential-crypto.js"; import { AdminMiniAppReleaseService } from "../dist/modules/admin/admin-miniapp-release.service.js"; import { PostgresClientErrorThrottleStore } from "../dist/modules/admin/client-error-throttle.postgres.store.js"; import { @@ -866,7 +867,7 @@ test("API restart recovers an expired persisted miniapp build attempt", async () } }); -test("miniapp release settings never expose or persist plaintext private keys", async () => { +test("miniapp release settings never expose or persist plaintext credentials", async () => { const login = await request("/admin/session/login", { method: "POST", payload: { username: "admin", password: process.env.SEED_ADMIN_PASSWORD }, @@ -897,6 +898,13 @@ test("miniapp release settings never expose or persist plaintext private keys", payload: { appId: "wxtestsettings", apiBaseUrl: "http://wechat.example.com/api" }, }); assert.equal(rejected.statusCode, 400); + const invalidSecret = await request("/admin/miniapp-releases/settings", { + method: "PATCH", + headers, + payload: { appSecret: "invalid secret!" }, + }); + assert.equal(invalidSecret.statusCode, 400); + const appSecret = "0123456789abcdef0123456789abcdef"; const saved = await request("/admin/miniapp-releases/settings", { method: "PATCH", headers, @@ -904,6 +912,7 @@ test("miniapp release settings never expose or persist plaintext private keys", appId: "wxtestsettings", apiBaseUrl: "https://wechat.example.com/api/", privateKey, + appSecret, }, }); assert.equal(saved.statusCode, 200); @@ -912,17 +921,24 @@ test("miniapp release settings never expose or persist plaintext private keys", assert.equal(body.apiBaseUrl, "https://wechat.example.com/api"); assert.equal(body.requestDomain, "wechat.example.com"); assert.equal(body.hasStoredCredentials, true); + assert.equal(body.hasStoredAppSecret, true); + assert.equal(body.loginConfigured, true); assert.equal(body.privateKey, undefined); assert.equal(body.credential?.algorithm, "aes-256-gcm"); + assert.equal("appSecretCredential" in body, false); assert.ok(body.requestDomain === null || typeof body.requestDomain === "string"); assert.ok(body.buildError === null || typeof body.buildError === "string"); if (typeof body.requestDomain === "string") assert.ok(!body.requestDomain.includes("localhost")); const brand = await prisma.brandProfile.findUniqueOrThrow({ where: { id: brandId } }); const credential = brand.miniAppSettings?.credential; + const appSecretCredential = brand.miniAppSettings?.appSecretCredential; assert.ok(credential); + assert.ok(appSecretCredential); assert.equal(brand.miniAppSettings.apiBaseUrl, "https://wechat.example.com/api"); assert.equal(typeof credential.ciphertext, "string"); + assert.equal(typeof appSecretCredential.ciphertext, "string"); assert.ok(!JSON.stringify(brand.miniAppSettings).includes(privateKey)); + assert.ok(!JSON.stringify(brand.miniAppSettings).includes(appSecret)); const missing = await request("/admin/miniapp-releases/settings"); assert.equal(missing.statusCode, 401); const forbidden = await request("/admin/miniapp-releases/settings", { @@ -5597,13 +5613,30 @@ test("wechat login validates the request DTO before exchanging the code", async assert.equal(response.statusCode, 400); }); -test("wechat login creates a customer session for the requested brand", async () => { +test("wechat login creates a customer session using the requested brand credentials", async () => { const doorsBrand = await prisma.brandProfile.findUnique({ where: { slug: "linjing-doors" } }); assert.ok(doorsBrand); const sessionOpenid = `doors-login-${Date.now()}`; + const appId = "wxintegrationdoors"; + const appSecret = "0123456789abcdef0123456789abcdef"; + const originalSettings = doorsBrand.miniAppSettings; + await prisma.brandProfile.update({ + where: { id: doorsBrand.id }, + data: { + miniAppSettings: { + ...(originalSettings && typeof originalSettings === "object" ? originalSettings : {}), + appId, + appSecretCredential: encryptMiniAppCredential(appSecret), + }, + }, + }); const wechatAuth = app.get(WechatAuthService); const originalExchangeCode = wechatAuth.exchangeCode; - wechatAuth.exchangeCode = async () => ({ openid: sessionOpenid }); + wechatAuth.exchangeCode = async (code, credentials) => { + assert.equal(code, "test-code"); + assert.deepEqual(credentials, { appId, appSecret }); + return { openid: sessionOpenid }; + }; try { const response = await request("/customer/session/wechat?brandSlug=linjing-doors", { method: "POST", @@ -5621,6 +5654,49 @@ test("wechat login creates a customer session for the requested brand", async () } finally { wechatAuth.exchangeCode = originalExchangeCode; await prisma.customerUser.deleteMany({ where: { openid: sessionOpenid } }); + await prisma.brandProfile.update({ + where: { id: doorsBrand.id }, + data: { miniAppSettings: originalSettings }, + }); + } +}); + +test("wechat login fails closed when a brand has no login AppSecret", async () => { + const brand = await prisma.brandProfile.findUnique({ where: { slug: "default-brand" } }); + assert.ok(brand); + const originalSettings = brand.miniAppSettings; + const { appSecretCredential: _ignoredAppSecretCredential, ...settingsWithoutAppSecret } = + originalSettings && typeof originalSettings === "object" ? originalSettings : {}; + await prisma.brandProfile.update({ + where: { id: brand.id }, + data: { + miniAppSettings: { + ...settingsWithoutAppSecret, + appId: "wxmissingsessionsecret", + }, + }, + }); + const wechatAuth = app.get(WechatAuthService); + const originalExchangeCode = wechatAuth.exchangeCode; + let exchanged = false; + wechatAuth.exchangeCode = async () => { + exchanged = true; + return { openid: `must-not-login-${Date.now()}` }; + }; + try { + const response = await request("/customer/session/wechat?brandSlug=default-brand", { + method: "POST", + payload: { code: "test-code" }, + }); + assert.equal(response.statusCode, 503); + assert.equal(JSON.parse(response.body).error.message, "该品牌尚未配置微信登录 AppSecret"); + assert.equal(exchanged, false); + } finally { + wechatAuth.exchangeCode = originalExchangeCode; + await prisma.brandProfile.update({ + where: { id: brand.id }, + data: { miniAppSettings: originalSettings }, + }); } }); diff --git a/apps/api/test/route-coverage.matrix.ts b/apps/api/test/route-coverage.matrix.ts index 4460df9..a6acb86 100644 --- a/apps/api/test/route-coverage.matrix.ts +++ b/apps/api/test/route-coverage.matrix.ts @@ -117,8 +117,8 @@ export const ROUTE_COVERAGE: RouteCoverage[] = [ method: "GET", path: "/admin/miniapp-releases/settings", auth: "brand", - authorizationTest: "miniapp release settings never expose or persist plaintext private keys", - successTest: "miniapp release settings never expose or persist plaintext private keys", + authorizationTest: "miniapp release settings never expose or persist plaintext credentials", + successTest: "miniapp release settings never expose or persist plaintext credentials", }, { method: "GET", @@ -378,8 +378,8 @@ export const ROUTE_COVERAGE: RouteCoverage[] = [ path: "/admin/miniapp-releases/settings", auth: "roles", roles: ["owner", "admin", "platform-admin"], - authorizationTest: "miniapp release settings never expose or persist plaintext private keys", - successTest: "miniapp release settings never expose or persist plaintext private keys", + authorizationTest: "miniapp release settings never expose or persist plaintext credentials", + successTest: "miniapp release settings never expose or persist plaintext credentials", }, { method: "PATCH", @@ -655,7 +655,7 @@ export const ROUTE_COVERAGE: RouteCoverage[] = [ path: "/customer/session/wechat", auth: "public", authorizationTest: null, - successTest: "wechat login creates a customer session for the requested brand", + successTest: "wechat login creates a customer session using the requested brand credentials", }, { method: "POST", diff --git a/apps/api/test/wechat-auth.test.ts b/apps/api/test/wechat-auth.test.ts new file mode 100644 index 0000000..a5e2fac --- /dev/null +++ b/apps/api/test/wechat-auth.test.ts @@ -0,0 +1,133 @@ +import assert from "node:assert/strict"; +import { test } from "node:test"; +import { ServiceUnavailableException, UnauthorizedException } from "@nestjs/common"; +import { encryptMiniAppCredential } from "../src/miniapp-credential-crypto.js"; +import { + WechatAuthService, + resolveWechatLoginCredentials, + type WechatLoginCredentials, +} from "../src/wechat-auth.js"; + +process.env.SESSION_SECRET = "wechat-auth-test-secret-1234567890"; + +const credentials: WechatLoginCredentials = { + appId: "wxbranchappid", + appSecret: "0123456789abcdef0123456789abcdef", +}; + +test("resolveWechatLoginCredentials requires a brand AppID", () => { + assert.throws( + () => resolveWechatLoginCredentials({}), + (error: unknown) => + error instanceof ServiceUnavailableException && error.message.includes("AppID"), + ); +}); + +test("resolveWechatLoginCredentials requires a brand AppSecret", () => { + assert.throws( + () => resolveWechatLoginCredentials({ appId: credentials.appId }), + (error: unknown) => + error instanceof ServiceUnavailableException && error.message.includes("AppSecret"), + ); +}); + +test("resolveWechatLoginCredentials decrypts the brand AppSecret", () => { + const resolved = resolveWechatLoginCredentials({ + appId: credentials.appId, + appSecretCredential: encryptMiniAppCredential(credentials.appSecret), + }); + assert.deepEqual(resolved, credentials); +}); + +test("resolveWechatLoginCredentials reports unusable encrypted credentials as unavailable", () => { + assert.throws( + () => + resolveWechatLoginCredentials({ + appId: credentials.appId, + appSecretCredential: { algorithm: "aes-256-gcm", ciphertext: "broken" }, + }), + (error: unknown) => + error instanceof ServiceUnavailableException && error.message.includes("凭据不可用"), + ); +}); + +test("exchangeCode uses the credentials supplied for the requested brand", async () => { + const originalFetch = globalThis.fetch; + let requestedUrl = ""; + globalThis.fetch = async (input: string | URL | Request) => { + requestedUrl = + typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url; + return new Response( + JSON.stringify({ + openid: "openid-1", + session_key: "session-key-1", + unionid: "unionid-1", + }), + { status: 200, headers: { "content-type": "application/json" } }, + ); + }; + try { + const session = await new WechatAuthService().exchangeCode("login-code", credentials); + const url = new URL(requestedUrl); + assert.equal(url.origin + url.pathname, "https://api.weixin.qq.com/sns/jscode2session"); + assert.equal(url.searchParams.get("appid"), credentials.appId); + assert.equal(url.searchParams.get("secret"), credentials.appSecret); + assert.equal(url.searchParams.get("js_code"), "login-code"); + assert.equal(url.searchParams.get("grant_type"), "authorization_code"); + assert.deepEqual(session, { + openid: "openid-1", + sessionKey: "session-key-1", + unionid: "unionid-1", + }); + } finally { + globalThis.fetch = originalFetch; + } +}); + +test("exchangeCode surfaces WeChat rejection details without treating them as success", async () => { + const originalFetch = globalThis.fetch; + globalThis.fetch = async () => + new Response(JSON.stringify({ errcode: 40029, errmsg: "invalid code" }), { + status: 200, + headers: { "content-type": "application/json" }, + }); + try { + await assert.rejects( + () => new WechatAuthService().exchangeCode("bad-code", credentials), + (error: unknown) => + error instanceof UnauthorizedException && error.message === "invalid code", + ); + } finally { + globalThis.fetch = originalFetch; + } +}); + +test("exchangeCode reports network and HTTP failures as service unavailable", async () => { + const originalFetch = globalThis.fetch; + try { + globalThis.fetch = async () => { + throw new Error("network down"); + }; + await assert.rejects( + () => new WechatAuthService().exchangeCode("login-code", credentials), + ServiceUnavailableException, + ); + + globalThis.fetch = async () => new Response("upstream error", { status: 502 }); + await assert.rejects( + () => new WechatAuthService().exchangeCode("login-code", credentials), + ServiceUnavailableException, + ); + } finally { + globalThis.fetch = originalFetch; + } +}); + +test("exchangeCode rejects empty codes and incomplete credentials", async () => { + const service = new WechatAuthService(); + await assert.rejects(() => service.exchangeCode(" ", credentials), UnauthorizedException); + await assert.rejects( + () => service.exchangeCode("login-code", { appId: "", appSecret: "" }), + ServiceUnavailableException, + ); +}); diff --git a/apps/taro/test/browser/publication-release.spec.ts b/apps/taro/test/browser/publication-release.spec.ts index 3d6a825..3350324 100644 --- a/apps/taro/test/browser/publication-release.spec.ts +++ b/apps/taro/test/browser/publication-release.spec.ts @@ -180,6 +180,8 @@ async function mockPublicationApi(page: Page, options: MockOptions = {}) { appId: "wx0000000000000000", apiBaseUrl: "https://wechat.app.que01.top/api", hasStoredCredentials: false, + hasStoredAppSecret: false, + loginConfigured: false, }, }); } @@ -268,7 +270,7 @@ test("恢复历史版本会提交版本号并刷新发布记录", async ({ page await expect(page.getByText("历史版本已重新发布")).toBeVisible(); }); -test("小程序配置页回填服务端设置并仅提交新私钥", async ({ page }) => { +test("小程序配置页回填服务端设置并提交新的登录凭据与私钥", async ({ page }) => { await page.setViewportSize({ width: 1440, height: 1000 }); const bodies: Record[] = []; await mockPublicationApi(page, {}); @@ -281,6 +283,8 @@ test("小程序配置页回填服务端设置并仅提交新私钥", async ({ pa appId: body.appId, apiBaseUrl: body.apiBaseUrl, hasStoredCredentials: true, + hasStoredAppSecret: true, + loginConfigured: true, }, }); } @@ -292,10 +296,12 @@ test("小程序配置页回填服务端设置并仅提交新私钥", async ({ pa await expect(page.getByLabel("微信 AppID")).toHaveValue("wx0000000000000000"); await expect(page.getByLabel("小程序请求地址")).toHaveValue("https://wechat.app.que01.top/api"); + const appSecret = "0123456789abcdef0123456789abcdef"; + await page.getByLabel("微信登录 AppSecret").fill(appSecret); await page .getByLabel("上传私钥") .fill("-----BEGIN PRIVATE KEY-----\nKEY\n-----END PRIVATE KEY-----"); - await page.getByRole("button", { name: "保存上传配置" }).click(); + await page.getByRole("button", { name: "保存小程序配置" }).click(); await expect .poll(() => bodies) @@ -303,8 +309,9 @@ test("小程序配置页回填服务端设置并仅提交新私钥", async ({ pa { appId: "wx0000000000000000", apiBaseUrl: "https://wechat.app.que01.top/api", + appSecret, privateKey: "-----BEGIN PRIVATE KEY-----\nKEY\n-----END PRIVATE KEY-----", }, ]); - await expect(page.getByText("小程序上传配置已保存")).toBeVisible(); + await expect(page.getByText("小程序配置已保存")).toBeVisible(); }); diff --git a/docs/deployment.md b/docs/deployment.md index 72857e0..20ae5fe 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -211,9 +211,11 @@ curl -fsS "$API_BASE_URL/public/workspace?brandSlug=$BRAND_SLUG" | `API_BASE_URL` 与 AppID 是**编译期常量**,构建时写入小程序包,无法在后台热改。上传前按以下顺序解析并校验,任一项不合法就直接拒绝构建,避免把指向 `localhost` 的包上传到微信: -- 请求地址:后台「配置与发布 → 小程序上传配置」里的“小程序请求地址”优先;未配置时回落到 `MINIAPP_API_BASE_URL`,再回落到 `PUBLIC_BASE_URL` 加 `MINIAPP_API_PATH`(默认 `/api`)。非 `https` 的公网地址会被拒绝。因此换域名只需在后台改这一项并重新上传代码,不用改服务端环境变量。 -- AppID:同样以后台“小程序上传配置”里的 AppID 为准,回落 `WEAPP_APP_ID`;`undefined`、`touristappid` 等占位值会被拒绝。 +- 请求地址:后台「配置与发布 → 小程序配置」里的“小程序请求地址”优先;未配置时回落到 `MINIAPP_API_BASE_URL`,再回落到 `PUBLIC_BASE_URL` 加 `MINIAPP_API_PATH`(默认 `/api`)。非 `https` 的公网地址会被拒绝。因此换域名只需在后台改这一项并重新上传代码,不用改服务端环境变量。 +- AppID:同样以后台“小程序配置”里的 AppID 为准,回落 `WEAPP_APP_ID`;`undefined`、`touristappid` 等占位值会被拒绝。 -该域名必须与微信后台“开发设置 → 服务器域名 → request 合法域名”完全一致,否则小程序打开即报“加载失败,请重试”。后台“小程序上传配置”会直接展示当前生效的请求域名,便于上线前比对。 +微信登录同样使用该品牌的 AppID,但 AppSecret 由后台“小程序配置”单独维护。服务端使用 `MINIAPP_CREDENTIAL_ENCRYPTION_KEY`(未配置时回退 `SESSION_SECRET`)加密保存 AppSecret,登录时按 `brandSlug` 读取对应品牌的凭据,不使用全局 `WECHAT_APP_SECRET`,也不会跨品牌回退。修改 AppSecret 后立即生效,不需要重新上传小程序代码;修改 AppID 时必须同时填写该 AppID 对应的 AppSecret。 + +该域名必须与微信后台“开发设置 → 服务器域名 → request 合法域名”完全一致,否则小程序打开即报“加载失败,请重试”。后台“小程序配置”会直接展示当前生效的请求域名,便于上线前比对。 小程序包内的 `/media/...` 按请求地址的 origin 解析(例如 `https://host/api` → `https://host/media/...`),与网关的 `/media` 路由保持一致,不依赖 `/api` 前缀的剥离行为。 diff --git a/packages/api-client/src/resources/brand.ts b/packages/api-client/src/resources/brand.ts index 7e533c3..595bd04 100644 --- a/packages/api-client/src/resources/brand.ts +++ b/packages/api-client/src/resources/brand.ts @@ -80,6 +80,7 @@ export interface BrandMethods { appId?: string; apiBaseUrl?: string; privateKey?: string; + appSecret?: string; }): Promise; } diff --git a/packages/api-client/src/types/brand.ts b/packages/api-client/src/types/brand.ts index eefc5b8..9ad543d 100644 --- a/packages/api-client/src/types/brand.ts +++ b/packages/api-client/src/types/brand.ts @@ -115,6 +115,10 @@ export interface MiniAppReleaseSettings { build: Record; credential: { algorithm: string } | null; hasStoredCredentials: boolean; + /** 微信登录 AppSecret 是否已加密保存 */ + hasStoredAppSecret: boolean; + /** AppID 与 AppSecret 均已配置,小程序 wx.login 可换取 OpenID */ + loginConfigured: boolean; /** 小程序包内编译期写入的请求域名,需与微信后台 request 合法域名一致 */ requestDomain?: string | null; /** 构建参数缺失时的原因,非空表示当前无法构建上传 */ diff --git a/packages/api-client/test/client.test.ts b/packages/api-client/test/client.test.ts index 4a2f4e6..e98f266 100644 --- a/packages/api-client/test/client.test.ts +++ b/packages/api-client/test/client.test.ts @@ -186,7 +186,7 @@ test("发布检查与发布操作使用当前品牌的管理接口", async () => ]); }); -test("小程序上传配置会提交请求地址", async () => { +test("小程序配置会提交请求地址", async () => { const calls: Array<{ url: string; method?: string; body?: string }> = []; const client = new ApiClient({ baseUrl: "http://api.test", @@ -199,6 +199,7 @@ test("小程序上传配置会提交请求地址", async () => { await client.updateAdminMiniAppSettings({ appId: "wx123", apiBaseUrl: "https://wechat.example.com/api", + appSecret: "0123456789abcdef0123456789abcdef", }); assert.deepEqual(calls, [ { @@ -207,6 +208,7 @@ test("小程序上传配置会提交请求地址", async () => { body: JSON.stringify({ appId: "wx123", apiBaseUrl: "https://wechat.example.com/api", + appSecret: "0123456789abcdef0123456789abcdef", }), }, ]);