add clan and login to web

Author: SonodaHanami

deploy/docker-compose.yml

@@ -14,7 +14,7 @@ services:
   web:
     image: zzbslayer/kokkoro_bot:latest
     ports:
-      - "5100:5001"
+      - "5560:5001"
     volumes:
       - ~/.kokkoro:/root/.kokkoro
     command: python3.8 -u /bot/run_web.py

docker-compose.yml

@@ -15,7 +15,7 @@ services:
   web:
     image: zzbslayer/kokkoro_bot:latest
     ports:
-      - "5100:5001"
+      - "5560:5001"
     volumes:
       - ./:/bot/
       - ~/.kokkoro:/root/.kokkoro

kokkoro/bot/discord/discord_util.py

@@ -16,12 +16,12 @@ def remove_mention_me(raw_message) -> (str, bool):
 Pattern in official document is <@![a-z0-9A-Z]+>
 e.g. <@!12345>
 
-But the `at` sent by ios discord is <@[a-z0-9A-Z]>
+But the `at` sent by iOS discord is <@[a-z0-9A-Z]>
 e.g. <@12345>
 
 So temp solution is <@!?[a-z0-9A-Z]+>
 '''
-dc_at_pattern = r'<@!?[a-z0-9A-Z]+>' 
+dc_at_pattern = r'<@!?[a-z0-9A-Z]+>'
 def normalize_message(raw_message: str) -> str:
     """
     规范化 at 信息，"<@!123> waht<@!312>a12" => "@123 waht @312 a12"
@@ -33,7 +33,7 @@ def normalize_message(raw_message: str) -> str:
 
 def normalize_at(raw_at):
     """
-    规范化 at 信息，"<@!123>" => " @123 " 
+    规范化 at 信息，"<@!123>" => " @123 "
     ios: "<@123>" => " @123 "
     """
-    return f' @{raw_at[3:-1]} ' if '!' in raw_at else f' @{raw_at[2:-1]} '
+    return f' @{raw_at[3:-1]} ' if '!' in raw_at else f' @{raw_at[2:-1]} '

kokkoro/config_example/__init__.py

@@ -4,6 +4,7 @@
 import matplotlib.font_manager as font_manager
 
 from .__bot__ import *
+from .__web__ import *
 
 for module in MODULES_ON:
     try:

kokkoro/config_example/__web__.py

@@ -0,0 +1,2 @@
+PUBLIC_ADDRESS="http://DOMAIN_OR_IP_ADDRESS:5560"
+PUBLIC_BASEPATH="/"

kokkoro/modules/pcrclanbattle/clanbattle/__init__.py

@@ -5,6 +5,7 @@
 from .argparse import ArgParser
 from .exception import *
 
+from kokkoro import config
 from kokkoro.typing import *
 from kokkoro.common_interface import KokkoroBot, EventInterface
 from kokkoro.service import Service
@@ -22,7 +23,7 @@ def cb_cmd(prefixes, parser:ArgParser) -> Callable:
     prefixes = cb_prefix(prefixes)
     if not isinstance(prefixes, Iterable):
         raise ValueError('`name` of cb_cmd must be `str` or `Iterable[str]`')
-    
+
     def deco(func):
         @wraps(func)
         async def wrapper(bot: KokkoroBot, ev: EventInterface):
@@ -44,6 +45,8 @@ async def wrapper(bot: KokkoroBot, ev: EventInterface):
 
 
 from .cmdv2 import *
+if config.ENABLE_WEB:
+    from .cmd_web import *
 
 
 QUICK_START = f'''
@@ -105,4 +108,4 @@ async def cb_help(bot: KokkoroBot, ev:EventInterface):
     #                            content='命令一览表')
     # await session.send(msg)
 
-from . import report
+from . import report

kokkoro/modules/pcrclanbattle/clanbattle/cmd_web.py

