From 729d8549e2b536a10c402a88e0d4cfde9e4baf3f Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Mon, 4 Dec 2023 19:17:38 +0100
Subject: new frontend and mobile view #1286

---
 web/html/xui/form/tls_settings.html | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'web/html/xui/form/tls_settings.html')

diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html
index ce3e0fe4..493aef75 100644
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -1,6 +1,7 @@
 {{define "form/tlsSettings"}}
 <!-- tls enable -->
 <a-form layout="inline" v-if="inbound.canSetTls()">
+    <a-divider style="margin:0;"></a-divider>
     <a-form-item v-if="inbound.canEnableTls()" label="TLS">
         <a-switch v-model="inbound.tls">
         </a-switch>
@@ -54,27 +55,27 @@
         <a-input v-model.trim="inbound.stream.tls.server" style="width: 250px"></a-input>
     </a-form-item>
     <a-form-item label="CipherSuites">
-        <a-select v-model="inbound.stream.tls.cipherSuites" style="width: 300px" :dropdown-class-name="themeSwitcher.darkCardClass">
+        <a-select v-model="inbound.stream.tls.cipherSuites" style="width: 300px" :dropdown-class-name="themeSwitcher.currentTheme">
             <a-select-option value="">auto</a-select-option>
-            <a-select-option v-for="key in TLS_CIPHER_OPTION" :value="key">[[ key ]]</a-select-option>
+            <a-select-option v-for="key,value in TLS_CIPHER_OPTION" :value="key">[[ value ]]</a-select-option>
         </a-select>
     </a-form-item>
-    <a-form-item label="MinVersion">
-        <a-select v-model="inbound.stream.tls.minVersion" style="width: 60px" :dropdown-class-name="themeSwitcher.darkCardClass">
-            <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
-        </a-select>
-    </a-form-item>
-    <a-form-item label="MaxVersion">
-        <a-select v-model="inbound.stream.tls.maxVersion" style="width: 60px" :dropdown-class-name="themeSwitcher.darkCardClass">
-            <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
-        </a-select>
+    <a-form-item label="Min/Max Version">
+        <a-input-group compact>
+            <a-select style="width: 60px" v-model="inbound.stream.tls.minVersion" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
+            </a-select>
+            <a-select style="width: 60px" v-model="inbound.stream.tls.maxVersion" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
+            </a-select>
+        </a-input-group>
     </a-form-item>
     <a-form-item label="SNI" placeholder="Server Name Indication">
         <a-input v-model.trim="inbound.stream.tls.settings.serverName" style="width: 250px"></a-input>
     </a-form-item>
     <a-form-item label="uTLS">
         <a-select v-model="inbound.stream.tls.settings.fingerprint"
-                  style="width: 170px" :dropdown-class-name="themeSwitcher.darkCardClass">
+                  style="width: 170px" :dropdown-class-name="themeSwitcher.currentTheme">
             <a-select-option value=''>None</a-select-option>
             <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
         </a-select>
@@ -83,7 +84,7 @@
         <a-select
             mode="multiple"
             style="width: 250px"
-            :dropdown-class-name="themeSwitcher.darkCardClass"
+            :dropdown-class-name="themeSwitcher.currentTheme"
             v-model="inbound.stream.tls.alpn">
             <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
         </a-select>
@@ -185,7 +186,7 @@
     </a-form-item>
     <a-form-item label="uTLS">
         <a-select v-model="inbound.stream.reality.settings.fingerprint" 
-                    style="width: 135px" :dropdown-class-name="themeSwitcher.darkCardClass">
+                    style="width: 135px" :dropdown-class-name="themeSwitcher.currentTheme">
             <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
         </a-select>
     </a-form-item>
-- 
cgit v1.2.3


From 549f230221d7139270efefd76ac81f37e1a747f9 Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Fri, 8 Dec 2023 16:46:44 +0100
Subject: optimize security in front codes #1300

---
 web/html/xui/form/tls_settings.html | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

(limited to 'web/html/xui/form/tls_settings.html')

diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html
index 493aef75..eb201862 100644
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -1,34 +1,24 @@
 {{define "form/tlsSettings"}}
 <!-- tls enable -->
-<a-form layout="inline" v-if="inbound.canSetTls()">
+<a-form layout="inline" v-if="inbound.canEnableTls()">
     <a-divider style="margin:0;"></a-divider>
-    <a-form-item v-if="inbound.canEnableTls()" label="TLS">
-        <a-switch v-model="inbound.tls">
-        </a-switch>
-    </a-form-item>
-    <a-form-item v-if="inbound.canEnableReality()">
-        <span slot="label">
-            Reality
+    <a-form-item label='{{ i18n "security" }}'>
+        <a-radio-group v-model="inbound.stream.security" button-style="solid">
+            <a-radio-button value="none">{{ i18n "none" }}</a-radio-button>
+            <a-radio-button value="tls">TLS</a-radio-button>
             <a-tooltip>
                 <template slot="title">
-                    <span>{{ i18n "pages.inbounds.realityDesc" }}</span>
+                    <span>{{ i18n "pages.inbounds.xtlsDesc" }}</span>
                 </template>
-                <a-icon type="question-circle" theme="filled"></a-icon>
+                <a-radio-button v-if="inbound.canEnableXtls()" value="xtls">XTLS</a-radio-button>
             </a-tooltip>
-        </span>
-        <a-switch v-model="inbound.reality"></a-switch>
-    </a-form-item>
-    <a-form-item v-if="inbound.canEnableXtls()">
-        <span slot="label">
-            XTLS
             <a-tooltip>
                 <template slot="title">
-                    <span>{{ i18n "pages.inbounds.xtlsDesc" }}</span>
+                    <span>{{ i18n "pages.inbounds.realityDesc" }}</span>
                 </template>
-                <a-icon type="question-circle" theme="filled"></a-icon>
+                <a-radio-button v-if="inbound.canEnableReality()" value="reality">Reality</a-radio-button>
             </a-tooltip>
