GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2025-07-19 12:03:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: 正向ws鉴权

Browse Source
This commit is contained in:
手瓜一十雪
2024-08-11 10:20:17 +08:00
parent e99ff1be35
commit 062cc307fb
1 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/onebot/network/passive-websocket.ts
View File

@@ -1,5 +1,6 @@
import { IOB11NetworkAdapter, OB11EmitEventContent } from './index'; import { IOB11NetworkAdapter, OB11EmitEventContent } from './index';
import { OB11BaseEvent } from '@/onebot/event/OB11BaseEvent'; import { OB11BaseEvent } from '@/onebot/event/OB11BaseEvent';
import urlParse from 'url';
import BaseAction from '@/onebot/action/BaseAction'; import BaseAction from '@/onebot/action/BaseAction';
import { WebSocket, WebSocketServer } from 'ws'; import { WebSocket, WebSocketServer } from 'ws';
import { Mutex } from 'async-mutex'; import { Mutex } from 'async-mutex';
@@ -23,6 +24,34 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
logger: LogWrapper; logger: LogWrapper;
private heartbeatIntervalId: NodeJS.Timeout | null = null; private heartbeatIntervalId: NodeJS.Timeout | null = null;
authorize(token: string, wsClient: WebSocket, wsReq: any) {
if (token && token.length > 0) {
const url = wsClient.url!.split('?').shift();
this.logger.log('ws connect', url);
let clientToken: string = '';
const authHeader = wsReq.headers['authorization'];
if (authHeader) {
clientToken = authHeader.split('Bearer ').pop() || '';
this.logger.log('receive ws header token', clientToken);
} else {
const parsedUrl = urlParse.parse(wsClient.url || '/', true);
const urlToken = parsedUrl.query.access_token;
if (urlToken) {
if (Array.isArray(urlToken)) {
clientToken = urlToken[0];
} else {
clientToken = urlToken;
}
this.logger.log('receive ws url token', clientToken);
}
}
if (clientToken != token) {
wsClient.send(JSON.stringify(OB11Response.res(null, 'failed', 1403, 'token验证失败')));
return wsClient.close();
}
}
}
constructor(ip: string, port: number, heartbeatInterval: number, token: string, coreContext: NapCatCore, onebotContext: NapCatOneBot11Adapter) { constructor(ip: string, port: number, heartbeatInterval: number, token: string, coreContext: NapCatCore, onebotContext: NapCatOneBot11Adapter) {
this.coreContext = coreContext; this.coreContext = coreContext;
this.onebotContext = onebotContext; this.onebotContext = onebotContext;
@@ -30,18 +59,14 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
this.heartbeatInterval = heartbeatInterval; this.heartbeatInterval = heartbeatInterval;
this.wsServer = new WebSocketServer({ port: port, host: ip }); this.wsServer = new WebSocketServer({ port: port, host: ip });
this.wsServer.on('connection', async (wsClient) => { this.wsServer.on('connection', async (wsClient, wsReq) => {
if (!this.isOpen) { if (!this.isOpen) {
wsClient.close(); wsClient.close();
return; return;
} }
if (token) { //鉴权
const incomingToken = wsClient.url.split('?')[1]?.split('=')[1]; this.authorize(token, wsClient, wsReq);
if (incomingToken !== token) {
wsClient.close();
return;
}
}
wsClient.on('message', (message) => { wsClient.on('message', (message) => {
this.handleMessage(wsClient, message); this.handleMessage(wsClient, message);
}); });
@@ -132,7 +157,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
echo = receiveData.echo; echo = receiveData.echo;
this.logger.logDebug('收到正向Websocket消息', receiveData); this.logger.logDebug('收到正向Websocket消息', receiveData);
} catch (e) { } catch (e) {
this.WsReply<any>(OB11Response.error('json解析失败，请检查数据格式', 1400, echo), wsClient); this.WsReply<any>(OB11Response.error('json解析失败,请检查数据格式', 1400, echo), wsClient);
} }
receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证 receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证
} catch (e) { } catch (e) {