diff options
| -rw-r--r-- | web/html/xui/form/client.html | 2 | ||||
| -rw-r--r-- | web/html/xui/form/reality_settings.html | 48 | ||||
| -rw-r--r-- | web/html/xui/form/tls_settings.html | 117 | ||||
| -rw-r--r-- | web/html/xui/form/xtls_settings.html | 58 |
4 files changed, 123 insertions, 102 deletions
diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html index 070b962c..01d96c73 100644 --- a/web/html/xui/form/client.html +++ b/web/html/xui/form/client.html @@ -104,7 +104,7 @@ </a-textarea> </a-form> </a-form-item> - <a-form-item v-if="inbound.xtls" label='Flow'> + <a-form-item v-if="inbound.stream.isXtls" label='Flow'> <a-select v-model="client.flow" :dropdown-class-name="themeSwitcher.currentTheme"> <a-select-option value="" selected>{{ i18n "none" }}</a-select-option> <a-select-option v-for="key in XTLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option> diff --git a/web/html/xui/form/reality_settings.html b/web/html/xui/form/reality_settings.html new file mode 100644 index 00000000..19804e17 --- /dev/null +++ b/web/html/xui/form/reality_settings.html @@ -0,0 +1,48 @@ +{{define "form/realitySettings"}} +<template> + <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.number="inbound.stream.reality.xver" :min="0"></a-input-number> + </a-form-item> + <a-form-item label='uTLS'> + <a-select v-model="inbound.stream.reality.settings.fingerprint" style="width: 50%" + :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"></a-input> + </a-form-item> + <a-form-item label='SNI'> + <a-input v-model.trim="inbound.stream.reality.serverNames"></a-input> + </a-form-item> + <a-form-item label='Max Time Diff (ms)'> + <a-input-number v-model.number="inbound.stream.reality.maxTimediff" :min="0"></a-input-number> + </a-form-item> + <a-form-item> + <template slot="label"> + <a-tooltip> + <template slot="title"> + <span>{{ i18n "reset" }}</span> + </template> Short IDs <a-icon @click="inbound.stream.reality.shortIds = RandomUtil.randomShortIds()" + type="sync"></a-icon> + </a-tooltip> + </template> + <a-input v-model.trim="inbound.stream.reality.shortIds"></a-input> + </a-form-item> + <a-form-item label='SpiderX'> + <a-input v-model.trim="inbound.stream.reality.settings.spiderX"></a-input> + </a-form-item> + <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'> + <a-input v-model.trim="inbound.stream.reality.privateKey"></a-input> + </a-form-item> + <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'> + <a-input v-model.trim="inbound.stream.reality.settings.publicKey"></a-input> + </a-form-item> + <a-form-item label=" "> + <a-button type="primary" icon="import" @click="getNewX25519Cert">Get New Cert</a-button> + </a-form-item> +</template> +{{end}}
\ No newline at end of file diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html index 97b23ef6..6c2f4a67 100644 --- a/web/html/xui/form/tls_settings.html +++ b/web/html/xui/form/tls_settings.html @@ -34,16 +34,19 @@ </a-form-item> <a-form-item label="Min/Max Version"> <a-input-group compact> - <a-select v-model="inbound.stream.tls.minVersion" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme"> + <a-select v-model="inbound.stream.tls.minVersion" style="width: 50%" + :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 v-model="inbound.stream.tls.maxVersion" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme"> + <a-select v-model="inbound.stream.tls.maxVersion" style="width: 50%" + :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="uTLS"> - <a-select v-model="inbound.stream.tls.settings.fingerprint" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme"> + <a-select v-model="inbound.stream.tls.settings.fingerprint" style="width: 50%" + :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> @@ -71,8 +74,10 @@ <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 icon="plus" v-if="index === 0" type="primary" size="small" @click="inbound.stream.tls.addCert()" style="margin-left: 10px"></a-button> - <a-button icon="minus" 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-button icon="plus" v-if="index === 0" type="primary" size="small" @click="inbound.stream.tls.addCert()" + style="margin-left: 10px"></a-button> + <a-button icon="minus" 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.publicKey" }}'> @@ -82,7 +87,8 @@ <a-input v-model.trim="cert.keyFile"></a-input> </a-form-item> <a-form-item label=" "> - <a-button type="primary" icon="import" @click="setDefaultCertData(index)">{{ i18n "pages.inbounds.setDefaultCert" }}</a-button> + <a-button type="primary" icon="import" @click="setDefaultCertData(index)"> + {{ i18n "pages.inbounds.setDefaultCert" }}</a-button> </a-form-item> </template> <template v-else> @@ -111,104 +117,13 @@ </template> <!-- xtls settings --> - <template v-else-if="inbound.xtls"> - <a-form-item label="SNI" placeholder="Server Name Indication"> - <a-input v-model.trim="inbound.stream.xtls.sni"></a-input> - </a-form-item> - <a-form-item label="ALPN"> - <a-select mode="multiple" :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 icon="plus" v-if="index === 0" type="primary" size="small" @click="inbound.stream.xtls.addCert()" style="margin-left: 10px"></a-button> - <a-button icon="minus" 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.publicKey" }}'> - <a-input v-model.trim="cert.certFile"></a-input> - </a-form-item> - <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'> - <a-input v-model.trim="cert.keyFile"></a-input> - </a-form-item> - <a-form-item label=" "> - <a-button type="primary" icon="import" @click="setDefaultCertXtls(index)">{{ i18n "pages.inbounds.setDefaultCert" }}</a-button> - </a-form-item> - </template> - <template v-else> - <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'> - <a-input type="textarea" :rows="3" v-model="cert.cert"></a-input> - </a-form-item> - <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'> - <a-input type="textarea" :rows="3" v-model="cert.key"></a-input> - </a-form-item> - </template> - <a-form-item label='OCSP stapling'> - <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number> - </a-form-item> - <a-form-item label="One Time Loading"> - <a-switch v-model="cert.oneTimeLoading"></a-switch> - </a-form-item> - <a-form-item label='Usage Option'> - <a-select v-model="cert.usage" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme"> - <a-select-option v-for="key in USAGE_OPTION" :value="key">[[ key ]]</a-select-option> - </a-select> - </a-form-item> - </template> + <template v-else-if="inbound.stream.isXtls"> + {{template "form/xtlsSettings"}} </template> <!-- reality settings --> <template v-if="inbound.stream.isReality"> - <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.number="inbound.stream.reality.xver" :min="0"></a-input-number> - </a-form-item> - <a-form-item label='uTLS'> - <a-select v-model="inbound.stream.reality.settings.fingerprint" style="width: 50%" :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"></a-input> - </a-form-item> - <a-form-item label='SNI'> - <a-input v-model.trim="inbound.stream.reality.serverNames"></a-input> - </a-form-item> - <a-form-item label='Max Time Diff (ms)'> - <a-input-number v-model.number="inbound.stream.reality.maxTimediff" :min="0"></a-input-number> - </a-form-item> - <a-form-item> - <template slot="label"> - <a-tooltip> - <template slot="title"> - <span>{{ i18n "reset" }}</span> - </template> Short IDs <a-icon @click="inbound.stream.reality.shortIds = RandomUtil.randomShortIds()" type="sync"></a-icon> - </a-tooltip> - </template> - <a-input v-model.trim="inbound.stream.reality.shortIds"></a-input> - </a-form-item> - <a-form-item label='SpiderX'> - <a-input v-model.trim="inbound.stream.reality.settings.spiderX"></a-input> - </a-form-item> - <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'> - <a-input v-model.trim="inbound.stream.reality.privateKey"></a-input> - </a-form-item> - <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'> - <a-input v-model.trim="inbound.stream.reality.settings.publicKey"></a-input> - </a-form-item> - <a-form-item label=" "> - <a-button type="primary" icon="import" @click="getNewX25519Cert">Get New Cert</a-button> - </a-form-item> + {{template "form/realitySettings"}} </template> </a-form> -{{end}} +{{end}}
\ No newline at end of file diff --git a/web/html/xui/form/xtls_settings.html b/web/html/xui/form/xtls_settings.html new file mode 100644 index 00000000..e6b88b4f --- /dev/null +++ b/web/html/xui/form/xtls_settings.html @@ -0,0 +1,58 @@ +{{define "form/xtlsSettings"}} +<template> + <a-form-item label="SNI" placeholder="Server Name Indication"> + <a-input v-model.trim="inbound.stream.xtls.sni"></a-input> + </a-form-item> + <a-form-item label="ALPN"> + <a-select mode="multiple" :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 icon="plus" v-if="index === 0" type="primary" size="small" @click="inbound.stream.xtls.addCert()" + style="margin-left: 10px"></a-button> + <a-button icon="minus" 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.publicKey" }}'> + <a-input v-model.trim="cert.certFile"></a-input> + </a-form-item> + <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'> + <a-input v-model.trim="cert.keyFile"></a-input> + </a-form-item> + <a-form-item label=" "> + <a-button type="primary" icon="import" @click="setDefaultCertXtls(index)"> + {{ i18n "pages.inbounds.setDefaultCert" }}</a-button> + </a-form-item> + </template> + <template v-else> + <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'> + <a-input type="textarea" :rows="3" v-model="cert.cert"></a-input> + </a-form-item> + <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'> + <a-input type="textarea" :rows="3" v-model="cert.key"></a-input> + </a-form-item> + </template> + <a-form-item label='OCSP stapling'> + <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number> + </a-form-item> + <a-form-item label="One Time Loading"> + <a-switch v-model="cert.oneTimeLoading"></a-switch> + </a-form-item> + <a-form-item label='Usage Option'> + <a-select v-model="cert.usage" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme"> + <a-select-option v-for="key in USAGE_OPTION" :value="key">[[ key ]]</a-select-option> + </a-select> + </a-form-item> + </template> +</template> +{{end}}
\ No newline at end of file |