twikoo-func 1.7.4 → 1.7.5

package/index.js

@@ -31,6 +31,7 @@ const {
   preCheckSpam,
   checkTurnstileCaptcha,
   checkGeeTestCaptcha,
+  checkCapCaptcha,
   getConfig,
   getConfigForAdmin,
   validate
@@ -719,13 +720,13 @@ async function limitFilter () {
 
 async function checkCaptcha (comment) {
   const provider = config.CAPTCHA_PROVIDER
-  if ((!provider || provider === 'Turnstile') && config.TURNSTILE_SITE_KEY && config.TURNSTILE_SECRET_KEY) {
+  if (provider === 'Turnstile' && config.TURNSTILE_SITE_KEY && config.TURNSTILE_SECRET_KEY) {
     await checkTurnstileCaptcha({
       ip: auth.getClientIP(),
       turnstileToken: comment.turnstileToken,
       turnstileTokenSecretKey: config.TURNSTILE_SECRET_KEY
     })
-  } else if ((!provider || provider === 'Geetest') && config.GEETEST_CAPTCHA_ID && config.GEETEST_CAPTCHA_KEY) {
+  } else if (provider === 'Geetest' && config.GEETEST_CAPTCHA_ID && config.GEETEST_CAPTCHA_KEY) {
     await checkGeeTestCaptcha({
       geeTestCaptchaId: config.GEETEST_CAPTCHA_ID,
       geeTestCaptchaKey: config.GEETEST_CAPTCHA_KEY,
@@ -734,6 +735,12 @@ async function checkCaptcha (comment) {
       geeTestPassToken: comment.geeTestPassToken,
       geeTestGenTime: comment.geeTestGenTime
     })
+  } else if (provider === 'Cap' && config.CAP_API_ENDPOINT && config.CAP_SECRET_KEY) {
+    await checkCapCaptcha({
+      capToken: comment.capToken,
+      capSecretKey: config.CAP_SECRET_KEY,
+      capApiEndpoint: config.CAP_API_ENDPOINT
+    })
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twikoo-func",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "A simple comment system.",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",

package/utils/image.js

@@ -12,7 +12,7 @@ const fn = {
   async uploadImage (event, config) {
     const { photo, fileName } = event
     const res = {}
-    const imageService = config.IMAGE_SERVICE || config.IMAGE_CDN
+    const imageService = config.IMAGE_CDN
     try {
       if (imageService === 's3') {
         // S3 图床只需要配置相关 S3 参数，不需要 IMAGE_CDN_TOKEN

package/utils/index.js

@@ -354,6 +354,21 @@ const fn = {
       throw new Error('极验验证码检测失败: ' + e.message)
     }
   },
+  async checkCapCaptcha ({ capToken, capSecretKey, capApiEndpoint }) {
+    try {
+      const params = new URLSearchParams()
+      params.append('response', capToken)
+      params.append('secret', capSecretKey)
+      const url = `${capApiEndpoint}/siteverify`
+      const { data } = await axios.post(url, params.toString(), {
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+      })
+      logger.log('Cap验证码检测结果', data)
+      if (!data.success) throw new Error(data.error || '验证码错误')
+    } catch (e) {
+      throw new Error('Cap验证码检测失败: ' + e.message)
+    }
+  },
   async getConfig ({ config, VERSION, isAdmin }) {
     // 构建对外配置，避免在启用某一验证码供应商时泄露另一个供应商的 key
     const baseConfig = {
@@ -367,7 +382,6 @@ const fn = {
       DEFAULT_GRAVATAR: config.DEFAULT_GRAVATAR,
       SHOW_IMAGE: config.SHOW_IMAGE || 'true',
       IMAGE_CDN: config.IMAGE_CDN,
-      IMAGE_SERVICE: config.IMAGE_SERVICE,
       LIGHTBOX: config.LIGHTBOX || 'false',
       SHOW_EMOTION: config.SHOW_EMOTION || 'true',
       EMOTION_CDN: config.EMOTION_CDN,
@@ -395,6 +409,12 @@ const fn = {
       baseConfig.GEETEST_CAPTCHA_ID = config.GEETEST_CAPTCHA_ID
     }
 
+    // 仅在明确指定使用 Cap 时下发 Cap 的 api endpoint 和 site key
+    if (config.CAPTCHA_PROVIDER === 'Cap') {
+      baseConfig.CAP_API_ENDPOINT = config.CAP_API_ENDPOINT
+      baseConfig.CAP_SITE_KEY = config.CAP_SITE_KEY
+    }
+
     return {
       code: RES_CODE.SUCCESS,
       config: baseConfig