From cfde05f5af8ec1da70c138668c9ebc2f8a534e13 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: Wed, 12 Jul 2023 14:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../groups/group/settings/remoteAddr/index.go   | 16 +++++++++++++++-
 .../settings/locations/remoteAddr/index.go      | 16 +++++++++++++++-
 .../servers/server/settings/remoteAddr/index.go | 17 ++++++++++++++++-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/internal/web/actions/default/servers/groups/group/settings/remoteAddr/index.go b/internal/web/actions/default/servers/groups/group/settings/remoteAddr/index.go
index 3997e424..36f6225e 100644
--- a/internal/web/actions/default/servers/groups/group/settings/remoteAddr/index.go
+++ b/internal/web/actions/default/servers/groups/group/settings/remoteAddr/index.go
@@ -10,6 +10,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
+	"strings"
 )
 
 type IndexAction struct {
@@ -55,9 +56,22 @@ func (this *IndexAction) RunPost(params struct {
 		this.Fail("参数校验失败：" + err.Error())
 	}
 
+	remoteAddrConfig.Value = strings.TrimSpace(remoteAddrConfig.Value)
+	err = remoteAddrConfig.Init()
+	if err != nil {
+		this.Fail("配置校验失败：" + err.Error())
+		return
+	}
+
+	remoteAddrJSON, err := json.Marshal(remoteAddrConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRemoteAddr(this.AdminContext(), &pb.UpdateHTTPWebRemoteAddrRequest{
 		HttpWebId:      params.WebId,
-		RemoteAddrJSON: params.RemoteAddrJSON,
+		RemoteAddrJSON: remoteAddrJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)
diff --git a/internal/web/actions/default/servers/server/settings/locations/remoteAddr/index.go b/internal/web/actions/default/servers/server/settings/locations/remoteAddr/index.go
index 7474dca0..9de70758 100644
--- a/internal/web/actions/default/servers/server/settings/locations/remoteAddr/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/remoteAddr/index.go
@@ -9,6 +9,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
+	"strings"
 )
 
 type IndexAction struct {
@@ -47,9 +48,22 @@ func (this *IndexAction) RunPost(params struct {
 		this.Fail("参数校验失败：" + err.Error())
 	}
 
+	remoteAddrConfig.Value = strings.TrimSpace(remoteAddrConfig.Value)
+	err = remoteAddrConfig.Init()
+	if err != nil {
+		this.Fail("配置校验失败：" + err.Error())
+		return
+	}
+
+	remoteAddrJSON, err := json.Marshal(remoteAddrConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRemoteAddr(this.AdminContext(), &pb.UpdateHTTPWebRemoteAddrRequest{
 		HttpWebId:      params.WebId,
-		RemoteAddrJSON: params.RemoteAddrJSON,
+		RemoteAddrJSON: remoteAddrJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)
diff --git a/internal/web/actions/default/servers/server/settings/remoteAddr/index.go b/internal/web/actions/default/servers/server/settings/remoteAddr/index.go
index 8da23e30..b6ef573a 100644
--- a/internal/web/actions/default/servers/server/settings/remoteAddr/index.go
+++ b/internal/web/actions/default/servers/server/settings/remoteAddr/index.go
@@ -10,6 +10,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/types"
+	"strings"
 )
 
 type IndexAction struct {
@@ -58,11 +59,25 @@ func (this *IndexAction) RunPost(params struct {
 	err := json.Unmarshal(params.RemoteAddrJSON, remoteAddrConfig)
 	if err != nil {
 		this.Fail("参数校验失败：" + err.Error())
+		return
+	}
+
+	remoteAddrConfig.Value = strings.TrimSpace(remoteAddrConfig.Value)
+	err = remoteAddrConfig.Init()
+	if err != nil {
+		this.Fail("配置校验失败：" + err.Error())
+		return
+	}
+
+	remoteAddrJSON, err := json.Marshal(remoteAddrConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRemoteAddr(this.AdminContext(), &pb.UpdateHTTPWebRemoteAddrRequest{
 		HttpWebId:      params.WebId,
-		RemoteAddrJSON: params.RemoteAddrJSON,
+		RemoteAddrJSON: remoteAddrJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)