diff options
| author | MHSanaei <ho3ein.sanaei@gmail.com> | 2023-12-09 20:13:36 +0300 |
|---|---|---|
| committer | MHSanaei <ho3ein.sanaei@gmail.com> | 2023-12-09 20:17:41 +0300 |
| commit | 83769f963efbd5075ffd5b8f04e57232b3e10229 (patch) | |
| tree | 49284c4f7c8539e57799afa680edfcd9ba391704 | |
| parent | 4db42ba40976328c4cb5dac7de623b2f08c20b75 (diff) | |
bug fix - multi cert
| -rw-r--r-- | web/html/xui/form/tls_settings.html | 730 |
1 files changed, 359 insertions, 371 deletions
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> - <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> + <!-- reality settings --> + <template v-else-if="inbound.reality"> + <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> + </template> </table> </a-form> {{end}}
\ No newline at end of file |
