diff options
Diffstat (limited to 'web/html/xui/form')
| -rw-r--r-- | web/html/xui/form/client.html | 6 | ||||
| -rw-r--r-- | web/html/xui/form/protocol/trojan.html | 4 | ||||
| -rw-r--r-- | web/html/xui/form/protocol/vless.html | 4 | ||||
| -rw-r--r-- | web/html/xui/form/protocol/vmess.html | 2 | ||||
| -rw-r--r-- | web/html/xui/form/tls_settings.html | 92 |
5 files changed, 77 insertions, 31 deletions
diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html index 1de05ac9..2d8c5d2b 100644 --- a/web/html/xui/form/client.html +++ b/web/html/xui/form/client.html @@ -68,7 +68,7 @@ </a-textarea> </a-form> </a-form-item> - <a-form-item v-if="inbound.XTLS" label="Flow"> + <a-form-item v-if="inbound.xtls" label="Flow"> <a-select v-model="client.flow" style="width: 150px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"> <a-select-option value="">{{ i18n "none" }}</a-select-option> <a-select-option v-for="key in XTLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option> @@ -100,10 +100,10 @@ </a-tag> </template> </a-form-item> - <a-form-item label="{{ i18n "pages.client.delayedStart" }}"> + <a-form-item label='{{ i18n "pages.client.delayedStart" }}'> <a-switch v-model="clientModal.delayedStart" @click="client._expiryTime=0"></a-switch> </a-form-item> - <a-form-item label="{{ i18n "pages.client.expireDays" }}" v-if="clientModal.delayedStart"> + <a-form-item label='{{ i18n "pages.client.expireDays" }}' v-if="clientModal.delayedStart"> <a-input type="number" v-model.number="delayedExpireDays" :min="0"></a-input> </a-form-item> <a-form-item v-else> diff --git a/web/html/xui/form/protocol/trojan.html b/web/html/xui/form/protocol/trojan.html index 91fd7afd..9f5c120a 100644 --- a/web/html/xui/form/protocol/trojan.html +++ b/web/html/xui/form/protocol/trojan.html @@ -1,7 +1,7 @@ {{define "form/trojan"}} <a-form layout="inline"> <a-collapse activeKey="0" v-for="(client, index) in inbound.settings.trojans.slice(0,1)" v-if="!isEdit"> - <a-collapse-panel header="{{ i18n "pages.inbounds.client" }}"> + <a-collapse-panel header='{{ i18n "pages.inbounds.client" }}'> <a-form layout="inline"> <a-form-item> <span slot="label"> @@ -31,7 +31,7 @@ </span> <a-input type="number" v-model.number="client.limitIp" min="0" style="width: 70px;" ></a-input> </a-form-item> - <a-form-item v-if="inbound.XTLS" label="Flow"> + <a-form-item v-if="inbound.xtls" label="Flow"> <a-select v-model="client.flow" style="width: 150px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"> <a-select-option value="">{{ 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/protocol/vless.html b/web/html/xui/form/protocol/vless.html index 029f2c9e..68c719dd 100644 --- a/web/html/xui/form/protocol/vless.html +++ b/web/html/xui/form/protocol/vless.html @@ -1,7 +1,7 @@ {{define "form/vless"}} <a-form layout="inline"> <a-collapse activeKey="0" v-for="(client, index) in inbound.settings.vlesses.slice(0,1)" v-if="!isEdit"> - <a-collapse-panel header="{{ i18n "pages.inbounds.client" }}"> + <a-collapse-panel header='{{ i18n "pages.inbounds.client" }}'> <a-form layout="inline"> <a-form-item> <span slot="label"> @@ -31,7 +31,7 @@ </span> <a-input type="number" v-model.number="client.limitIp" min="0" style="width: 70px;" ></a-input> </a-form-item> - <a-form-item v-if="inbound.XTLS" label="Flow"> + <a-form-item v-if="inbound.xtls" label="Flow"> <a-select v-model="inbound.settings.vlesses[index].flow" style="width: 150px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"> <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/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html index ad2b3960..d19e5cb7 100644 --- a/web/html/xui/form/protocol/vmess.html +++ b/web/html/xui/form/protocol/vmess.html @@ -1,7 +1,7 @@ {{define "form/vmess"}} <a-form layout="inline"> <a-collapse activeKey="0" v-for="(client, index) in inbound.settings.vmesses.slice(0,1)" v-if="!isEdit"> - <a-collapse-panel header="{{ i18n "pages.inbounds.client" }}"> + <a-collapse-panel header='{{ i18n "pages.inbounds.client" }}'> <a-form layout="inline"> <a-form-item> <span slot="label"> diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html index f954b76b..dcef3990 100644 --- a/web/html/xui/form/tls_settings.html +++ b/web/html/xui/form/tls_settings.html @@ -17,7 +17,7 @@ </span> <a-switch v-model="inbound.reality"></a-switch> </a-form-item> - <a-form-item v-if="inbound.canEnableXTLS()"> + <a-form-item v-if="inbound.canEnableXtls()"> <span slot="label"> XTLS <a-tooltip> @@ -27,14 +27,14 @@ <a-icon type="question-circle" theme="filled"></a-icon> </a-tooltip> </span> - <a-switch v-model="inbound.XTLS"></a-switch> + <a-switch v-model="inbound.xtls"></a-switch> </a-form-item> </a-form> <!-- tls settings --> -<a-form v-if="inbound.tls || inbound.XTLS" layout="inline"> - <a-form-item label="SNI" placeholder="Server Name Indication" v-if="inbound.tls"> - <a-input v-model.trim="inbound.stream.tls.settings[0].serverName"></a-input> +<a-form v-if="inbound.tls" layout="inline"> + <a-form-item 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"> @@ -52,22 +52,22 @@ <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="uTLS" v-if="inbound.tls" > - <a-select v-model="inbound.stream.tls.settings[0].fingerprint" style="width: 135px"> + <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"> <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='{{ i18n "domainName" }}'> - <a-input v-model.trim="inbound.stream.tls.server"></a-input> - </a-form-item> <a-form-item label="Alpn"> <a-checkbox-group v-model="inbound.stream.tls.alpn" style="width:200px"> <a-checkbox v-for="key in ALPN_OPTION" :value="key">[[ key ]]</a-checkbox> </a-checkbox-group> </a-form-item> <a-form-item label="Allow insecure"> - <a-switch v-model="inbound.stream.tls.settings[0].allowInsecure"></a-switch> + <a-switch v-model="inbound.stream.tls.settings.allowInsecure"></a-switch> </a-form-item> <a-form-item label='{{ i18n "certificate" }}'> <a-radio-group v-model="inbound.stream.tls.certs[0].useFile" button-style="solid"> @@ -93,33 +93,79 @@ </a-form-item> </template> </a-form> + +<!-- xtls settings --> +<a-form v-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="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-form-item> + <a-form-item label="Allow insecure"> + <a-switch v-model="inbound.stream.xtls.settings.allowInsecure"></a-switch> + </a-form-item> + <a-form-item label='{{ i18n "certificate" }}'> + <a-radio-group v-model="inbound.stream.xtls.certs[0].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-form-item> + <template v-if="inbound.stream.xtls.certs[0].useFile"> + <a-form-item label='{{ i18n "pages.inbounds.publicKeyPath" }}'> + <a-input v-model.trim="inbound.stream.xtls.certs[0].certFile" style="width:300px;"></a-input> + </a-form-item> + <a-form-item label='{{ i18n "pages.inbounds.keyPath" }}'> + <a-input v-model.trim="inbound.stream.xtls.certs[0].keyFile" style="width:300px;"></a-input> + </a-form-item> + <a-button @click="setDefaultCertData">{{ 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="inbound.stream.xtls.certs[0].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="inbound.stream.xtls.certs[0].key"></a-input> + </a-form-item> + </template> +</a-form> + +<!-- reality settings --> <a-form v-else-if="inbound.reality" layout="inline"> - <a-form-item label="show"> + <a-form-item label="Show"> <a-switch v-model="inbound.stream.reality.show"> </a-switch> </a-form-item> - <a-form-item label="xver"> + <a-form-item label="xVer"> <a-input type="number" v-model.number="inbound.stream.reality.xver" :min="0" style="width: 60px"></a-input> </a-form-item> <a-form-item label="uTLS" > - <a-select v-model="inbound.stream.reality.fingerprint" style="width: 135px"> + <a-select v-model="inbound.stream.reality.settings.fingerprint" style="width: 135px"> <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: 360px"></a-input> + <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="serverNames"> - <a-input v-model.trim="inbound.stream.reality.serverNames" style="width: 360px"></a-input> + <a-form-item label="ShortIds"> + <a-input v-model.trim="inbound.stream.reality.shortIds"></a-input> </a-form-item> - <a-form-item label="privateKey"> - <a-input v-model.trim="inbound.stream.reality.privateKey" style="width: 360px"></a-input> + <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="publicKey"> - <a-input v-model.trim="inbound.stream.reality.publicKey" style="width: 360px"></a-input> + <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 label="shortIds"> - <a-input v-model.trim="inbound.stream.reality.shortIds"></a-input> + <a-form-item > + <a-button type="primary" icon="import" @click="getNewX25519Cert">Get New Key</a-button> </a-form-item> </a-form> {{end}}
\ No newline at end of file |