From c8dd520d6572c528dbe983c045c0f7443daef32c Mon Sep 17 00:00:00 2001 From: H3CoF6 <1707889225@qq.com> Date: Sat, 9 May 2026 05:17:18 +0800 Subject: [PATCH] feat: implement get cookies and CSRF and credentials --- packages/core/src/bridge/bridge.ts | 6 +++ packages/core/src/bridge/web-actions.ts | 53 ++++++++++++++++++++ packages/core/src/onebot/actions/extended.ts | 36 ++++++++++--- packages/core/src/onebot/api-handler.ts | 3 ++ packages/core/src/onebot/instance-context.ts | 3 ++ 5 files changed, 95 insertions(+), 6 deletions(-) diff --git a/packages/core/src/bridge/bridge.ts b/packages/core/src/bridge/bridge.ts index 9b957a50..7da6d88e 100644 --- a/packages/core/src/bridge/bridge.ts +++ b/packages/core/src/bridge/bridge.ts @@ -75,6 +75,9 @@ import { getGroupEssenceAll as getGroupEssenceAll_, sendGroupNotice as sendGroupNotice_, getGroupNotice as getGroupNotice_, + getCookiesStr as getCookiesStr_, + getCsrfToken as getCsrfToken_, + getCredentials as getCredentials_, } from './web-actions'; import type { GroupFilesResult } from './bridge-actions'; import type { MediaIndexNode } from './bridge-actions'; @@ -496,6 +499,9 @@ export class Bridge { async setProfile(nickname?: string, personalNote?: string): Promise { return setProfile_(this, nickname, personalNote); } + async getCookiesStr(domain: string): Promise { return getCookiesStr_(this, domain); } + async getCsrfToken(): Promise { return getCsrfToken_(this); } + async getCredentials(domain: string) { return getCredentials_(this, domain); } } diff --git a/packages/core/src/bridge/web-actions.ts b/packages/core/src/bridge/web-actions.ts index 2677a5de..7fce47f2 100644 --- a/packages/core/src/bridge/web-actions.ts +++ b/packages/core/src/bridge/web-actions.ts @@ -259,4 +259,57 @@ export async function getGroupNotice(bridge: Bridge, groupId: number) { } return retNotices; +} + +/** + * 提取的公共算法:根据 skey/p_skey 计算 bkn (也就是 token / csrf_token) + */ +export function getBknFromSKey(skey: string): number { + let hash = 5381; + for (let i = 0; i < skey.length; i++) { + hash += (hash << 5) + skey.charCodeAt(i); + } + return hash & 2147483647; +} + +/** + * 获取 Cookies (字符串格式) + */ +export async function getCookiesStr(bridge: Bridge, domain: string): Promise { + const cookieObject = await getCookies(bridge, domain); + return Object.entries(cookieObject) + .map(([key, value]) => `${key}=${value}`) + .join('; '); +} + +/** + * 获取 CSRF Token (即 BKN) + */ +export async function getCsrfToken(bridge: Bridge): Promise { + + const skey = await getSKey(bridge); + if (!skey) { + throw new Error('SKey is Empty'); + } + return getBknFromSKey(skey); +} + +/** + * 获取凭证 (Cookies 字符串 + Token) + */ +export async function getCredentials(bridge: Bridge, domain: string) { + const cookieObject = await getCookies(bridge, domain); + const cookiesStr = Object.entries(cookieObject) + .map(([key, value]) => `${key}=${value}`) + .join('; '); + + + const skey = cookieObject['p_skey'] || cookieObject['skey'] || ''; + const token = skey ? getBknFromSKey(skey) : 0; + + return { + cookies: cookiesStr, + token: token, + csrf_token: token + }; } \ No newline at end of file diff --git a/packages/core/src/onebot/actions/extended.ts b/packages/core/src/onebot/actions/extended.ts index c4edf99f..b1eaa229 100644 --- a/packages/core/src/onebot/actions/extended.ts +++ b/packages/core/src/onebot/actions/extended.ts @@ -413,18 +413,42 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { // --- Credentials --- - h.registerAction('get_cookies', async () => { - return okResponse({ cookies: '' }); + h.registerAction('get_cookies', async (params) => { + const domain = asString(params.domain) || 'qun.qq.com'; + + if (!ctx.getCookiesStr) return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + + try { + const cookies = await ctx.getCookiesStr(domain); + return okResponse({ cookies }); + } catch (e) { + return failedResponse(RETCODE.ACTION_FAILED, String(e)); + } }); h.registerAction('get_csrf_token', async () => { - return okResponse({ token: 0 }); + if (!ctx.getCsrfToken) return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + + try { + const token = await ctx.getCsrfToken(); + return okResponse({ token }); + } catch (e) { + return failedResponse(RETCODE.ACTION_FAILED, String(e)); + } }); - h.registerAction('get_credentials', async () => { - return okResponse({ cookies: '', csrf_token: 0 }); - }); + h.registerAction('get_credentials', async (params) => { + const domain = asString(params.domain) || 'qun.qq.com'; + if (!ctx.getCredentials) return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + + try { + const creds = await ctx.getCredentials(domain); + return okResponse(creds); + } catch (e) { + return failedResponse(RETCODE.ACTION_FAILED, String(e)); + } + }); // --- Utility --- h.registerAction('set_restart', async () => { diff --git a/packages/core/src/onebot/api-handler.ts b/packages/core/src/onebot/api-handler.ts index 52f71a2c..407096e1 100644 --- a/packages/core/src/onebot/api-handler.ts +++ b/packages/core/src/onebot/api-handler.ts @@ -102,6 +102,9 @@ export interface ApiActionContext { getGroupEssenceAll?: (groupId: number) => Promise; sendGroupNotice?: (groupId: number, content: string, options?: any) => Promise; getGroupNotice?: (groupId: number) => Promise; + getCookiesStr?: (domain: string) => Promise; + getCsrfToken?: () => Promise; + getCredentials?: (domain: string) => Promise<{ cookies: string; token: number; csrf_token: number }>; } type ActionHandler = (params: JsonObject) => Promise; diff --git a/packages/core/src/onebot/instance-context.ts b/packages/core/src/onebot/instance-context.ts index 34b01dac..7800e5b1 100644 --- a/packages/core/src/onebot/instance-context.ts +++ b/packages/core/src/onebot/instance-context.ts @@ -132,6 +132,9 @@ export function buildApiContext(ref: InstanceRef): ApiActionContext { getGroupEssenceAll: (groupId: number) => bridge.getGroupEssenceAll(groupId), sendGroupNotice: (groupId: number, content: string, options?: any) => bridge.sendGroupNotice(groupId, content, options), getGroupNotice: (groupId: number) => bridge.getGroupNotice(groupId), + getCookiesStr: (domain: string) => bridge.getCookiesStr(domain), + getCsrfToken: () => bridge.getCsrfToken(), + getCredentials: (domain: string) => bridge.getCredentials(domain), }; }