Merge branch 'master' into feat/dingtalk

pkg/platform/sources/lark.py

@@ -11,10 +11,16 @@ import base64
 import uuid
 import json
 import datetime
+import hashlib
+import base64
+from Crypto.Cipher import AES
 
 import aiohttp
 import lark_oapi.ws.exception
+import quart
+from flask import jsonify
 from lark_oapi.api.im.v1 import *
+from lark_oapi.api.verification.v1 import GetVerificationRequest
 
 from .. import adapter
 from ...pipeline.longtext.strategies import forward
@@ -25,6 +31,28 @@ from ..types import entities as platform_entities
 from ...utils import image
 
 
+class  AESCipher(object):
+    def __init__(self, key):
+        self.bs = AES.block_size
+        self.key=hashlib.sha256(AESCipher.str_to_bytes(key)).digest()
+    @staticmethod
+    def str_to_bytes(data):
+        u_type = type(b"".decode('utf8'))
+        if isinstance(data, u_type):
+            return data.encode('utf8')
+        return data
+    @staticmethod
+    def _unpad(s):
+        return s[:-ord(s[len(s) - 1:])]
+    def decrypt(self, enc):
+        iv = enc[:AES.block_size]
+        cipher = AES.new(self.key, AES.MODE_CBC, iv)
+        return  self._unpad(cipher.decrypt(enc[AES.block_size:]))
+    def decrypt_string(self, enc):
+        enc = base64.b64decode(enc)
+        return  self.decrypt(enc).decode('utf8')
+
+
 class LarkMessageConverter(adapter.MessageConverter):
 
     @staticmethod
@@ -288,12 +316,57 @@ class LarkMessageSourceAdapter(adapter.MessageSourceAdapter):
     ] = {}
 
     config: dict
-
+    quart_app: quart.Quart
     ap: app.Application
 
     def __init__(self, config: dict, ap: app.Application):
         self.config = config
         self.ap = ap
+        self.quart_app = quart.Quart(__name__)
+
+        @self.quart_app.route('/lark/callback', methods=['POST'])
+        async def lark_callback():
+            try:
+                data = await quart.request.json
+
+                if 'encrypt' in data:
+                    cipher = AESCipher(self.config['encrypt-key'])
+                    data = cipher.decrypt_string(data['encrypt'])
+                    data = json.loads(data)
+
+                type =  data.get("type")
+                if type is None :
+                    context = EventContext(data)
+                    type = context.header.event_type
+                
+                if 'url_verification' == type:
+                    print(data.get("challenge"))
+                    # todo 验证verification token
+                    return {
+                        "challenge": data.get("challenge")
+                    }
+                context = EventContext(data)
+                type = context.header.event_type
+                p2v1 = P2ImMessageReceiveV1()
+                p2v1.header = context.header
+                event = P2ImMessageReceiveV1Data()
+                event.message = EventMessage(context.event['message'])
+                event.sender = EventSender(context.event['sender'])
+                p2v1.event = event
+                p2v1.schema = context.schema
+                if 'im.message.receive_v1' == type:
+                    try:
+                        event = await self.event_converter.target2yiri(p2v1, self.api_client)
+                    except Exception as e:
+                        traceback.print_exc()
+
+                    if event.__class__ in self.listeners:
+                        await self.listeners[event.__class__](event, self)
+
+                return {"code": 200, "message": "ok"}
+            except Exception as e:
+                traceback.print_exc()
+                return {"code": 500, "message": "error"}
 
         async def on_message(event: lark_oapi.im.v1.P2ImMessageReceiveV1):
 
@@ -392,16 +465,29 @@ class LarkMessageSourceAdapter(adapter.MessageSourceAdapter):
         self.listeners.pop(event_type)
 
     async def run_async(self):
-        try:
-            await self.bot._connect()
-        except lark_oapi.ws.exception.ClientException as e:
-            raise e
-        except Exception as e:
-            await self.bot._disconnect()
-            if self.bot._auto_reconnect:
-                await self.bot._reconnect()
-            else:
-                raise e
+        port = self.config['port']
+        enable_webhook = self.config['enable-webhook']
 
+        if not enable_webhook:
+            try:
+                await self.bot._connect()
+            except lark_oapi.ws.exception.ClientException as e:
+                raise e
+            except Exception as e:
+                await self.bot._disconnect()
+                if self.bot._auto_reconnect:
+                    await self.bot._reconnect()
+                else:
+                    raise e
+        else:
+            async def shutdown_trigger_placeholder():
+                while True:
+                    await asyncio.sleep(1)
+
+            await self.quart_app.run_task(
+                host='0.0.0.0',
+                port=port,
+                shutdown_trigger=shutdown_trigger_placeholder,
+            )
     async def kill(self) -> bool:
         return False

pkg/platform/sources/qqofficial.py

@@ -47,6 +47,7 @@ class QQOfficialMessageConverter(adapter.MessageConverter):
             yiri_msg_list.append(
                 platform_message.Image(base64=base64_url)
             )
+
         yiri_msg_list.append(platform_message.Plain(text=message))
         chain = platform_message.MessageChain(yiri_msg_list)
         return chain

pkg/platform/sources/wecom.py

@@ -130,7 +130,7 @@ class WecomEventConverter:
             )
         elif event.type == "image":
             friend = platform_entities.Friend(
-                id=event.user_id,
+                id=f"u{event.user_id}",
                 nickname=str(event.agent_id),
                 remark="",
             )