From 8c6e960db7e5e57aaca212b2bbf5da7aa194361e 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, 14 Mar 2022 15:07:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=9B=9E=E6=BA=90=E8=B7=9F?=
 =?UTF-8?q?=E9=9A=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../groups/group/settings/httpReverseProxy/setting.go  |  1 +
 .../groups/group/settings/tcpReverseProxy/setting.go   |  1 +
 .../groups/group/settings/udpReverseProxy/setting.go   |  1 +
 .../server/settings/locations/reverseProxy/setting.go  |  1 +
 .../servers/server/settings/reverseProxy/setting.go    |  1 +
 web/public/js/components/server/reverse-proxy-box.js   | 10 +++++++++-
 6 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go b/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go
index 0c3bab68..65973c0d 100644
--- a/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go
+++ b/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go
@@ -106,6 +106,7 @@ func (this *SettingAction) RunPost(params struct {
 		StripPrefix:       reverseProxyConfig.StripPrefix,
 		AutoFlush:         reverseProxyConfig.AutoFlush,
 		AddHeaders:        reverseProxyConfig.AddHeaders,
+		FollowRedirects:   reverseProxyConfig.FollowRedirects,
 		ProxyProtocolJSON: proxyProtocolJSON,
 	})
 
diff --git a/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go b/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go
index 09c13ed7..11a801fa 100644
--- a/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go
+++ b/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go
@@ -106,6 +106,7 @@ func (this *SettingAction) RunPost(params struct {
 		StripPrefix:       reverseProxyConfig.StripPrefix,
 		AutoFlush:         reverseProxyConfig.AutoFlush,
 		AddHeaders:        reverseProxyConfig.AddHeaders,
+		FollowRedirects:   reverseProxyConfig.FollowRedirects,
 		ProxyProtocolJSON: proxyProtocolJSON,
 	})
 
diff --git a/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go b/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go
index 41b0f531..6fe2cb88 100644
--- a/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go
+++ b/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go
@@ -96,6 +96,7 @@ func (this *SettingAction) RunPost(params struct {
 		StripPrefix:     reverseProxyConfig.StripPrefix,
 		AutoFlush:       reverseProxyConfig.AutoFlush,
 		AddHeaders:      reverseProxyConfig.AddHeaders,
+		FollowRedirects:   reverseProxyConfig.FollowRedirects,
 	})
 
 	this.Success()
diff --git a/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go b/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go
index a21c9056..e63b8d53 100644
--- a/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go
+++ b/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go
@@ -97,6 +97,7 @@ func (this *SettingAction) RunPost(params struct {
 		StripPrefix:       reverseProxyConfig.StripPrefix,
 		AutoFlush:         reverseProxyConfig.AutoFlush,
 		AddHeaders:        reverseProxyConfig.AddHeaders,
+		FollowRedirects:   reverseProxyConfig.FollowRedirects,
 		ProxyProtocolJSON: proxyProtocolJSON,
 	})
 
diff --git a/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go b/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go
index fb5d430f..c5d9610d 100644
--- a/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go
+++ b/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go
@@ -131,6 +131,7 @@ func (this *SettingAction) RunPost(params struct {
 		MaxConns:          types.Int32(reverseProxyConfig.MaxConns),
 		MaxIdleConns:      types.Int32(reverseProxyConfig.MaxIdleConns),
 		ProxyProtocolJSON: proxyProtocolJSON,
+		FollowRedirects:   reverseProxyConfig.FollowRedirects,
 	})
 	if err != nil {
 		this.ErrorPage(err)
diff --git a/web/public/js/components/server/reverse-proxy-box.js b/web/public/js/components/server/reverse-proxy-box.js
index 47cafa08..cce35a90 100644
--- a/web/public/js/components/server/reverse-proxy-box.js
+++ b/web/public/js/components/server/reverse-proxy-box.js
@@ -23,7 +23,8 @@ Vue.component("reverse-proxy-box", {
 				readTimeout: {count: 0, unit: "second"},
 				idleTimeout: {count: 0, unit: "second"},
 				maxConns: 0,
-				maxIdleConns: 0
+				maxIdleConns: 0,
+				followRedirects: false
 			}
 		}
 		if (reverseProxyConfig.addHeaders == null) {
@@ -183,6 +184,13 @@ Vue.component("reverse-proxy-box", {
 		</tbody>
 		<more-options-tbody @change="changeAdvancedVisible" v-if="isOn()"></more-options-tbody>
 		<tbody v-show="isOn() && advancedVisible">
+			<tr v-show="family == null || family == 'http'">
+				<td>回源跟随</td>
+				<td>
+					<checkbox v-model="reverseProxyConfig.followRedirects"></checkbox>
+					<p class="comment">选中后，自动读取源站跳转后的网页内容。</p>
+				</td>
+			</tr>
 		    <tr v-show="family == null || family == 'http'">
 		        <td>自动添加的Header</td>
 		        <td>