fix: 补充公众号和小程序服务端缺失的获取解密消息的方法，并优化其它模块该方法的逻辑；(#86)

hpyer · Jul 22, 2024 · 86766e0 · 86766e0
1 parent 32c91fe
commit 86766e0
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 17 deletions.
diff --git a/src/OfficialAccount/Server.ts b/src/OfficialAccount/Server.ts
@@ -21,13 +21,13 @@ class Server extends ServerInterface
    * @returns
    */
   async serve(): Promise<Response> {
-    let echostr: string = this.request.getQueryParams()['echostr'] || '';
+    let query = this.request.getQueryParams();
+    let echostr: string = query['echostr'] || '';
     if (!!echostr) {
       return new Response(200, { 'Content-Type': 'text/html' }, echostr);
     }
 
     let message = await this.getRequestMessage(this.request);
-    let query = this.request.getQueryParams();
 
     if (this.encryptor && query['msg_signature']) {
       this.prepend(this.decryptRequestMessage(query));
@@ -80,8 +80,7 @@ class Server extends ServerInterface
 
   protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure<Message> {
     return async (message: Message, next: ServerHandlerClosure<Message>) => {
-      if (!this.encryptor) return null;
-      await this.decryptMessage(
+      message = await this.decryptMessage(
         message,
         this.encryptor,
         query['msg_signature'] || '',
@@ -93,6 +92,29 @@ class Server extends ServerInterface
     };
   }
 
+  /**
+   * 获取解密后的消息
+   * @param request 未设置该参数时，则从当前服务端收到的请求中获取
+   * @returns
+   */
+  async getDecryptedMessage(request: ServerRequestInterface = null) {
+    request = request ?? this.request;
+    let message = await this.getRequestMessage(request);
+    let query = request.getQueryParams();
+
+    if (!this.encryptor || !query['msg_signature']) {
+      return message;
+    }
+
+    return await this.decryptMessage(
+      message,
+      this.encryptor,
+      query['msg_signature'] ?? '',
+      query['timestamp'] ?? '',
+      query['nonce'] ?? ''
+    );
+  }
+
 };
 
 interface Server {

diff --git a/src/OpenPlatform/Server.ts b/src/OpenPlatform/Server.ts
@@ -23,13 +23,17 @@ class Server extends ServerInterface
    * @returns
    */
   async serve(): Promise<Response> {
-    let echostr: string = this.request.getQueryParams()['echostr'] || '';
+    let query = this.request.getQueryParams();
+    let echostr: string = query['echostr'] || '';
     if (!!echostr) {
       return new Response(200, { 'Content-Type': 'text/html' }, echostr);
     }
 
     let message = await this.getRequestMessage(this.request);
-    this.prepend(this.decryptRequestMessage());
+
+    if (this.encryptor && query['msg_signature']) {
+      this.prepend(this.decryptRequestMessage(query));
+    }
 
     let response = await this.handle(new Response(200, {}, 'success'), message);
 
@@ -111,10 +115,9 @@ class Server extends ServerInterface
     })
   }
 
-  protected decryptRequestMessage(): ServerHandlerClosure<Message> {
-    let query = this.request.getQueryParams();
+  protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure<Message> {
     return async (message: Message, next: ServerHandlerClosure<Message>) => {
-      await this.decryptMessage(
+      message = await this.decryptMessage(
         message,
         this.encryptor,
         query['msg_signature'] || '',
@@ -141,8 +144,8 @@ class Server extends ServerInterface
    * @returns
    */
   async getDecryptedMessage(request: ServerRequestInterface = null): Promise<Message> {
-    if (!request) request = this.request;
-    let message = await Message.createFromRequest(request);
+    request = request ?? this.request;
+    let message = await this.getRequestMessage(request);
     let query = request.getQueryParams();
 
     return this.decryptMessage(

diff --git a/src/OpenWork/Server.ts b/src/OpenWork/Server.ts
@@ -37,7 +37,9 @@ class Server extends ServerInterface
 
     let message = await this.getRequestMessage(this.request);
 
-    this.prepend(this.decryptRequestMessage(query));
+    if (this.encryptor && query['msg_signature']) {
+      this.prepend(this.decryptRequestMessage(query));
+    }
 
     let response = await this.handle(new Response(200, {}, 'success'), message);
 
@@ -210,8 +212,7 @@ class Server extends ServerInterface
 
   protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure<Message> {
     return async (message: Message, next: ServerHandlerClosure<Message>) => {
-      if (!this.encryptor) return null;
-      await this.decryptMessage(
+      message = await this.decryptMessage(
         message,
         this.encryptor,
         query['msg_signature'] ?? '',
@@ -233,6 +234,10 @@ class Server extends ServerInterface
     let message = await this.getRequestMessage(request);
     let query = request.getQueryParams();
 
+    if (!this.encryptor || !query['msg_signature']) {
+      return message;
+    }
+
     return await this.decryptMessage(
       message,
       this.encryptor,

diff --git a/src/Work/Server.ts b/src/Work/Server.ts
@@ -34,7 +34,9 @@ class Server extends ServerInterface
 
     let message = await this.getRequestMessage(this.request);
 
-    this.prepend(this.decryptRequestMessage(query));
+    if (this.encryptor && query['msg_signature']) {
+      this.prepend(this.decryptRequestMessage(query));
+    }
 
     let response = await this.handle(new Response(200, {}, 'SUCCESS'), message);
 
@@ -185,8 +187,7 @@ class Server extends ServerInterface
 
   protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure {
     return async (message: Message, next: ServerHandlerClosure) => {
-      if (!this.encryptor) return null;
-      await this.decryptMessage(
+      message = await this.decryptMessage(
         message,
         this.encryptor,
         query['msg_signature'] ?? '',
@@ -208,6 +209,10 @@ class Server extends ServerInterface
     let message = await this.getRequestMessage(request);
     let query = request.getQueryParams();
 
+    if (!this.encryptor || !query['msg_signature']) {
+      return message;
+    }
+
     return await this.decryptMessage(
       message,
       this.encryptor,