-        </span>
-        <a-switch v-model="inbound.xtls"></a-switch>
+        </a-radio-group>
     </a-form-item>
 </a-form>
 
-- 
cgit v1.2.3


From 5fbf8f0d535b131ad6de22a0d1dda0f2167d5ee0 Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Fri, 8 Dec 2023 18:45:21 +0100
Subject: Expand multiDomain to externalProxy #1300

---
 web/html/xui/form/tls_settings.html | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

(limited to 'web/html/xui/form/tls_settings.html')

diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html
index eb201862..a77bec40 100644
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -24,26 +24,6 @@
 
 <!-- tls settings -->
 <a-form v-if="inbound.tls" layout="inline">
-    <a-form-item label='Multi Domain'>
-        <a-switch v-model="multiDomain"></a-switch>
-    </a-form-item>
-    <a-form-item v-if="multiDomain">
-        <a-row>
-            <span>Domains:</span>
-            <a-button v-if="multiDomain" type="primary" size="small" @click="inbound.stream.tls.settings.domains.push({remark: '', domain: ''})" style="margin-left: 10px">+</a-button>
-        </a-row>
-        <a-input-group v-for="(row, index) in inbound.stream.tls.settings.domains">
-            <a-input style="width: 40%" v-model.trim="row.remark" addon-before='{{ i18n "remark" }}'></a-input>
-            <a-input style="width: 60%" v-model.trim="row.domain" addon-before='{{ i18n "host" }}'>
-                <template slot="addonAfter">
-                    <a-button type="primary" size="small" style="margin-left: 10px" @click="inbound.stream.tls.settings.domains.splice(index, 1)">-</a-button>
-                </template>
-            </a-input>
-        </a-input-group>
-    </a-form-item>
-    <a-form-item v-else label='{{ i18n "domainName" }}'>
-        <a-input v-model.trim="inbound.stream.tls.server" style="width: 250px"></a-input>
-    </a-form-item>
     <a-form-item label="CipherSuites">
         <a-select v-model="inbound.stream.tls.cipherSuites" style="width: 300px" :dropdown-class-name="themeSwitcher.currentTheme">
             <a-select-option value="">auto</a-select-option>
@@ -61,7 +41,7 @@
         </a-input-group>
     </a-form-item>
     <a-form-item label="SNI" placeholder="Server Name Indication">
-        <a-input v-model.trim="inbound.stream.tls.settings.serverName" style="width: 250px"></a-input>
+        <a-input v-model.trim="inbound.stream.tls.server" style="width: 250px"></a-input>
     </a-form-item>
     <a-form-item label="uTLS">
         <a-select v-model="inbound.stream.tls.settings.fingerprint"
@@ -122,11 +102,8 @@
 
 <!-- xtls settings -->
 <a-form v-else-if="inbound.xtls" layout="inline">
-    <a-form-item label='{{ i18n "domainName" }}'>
-        <a-input v-model.trim="inbound.stream.xtls.server"></a-input>
-    </a-form-item>
     <a-form-item label="SNI" placeholder="Server Name Indication">
-        <a-input v-model.trim="inbound.stream.xtls.settings.serverName" style="width: 250px"></a-input>
+        <a-input v-model.trim="inbound.stream.xtls.server" style="width: 250px"></a-input>
     </a-form-item>
     <a-form-item label="Alpn">
         <a-checkbox-group v-model="inbound.stream.xtls.alpn" style="width:200px">
@@ -179,9 +156,6 @@
                     style="width: 135px" :dropdown-class-name="themeSwitcher.currentTheme">
             <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
         </a-select>
-    </a-form-item>
-    <a-form-item label='{{ i18n "domainName" }}'>
-        <a-input v-model.trim="inbound.stream.reality.settings.serverName" style="width: 250px"></a-input>
     </a-form-item>
 	<a-form-item label="Dest">
         <a-input v-model.trim="inbound.stream.reality.dest" style="width: 300px"></a-input>
-- 
cgit v1.2.3


From 784b93cfd02be8bacad63795e7814d51427cc22f Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Fri, 8 Dec 2023 18:52:11 +0100
Subject: Add TLS for SHADOWSOCKS #1300

---
 web/html/xui/form/tls_settings.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/html/xui/form/tls_settings.html')

diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html
index a77bec40..db92eea5 100644
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -5,7 +5,6 @@
     <a-form-item label='{{ i18n "security" }}'>
         <a-radio-group v-model="inbound.stream.security" button-style="solid">
             <a-radio-button value="none">{{ i18n "none" }}</a-radio-button>
-            <a-radio-button value="tls">TLS</a-radio-button>
             <a-tooltip>
                 <template slot="title">
                     <span>{{ i18n "pages.inbounds.xtlsDesc" }}</span>
@@ -18,6 +17,7 @@
                 </template>
                 <a-radio-button v-if="inbound.canEnableReality()" value="reality">Reality</a-radio-button>
             </a-tooltip>
+            <a-radio-button value="tls">TLS</a-radio-button>
         </a-radio-group>
     </a-form-item>
 </a-form>
-- 
cgit v1.2.3


From 07019d659464f698755f7a83d920871f6a8a7c08 Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Sat, 9 Dec 2023 01:06:22 +0330
Subject: better view

---
 web/html/xui/form/tls_settings.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'web/html/xui/form/tls_settings.html')

diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html
index db92eea5..9c881844 100644
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -106,9 +106,13 @@
         <a-input v-model.trim="inbound.stream.xtls.server" style="width: 250px"></a-input>
     </a-form-item>
     <a-form-item label="Alpn">
-        <a-checkbox-group v-model="inbound.stream.xtls.alpn" style="width:200px">
-            <a-checkbox v-for="key in ALPN_OPTION" :value="key">[[ key ]]</a-checkbox>
-        </a-checkbox-group>
+        <a-select
+            mode="multiple"
+            style="width: 250px"
+            :dropdown-class-name="themeSwitcher.currentTheme"
+            v-model="inbound.stream.xtls.alpn">
+            <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
+        </a-select>
     </a-form-item>
     <a-form-item label="Allow insecure">
         <a-switch v-model="inbound.stream.xtls.settings.allowInsecure"></a-switch>
