Merge pull request #2595 from emqx/dev/1.9.0

Sync code from refs/heads/dev/1.9.0 to enterprise
emqx · Apr 25, 2024 · ffb4487 · ffb4487
2 parents 01e88c4 + 60191a3
commit ffb4487
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/src/components/ListenerDrawer/ListenerDrawer.vue b/src/components/ListenerDrawer/ListenerDrawer.vue
@@ -107,6 +107,7 @@
               :is-edit="isEdit"
               :base-path="SSLConfigKey"
               :verify-label="t('Base.tlsVerifyClient')"
+              @verify-change="handleTLSVerifyChange"
             />
           </el-col>
           <template v-if="!isQUIC && listenerRecord[SSLConfigKey].verify !== 'verify_none'">
@@ -462,6 +463,7 @@ const {
   listenerFormRules,
   submit,
   onDelete,
+  handleTLSVerifyChange,
 } = useListenerDialog(props, emit)
 
 const isUDP = computed(() => listenerRecord.value.type === ListenerTypeForGateway.UDP)

diff --git a/src/components/TLSConfig/TLSEnableConfig.vue b/src/components/TLSConfig/TLSEnableConfig.vue
@@ -6,6 +6,7 @@
         :disabled="readonly || disabledVerify"
         :active-value="SSL_VERIFY_VALUE_MAP.get(true)"
         :inactive-value="SSL_VERIFY_VALUE_MAP.get(false)"
+        @change="handleVerifyChange"
       />
     </el-form-item>
     <CustomFormItem
@@ -162,7 +163,7 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'verifyChange'])
 
 const record: WritableComputedRef<SSL> = computed({
   get() {
@@ -190,6 +191,10 @@ const getFormItemProp = (key: string) => {
   }
   return undefined
 }
+
+const handleVerifyChange = (val: string | number | boolean) => {
+  emit('verifyChange', val)
+}
 </script>
 
 <style lang="scss">

diff --git a/src/hooks/Config/useListenerDialog.ts b/src/hooks/Config/useListenerDialog.ts
@@ -52,6 +52,7 @@ interface UseListenerDialogReturns {
   submit: () => Promise<void>
   onDelete: () => void
   transPort: (port: string) => string
+  handleTLSVerifyChange: (val: string | number | boolean) => void
 }
 
 export default (props: Props, emit: Emit): UseListenerDialogReturns => {
@@ -316,6 +317,14 @@ export default (props: Props, emit: Emit): UseListenerDialogReturns => {
     }
   })
 
+  // If 'fail_if_no_peer_cert' is true while TLS verification is 'verify_none', it will cause an update error
+  const handleTLSVerifyChange = (val: string | number | boolean) => {
+    const { fail_if_no_peer_cert } = listenerRecord.value[SSLConfigKey.value]
+    if (val === 'verify_none' && fail_if_no_peer_cert === true) {
+      listenerRecord.value[SSLConfigKey.value].fail_if_no_peer_cert = false
+    }
+  }
+
   return {
     showDialog,
     isLoading,
@@ -339,5 +348,6 @@ export default (props: Props, emit: Emit): UseListenerDialogReturns => {
     submit,
     onDelete,
     transPort,
+    handleTLSVerifyChange,
   }
 }