@@ -0,0 +1,89 @@
+import json
+import os
+from datetime import datetime, timedelta
+import time
+from hashlib import sha256
+from typing import Dict, Union
+from urllib.parse import urljoin
+
+from .webmaster import WebMaster
+
+from .argparse import ArgParser, ArgHolder, ParseResult
+from .argparse.argtype import *
+from . import sv, cb_cmd, cb_prefix
+from . import cb_cmd
+from kokkoro import config
+from kokkoro.common_interface import KokkoroBot, EventInterface
+from kokkoro.service import Service
+from kokkoro.priv import ADMIN, SUPERUSER
+from kokkoro.util import rand_string, add_salt_and_hash
+
+svweb = Service('web')
+@svweb.scheduled_job('cron', hour='5')
+async def drop_expired_logins():
+    now = datetime.now()
+    wm = WebMaster()
+    wm.del_login_by_time(now)
+
+EXPIRED_TIME = 7 * 24 * 60 * 60  # 7 days
+LOGIN_AUTH_COOKIE_NAME = 'yobot_login'
+# this need be same with static/password.js
+FRONTEND_SALT = '14b492a3-a40a-42fc-a236-e9a9307b47d2'
+
+
+@cb_cmd(('登录', 'login'), ArgParser('!登录'))
+async def login(bot:KokkoroBot, ev:EventInterface, args:ParseResult):
+    if False and "this message is from group": # FIXME
+        return '请私聊使用'
+
+    wm = WebMaster()
+    uid = ev.get_author_id()
+    gid = ev.get_group_id()
+    auth = ev.get_author().get_priv()
+
+    member = wm.get_member(uid, gid)
+    if member is None:
+        await bot.kkr_send(ev, '请先加入公会')
+        return
+    member['authority_group'] = 100
+    if auth == SUPERUSER:
+        member['authority_group'] = 1
+    elif auth == ADMIN:
+        member['authority_group'] = 10
+    wm.mod_member(member)
+
+    user = wm.get_or_add_user(uid, rand_string(16))
+    login_code = rand_string(6)
+    user['login_code'] = login_code
+    user['login_code_available'] = True
+    user['login_code_expire_time'] = int(time.time()) + 60
+    wm.mod_user(user)
+
+    url = urljoin(
+        config.PUBLIC_ADDRESS,
+        '{}login/c/#uid={}&key={}'.format(
+            config.PUBLIC_BASEPATH,
+            user['uid'],
+            login_code,
+        )
+    )
+    await bot.kkr_send_dm(uid, url)
+
+@cb_cmd(('重置密码', 'reset-password'), ArgParser('!重置密码'))
+async def reset_password(bot:KokkoroBot, ev:EventInterface, args:ParseResult):
+    if False and "this message is from group": # FIXME
+        return '请私聊使用'
+    reply = f'您的临时密码是：{reset_pwd(ev)}'
+    await bot.kkr_send_dm(ev.get_author_id(), reply)
+
+def reset_pwd(ev:EventInterface):
+    wm = WebMaster()
+    user = wm.get_or_add_user(ev.get_author_id(), rand_string(16))
+    raw_pwd = rand_string(8)
+    frontend_salted_pwd = add_salt_and_hash(raw_pwd + user['uid'], FRONTEND_SALT)
+    user['password'] = add_salt_and_hash(frontend_salted_pwd, user['salt'])
+    user['privacy'] = 0
+    user['must_change_password'] = 1
+    wm.mod_user(user)
+    wm.del_login(user['uid'])
+    return raw_pwd

kokkoro/modules/pcrclanbattle/clanbattle/webmaster.py