-- 
cgit v1.2.3


From 0f1f3d843907ee35b19bd5f0aadc37958cee09e1 Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Sat, 9 Dec 2023 18:48:06 +0330
Subject: <tr> <td> instead of <a-form-item>

convert the form structure to use <tr> and <td> instead of <a-form-item>,
---
 web/html/xui/form/tls_settings.html | 560 +++++++++++++++++++++++++-----------
 1 file changed, 390 insertions(+), 170 deletions(-)

(limited to 'web/html/xui/form/tls_settings.html')

diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html
index 9c881844..11a65818 100644
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -2,187 +2,407 @@
 <!-- tls enable -->
 <a-form layout="inline" v-if="inbound.canEnableTls()">
     <a-divider style="margin:0;"></a-divider>
-    <a-form-item label='{{ i18n "security" }}'>
-        <a-radio-group v-model="inbound.stream.security" button-style="solid">
-            <a-radio-button value="none">{{ i18n "none" }}</a-radio-button>
-            <a-tooltip>
-                <template slot="title">
-                    <span>{{ i18n "pages.inbounds.xtlsDesc" }}</span>
-                </template>
-                <a-radio-button v-if="inbound.canEnableXtls()" value="xtls">XTLS</a-radio-button>
-            </a-tooltip>
-            <a-tooltip>
-                <template slot="title">
-                    <span>{{ i18n "pages.inbounds.realityDesc" }}</span>
-                </template>
-                <a-radio-button v-if="inbound.canEnableReality()" value="reality">Reality</a-radio-button>
-            </a-tooltip>
-            <a-radio-button value="tls">TLS</a-radio-button>
-        </a-radio-group>
-    </a-form-item>
+    <table width="100%" class="ant-table-tbody">
+        <tr>
+            <td>
+                <span>{{ i18n "security" }}</span>
+            </td>
+            <td>
+                <a-radio-group v-model="inbound.stream.security" button-style="solid">
+                    <a-radio-button value="none">{{ i18n "none" }}</a-radio-button>
+                    <a-tooltip>
+                        <template slot="title">
+                            <span>{{ i18n "pages.inbounds.xtlsDesc" }}</span>
+                        </template>
+                        <a-radio-button v-if="inbound.canEnableXtls()" value="xtls">XTLS</a-radio-button>
+                    </a-tooltip>
+                    <a-tooltip>
+                        <template slot="title">
+                            <span>{{ i18n "pages.inbounds.realityDesc" }}</span>
+                        </template>
+                        <a-radio-button v-if="inbound.canEnableReality()" value="reality">Reality</a-radio-button>
+                    </a-tooltip>
+                    <a-radio-button value="tls">TLS</a-radio-button>
+                </a-radio-group>
+            </td>
+        </tr>
+    </table>
 </a-form>
 
 <!-- tls settings -->
 <a-form v-if="inbound.tls" layout="inline">
