TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-27 22:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

TLS源站支持填写回源主机名

Browse Source
This commit is contained in:
刘祥超
2022-06-27 15:10:45 +08:00
parent 8126de4048
commit f6f003d524
5 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/web/actions/default/servers/server/settings/origins/addPopup.go
View File

@@ -98,7 +98,7 @@ func (this *AddPopupAction) RunPost(params struct {
} else if params.Protocol == "https" { } else if params.Protocol == "https" {
addr += ":443" addr += ":443"
} else { } else {
this.Fail("地址中需要带有端口") this.FailField("addr", "源站地址中需要带有端口")
} }
portIndex = strings.LastIndex(addr, ":") portIndex = strings.LastIndex(addr, ":")
} }
@@ -107,19 +107,19 @@ func (this *AddPopupAction) RunPost(params struct {
// 检查端口号 // 检查端口号
if port == "0" { if port == "0" {
this.Fail("端口号不能为0") this.FailField("addr", "源站端口号不能为0")
} }
if !configutils.HasVariables(port) { if !configutils.HasVariables(port) {
// 必须是整数 // 必须是整数
if !regexp.MustCompile(`^\d+$`).MatchString(port) { if !regexp.MustCompile(`^\d+$`).MatchString(port) {
this.Fail("端口号只能为整数") this.FailField("addr", "源站端口号只能为整数")
} }
var portInt = types.Int(port) var portInt = types.Int(port)
if portInt == 0 { if portInt == 0 {
this.Fail("端口号不能为0") this.FailField("addr", "源站端口号不能为0")
} }
if portInt > 65535 { if portInt > 65535 {
this.Fail("端口号不能大于65535") this.FailField("addr", "源站端口号不能大于65535")
} }
} }

10
internal/web/actions/default/servers/server/settings/origins/updatePopup.go
View File

@@ -164,7 +164,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
} else if params.Protocol == "https" { } else if params.Protocol == "https" {
addr += ":443" addr += ":443"
} else { } else {
this.Fail("地址中需要带有端口") this.FailField("addr", "源站地址中需要带有端口")
} }
portIndex = strings.LastIndex(addr, ":") portIndex = strings.LastIndex(addr, ":")
} }
@@ -172,19 +172,19 @@ func (this *UpdatePopupAction) RunPost(params struct {
var port = addr[portIndex+1:] var port = addr[portIndex+1:]
// 检查端口号 // 检查端口号
if port == "0" { if port == "0" {
this.Fail("端口号不能为0") this.FailField("addr", "源站端口号不能为0")
} }
if !configutils.HasVariables(port) { if !configutils.HasVariables(port) {
// 必须是整数 // 必须是整数
if !regexp.MustCompile(`^\d+$`).MatchString(port) { if !regexp.MustCompile(`^\d+$`).MatchString(port) {
this.Fail("端口号只能为整数") this.FailField("addr", "源站端口号只能为整数")
} }
var portInt = types.Int(port) var portInt = types.Int(port)
if portInt == 0 { if portInt == 0 {
this.Fail("端口号不能为0") this.FailField("addr", "源站端口号不能为0")
} }
if portInt > 65535 { if portInt > 65535 {
this.Fail("端口号不能大于65535") this.FailField("addr", "源站端口号不能大于65535")
} }
} }

8
web/views/@default/servers/server/settings/origins/addPopup.html
View File

@@ -16,13 +16,13 @@
</select> </select>
<!-- TCP --> <!-- TCP -->
<select class="ui dropdown auto-width" name="protocol" v-if="serverType == 'tcpProxy'"> <select class="ui dropdown auto-width" name="protocol" v-model="protocol" v-if="serverType == 'tcpProxy'">
<option value="tcp">TCP</option> <option value="tcp">TCP</option>
<option value="tls">TLS</option> <option value="tls">TLS</option>
</select> </select>
<!-- UDP --> <!-- UDP -->
<select class="ui dropdown auto-width" name="protocol" v-if="serverType == 'udpProxy'"> <select class="ui dropdown auto-width" name="protocol" v-model="protocol" v-if="serverType == 'udpProxy'">
<option value="udp">UDP</option> <option value="udp">UDP</option>
</select> </select>
</td> </td>
@@ -45,11 +45,11 @@
<ssl-certs-box :v-single-mode="true" :v-view-size="'mini'" :v-description="'可以选择连接源站使用的证书。'"></ssl-certs-box> <ssl-certs-box :v-single-mode="true" :v-view-size="'mini'" :v-description="'可以选择连接源站使用的证书。'"></ssl-certs-box>
</td> </td>
</tr> </tr>
<tr v-if="isHTTP"> <tr v-if="isHTTP || protocol == 'tls'">
<td>回源主机名</td> <td>回源主机名</td>
<td> <td>
<input type="text" name="host" placeholder="比如example.com" maxlength="100"/> <input type="text" name="host" placeholder="比如example.com" maxlength="100"/>
<p class="comment">请求源站时的Host，用于修改源站接收到的域名，自定义Host内容中支持请求变量。</p> <p class="comment">请求源站时的Host，用于修改源站接收到的域名<span v-if="isHTTP">，自定义Host内容中支持请求变量</span>。</p>
</td> </td>
</tr> </tr>
<tr v-if="isHTTP"> <tr v-if="isHTTP">

4
web/views/@default/servers/server/settings/origins/addPopup.js
View File

@@ -6,6 +6,10 @@ Tea.context(function () {
if (this.isHTTP) { if (this.isHTTP) {
this.protocol = "http" this.protocol = "http"
} else if (this.serverType == "tcpProxy") {
this.protocol = "tcp"
} else if (this.serverType == "udpProxy") {
this.protocol = "udp"
} }
this.changeProtocol = function () { this.changeProtocol = function () {

2
web/views/@default/servers/server/settings/origins/updatePopup.html
View File

@@ -46,7 +46,7 @@
<ssl-certs-box :v-single-mode="true" :v-cert="origin.cert" :v-view-size="'mini'" :v-description="'可以选择连接源站使用的证书。'"></ssl-certs-box> <ssl-certs-box :v-single-mode="true" :v-cert="origin.cert" :v-view-size="'mini'" :v-description="'可以选择连接源站使用的证书。'"></ssl-certs-box>
</td> </td>
</tr> </tr>
<tr v-if="isHTTP"> <tr v-if="isHTTP || origin.protocol == 'tls'">
<td>回源主机名</td> <td>回源主机名</td>
<td> <td>
<input type="text" name="host" v-model="origin.host" placeholder="比如example.com" maxlength="100"/> <input type="text" name="host" v-model="origin.host" placeholder="比如example.com" maxlength="100"/>