@@ -0,0 +1,49 @@
+from datetime import datetime, timezone, timedelta
+
+from kokkoro.common_interface import EventInterface
+from .dao.sqlitedao import ClanDao, MemberDao, UserDao, LoginDao
+from .exception import NotFoundError
+
+class WebMaster():
+    def __init__(self):
+        super().__init__()
+        self.clandao = ClanDao()
+        self.memberdao = MemberDao()
+        self.userdao = UserDao()
+        self.logindao = LoginDao()
+
+
+    def get_clan(self, gid):
+        return self.clandao.findone(gid)
+    def get_clan_by_uid(self, uid):
+        return self.clandao.find_by_uid(uid)
+
+
+    def get_member(self, uid, gid):
+        mem = self.memberdao.find_one(uid, gid)
+        return mem if mem else None
+    def get_member_by_uid(self, uid):
+        mems = self.memberdao.find_by(uid=uid)
+        return mems if mems else None
+    def mod_member(self, member:dict):
+        return self.memberdao.modify(member)
+
+
+    def get_or_add_user(self, uid, salt):
+        return self.userdao.get_or_add(uid, salt)
+    def get_user(self, uid):
+        return self.userdao.find_one(uid)
+    def mod_user(self, user:dict):
+        return self.userdao.modify(user)
+
+
+    def add_login(self, uid, auth_cookie, auth_cookie_expire_time):
+        return self.logindao.add(uid, auth_cookie, auth_cookie_expire_time)
+    def get_login(self, uid, auth_cookie):
+        return self.logindao.find_one(uid, auth_cookie)
+    def mod_login(self, login:dict):
+        return self.logindao.modify(login)
+    def del_login(self, uid):
+        return self.logindao.delete(uid)
+    def del_login_by_time(self, time):
+        return self.logindao.delete_by_time(self, time)

kokkoro/modules/priconne/message_push/arena_reminder.py

@@ -1,18 +1,19 @@
 from kokkoro.service import BroadcastTag, BroadcastService
 
-sv9 = BroadcastService('pcr-arena-reminder-utc9', 
-    broadcast_tag=[BroadcastTag.cn_broadcast, BroadcastTag.tw_broadcast], enable_on_default=False, help_='背刺时间提醒(UTC+9)')
+sv9 = BroadcastService('pcr-arena-reminder-utc9',
+    broadcast_tag=[BroadcastTag.cn_broadcast, BroadcastTag.tw_broadcast],
+    enable_on_default=False, help_='背刺时间提醒(UTC+9)')
 
-sv8 = BroadcastService('pcr-arena-reminder-utc8', 
-    broadcast_tag=BroadcastTag.jp_broadcast, 
+sv8 = BroadcastService('pcr-arena-reminder-utc8',
+    broadcast_tag=BroadcastTag.jp_broadcast,
     enable_on_default=False, help_='背刺时间提醒(UTC+8)')
 
-msg = '主人様、准备好背刺了吗？'
+msg = '主さま、准备好背刺了吗？'
 
 @sv8.scheduled_job('cron', hour='14', minute='45', misfire_grace_time=60*10)
 async def pcr_reminder_utc8():
     await sv8.broadcast(msg)
 
 @sv9.scheduled_job('cron', hour='13', minute='45', misfire_grace_time=60*10)
 async def pcr_reminder_utc9():
-    await sv9.broadcast(msg)
+    await sv9.broadcast(msg)

kokkoro/util.py

@@ -7,19 +7,23 @@
 import json
 import re
 import importlib
+import random
 
 from collections import defaultdict
 from datetime import datetime, timedelta
 from matplotlib import pyplot as plt
 from PIL import Image
 from io import BytesIO
+from hashlib import sha256
 
 import itertools
 
 import kokkoro
 from kokkoro import config
 from kokkoro.typing import Iterable
 
+charset = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
+
 def escape(s: str, *, escape_comma: bool = True) -> str:
     s = s.replace('&', '&') \
         .replace('[', '[') \
@@ -118,7 +122,7 @@ def left_time(self, key) -> float:
 
 class DailyNumberLimiter:
     tz = pytz.timezone('Asia/Shanghai')
-    
+
     def __init__(self, max_num):
         self.today = -1
         self.count = defaultdict(int)
@@ -167,3 +171,8 @@ def load_modules(module_dir, module_prefix):
 
         load_module(f'{module_prefix}.{m.group(1)}')
 
+def rand_string(n=16):
+    return ''.join(random.choice(charset) for _ in range(n))
+
+def add_salt_and_hash(raw: str, salt: str):
+    return sha256((raw + salt).encode()).hexdigest()