fix(setting): 优化安全设置的一些字段提醒 (#190)

jumpserver · Jul 15, 2020 · 326302e · 326302e
1 parent be21326
commit 326302e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
@@ -636,6 +636,11 @@
       "securityPasswordUpperCase": "开启后，用户密码修改、重置必须包含大写字母",
       "securityServiceAccountRegistration": "允许使用bootstrap token注册终端, 当终端注册成功后可以禁止"
     },
+    "validatorMessage": {
+      "EnsureThisValueIsGreaterThanOrEqualTo3": "请确保该值大于或者等于 3",
+      "EnsureThisValueIsGreaterThanOrEqualTo5": "请确保该值大于或者等于 5",
+      "EnsureThisValueIsGreaterThanOrEqualTo6": "请确保该值大于或者等于 6"
+    },
     "import": "导入",
     "importLdapUserTip": "请先提交LDAP配置再进行导入",
     "importLdapUserTitle": "LDAP 用户列表",

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
@@ -635,6 +635,11 @@
       "securityPasswordUpperCase": "After opening, the user password changes and resets must contain uppercase letters",
       "securityServiceAccountRegistration": "Allow using bootstrap token register service account, when terminal setup, can disable it"
     },
+    "validatorMessage": {
+      "EnsureThisValueIsGreaterThanOrEqualTo3": "Ensure this value is greater than or equal to 3",
+      "EnsureThisValueIsGreaterThanOrEqualTo5": "Ensure this value is greater than or equal to 5",
+      "EnsureThisValueIsGreaterThanOrEqualTo6": "Ensure this value is greater than or equal to 6"
+    },
     "import": "Import",
     "importLdapUserTip": "Please submit the LDAP configuration before import",
     "importLdapUserTitle": "LDAP user list",

diff --git a/src/views/settings/Security.vue b/src/views/settings/Security.vue
@@ -29,6 +29,21 @@ export default {
     }
   },
   data() {
+    var validatorLoginLimitCount = (rule, value, callback) => {
+      if (parseInt(value) < 3) {
+        return callback(new Error(this.$t('setting.validatorMessage.EnsureThisValueIsGreaterThanOrEqualTo3')))
+      }
+    }
+    var validatorLoginLimitTime = (rule, value, callback) => {
+      if (parseInt(value) < 5) {
+        return callback(new Error(this.$t('setting.validatorMessage.EnsureThisValueIsGreaterThanOrEqualTo5')))
+      }
+    }
+    var validatorPasswordMinLength = (rule, value, callback) => {
+      if (parseInt(value) < 6) {
+        return callback(new Error(this.$t('setting.validatorMessage.EnsureThisValueIsGreaterThanOrEqualTo6')))
+      }
+    }
     return {
       selectFields: [
         [this.$t('setting.SecuritySetting'), ['SECURITY_MFA_AUTH', 'SECURITY_COMMAND_EXECUTION', 'SECURITY_SERVICE_ACCOUNT_REGISTRATION',
@@ -57,13 +72,15 @@ export default {
         SECURITY_LOGIN_LIMIT_COUNT: {
           label: this.$t('setting.securityLoginLimitCount'),
           rules: [
-            { required: true }
+            { required: true },
+            { validator: validatorLoginLimitCount }
           ]
         },
         SECURITY_LOGIN_LIMIT_TIME: {
           label: this.$t('setting.securityLoginLimitTime'),
           rules: [
-            { required: true }
+            { required: true },
+            { validator: validatorLoginLimitTime }
           ],
           helpText: this.$t('setting.helpText.securityLoginLimitTime')
         },
@@ -81,7 +98,8 @@ export default {
         SECURITY_PASSWORD_MIN_LENGTH: {
           label: this.$t('setting.securityPasswordMinLength'),
           rules: [
-            { required: true }
+            { required: true },
+            { validator: validatorPasswordMinLength }
           ]
         },
         SECURITY_PASSWORD_UPPER_CASE: {