From ab7d406a26c94889c61428979a2fc7f30f871c66 Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 26 Jul 2022 18:08:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/servers/connector/filter/global.ts | 7 +- game-server/app/services/checkParam.ts | 105 +++++++++++++++--- 2 files changed, 95 insertions(+), 17 deletions(-) diff --git a/game-server/app/servers/connector/filter/global.ts b/game-server/app/servers/connector/filter/global.ts index 5bdd182a5..5f5db6bb3 100644 --- a/game-server/app/servers/connector/filter/global.ts +++ b/game-server/app/servers/connector/filter/global.ts @@ -66,9 +66,10 @@ class Filter { session.push('teamCode', () => {}); - - let hasNoBlockWords = isCheckWord(isDevelopEnv()) && this.checkHasBlockWord(routeRecord.route, msg, roleId, serverId, guildCode); - if(!hasNoBlockWords) return next(new Error('globalFilter'), resResult(STATUS.BLOCK_WORDS)); + if(isCheckWord(isDevelopEnv())) { + let hasNoBlockWords = this.checkHasBlockWord(routeRecord.route, msg, roleId, serverId, guildCode); + if(!hasNoBlockWords) return next(new Error('globalFilter'), resResult(STATUS.BLOCK_WORDS)); + } if(routeRecord.route == 'guild.guildHandler.createGuild') { let guildCode = genCode(6); diff --git a/game-server/app/services/checkParam.ts b/game-server/app/services/checkParam.ts index b07732604..b1140cda4 100644 --- a/game-server/app/services/checkParam.ts +++ b/game-server/app/services/checkParam.ts @@ -15,6 +15,7 @@ export function checkRouteParam(route: string, msg: any) { case "battle.comBattleHandler.getAssistCnt": case "battle.comBattleHandler.getComBtlCnt": case "battle.comBattleHandler.getRecentTeammates": + case "battle.comBattleHandler.getTeamInvitation": case "battle.dailyBattleHandler.getData": case "battle.dungeonBattleHandler.getData": case "battle.eventBattleHandler.getEvents": @@ -25,6 +26,10 @@ export function checkRouteParam(route: string, msg: any) { case "battle.pvpHandler.refreshOppPlayer": case "battle.pvpHandler.getRank": case "battle.pvpHandler.getRec": + case "battle.ladderHandler.getData": + case "battle.ladderHandler.refreshOppPlayers": + case "battle.ladderHandler.getRec": + case "battle.towerBattleHandler.getStatus": case "battle.towerBattleHandler.checkHangUpRewards": case "battle.towerBattleHandler.recHangUpRewards": @@ -537,11 +542,17 @@ export function checkRouteParam(route: string, msg: any) { if(!checkNumberArray(stars)) return false; break; } - case "battle.expeditionBattleHandler.pointReward": - { - if(!checkNaturalNumbers(msg.point)) return false; - break; - } + case "battle.expeditionBattleHandler.pointReward": + { + if(!checkNaturalNumbers(msg.point)) return false; + break; + } + case "battle.expeditionBattleHandler.skipExpedition": + { + if(!checkNaturalStrings(msg.expeditionCode)) return false; + if(!checkNaturalNumbers(msg.expeditionId, msg.battleId)) return false; + break; + } case "battle.normalBattleHandler.checkBattle": { let { battleId, heroes } = msg; @@ -596,6 +607,11 @@ export function checkRouteParam(route: string, msg: any) { if(!checkNaturalNumbers(msg.chapter, msg.id, msg.warType)) return false; break; } + case "battle.normalBattleHandler.receiveWarReward": + { + if(!checkNaturalNumbers(msg.chapter, msg.warType)) return false; + break; + } case "battle.pvpHandler.getOppPlayer": case "battle.pvpHandler.getPlayerDetail": { @@ -647,6 +663,66 @@ export function checkRouteParam(route: string, msg: any) { if(!checkNaturalNumbers(msg.id)) return false; break; } + case "battle.ladderHandler.getOppLineup": + { + if(!checkNaturalStrings(msg.roleId)) return false; + if(!checkNaturalNumbers(msg.rank)) return false; + break; + } + case "battle.ladderHandler.chooseOpp": + { + if(!checkNaturalStrings(msg.roleId)) return false; + if(!checkNaturalNumbers(msg.rank, msg.myRank)) return false; + break; + } + case "battle.ladderHandler.chooseOpp": + { + if(!checkNaturalStrings(msg.roleId)) return false; + if(!checkNaturalNumbers(msg.rank, msg.myRank)) return false; + break; + } + case "battle.ladderHandler.giveupCheck": + case "battle.ladderHandler.getOppData": + { + if(!checkNaturalStrings(msg.battleCode)) return false; + break; + } + case "battle.ladderHandler.checkBattle": + { + if(!checkNaturalStrings(msg.battleCode)) return false; + if(!checkNaturalNumbers(msg.battleId)) return false; + if(!checkArrayCanEmpty(msg.heroes)) return false; + for(let { actorId, order } of msg.heroes) { + if(!checkNaturalNumbers(actorId, order)) return false; + } + break; + } + case "battle.ladderHandler.battleEnd": + { + if(!checkNaturalStrings(msg.battleCode)) return false; + if(!checkBoolean(msg.isSuccess)) return false; + break; + } + case "battle.ladderHandler.battleSweep": + { + if(!checkNaturalStrings(msg.roleId)) return false; + if(!checkNaturalNumbers(msg.rank, msg.count)) return false; + break; + } + case "battle.ladderHandler.saveDefense": + { + if(!checkNaturalNumbers(msg.warId)) return false; + if(!checkArrayCanEmpty(msg.heroes)) return false; + for(let { actorId, ai, dataId, order } of msg.heroes) { + if(!checkNaturalNumbers(actorId, ai, dataId, order)) return false; + } + break; + } + case "battle.ladderHandler.buyCnt": + { + if(!checkNaturalNumbers(msg.count)) return false; + break; + } case "battle.towerBattleHandler.resetLv": { if(!checkNaturalNumbers(msg.towerLv)) return false; @@ -1119,10 +1195,11 @@ export function checkRouteParam(route: string, msg: any) { } case "order.orderHandler.applyOrder": { - let { productID, payType, activityId, paramStr } = msg; + let { productID, payType, activityId, paramStr, useVoucher } = msg; if(!checkNaturalNumbers(payType, activityId)) return false; if(!checkNaturalStrings(productID)) return false; if(!checkStringIfExist(paramStr)) return false; + if(!checkBoolean(useVoucher)) return false; break; } case "order.orderHandler.checkOrder": @@ -1289,14 +1366,9 @@ export function checkRouteParam(route: string, msg: any) { if(!checkNaturalNumbers(msg.hid)) return false; break; } - case "role.heroHandler.heroConectionActivate": - { - if(!checkNaturalNumbers(msg.shipId)) return false; - break; - } case "role.heroHandler.heroGiveFavor": { - if(!checkNaturalNumbers(msg.hid, msg.type)) return false; + if(!checkNaturalNumbers(msg.hid, msg.shipId, msg.type)) return false; break; } case "role.heroHandler.heroWearSkin": @@ -1427,13 +1499,14 @@ export function checkRouteParam(route: string, msg: any) { break; } case "role.shopHandler.getShopList": + case "role.shopHandler.readShop": { - if(!checkNaturalNumbers(msg.shopId)) return false; + if(!checkNaturalNumbers(msg.shopId, msg.type)) return false; break; } case "role.shopHandler.purchase": { - if(!checkNaturalNumbers(msg.shopId, msg.count)) return false; + if(!checkNaturalNumbers(msg.shopItemId, msg.count)) return false; break; } case "role.shopHandler.recycleSoul": @@ -1529,6 +1602,10 @@ export function checkRouteParam(route: string, msg: any) { case "role.taskHandler.debugRefTask": case "role.shopHandler.debugClearPurchaseLimit": case "guild.raceActivityHandler.settleReward": + case "battle.ladderHandler.resetCnt": + case "battle.ladderHandler.setMyRank": + case "battle.ladderHandler.setMyOpp": + case "guild.raceActivityHandler.debugAddHorse": { if (msg.magicWord !== DEBUG_MAGIC_WORD) return false; break;