@waline/vercel 1.21.0 → 1.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.21.0",
+  "version": "1.22.0",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",

package/src/controller/comment.js

@@ -655,8 +655,10 @@ module.exports = class extends BaseRest {
     oldData = oldData[0];
     if (think.isBoolean(data.like)) {
       const likeIncMax = this.config('LIKE_INC_MAX') || 1;
-      data.like = (Number(oldData.like) || 0) +
-      (data.like ? Math.ceil(Math.random() * likeIncMax) : -1);
+
+      data.like =
+        (Number(oldData.like) || 0) +
+        (data.like ? Math.ceil(Math.random() * likeIncMax) : -1);
     }
 
     const preUpdateResp = await this.hook('preUpdate', {
@@ -673,6 +675,7 @@ module.exports = class extends BaseRest {
     });
 
     let cmtUser;
+
     if (!think.isEmpty(newData) && newData[0].user_id) {
       cmtUser = await this.service(
         `storage/${this.config('storage')}`,
@@ -688,13 +691,12 @@ module.exports = class extends BaseRest {
       this.config(),
       userInfo
     );
-    
+
     if (
       oldData.status === 'waiting' &&
       data.status === 'approved' &&
       oldData.pid
     ) {
-
       let pComment = await this.modelInstance.select({
         objectId: oldData.pid,
       });

package/src/logic/base.js

@@ -1,4 +1,6 @@
 const path = require('path');
+const qs = require('querystring');
+const fetch = require('node-fetch');
 const jwt = require('jsonwebtoken');
 const helper = require('think-helper');
 
@@ -122,4 +124,35 @@ module.exports = class extends think.Logic {
 
     return '';
   }
+
+  async useCaptchaCheck() {
+    const { RECAPTCHA_V3_SECRET } = process.env;
+
+    if (!RECAPTCHA_V3_SECRET) {
+      return;
+    }
+    const { recaptchaV3 } = this.post();
+
+    if (!recaptchaV3) {
+      return this.ctx.throw(403);
+    }
+
+    const query = qs.stringify({
+      secret: RECAPTCHA_V3_SECRET,
+      response: recaptchaV3,
+      remoteip: this.ctx.ip,
+    });
+    const recaptchaV3Result = await fetch(
+      `https://recaptcha.net/recaptcha/api/siteverify?${query}`
+    ).then((resp) => resp.json());
+
+    if (!recaptchaV3Result.success) {
+      think.logger.debug(
+        'RecaptchaV3 Result:',
+        JSON.stringify(recaptchaV3Result, null, '\t')
+      );
+
+      return this.ctx.throw(403);
+    }
+  }
 };

package/src/logic/comment.js

@@ -107,6 +107,7 @@ module.exports = class extends Base {
   getAction() {
     const { type, path } = this.get();
     const isAllowedGet = type !== 'list' || path;
+
     if (!isAllowedGet) {
       this.checkAdmin();
     }
@@ -199,13 +200,19 @@ module.exports = class extends Base {
    * @apiSuccess  (200) {String}  data.avatar comment user avatar
    * @apiSuccess  (200) {String}  data.type comment login user type
    */
-  postAction() {
+  async postAction() {
     const { LOGIN } = process.env;
     const { userInfo } = this.ctx.state;
 
-    if (LOGIN === 'force' && think.isEmpty(userInfo)) {
+    if (!think.isEmpty(userInfo)) {
+      return;
+    }
+
+    if (LOGIN === 'force') {
       return this.ctx.throw(401);
     }
+
+    return this.useCaptchaCheck();
   }
 
   /**
@@ -235,6 +242,7 @@ module.exports = class extends Base {
           boolean: true,
         },
       };
+
       return;
     }
 
@@ -252,11 +260,15 @@ module.exports = class extends Base {
       `storage/${this.config('storage')}`,
       'Comment'
     );
-    const commentData = await modelInstance.select({ user_id: userInfo.objectId, objectId: this.id });
+    const commentData = await modelInstance.select({
+      user_id: userInfo.objectId,
+      objectId: this.id,
+    });
+
     if (!think.isEmpty(commentData)) {
       return;
     }
-    
+
     return this.ctx.throw(403);
   }
 
@@ -283,10 +295,15 @@ module.exports = class extends Base {
       `storage/${this.config('storage')}`,
       'Comment'
     );
-    const commentData = await modelInstance.select({ user_id: userInfo.objectId, objectId: this.id });
+    const commentData = await modelInstance.select({
+      user_id: userInfo.objectId,
+      objectId: this.id,
+    });
+
     if (!think.isEmpty(commentData)) {
       return;
     }
+
     return this.ctx.throw(403);
   }
 };

package/src/logic/token.js

@@ -32,7 +32,9 @@ module.exports = class extends Base {
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
    */
-  postAction() {}
+  postAction() {
+    return this.useCaptchaCheck();
+  }
 
   /**
    * @api {DELETE} /token  user logout

package/src/logic/user.js

@@ -33,7 +33,9 @@ module.exports = class extends Base {
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
    */
-  postAction() {}
+  postAction() {
+    return this.useCaptchaCheck();
+  }
 
   /**
    * @api {PUT} /user update user profile

package/src/middleware/dashboard.js

@@ -12,6 +12,7 @@ module.exports = function () {
     <script>
     window.SITE_URL = ${JSON.stringify(process.env.SITE_URL)};
     window.SITE_NAME = ${JSON.stringify(process.env.SITE_NAME)};
+    window.recaptchaV3Key = ${JSON.stringify(process.env.RECAPTCHA_V3_KEY)};
     </script>
     <script src="${
       process.env.WALINE_ADMIN_MODULE_ASSET_URL || '//unpkg.com/@waline/admin'

package/src/service/storage/mysql.js

@@ -69,7 +69,7 @@ module.exports = class extends Base {
 
     instance.field([...group, 'COUNT(*) as count'].join(','));
     instance.group(group);
-    
+
     return instance.select();
   }
 
@@ -79,10 +79,9 @@ module.exports = class extends Base {
       delete data.objectId;
     }
     const date = new Date();
-    if (!data.createdAt)
-      data.createdAt = date;
-    if (!data.updatedAt)
-      data.updatedAt = date;
+
+    if (!data.createdAt) data.createdAt = date;
+    if (!data.updatedAt) data.updatedAt = date;
 
     const instance = this.model(this.tableName);
     const id = await instance.add(data);