From d30ebdb3693c98efe91df8c30c6dab6f31597d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Sat, 31 Dec 2022 17:12:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=81=E4=B9=A6=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=BE=88=E5=A4=9A=E6=97=B6=E7=9A=84=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../servers/server/settings/dns/updateCNAMEPopup.go | 5 ++++- .../default/servers/server/settings/https/index.go | 9 ++++++--- .../web/actions/default/servers/server/settings/index.go | 5 ++++- .../actions/default/servers/serverutils/server_helper.go | 5 ++++- .../web/actions/default/servers/serverutils/utils.go | 9 ++++++--- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/internal/web/actions/default/servers/server/settings/dns/updateCNAMEPopup.go b/internal/web/actions/default/servers/server/settings/dns/updateCNAMEPopup.go index 5791853f..772aa137 100644 --- a/internal/web/actions/default/servers/server/settings/dns/updateCNAMEPopup.go +++ b/internal/web/actions/default/servers/server/settings/dns/updateCNAMEPopup.go @@ -48,7 +48,10 @@ func (this *UpdateCNAMEPopupAction) RunPost(params struct { this.FailField("dnsName", "CNAME中只能包含数字、英文字母") } - serverResp, err := this.RPC().ServerRPC().FindEnabledServer(this.AdminContext(), &pb.FindEnabledServerRequest{ServerId: params.ServerId}) + serverResp, err := this.RPC().ServerRPC().FindEnabledServer(this.AdminContext(), &pb.FindEnabledServerRequest{ + ServerId: params.ServerId, + IgnoreSSLCertData: true, + }) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/servers/server/settings/https/index.go b/internal/web/actions/default/servers/server/settings/https/index.go index 378daba8..e3f6363d 100644 --- a/internal/web/actions/default/servers/server/settings/https/index.go +++ b/internal/web/actions/default/servers/server/settings/https/index.go @@ -31,7 +31,7 @@ func (this *IndexAction) RunGet(params struct { if !isOk { return } - httpsConfig := &serverconfigs.HTTPSProtocolConfig{} + var httpsConfig = &serverconfigs.HTTPSProtocolConfig{} if len(server.HttpsJSON) > 0 { err := json.Unmarshal(server.HttpsJSON, httpsConfig) if err != nil { @@ -44,12 +44,15 @@ func (this *IndexAction) RunGet(params struct { var sslPolicy *sslconfigs.SSLPolicy if httpsConfig.SSLPolicyRef != nil && httpsConfig.SSLPolicyRef.SSLPolicyId > 0 { - sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{SslPolicyId: httpsConfig.SSLPolicyRef.SSLPolicyId}) + sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{ + SslPolicyId: httpsConfig.SSLPolicyRef.SSLPolicyId, + IgnoreData: true, + }) if err != nil { this.ErrorPage(err) return } - sslPolicyConfigJSON := sslPolicyConfigResp.SslPolicyJSON + var sslPolicyConfigJSON = sslPolicyConfigResp.SslPolicyJSON if len(sslPolicyConfigJSON) > 0 { sslPolicy = &sslconfigs.SSLPolicy{} err = json.Unmarshal(sslPolicyConfigJSON, sslPolicy) diff --git a/internal/web/actions/default/servers/server/settings/index.go b/internal/web/actions/default/servers/server/settings/index.go index 938950fe..a06a073f 100644 --- a/internal/web/actions/default/servers/server/settings/index.go +++ b/internal/web/actions/default/servers/server/settings/index.go @@ -42,7 +42,10 @@ func (this *IndexAction) RunGet(params struct { this.Data["clusters"] = clusterMaps // 当前服务信息 - serverResp, err := this.RPC().ServerRPC().FindEnabledServer(this.AdminContext(), &pb.FindEnabledServerRequest{ServerId: params.ServerId}) + serverResp, err := this.RPC().ServerRPC().FindEnabledServer(this.AdminContext(), &pb.FindEnabledServerRequest{ + ServerId: params.ServerId, + IgnoreSSLCertData: true, + }) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/servers/serverutils/server_helper.go b/internal/web/actions/default/servers/serverutils/server_helper.go index b79f6bfd..64af7cad 100644 --- a/internal/web/actions/default/servers/serverutils/server_helper.go +++ b/internal/web/actions/default/servers/serverutils/server_helper.go @@ -57,7 +57,10 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) { return } - serverResp, err := rpcClient.ServerRPC().FindEnabledServer(rpcClient.Context(action.Context.GetInt64("adminId")), &pb.FindEnabledServerRequest{ServerId: serverId}) + serverResp, err := rpcClient.ServerRPC().FindEnabledServer(rpcClient.Context(action.Context.GetInt64("adminId")), &pb.FindEnabledServerRequest{ + ServerId: serverId, + IgnoreSSLCertData: true, + }) if err != nil { logs.Error(err) return diff --git a/internal/web/actions/default/servers/serverutils/utils.go b/internal/web/actions/default/servers/serverutils/utils.go index b1bae717..c91d5d3a 100644 --- a/internal/web/actions/default/servers/serverutils/utils.go +++ b/internal/web/actions/default/servers/serverutils/utils.go @@ -8,14 +8,17 @@ import ( "strconv" ) -// 查找Server +// FindServer 查找服务信息 func FindServer(p *actionutils.ParentAction, serverId int64) (*pb.Server, *serverconfigs.ServerConfig, bool) { - serverResp, err := p.RPC().ServerRPC().FindEnabledServer(p.AdminContext(), &pb.FindEnabledServerRequest{ServerId: serverId}) + serverResp, err := p.RPC().ServerRPC().FindEnabledServer(p.AdminContext(), &pb.FindEnabledServerRequest{ + ServerId: serverId, + IgnoreSSLCertData: true, + }) if err != nil { p.ErrorPage(err) return nil, nil, false } - server := serverResp.Server + var server = serverResp.Server if server == nil { p.ErrorPage(errors.New("not found server with id '" + strconv.FormatInt(serverId, 10) + "'")) return nil, nil, false