feat: add Internet-Only captcha rule (#3919)

2025-07-04 21:30:24 +08:00 · 2025-07-03 02:39:06 +08:00
parent 3ccc0339c7
commit bf91ad6c97
34 changed files with 122 additions and 35 deletions
--- a/web/src/auth/AuthBackend.js
+++ b/web/src/auth/AuthBackend.js
@ -163,7 +163,7 @@ export function getWechatQRCode(providerId) {
 }

 export function getCaptchaStatus(values) {
-  return fetch(`${Setting.ServerUrl}/api/get-captcha-status?organization=${values["organization"]}&userId=${values["username"]}`, {
+  return fetch(`${Setting.ServerUrl}/api/get-captcha-status?organization=${values["organization"]}&userId=${values["username"]}&application=${values["application"]}`, {
    method: "GET",
    credentials: "include",
    headers: {
--- a/web/src/auth/LoginPage.js
+++ b/web/src/auth/LoginPage.js
@ -134,6 +134,8 @@ class LoginPage extends React.Component {
        return CaptchaRule.Always;
      } else if (captchaProviderItems.some(providerItem => providerItem.rule === "Dynamic")) {
        return CaptchaRule.Dynamic;
+      } else if (captchaProviderItems.some(providerItem => providerItem.rule === "Internet-Only")) {
+        return CaptchaRule.InternetOnly;
      } else {
        return CaptchaRule.Never;
      }
@ -443,6 +445,9 @@ class LoginPage extends React.Component {
      } else if (captchaRule === CaptchaRule.Dynamic) {
        this.checkCaptchaStatus(values);
        return;
+      } else if (captchaRule === CaptchaRule.InternetOnly) {
+        this.checkCaptchaStatus(values);
+        return;
      }
    }
    this.login(values);
@ -961,9 +966,23 @@ class LoginPage extends React.Component {
    const captchaProviderItems = this.getCaptchaProviderItems(application);
    const alwaysProviderItems = captchaProviderItems.filter(providerItem => providerItem.rule === "Always");
    const dynamicProviderItems = captchaProviderItems.filter(providerItem => providerItem.rule === "Dynamic");
-    const provider = alwaysProviderItems.length > 0
-      ? alwaysProviderItems[0].provider
-      : dynamicProviderItems[0].provider;
+    const internetOnlyProviderItems = captchaProviderItems.filter(providerItem => providerItem.rule === "Internet-Only");
+
+    // Select provider based on the active captcha rule, not fixed priority
+    const captchaRule = this.getCaptchaRule(this.getApplicationObj());
+    let provider = null;
+
+    if (captchaRule === CaptchaRule.Always && alwaysProviderItems.length > 0) {
+      provider = alwaysProviderItems[0].provider;
+    } else if (captchaRule === CaptchaRule.Dynamic && dynamicProviderItems.length > 0) {
+      provider = dynamicProviderItems[0].provider;
+    } else if (captchaRule === CaptchaRule.InternetOnly && internetOnlyProviderItems.length > 0) {
+      provider = internetOnlyProviderItems[0].provider;
+    }
+
+    if (!provider) {
+      return null;
+    }

    return <CaptchaModal
      owner={provider.owner}
--- a/web/src/common/modal/CaptchaModal.js
+++ b/web/src/common/modal/CaptchaModal.js
@ -181,4 +181,5 @@ export const CaptchaRule = {
  Always: "Always",
  Never: "Never",
  Dynamic: "Dynamic",
+  InternetOnly: "Internet-Only",
 };
--- a/web/src/locales/ar/data.json
+++ b/web/src/locales/ar/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Left",
--- a/web/src/locales/cs/data.json
+++ b/web/src/locales/cs/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Přizpůsobit hlavičku vstupní stránky vaší aplikace",
    "Incremental": "Inkrementální",
    "Input": "Vstup",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Kód pozvánky",
    "Left": "Vlevo",
--- a/web/src/locales/de/data.json
+++ b/web/src/locales/de/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Links",
--- a/web/src/locales/en/data.json
+++ b/web/src/locales/en/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Left",
--- a/web/src/locales/es/data.json
+++ b/web/src/locales/es/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Izquierda",
--- a/web/src/locales/fa/data.json
+++ b/web/src/locales/fa/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "کد head صفحه ورود برنامه خود را سفارشی کنید",
    "Incremental": "افزایشی",
    "Input": "ورودی",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "کد دعوت",
    "Left": "چپ",
--- a/web/src/locales/fi/data.json
+++ b/web/src/locales/fi/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Left",
--- a/web/src/locales/fr/data.json
+++ b/web/src/locales/fr/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incrémentale",
    "Input": "Saisie",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Code d'invitation",
    "Left": "Gauche",
--- a/web/src/locales/he/data.json
+++ b/web/src/locales/he/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Left",
--- a/web/src/locales/id/data.json
+++ b/web/src/locales/id/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Kiri",
--- a/web/src/locales/it/data.json
+++ b/web/src/locales/it/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Left",
--- a/web/src/locales/ja/data.json
+++ b/web/src/locales/ja/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "左",
--- a/web/src/locales/kk/data.json
+++ b/web/src/locales/kk/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Left",
--- a/web/src/locales/ko/data.json
+++ b/web/src/locales/ko/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "왼쪽",
--- a/web/src/locales/ms/data.json
+++ b/web/src/locales/ms/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Left",
--- a/web/src/locales/nl/data.json
+++ b/web/src/locales/nl/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Left",
--- a/web/src/locales/pl/data.json
+++ b/web/src/locales/pl/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Left",
--- a/web/src/locales/pt/data.json
+++ b/web/src/locales/pt/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Código de convite",
    "Left": "Esquerda",
--- a/web/src/locales/ru/data.json
+++ b/web/src/locales/ru/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Последовательный",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Код приглашения",
    "Left": "Левый",
--- a/web/src/locales/sk/data.json
+++ b/web/src/locales/sk/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Vlastný HTML kód pre hlavičku vašej vstupnej stránky aplikácie",
    "Incremental": "Postupný",
    "Input": "Vstup",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Kód pozvania",
    "Left": "Vľavo",
--- a/web/src/locales/sv/data.json
+++ b/web/src/locales/sv/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Left",
--- a/web/src/locales/tr/data.json
+++ b/web/src/locales/tr/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Incremental",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Davet Kodu",
    "Left": "Sol",
--- a/web/src/locales/uk/data.json
+++ b/web/src/locales/uk/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Налаштуйте тег head на сторінці входу до програми",
    "Incremental": "Інкрементний",
    "Input": "Введення",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Код запрошення",
    "Left": "Ліворуч",
--- a/web/src/locales/vi/data.json
+++ b/web/src/locales/vi/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "Custom the head tag of your application entry page",
    "Incremental": "Tăng",
    "Input": "Input",
+    "Internet-Only": "Internet-Only",
    "Invalid characters in application name": "Invalid characters in application name",
    "Invitation code": "Invitation code",
    "Left": "Trái",
--- a/web/src/locales/zh/data.json
+++ b/web/src/locales/zh/data.json
@ -76,6 +76,7 @@
    "Header HTML - Tooltip": "自定义应用页面的head标签",
    "Incremental": "递增",
    "Input": "输入",
+    "Internet-Only": "外网启用",
    "Invalid characters in application name": "应用名称内有非法字符",
    "Invitation code": "邀请码",
    "Left": "居左",
--- a/web/src/table/ProviderTable.js
+++ b/web/src/table/ProviderTable.js
@ -255,6 +255,7 @@ class ProviderTable extends React.Component {
                <Option key="None" value="None">{i18next.t("general:None")}</Option>
                <Option key="Dynamic" value="Dynamic">{i18next.t("application:Dynamic")}</Option>
                <Option key="Always" value="Always">{i18next.t("application:Always")}</Option>
+                <Option key="Internet-Only" value="Internet-Only">{i18next.t("application:Internet-Only")}</Option>
              </Select>
            );
          } else if (record.provider?.category === "SMS" || record.provider?.category === "Email") {