-    <a-form-item label="CipherSuites">
-        <a-select v-model="inbound.stream.tls.cipherSuites" style="width: 300px" :dropdown-class-name="themeSwitcher.currentTheme">
-            <a-select-option value="">auto</a-select-option>
-            <a-select-option v-for="key,value in TLS_CIPHER_OPTION" :value="key">[[ value ]]</a-select-option>
-        </a-select>
-    </a-form-item>
-    <a-form-item label="Min/Max Version">
-        <a-input-group compact>
-            <a-select style="width: 60px" v-model="inbound.stream.tls.minVersion" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
-            </a-select>
-            <a-select style="width: 60px" v-model="inbound.stream.tls.maxVersion" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
-            </a-select>
-        </a-input-group>
-    </a-form-item>
-    <a-form-item label="SNI" placeholder="Server Name Indication">
-        <a-input v-model.trim="inbound.stream.tls.server" style="width: 250px"></a-input>
-    </a-form-item>
-    <a-form-item label="uTLS">
-        <a-select v-model="inbound.stream.tls.settings.fingerprint"
-                  style="width: 170px" :dropdown-class-name="themeSwitcher.currentTheme">
-            <a-select-option value=''>None</a-select-option>
-            <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
-        </a-select>
-    </a-form-item>
-    <a-form-item label="Alpn">
-        <a-select
-            mode="multiple"
-            style="width: 250px"
-            :dropdown-class-name="themeSwitcher.currentTheme"
-            v-model="inbound.stream.tls.alpn">
-            <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
-        </a-select>
-    </a-form-item>
-    <br>
-    <a-form-item label="Allow insecure">
-        <a-switch v-model="inbound.stream.tls.settings.allowInsecure"></a-switch>
-    </a-form-item>
-    <br>
-    <a-form-item label="Reject Unknown SNI">
-        <a-switch v-model="inbound.stream.tls.rejectUnknownSni"></a-switch>
-    </a-form-item>
-    <template v-for="cert,index in inbound.stream.tls.certs">
-        <a-form-item label='{{ i18n "certificate" }}'>
-            <a-radio-group v-model="cert.useFile" button-style="solid">
-                <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button>
-                <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-button>
-            </a-radio-group>
-            <a-button v-if="index === 0" type="primary" size="small" @click="inbound.stream.tls.addCert()" style="margin-left: 10px">+</a-button>
-            <a-button v-if="inbound.stream.tls.certs.length>1" type="primary" size="small" @click="inbound.stream.tls.removeCert(index)" style="margin-left: 10px">-</a-button>
-        </a-form-item>
-        <template v-if="cert.useFile">
-            <a-form-item label='{{ i18n "pages.inbounds.publicKeyPath" }}'>
-                <a-input v-model.trim="cert.certFile" style="width:300px;"></a-input>
-            </a-form-item>
-            <a-form-item label='{{ i18n "pages.inbounds.keyPath" }}'>
-                <a-input v-model.trim="cert.keyFile" style="width:300px;"></a-input>
-            </a-form-item>
-            <a-button type="primary" icon="import" @click="setDefaultCertData(index)">{{ i18n "pages.inbounds.setDefaultCert" }}</a-button>
-        </template>
-        <template v-else>
-            <a-form-item label='{{ i18n "pages.inbounds.publicKeyContent" }}'>
-                <a-input type="textarea" :rows="3" style="width:300px;" v-model="cert.cert"></a-input>
-            </a-form-item>
-            <a-form-item label='{{ i18n "pages.inbounds.keyContent" }}'>
-                <a-input type="textarea" :rows="3" style="width:300px;" v-model="cert.key"></a-input>
-            </a-form-item>
-        </template>
-        <br>
-        <a-form-item label="ocspStapling">
-            <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number>
-        </a-form-item>
-    </template>
+    <table width="100%" class="ant-table-tbody">
+        <tr>
+            <td>
+                <span>CipherSuites</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-select v-model="inbound.stream.tls.cipherSuites" style="width: 300px"
+                        :dropdown-class-name="themeSwitcher.currentTheme">
+                        <a-select-option value="">auto</a-select-option>
+                        <a-select-option v-for="key,value in TLS_CIPHER_OPTION" :value="key">[[ value
+                            ]]</a-select-option>
+                    </a-select>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>Min/Max Version</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input-group compact>
+                        <a-select style="width: 60px" v-model="inbound.stream.tls.minVersion"
+                            :dropdown-class-name="themeSwitcher.currentTheme">
+                            <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
+                        </a-select>
+                        <a-select style="width: 60px" v-model="inbound.stream.tls.maxVersion"
+                            :dropdown-class-name="themeSwitcher.currentTheme">
+                            <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
+                        </a-select>
+                    </a-input-group>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>SNI</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input v-model.trim="inbound.stream.tls.server" style="width: 250px"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>uTLS</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-select v-model="inbound.stream.tls.settings.fingerprint" style="width: 170px"
+                        :dropdown-class-name="themeSwitcher.currentTheme">
+                        <a-select-option value=''>None</a-select-option>
+                        <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
+                    </a-select>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>Alpn</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-select mode="multiple" style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme"
+                        v-model="inbound.stream.tls.alpn">
+                        <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
+                    </a-select>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>Allow insecure</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-switch v-model="inbound.stream.tls.settings.allowInsecure"></a-switch>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>Reject Unknown SNI</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-switch v-model="inbound.stream.tls.rejectUnknownSni"></a-switch>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr v-for="cert,index in inbound.stream.tls.certs">
+            <td>
+                <span>{{ i18n "certificate" }}</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-radio-group v-model="cert.useFile" button-style="solid">
+                        <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button>
+                        <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-button>
+                    </a-radio-group>
+                    <a-button v-if="index === 0" type="primary" size="small" @click="inbound.stream.tls.addCert()"
+                        style="margin-left: 10px">+</a-button>
+                    <a-button v-if="inbound.stream.tls.certs.length>1" type="primary" size="small"
+                        @click="inbound.stream.tls.removeCert(index)" style="margin-left: 10px">-</a-button>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr v-for="cert,index in inbound.stream.tls.certs" v-if="cert.useFile">
+            <td>
+                <span>{{ i18n "pages.inbounds.publicKeyPath" }}</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input v-model.trim="cert.certFile" style="width:300px;"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr v-for="cert,index in inbound.stream.tls.certs" v-if="cert.useFile">
+            <td>
+                <span>{{ i18n "pages.inbounds.keyPath" }}</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input v-model.trim="cert.keyFile" style="width:300px;"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr v-for="cert,index in inbound.stream.tls.certs" v-if="cert.useFile">
+            <td>
+                <a-button type="primary" icon="import" @click="setDefaultCertData(index)">{{ i18n
+                    "pages.inbounds.setDefaultCert" }}</a-button>
+            </td>
+        </tr>
+        <tr v-for="cert,index in inbound.stream.tls.certs" v-else>
+            <td>
+                <span>{{ i18n "pages.inbounds.publicKeyContent" }}</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input type="textarea" :rows="3" style="width:300px;" v-model="cert.cert"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr v-for="cert,index in inbound.stream.tls.certs" v-else>
+            <td>
+                <span>{{ i18n "pages.inbounds.keyContent" }}</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input type="textarea" :rows="3" style="width:300px;" v-model="cert.key"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr v-for="cert,index in inbound.stream.tls.certs">
+            <td>
+                <span>ocspStapling</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number>
+                </a-form-item>
+            </td>
+        </tr>
+    </table>
 </a-form>
 
 <!-- xtls settings -->
 <a-form v-else-if="inbound.xtls" layout="inline">
