From 2b83985efda6dd9ddcdfd948224678f14f210f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B4=9B=E6=B0=B4=E5=B1=85=E5=AE=A4?= Date: Sun, 20 Nov 2022 19:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Add=20Webapp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/apihelper/hyperion.py | 4 +- plugins/genshin/verification.py | 62 ++++++--------- plugins/system/start.py | 74 +++++++---------- plugins/system/webapp.py | 135 ++++++++++++++++++++++++++++++++ 4 files changed, 190 insertions(+), 85 deletions(-) create mode 100644 plugins/system/webapp.py diff --git a/modules/apihelper/hyperion.py b/modules/apihelper/hyperion.py index f6bac570..5740ddf4 100644 --- a/modules/apihelper/hyperion.py +++ b/modules/apihelper/hyperion.py @@ -405,9 +405,9 @@ class Verification: def get_url(host: str, url: str): return f"https://{host}{url}" - async def create(self): + async def create(self, is_high: bool = False): url = self.get_url(self.HOST, self.CREATE_VERIFICATION_URL) - params = {"is_high": "true"} + params = {"is_high": "true" if is_high else "false"} headers = self.get_headers(params=params) response = await self.client.get(url, params=params, headers=headers) return response diff --git a/plugins/genshin/verification.py b/plugins/genshin/verification.py index b97b9134..3ec5732b 100644 --- a/plugins/genshin/verification.py +++ b/plugins/genshin/verification.py @@ -1,7 +1,7 @@ from typing import Tuple, Optional from genshin import Region, GenshinException -from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup +from telegram import Update, WebAppInfo, KeyboardButton, ReplyKeyboardMarkup from telegram.ext import CallbackContext from core.base.redisdb import RedisDB @@ -12,7 +12,7 @@ from core.cookies.error import CookiesNotFoundError from core.plugin import Plugin, handler from core.user import UserService from core.user.error import UserNotFoundError -from modules.apihelper.error import ResponseException, APIHelperException +from modules.apihelper.error import ResponseException from modules.apihelper.hyperion import Verification from utils.decorators.error import error_callable from utils.decorators.restricts import restricts @@ -61,33 +61,21 @@ class VerificationPlugins(Plugin, BasePlugin): except CookiesNotFoundError: await message.reply_text("检测到用户为UID绑定，无需认证") return + is_high: bool = False verification = Verification(cookies=client.cookie_manager.cookies) - if context.args and len(context.args) > 0: - validate = context.args[0] - _, challenge = await self.system.get_challenge(client.uid) - logger.info("用户 %s[%s] 请求通过认证 challenge[%s] validate[%s] ", user.full_name, user.id, challenge, validate) - if challenge: - try: - await verification.verify(challenge, validate) - logger.success("用户 %s[%s] 验证成功", user.full_name, user.id) - await message.reply_text("验证成功") - except ResponseException as exc: - logger.warning("用户 %s[%s] 验证失效 API返回 [%s]%s", user.full_name, user.id, exc.code, exc.message) - await message.reply_text(f"验证失败 错误信息为 [{exc.code}]{exc.message}") + if not context.args: + try: + await client.get_genshin_notes() + except GenshinException as exc: + if exc.retcode == 1034: + is_high = True + else: + raise exc else: - logger.warning("用户 %s[%s] 验证失效 请求已经过期", user.full_name, user.id) - await message.reply_text("验证失效 请求已经过期 请稍后重试") - return + await message.reply_text("账户正常，无需认证") + return try: - await client.get_genshin_notes() - except GenshinException as exc: - if exc.retcode != 1034: - raise exc - else: - await message.reply_text("账户正常，无需认证") - return - try: - data = await verification.create() + data = await verification.create(is_high=is_high) challenge = data["challenge"] gt = data["gt"] logger.success("用户 %s[%s] 创建验证成功 gt[%s] challenge[%s]", user.full_name, user.id, gt, challenge) @@ -95,16 +83,14 @@ class VerificationPlugins(Plugin, BasePlugin): logger.warning("用户 %s[%s] 创建验证失效 API返回 [%s]%s", user.full_name, user.id, exc.code, exc.message) await message.reply_text(f"创建验证失败 错误信息为 [{exc.code}]{exc.message} 请稍后重试") return - try: - validate = await verification.ajax(referer="https://webstatic.mihoyo.com/", gt=gt, challenge=challenge) - if validate: - await verification.verify(challenge, validate) - logger.success(f"用户 %s[%s] 通过 ajax 验证", user.full_name, user.id) - await message.reply_text("验证成功") - return - except APIHelperException as exc: - logger.warning(f"用户 %s[%s] ajax 验证失效 错误信息为 %s", user.full_name, user.id, repr(exc)) await self.system.set_challenge(client.uid, gt, challenge) - url = f"{config.pass_challenge_user_web}?username={context.bot.username}&command=verify>={gt}&challenge={challenge}&uid={client.uid}" - button = InlineKeyboardMarkup([[InlineKeyboardButton("验证", url=url)]]) - await message.reply_text("请尽快点击下方手动验证", reply_markup=button) + url = f"{config.pass_challenge_user_web}/webapp?username={context.bot.username}&command=verify>={gt}&challenge={challenge}&uid={client.uid}" + await message.reply_text( + "请尽快在10秒内完成手动验证\n或发送 /web_cancel 取消操作", + reply_markup=ReplyKeyboardMarkup.from_button( + KeyboardButton( + text="点我手动验证", + web_app=WebAppInfo(url=url), + ) + ), + ) diff --git a/plugins/system/start.py b/plugins/system/start.py index 2fd1406b..7fe817c0 100644 --- a/plugins/system/start.py +++ b/plugins/system/start.py @@ -1,7 +1,7 @@ from typing import Optional from genshin import Region, GenshinException -from telegram import Update, ReplyKeyboardRemove, Message, User, InlineKeyboardMarkup, InlineKeyboardButton +from telegram import Update, ReplyKeyboardRemove, Message, User, WebAppInfo, ReplyKeyboardMarkup, KeyboardButton from telegram.constants import ChatAction from telegram.ext import CallbackContext, CommandHandler from telegram.helpers import escape_markdown @@ -66,9 +66,6 @@ class StartPlugin(Plugin): if _command == "sign": logger.info(f"用户 %s[%s] 通过start命令 进入签到流程", user.full_name, user.id) await self.process_sign_validate(message, user, _challenge) - elif _command == "verify": - logger.info(f"用户 %s[%s] 通过start命令 进入认证流程", user.full_name, user.id) - await self.process_validate(message, user, validate=_challenge) else: await message.reply_html(f"你好 {user.mention_html()} ！我是派蒙 ！\n请点击 /{args[0]} 命令进入对应流程") return @@ -122,9 +119,7 @@ class StartPlugin(Plugin): except NeedChallenge: await message.reply_text("回调错误，请重新签到", allow_sending_without_reply=True) - async def process_validate( - self, message: Message, user: User, validate: Optional[str] = None, bot_username: Optional[str] = None - ): + async def process_validate(self, message: Message, user: User, bot_username: Optional[str] = None): try: client = await get_genshin_client(user.id) if client.region != Region.CHINESE: @@ -150,43 +145,32 @@ class StartPlugin(Plugin): "在暂停使用期间依然出现频繁认证，建议修改密码以保护账号安全。" ) verification = Verification(cookies=client.cookie_manager.cookies) - if validate: - _, challenge = await self.verification_system.get_challenge(client.uid) - if challenge: - logger.info( - "用户 %s[%s] 请求通过认证 challenge[%s] validate[%s] ", user.full_name, user.id, challenge, validate - ) - try: - await verification.verify(challenge, validate) - logger.success("用户 %s[%s] 验证成功", user.full_name, user.id) - await message.reply_text("验证成功") - except ResponseException as exc: - logger.warning("用户 %s[%s] 验证失效 API返回 [%s]%s", user.full_name, user.id, exc.code, exc.message) - await message.reply_text(f"验证失败 错误信息为 [{exc.code}]{exc.message} 请稍后重试") - else: - logger.warning("用户 %s[%s] 验证失效 请求已经过期", user.full_name, user.id) - await message.reply_text("验证失效 请求已经过期 请稍后重试") + try: + data = await verification.create(is_high=True) + challenge = data["challenge"] + gt = data["gt"] + logger.success("用户 %s[%s] 创建验证成功 gt[%s] challenge[%s]", user.full_name, user.id, gt, challenge) + except ResponseException as exc: + logger.warning("用户 %s[%s] 创建验证失效 API返回 [%s]%s", user.full_name, user.id, exc.code, exc.message) + await message.reply_text(f"验证失败 错误信息为 [{exc.code}]{exc.message}") return - if bot_username: - try: - data = await verification.create() - challenge = data["challenge"] - gt = data["gt"] - logger.success("用户 %s[%s] 创建验证成功 gt[%s] challenge[%s]", user.full_name, user.id, gt, challenge) - except ResponseException as exc: - logger.warning("用户 %s[%s] 创建验证失效 API返回 [%s]%s", user.full_name, user.id, exc.code, exc.message) - await message.reply_text(f"验证失败 错误信息为 [{exc.code}]{exc.message}") + try: + validate = await verification.ajax(referer="https://webstatic.mihoyo.com/", gt=gt, challenge=challenge) + if validate: + await verification.verify(challenge, validate) + logger.success("用户 %s[%s] 通过 ajax 验证", user.full_name, user.id) + await message.reply_text("验证成功") return - try: - validate = await verification.ajax(referer="https://webstatic.mihoyo.com/", gt=gt, challenge=challenge) - if validate: - await verification.verify(challenge, validate) - logger.success("用户 %s[%s] 通过 ajax 验证", user.full_name, user.id) - await message.reply_text("验证成功") - return - except APIHelperException as exc: - logger.warning("用户 %s[%s] ajax 验证失效 错误信息为 %s", user.full_name, user.id, repr(exc)) - await self.verification_system.set_challenge(client.uid, gt, challenge) - url = f"{config.pass_challenge_user_web}?username={bot_username}&command=verify>={gt}&challenge={challenge}&uid={client.uid}" - button = InlineKeyboardMarkup([[InlineKeyboardButton("验证", url=url)]]) - await message.reply_text("请尽快点击下方手动验证", reply_markup=button) + except APIHelperException as exc: + logger.warning("用户 %s[%s] ajax 验证失效 错误信息为 %s", user.full_name, user.id, repr(exc)) + await self.verification_system.set_challenge(client.uid, gt, challenge) + url = f"{config.pass_challenge_user_web}/webapp?username={bot_username}&command=verify>={gt}&challenge={challenge}&uid={client.uid}" + await message.reply_text( + "请尽快在10秒内完成手动验证\n或发送 /web_cancel 取消操作", + reply_markup=ReplyKeyboardMarkup.from_button( + KeyboardButton( + text="点我手动验证", + web_app=WebAppInfo(url=url), + ) + ), + ) diff --git a/plugins/system/webapp.py b/plugins/system/webapp.py new file mode 100644 index 00000000..841e8868 --- /dev/null +++ b/plugins/system/webapp.py @@ -0,0 +1,135 @@ +from genshin import Region, GenshinException +from pydantic import BaseModel +from telegram import ReplyKeyboardRemove, Update, WebAppInfo, ReplyKeyboardMarkup, KeyboardButton +from telegram.ext import CallbackContext, filters + +from core.base.redisdb import RedisDB +from core.config import config +from core.cookies import CookiesService +from core.cookies.error import CookiesNotFoundError +from core.plugin import Plugin, handler +from core.user import UserService +from core.user.error import UserNotFoundError +from modules.apihelper.error import ResponseException +from modules.apihelper.hyperion import Verification +from plugins.genshin.verification import VerificationSystem +from utils.decorators.restricts import restricts +from utils.helpers import get_genshin_client +from utils.log import logger + + +class WebAppData(BaseModel): + path: str + data: dict + code: int + message: str + + +class WebAppDataException(Exception): + def __init__(self, data): + self.data = data + super().__init__() + + +class WebApp(Plugin): + def __init__(self, user_service: UserService = None, cookies_service: CookiesService = None, redis: RedisDB = None): + self.cookies_service = cookies_service + self.user_service = user_service + self.verification_system = VerificationSystem(redis) + + @staticmethod + def de_web_app_data(data: str) -> WebAppData: + try: + return WebAppData.parse_raw(data) + except Exception as exc: + raise WebAppDataException(data) from exc + + @handler.message(filters=filters.StatusUpdate.WEB_APP_DATA, block=False) + @restricts() + async def app(self, update: Update, context: CallbackContext): + user = update.effective_user + message = update.effective_message + web_app_data = message.web_app_data + if web_app_data: + logger.info("用户 %s[%s] 触发 WEB_APP_DATA 请求", user.full_name, user.id) + result = self.de_web_app_data(web_app_data.data) + logger.debug("path:%s\ndata:%s\ncode:%s\nmessage:%s", result.path, result.data, result.code, result.message) + if result.code == 0: + if result.path == "verify": + validate = result.data.get("geetest_validate") + try: + client = await get_genshin_client(user.id) + if client.region != Region.CHINESE: + await message.reply_text("非法用户", reply_markup=ReplyKeyboardRemove()) + return + except UserNotFoundError: + await message.reply_text("用户未找到", reply_markup=ReplyKeyboardRemove()) + return + except CookiesNotFoundError: + await message.reply_text("检测到用户为UID绑定，无需认证", reply_markup=ReplyKeyboardRemove()) + return + verification = Verification(cookies=client.cookie_manager.cookies) + if validate: + _, challenge = await self.verification_system.get_challenge(client.uid) + if challenge: + logger.info( + "用户 %s[%s] 请求通过认证 challenge[%s] validate[%s] ", + user.full_name, + user.id, + challenge, + validate, + ) + try: + await verification.verify(challenge=challenge, validate=validate) + logger.success("用户 %s[%s] 验证成功", user.full_name, user.id) + await message.reply_text("验证成功", reply_markup=ReplyKeyboardRemove()) + except ResponseException as exc: + logger.warning( + "用户 %s[%s] 验证失效 API返回 [%s]%s", user.full_name, user.id, exc.code, exc.message + ) + await message.reply_text(f"验证失败 错误信息为 [{exc.code}]{exc.message} 请稍后重试", reply_markup=ReplyKeyboardRemove()) + else: + logger.warning("用户 %s[%s] 验证失效 请求已经过期", user.full_name, user.id) + await message.reply_text("验证失效 请求已经过期 请稍后重试", reply_markup=ReplyKeyboardRemove()) + return + try: + await client.get_genshin_notes() + except GenshinException as exc: + if exc.retcode != 1034: + raise exc + else: + await message.reply_text("账户正常，无需认证") + return + try: + data = await verification.create(is_high=True) + challenge = data["challenge"] + gt = data["gt"] + logger.success("用户 %s[%s] 创建验证成功 gt[%s] challenge[%s]", user.full_name, user.id, gt, challenge) + except ResponseException as exc: + logger.warning("用户 %s[%s] 创建验证失效 API返回 [%s]%s", user.full_name, user.id, exc.code, exc.message) + await message.reply_text(f"创建验证失败 错误信息为 [{exc.code}]{exc.message} 请稍后重试", reply_markup=ReplyKeyboardRemove()) + return + await self.verification_system.set_challenge(client.uid, gt, challenge) + url = f"{config.pass_challenge_user_web}/webapp?username={context.bot.username}&command=verify>={gt}&challenge={challenge}&uid={client.uid}" + await message.reply_text( + "请尽快点击下方手动验证 或发送 /web_cancel 取消操作", + reply_markup=ReplyKeyboardMarkup.from_button( + KeyboardButton( + text="点我手动验证", + web_app=WebAppInfo(url=url), + ) + ), + ) + else: + logger.warning( + "用户 %s[%s] WEB_APP_DATA 请求错误 [%s]%s", user.full_name, user.id, result.code, result.message + ) + await message.reply_text(result.message, reply_markup=ReplyKeyboardRemove()) + else: + logger.warning("用户 %s[%s] WEB_APP_DATA 非法数据", user.full_name, user.id) + + @handler.command("web_cancel", block=False) + @restricts() + async def web_cancel(self, update: Update, _: CallbackContext) -> None: + message = update.effective_message + await message.reply_text("取消操作", reply_markup=ReplyKeyboardRemove())