From f6f003d52460abcfd79ea32aed3f7ac535c8e503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Mon, 27 Jun 2022 15:10:45 +0800
Subject: [PATCH] =?UTF-8?q?TLS=E6=BA=90=E7=AB=99=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E5=9B=9E=E6=BA=90=E4=B8=BB=E6=9C=BA=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../servers/server/settings/origins/addPopup.go        | 10 +++++-----
 .../servers/server/settings/origins/updatePopup.go     | 10 +++++-----
 .../servers/server/settings/origins/addPopup.html      |  8 ++++----
 .../servers/server/settings/origins/addPopup.js        |  4 ++++
 .../servers/server/settings/origins/updatePopup.html   |  2 +-
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/internal/web/actions/default/servers/server/settings/origins/addPopup.go b/internal/web/actions/default/servers/server/settings/origins/addPopup.go
index 4f302b68..debcf3e2 100644
--- a/internal/web/actions/default/servers/server/settings/origins/addPopup.go
+++ b/internal/web/actions/default/servers/server/settings/origins/addPopup.go
@@ -98,7 +98,7 @@ func (this *AddPopupAction) RunPost(params struct {
 		} else if params.Protocol == "https" {
 			addr += ":443"
 		} else {
-			this.Fail("地址中需要带有端口")
+			this.FailField("addr", "源站地址中需要带有端口")
 		}
 		portIndex = strings.LastIndex(addr, ":")
 	}
@@ -107,19 +107,19 @@ func (this *AddPopupAction) RunPost(params struct {
 
 	// 检查端口号
 	if port == "0" {
-		this.Fail("端口号不能为0")
+		this.FailField("addr", "源站端口号不能为0")
 	}
 	if !configutils.HasVariables(port) {
 		// 必须是整数
 		if !regexp.MustCompile(`^\d+$`).MatchString(port) {
-			this.Fail("端口号只能为整数")
+			this.FailField("addr", "源站端口号只能为整数")
 		}
 		var portInt = types.Int(port)
 		if portInt == 0 {
-			this.Fail("端口号不能为0")
+			this.FailField("addr", "源站端口号不能为0")
 		}
 		if portInt > 65535 {
-			this.Fail("端口号不能大于65535")
+			this.FailField("addr", "源站端口号不能大于65535")
 		}
 	}
 
diff --git a/internal/web/actions/default/servers/server/settings/origins/updatePopup.go b/internal/web/actions/default/servers/server/settings/origins/updatePopup.go
index 8ff99304..1efcf146 100644
--- a/internal/web/actions/default/servers/server/settings/origins/updatePopup.go
+++ b/internal/web/actions/default/servers/server/settings/origins/updatePopup.go
@@ -164,7 +164,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		} else if params.Protocol == "https" {
 			addr += ":443"
 		} else {
-			this.Fail("地址中需要带有端口")
+			this.FailField("addr", "源站地址中需要带有端口")
 		}
 		portIndex = strings.LastIndex(addr, ":")
 	}
@@ -172,19 +172,19 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	var port = addr[portIndex+1:]
 	// 检查端口号
 	if port == "0" {
-		this.Fail("端口号不能为0")
+		this.FailField("addr", "源站端口号不能为0")
 	}
 	if !configutils.HasVariables(port) {
 		// 必须是整数
 		if !regexp.MustCompile(`^\d+$`).MatchString(port) {
-			this.Fail("端口号只能为整数")
+			this.FailField("addr", "源站端口号只能为整数")
 		}
 		var portInt = types.Int(port)
 		if portInt == 0 {
-			this.Fail("端口号不能为0")
+			this.FailField("addr", "源站端口号不能为0")
 		}
 		if portInt > 65535 {
-			this.Fail("端口号不能大于65535")
+			this.FailField("addr", "源站端口号不能大于65535")
 		}
 	}
 
diff --git a/web/views/@default/servers/server/settings/origins/addPopup.html b/web/views/@default/servers/server/settings/origins/addPopup.html
index 042fec3b..b863f33e 100644
--- a/web/views/@default/servers/server/settings/origins/addPopup.html
+++ b/web/views/@default/servers/server/settings/origins/addPopup.html
@@ -16,13 +16,13 @@
 				</select>
 
 				<!-- 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="tls">TLS</option>
 				</select>
 
                 <!-- 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>
                 </select>
 			</td>
@@ -45,11 +45,11 @@
                     <ssl-certs-box :v-single-mode="true" :v-view-size="'mini'" :v-description="'可以选择连接源站使用的证书。'"></ssl-certs-box>
                 </td>
             </tr>
-            <tr v-if="isHTTP">
+            <tr v-if="isHTTP || protocol == 'tls'">
                 <td>回源主机名</td>
                 <td>
                     <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>
             </tr>
             <tr v-if="isHTTP">
diff --git a/web/views/@default/servers/server/settings/origins/addPopup.js b/web/views/@default/servers/server/settings/origins/addPopup.js
index 76031719..7dd43372 100644
--- a/web/views/@default/servers/server/settings/origins/addPopup.js
+++ b/web/views/@default/servers/server/settings/origins/addPopup.js
@@ -6,6 +6,10 @@ Tea.context(function () {
 
 	if (this.isHTTP) {
 		this.protocol = "http"
+	} else if (this.serverType == "tcpProxy") {
+		this.protocol = "tcp"
+	} else if (this.serverType == "udpProxy") {
+		this.protocol = "udp"
 	}
 
 	this.changeProtocol = function () {
diff --git a/web/views/@default/servers/server/settings/origins/updatePopup.html b/web/views/@default/servers/server/settings/origins/updatePopup.html
index 36614a64..4ebd5ae5 100644
--- a/web/views/@default/servers/server/settings/origins/updatePopup.html
+++ b/web/views/@default/servers/server/settings/origins/updatePopup.html
@@ -46,7 +46,7 @@
                     <ssl-certs-box :v-single-mode="true" :v-cert="origin.cert" :v-view-size="'mini'" :v-description="'可以选择连接源站使用的证书。'"></ssl-certs-box>
                 </td>
             </tr>
-            <tr v-if="isHTTP">
+            <tr v-if="isHTTP || origin.protocol == 'tls'">
                 <td>回源主机名</td>
                 <td>
                     <input type="text" name="host"  v-model="origin.host" placeholder="比如example.com" maxlength="100"/>