-    <a-form-item label="SNI" placeholder="Server Name Indication">
-        <a-input v-model.trim="inbound.stream.xtls.server" style="width: 250px"></a-input>
-    </a-form-item>
-    <a-form-item label="Alpn">
-        <a-select
-            mode="multiple"
-            style="width: 250px"
-            :dropdown-class-name="themeSwitcher.currentTheme"
-            v-model="inbound.stream.xtls.alpn">
-            <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
-        </a-select>
-    </a-form-item>
-    <a-form-item label="Allow insecure">
-        <a-switch v-model="inbound.stream.xtls.settings.allowInsecure"></a-switch>
-    </a-form-item>
-    <template v-for="cert,index in inbound.stream.xtls.certs">
-        <a-form-item label='{{ i18n "certificate" }}'>
-            <a-radio-group v-model="cert.useFile" button-style="solid">
-                <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button>
-                <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-button>
-            </a-radio-group>
-            <a-button v-if="index === 0" type="primary" size="small" @click="inbound.stream.xtls.addCert()" style="margin-left: 10px">+</a-button>
-            <a-button v-if="inbound.stream.xtls.certs.length>1" type="primary" size="small" @click="inbound.stream.xtls.removeCert(index)" style="margin-left: 10px">-</a-button> 
-        </a-form-item>
-        <template v-if="cert.useFile">
-            <a-form-item label='{{ i18n "pages.inbounds.publicKeyPath" }}'>
-                <a-input v-model.trim="cert.certFile" style="width:300px;"></a-input>
-            </a-form-item>
-            <a-form-item label='{{ i18n "pages.inbounds.keyPath" }}'>
-                <a-input v-model.trim="cert.keyFile" style="width:300px;"></a-input>
-            </a-form-item>
-            <a-button type="primary" icon="import" @click="setDefaultCertXtls(index)">{{ i18n "pages.inbounds.setDefaultCert" }}</a-button>
-        </template>
-        <template v-else>
-            <a-form-item label='{{ i18n "pages.inbounds.publicKeyContent" }}'>
-                <a-input type="textarea" :rows="3" style="width:300px;" v-model="cert.cert"></a-input>
-            </a-form-item>
-            <a-form-item label='{{ i18n "pages.inbounds.keyContent" }}'>
-                <a-input type="textarea" :rows="3" style="width:300px;" v-model="cert.key"></a-input>
-            </a-form-item>
-        </template>
-    </template>
+    <table width="100%" class="ant-table-tbody">
+        <tr>
+            <td>
+                <span>SNI</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input v-model.trim="inbound.stream.xtls.server" style="width: 250px"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>Alpn</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-select mode="multiple" style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme"
+                        v-model="inbound.stream.xtls.alpn">
+                        <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
+                    </a-select>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>Allow insecure</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-switch v-model="inbound.stream.xtls.settings.allowInsecure"></a-switch>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr v-for="cert,index in inbound.stream.xtls.certs">
+            <td>
+                <span>{{ i18n "certificate" }}</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-radio-group v-model="cert.useFile" button-style="solid">
+                        <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button>
+                        <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-button>
+                    </a-radio-group>
+                    <a-button v-if="index === 0" type="primary" size="small" @click="inbound.stream.xtls.addCert()"
+                        style="margin-left: 10px">+</a-button>
+                    <a-button v-if="inbound.stream.xtls.certs.length>1" type="primary" size="small"
+                        @click="inbound.stream.xtls.removeCert(index)" style="margin-left: 10px">-</a-button>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr v-for="cert,index in inbound.stream.xtls.certs" v-if="cert.useFile">
+            <td>
+                <span>{{ i18n "pages.inbounds.publicKeyPath" }}</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input v-model.trim="cert.certFile" style="width:300px;"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr v-for="cert,index in inbound.stream.xtls.certs" v-if="cert.useFile">
+            <td>
+                <span>{{ i18n "pages.inbounds.keyPath" }}</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input v-model.trim="cert.keyFile" style="width:300px;"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr v-for="cert,index in inbound.stream.xtls.certs" v-if="cert.useFile">
+            <td>
+                <a-button type="primary" icon="import" @click="setDefaultCertXtls(index)">{{ i18n
+                    "pages.inbounds.setDefaultCert" }}</a-button>
+            </td>
+        </tr>
+        <tr v-for="cert,index in inbound.stream.xtls.certs" v-else>
+            <td>
+                <span>{{ i18n "pages.inbounds.publicKeyContent" }}</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input type="textarea" :rows="3" style="width:300px;" v-model="cert.cert"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr v-for="cert,index in inbound.stream.xtls.certs" v-else>
+            <td>
+                <span>{{ i18n "pages.inbounds.keyContent" }}</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input type="textarea" :rows="3" style="width:300px;" v-model="cert.key"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+    </table>
 </a-form>
 
 <!-- reality settings -->
 <a-form v-else-if="inbound.reality" layout="inline">
-    <a-form-item label="Show">
-        <a-switch v-model="inbound.stream.reality.show">
-        </a-switch>
-    </a-form-item>
-    <a-form-item label="xVer">
-        <a-input-number v-model="inbound.stream.reality.xver" :min="0" style="width: 60px"></a-input-number>
-    </a-form-item>
-    <a-form-item label="uTLS">
-        <a-select v-model="inbound.stream.reality.settings.fingerprint" 
-                    style="width: 135px" :dropdown-class-name="themeSwitcher.currentTheme">
-            <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
-        </a-select>
-    </a-form-item>
-	<a-form-item label="Dest">
-        <a-input v-model.trim="inbound.stream.reality.dest" style="width: 300px"></a-input>
-    </a-form-item>
-    <a-form-item label="Server Names">
-        <a-input v-model.trim="inbound.stream.reality.serverNames" style="width: 300px"></a-input>
-    </a-form-item>
-    <a-form-item label="ShortIds">
-        <a-icon @click="inbound.stream.reality.shortIds = RandomUtil.randomShortId()" type="sync"> </a-icon>
-        <a-input v-model.trim="inbound.stream.reality.shortIds" style="width: 150px;"></a-input>
-    </a-form-item>
-    <br>
-    <a-form-item label="SpiderX">
-        <a-input v-model.trim="inbound.stream.reality.settings.spiderX" style="width: 150px;"></a-input>
-    </a-form-item>
-    <a-form-item label="Private Key">
-        <a-input v-model.trim="inbound.stream.reality.privateKey" style="width: 300px"></a-input>
-    </a-form-item>
-    <a-form-item label="Public Key">
-        <a-input v-model.trim="inbound.stream.reality.settings.publicKey" style="width: 300px"></a-input>
-    </a-form-item>
-    <a-form-item>
-        <a-button type="primary" icon="import" @click="getNewX25519Cert">Get New Key</a-button>
-    </a-form-item>
+    <table width="100%" class="ant-table-tbody">
+        <tr>
+            <td>
+                <span>Show</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-switch v-model="inbound.stream.reality.show"></a-switch>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>xVer</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input-number v-model="inbound.stream.reality.xver" :min="0" style="width: 60px"></a-input-number>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>uTLS</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-select v-model="inbound.stream.reality.settings.fingerprint" style="width: 135px"
+                        :dropdown-class-name="themeSwitcher.currentTheme">
+                        <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
+                    </a-select>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>Dest</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input v-model.trim="inbound.stream.reality.dest" style="width: 300px"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>Server Names</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input v-model.trim="inbound.stream.reality.serverNames" style="width: 300px"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>ShortIds</span> <a-icon @click="inbound.stream.reality.shortIds = RandomUtil.randomShortId()" type="sync"> </a-icon>
+            </td>
+            <td>
+                <a-form-item>
+                    
+                    <a-input v-model.trim="inbound.stream.reality.shortIds" style="width: 150px;"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>SpiderX</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input v-model.trim="inbound.stream.reality.settings.spiderX" style="width: 150px;"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>Private Key</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input v-model.trim="inbound.stream.reality.privateKey" style="width: 300px"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <span>Public Key</span>
+            </td>
+            <td>
+                <a-form-item>
+                    <a-input v-model.trim="inbound.stream.reality.settings.publicKey" style="width: 300px"></a-input>
+                </a-form-item>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2">
+                <a-button type="primary" icon="import" @click="getNewX25519Cert">Get New Key</a-button>
+            </td>
+        </tr>
+    </table>
 </a-form>
 {{end}}
\ No newline at end of file
-- 
cgit v1.2.3


From 83769f963efbd5075ffd5b8f04e57232b3e10229 Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Sat, 9 Dec 2023 20:43:36 +0330
Subject: bug fix  - multi cert

---
 web/html/xui/form/tls_settings.html | 730 ++++++++++++++++++------------------
 1 file changed, 359 insertions(+), 371 deletions(-)

(limited to 'web/html/xui/form/tls_settings.html')

diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html
index 11a65818..9c55b410 100644
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -1,6 +1,7 @@
 {{define "form/tlsSettings"}}
 <!-- tls enable -->
-<a-form layout="inline" v-if="inbound.canEnableTls()">
+
+<a-form v-if="inbound.canEnableTls()" layout="inline">
     <a-divider style="margin:0;"></a-divider>
     <table width="100%" class="ant-table-tbody">
         <tr>
@@ -26,383 +27,370 @@
                 </a-radio-group>
             </td>
         </tr>
-    </table>
-</a-form>
 
-<!-- tls settings -->
-<a-form v-if="inbound.tls" layout="inline">
-    <table width="100%" class="ant-table-tbody">
-        <tr>
-            <td>
-                <span>CipherSuites</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-select v-model="inbound.stream.tls.cipherSuites" style="width: 300px"
-                        :dropdown-class-name="themeSwitcher.currentTheme">
-                        <a-select-option value="">auto</a-select-option>
-                        <a-select-option v-for="key,value in TLS_CIPHER_OPTION" :value="key">[[ value
-                            ]]</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <span>Min/Max Version</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input-group compact>
-                        <a-select style="width: 60px" v-model="inbound.stream.tls.minVersion"
+        <!-- tls settings -->
+        <template v-if="inbound.stream.isTls">
+            <tr>
+                <td>SNI</td>
+                <td>
+                    <a-form-item placeholder="Server Name Indication">
+                        <a-input v-model.trim="inbound.stream.tls.sni" style="width: 250px"></a-input>
+                    </a-form-item>
+                </td>
+            </tr>
+            <tr>
+                <td>CipherSuites</td>
+                <td>
+                    <a-form-item>
+                        <a-select v-model="inbound.stream.tls.cipherSuites" style="width: 250px"
                             :dropdown-class-name="themeSwitcher.currentTheme">
-                            <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
+                            <a-select-option value="">auto</a-select-option>
+                            <a-select-option v-for="key,value in TLS_CIPHER_OPTION" 
+                            :value="key">[[ value]]</a-select-option>
                         </a-select>
-                        <a-select style="width: 60px" v-model="inbound.stream.tls.maxVersion"
+                    </a-form-item>
+                </td>
+            </tr>
+            <tr>
+                <td>Min/Max Version</td>
+                <td>
+                    <a-form-item>
+                        <a-input-group compact>
+                            <a-select style="width: 125px" v-model="inbound.stream.tls.minVersion"
+                                :dropdown-class-name="themeSwitcher.currentTheme">
+                                <a-select-option v-for="key in TLS_VERSION_OPTION" 
+                                :value="key">[[ key ]]</a-select-option>
+                            </a-select>
+                            <a-select style="width: 125px" v-model="inbound.stream.tls.maxVersion"
+                                :dropdown-class-name="themeSwitcher.currentTheme">
+                                <a-select-option v-for="key in TLS_VERSION_OPTION" 
+                                :value="key">[[ key ]]</a-select-option>
+                            </a-select>
+                        </a-input-group>
+                    </a-form-item>
+                </td>
+            </tr>
+            <tr>
+                <td>uTLS</td>
+                <td>
+                    <a-form-item>
+                        <a-select v-model="inbound.stream.tls.settings.fingerprint" style="width: 250px"
                             :dropdown-class-name="themeSwitcher.currentTheme">
-                            <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
+                            <a-select-option value=''>None</a-select-option>
+                            <a-select-option v-for="key in UTLS_FINGERPRINT" 
+                            :value="key">[[ key ]]</a-select-option>
                         </a-select>
-                    </a-input-group>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <span>SNI</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="inbound.stream.tls.server" style="width: 250px"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <span>uTLS</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-select v-model="inbound.stream.tls.settings.fingerprint" style="width: 170px"
-                        :dropdown-class-name="themeSwitcher.currentTheme">
-                        <a-select-option value=''>None</a-select-option>
-                        <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <span>Alpn</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-select mode="multiple" style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme"
-                        v-model="inbound.stream.tls.alpn">
-                        <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <span>Allow insecure</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-switch v-model="inbound.stream.tls.settings.allowInsecure"></a-switch>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <span>Reject Unknown SNI</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-switch v-model="inbound.stream.tls.rejectUnknownSni"></a-switch>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-for="cert,index in inbound.stream.tls.certs">
-            <td>
-                <span>{{ i18n "certificate" }}</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-radio-group v-model="cert.useFile" button-style="solid">
-                        <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button>
-                        <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-button>
-                    </a-radio-group>
-                    <a-button v-if="index === 0" type="primary" size="small" @click="inbound.stream.tls.addCert()"
-                        style="margin-left: 10px">+</a-button>
-                    <a-button v-if="inbound.stream.tls.certs.length>1" type="primary" size="small"
-                        @click="inbound.stream.tls.removeCert(index)" style="margin-left: 10px">-</a-button>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-for="cert,index in inbound.stream.tls.certs" v-if="cert.useFile">
-            <td>
-                <span>{{ i18n "pages.inbounds.publicKeyPath" }}</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="cert.certFile" style="width:300px;"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-for="cert,index in inbound.stream.tls.certs" v-if="cert.useFile">
-            <td>
-                <span>{{ i18n "pages.inbounds.keyPath" }}</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="cert.keyFile" style="width:300px;"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-for="cert,index in inbound.stream.tls.certs" v-if="cert.useFile">
-            <td>
-                <a-button type="primary" icon="import" @click="setDefaultCertData(index)">{{ i18n
-                    "pages.inbounds.setDefaultCert" }}</a-button>
-            </td>
-        </tr>
-        <tr v-for="cert,index in inbound.stream.tls.certs" v-else>
-            <td>
-                <span>{{ i18n "pages.inbounds.publicKeyContent" }}</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input type="textarea" :rows="3" style="width:300px;" v-model="cert.cert"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-for="cert,index in inbound.stream.tls.certs" v-else>
-            <td>
-                <span>{{ i18n "pages.inbounds.keyContent" }}</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input type="textarea" :rows="3" style="width:300px;" v-model="cert.key"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-for="cert,index in inbound.stream.tls.certs">
-            <td>
-                <span>ocspStapling</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
-    </table>
-</a-form>
+                    </a-form-item>
+                </td>
+            </tr>
+            <tr>
+                <td>ALPN</td>
+                <td>
+                    <a-form-item>
+                        <a-select mode="multiple" style="width: 250px" 
+                            :dropdown-class-name="themeSwitcher.currentTheme"
+                            v-model="inbound.stream.tls.alpn">
+                            <a-select-option v-for="alpn in ALPN_OPTION" 
+                            :value="alpn">[[ alpn ]]</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </td>
+            </tr>
+            <tr>
+                <td>Allow insecure</td>
+                <td>
+                    <a-form-item>
+                        <a-switch v-model="inbound.stream.tls.settings.allowInsecure"></a-switch>
+                    </a-form-item>
+                </td>
+            </tr>
+            <tr>
+                <td>Reject Unknown SNI</td>
+                <td>
+                    <a-form-item>
+                        <a-switch v-model="inbound.stream.tls.rejectUnknownSni"></a-switch>
+                    </a-form-item>
+                </td>
+            </tr>
+            <template v-for="cert,index in inbound.stream.tls.certs">
+                <tr>
+                    <td>{{ i18n "certificate" }}</td>
+                    <td>
+                        <a-form-item>
+                            <a-radio-group v-model="cert.useFile" button-style="solid">
+                                <a-radio-button 
+                                    :value="true">{{ i18n "pages.inbounds.certificatePath"}}
+                                </a-radio-button>
+                                <a-radio-button 
+                                    :value="false">{{ i18n "pages.inbounds.certificateContent"}}
+                                </a-radio-button>
+                            </a-radio-group>
+                            <a-button v-if="index === 0" type="primary" size="small"
+                                @click="inbound.stream.tls.addCert()" style="margin-left: 10px">+</a-button>
+                            <a-button v-if="inbound.stream.tls.certs.length>1" type="primary" size="small"
+                                @click="inbound.stream.tls.removeCert(index)" style="margin-left: 10px">-</a-button>
+                        </a-form-item>
+                    </td>
+                </tr>
+                <template v-if="cert.useFile">
+                    <tr>
+                        <td>{{ i18n "pages.inbounds.publicKeyPath" }}</td>
+                        <td>
+                            <a-form-item>
+                                <a-input v-model.trim="cert.certFile" style="width:250px;"></a-input>
+                            </a-form-item>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>{{ i18n "pages.inbounds.keyPath" }}</td>
+                        <td>
+                            <a-form-item>
+                                <a-input v-model.trim="cert.keyFile" style="width:250px;"></a-input>
+                            </a-form-item>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td>
+                            <a-button type="primary" icon="import" @click="setDefaultCertData(index)">
+                                {{ i18n "pages.inbounds.setDefaultCert" }}
+                            </a-button>
+                        </td>
+                    </tr>
+                </template>
+                <template v-else>
+                    <tr>
+                        <td>{{ i18n "pages.inbounds.publicKeyContent" }}</td>
+                        <td>
+                            <a-form-item>
+                                <a-input type="textarea" :rows="3" style="width:250px;" v-model="cert.cert"></a-input>
+                            </a-form-item>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>{{ i18n "pages.inbounds.keyContent" }}</td>
+                        <td>
+                            <a-form-item>
+                                <a-input type="textarea" :rows="3" style="width:250px;" v-model="cert.key"></a-input>
+                            </a-form-item>
+                        </td>
+                    </tr>
+                </template>
+                <tr>
+                    <td>ocspStapling</td>
+                    <td>
+                        <a-form-item>
+                            <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number>
+                        </a-form-item>
+                    </td>
+                </tr>
+            </template>
+        </template>
 
-<!-- xtls settings -->
-<a-form v-else-if="inbound.xtls" layout="inline">
-    <table width="100%" class="ant-table-tbody">
-        <tr>
-            <td>
-                <span>SNI</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="inbound.stream.xtls.server" style="width: 250px"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <span>Alpn</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-select mode="multiple" style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme"
-                        v-model="inbound.stream.xtls.alpn">
-                        <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <span>Allow insecure</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-switch v-model="inbound.stream.xtls.settings.allowInsecure"></a-switch>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-for="cert,index in inbound.stream.xtls.certs">
-            <td>
-                <span>{{ i18n "certificate" }}</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-radio-group v-model="cert.useFile" button-style="solid">
-                        <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button>
-                        <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-button>
-                    </a-radio-group>
-                    <a-button v-if="index === 0" type="primary" size="small" @click="inbound.stream.xtls.addCert()"
-                        style="margin-left: 10px">+</a-button>
-                    <a-button v-if="inbound.stream.xtls.certs.length>1" type="primary" size="small"
-                        @click="inbound.stream.xtls.removeCert(index)" style="margin-left: 10px">-</a-button>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-for="cert,index in inbound.stream.xtls.certs" v-if="cert.useFile">
-            <td>
-                <span>{{ i18n "pages.inbounds.publicKeyPath" }}</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="cert.certFile" style="width:300px;"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-for="cert,index in inbound.stream.xtls.certs" v-if="cert.useFile">
-            <td>
-                <span>{{ i18n "pages.inbounds.keyPath" }}</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="cert.keyFile" style="width:300px;"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-for="cert,index in inbound.stream.xtls.certs" v-if="cert.useFile">
-            <td>
-                <a-button type="primary" icon="import" @click="setDefaultCertXtls(index)">{{ i18n
-                    "pages.inbounds.setDefaultCert" }}</a-button>
-            </td>
-        </tr>
-        <tr v-for="cert,index in inbound.stream.xtls.certs" v-else>
-            <td>
-                <span>{{ i18n "pages.inbounds.publicKeyContent" }}</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input type="textarea" :rows="3" style="width:300px;" v-model="cert.cert"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-for="cert,index in inbound.stream.xtls.certs" v-else>
-            <td>
-                <span>{{ i18n "pages.inbounds.keyContent" }}</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input type="textarea" :rows="3" style="width:300px;" v-model="cert.key"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-    </table>
-</a-form>
+        <!-- xtls settings -->
+        <template v-else-if="inbound.xtls">
+            <tr>
+                <td>
+                    <span>SNI</span>
+                </td>
+                <td>
+                    <a-form-item>
+                        <a-input v-model.trim="inbound.stream.xtls.server" style="width: 250px"></a-input>
+                    </a-form-item>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <span>Alpn</span>
+                </td>
+                <td>
+                    <a-form-item>
+                        <a-select mode="multiple" style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme"
+                            v-model="inbound.stream.xtls.alpn">
+                            <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <span>Allow insecure</span>
+                </td>
+                <td>
+                    <a-form-item>
+                        <a-switch v-model="inbound.stream.xtls.settings.allowInsecure"></a-switch>
+                    </a-form-item>
+                </td>
+            </tr>
+            <template v-for="cert,index in inbound.stream.xtls.certs">
+                <tr>
+                    <td>{{ i18n "certificate" }}</td>
+                    <td>
+                        <a-form-item>
+                            <a-radio-group v-model="cert.useFile" button-style="solid">
+                                <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath"
+                                    }}</a-radio-button>
+                                <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent"
+                                    }}</a-radio-button>
+                            </a-radio-group>
+                            <a-button v-if="index === 0" type="primary" size="small"
+                                @click="inbound.stream.xtls.addCert()" style="margin-left: 10px">+</a-button>
+                            <a-button v-if="inbound.stream.xtls.certs.length>1" type="primary" size="small"
+                                @click="inbound.stream.xtls.removeCert(index)" style="margin-left: 10px">-</a-button>
+                        </a-form-item>
+                    </td>
+                </tr>
+                <template v-if="cert.useFile">
+                    <tr>
+                        <td>{{ i18n "pages.inbounds.publicKeyPath" }}</td>
+                        <td>
+                            <a-form-item>
+                                <a-input v-model.trim="cert.certFile" style="width:250px;"></a-input>
+                            </a-form-item>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>{{ i18n "pages.inbounds.keyPath" }}</td>
+                        <td>
+                            <a-form-item>
+                                <a-input v-model.trim="cert.keyFile" style="width:250px;"></a-input>
+                            </a-form-item>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td>
+                            <a-button type="primary" icon="import" @click="setDefaultCertData(index)">{{ i18n
+                                "pages.inbounds.setDefaultCert" }}</a-button>
+                        </td>
+                    </tr>
+                </template>
+                <template v-else>
+                    <tr>
+                        <td>{{ i18n "pages.inbounds.publicKeyContent" }}</td>
+                        <td>
+                            <a-form-item>
+                                <a-input type="textarea" :rows="3" style="width:250px;" v-model="cert.cert"></a-input>
+                            </a-form-item>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>{{ i18n "pages.inbounds.keyContent" }}</td>
+                        <td>
+                            <a-form-item>
+                                <a-input type="textarea" :rows="3" style="width:250px;" v-model="cert.key"></a-input>
+                            </a-form-item>
+                        </td>
+                    </tr>
+                </template>
+            </template>
+        </template>
 
-<!-- reality settings -->
-<a-form v-else-if="inbound.reality" layout="inline">
-    <table width="100%" class="ant-table-tbody">
-        <tr>
-            <td>
-                <span>Show</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-switch v-model="inbound.stream.reality.show"></a-switch>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <span>xVer</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input-number v-model="inbound.stream.reality.xver" :min="0" style="width: 60px"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <span>uTLS</span>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-select v-model="inbound.stream.reality.settings.fingerprint" style="width: 135px"
-                        :dropdown-class-name="themeSwitcher.currentTheme">
-                        <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <t