From 662e621a9edba3db204cbf60d0a2898c68622bc9 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sun, 14 Apr 2024 16:45:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6TCP=E5=92=8CUDP=E7=BD=91?= =?UTF-8?q?=E7=AB=99=E6=93=8D=E4=BD=9CHTTP=E7=BD=91=E7=AB=99=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/web/actions/actionutils/parent_action.go | 11 +++++++++++ .../default/servers/server/settings/access/index.go | 5 +++++ .../servers/server/settings/accessLog/index.go | 5 +++++ .../default/servers/server/settings/cache/index.go | 5 +++++ .../default/servers/server/settings/charset/index.go | 8 +++++++- .../default/servers/server/settings/common/index.go | 5 +++++ .../servers/server/settings/compression/index.go | 5 +++++ .../default/servers/server/settings/fastcgi/index.go | 5 +++++ .../default/servers/server/settings/headers/index.go | 5 +++++ .../default/servers/server/settings/http/index.go | 5 +++++ .../default/servers/server/settings/https/index.go | 5 +++++ .../servers/server/settings/locations/index.go | 5 +++++ .../default/servers/server/settings/pages/index.go | 5 +++++ .../servers/server/settings/redirects/index.go | 5 +++++ .../default/servers/server/settings/referers/index.go | 5 +++++ .../servers/server/settings/remoteAddr/index.go | 5 +++++ .../servers/server/settings/requestLimit/index.go | 5 +++++ .../default/servers/server/settings/rewrite/index.go | 5 +++++ .../servers/server/settings/userAgent/index.go | 5 +++++ .../default/servers/server/settings/waf/index.go | 5 +++++ .../default/servers/server/settings/web/index.go | 5 +++++ .../default/servers/server/settings/webp/index.go | 5 +++++ .../servers/server/settings/websocket/index.go | 5 +++++ .../default/servers/serverutils/server_helper.go | 4 ++-- 24 files changed, 125 insertions(+), 3 deletions(-) diff --git a/internal/web/actions/actionutils/parent_action.go b/internal/web/actions/actionutils/parent_action.go index 2438b2c1..6bfabf6e 100644 --- a/internal/web/actions/actionutils/parent_action.go +++ b/internal/web/actions/actionutils/parent_action.go @@ -169,3 +169,14 @@ func (this *ParentAction) FailLang(messageCode langs.MessageCode, args ...any) { func (this *ParentAction) FailFieldLang(field string, messageCode langs.MessageCode, args ...any) { this.FailField(field, langs.Message(this.LangCode(), messageCode, args...)) } + +func (this *ParentAction) FilterHTTPFamily() bool { + if this.Data.GetString("serverFamily") == "http" { + return false + } + + this.ResponseWriter.WriteHeader(http.StatusNotFound) + _, _ = this.ResponseWriter.Write([]byte("page not found")) + + return true +} diff --git a/internal/web/actions/default/servers/server/settings/access/index.go b/internal/web/actions/default/servers/server/settings/access/index.go index e339bf1e..d8d18990 100644 --- a/internal/web/actions/default/servers/server/settings/access/index.go +++ b/internal/web/actions/default/servers/server/settings/access/index.go @@ -24,6 +24,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/server/settings/accessLog/index.go b/internal/web/actions/default/servers/server/settings/accessLog/index.go index 7712c3d1..afd3e167 100644 --- a/internal/web/actions/default/servers/server/settings/accessLog/index.go +++ b/internal/web/actions/default/servers/server/settings/accessLog/index.go @@ -21,6 +21,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + // 网站分组设置 groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ ServerId: params.ServerId, diff --git a/internal/web/actions/default/servers/server/settings/cache/index.go b/internal/web/actions/default/servers/server/settings/cache/index.go index 9e30e6e9..e7c57aaa 100644 --- a/internal/web/actions/default/servers/server/settings/cache/index.go +++ b/internal/web/actions/default/servers/server/settings/cache/index.go @@ -28,6 +28,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + // 服务分组设置 groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ ServerId: params.ServerId, diff --git a/internal/web/actions/default/servers/server/settings/charset/index.go b/internal/web/actions/default/servers/server/settings/charset/index.go index 7a609839..7ace66c3 100644 --- a/internal/web/actions/default/servers/server/settings/charset/index.go +++ b/internal/web/actions/default/servers/server/settings/charset/index.go @@ -1,6 +1,7 @@ package charset -import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" @@ -21,6 +22,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + // 服务分组设置 groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ ServerId: params.ServerId, diff --git a/internal/web/actions/default/servers/server/settings/common/index.go b/internal/web/actions/default/servers/server/settings/common/index.go index a79d53b6..244c4efd 100644 --- a/internal/web/actions/default/servers/server/settings/common/index.go +++ b/internal/web/actions/default/servers/server/settings/common/index.go @@ -23,6 +23,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + this.Data["hasGroupConfig"] = false webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId) diff --git a/internal/web/actions/default/servers/server/settings/compression/index.go b/internal/web/actions/default/servers/server/settings/compression/index.go index 6d6fec4d..340dde87 100644 --- a/internal/web/actions/default/servers/server/settings/compression/index.go +++ b/internal/web/actions/default/servers/server/settings/compression/index.go @@ -25,6 +25,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + // 服务分组设置 groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ ServerId: params.ServerId, diff --git a/internal/web/actions/default/servers/server/settings/fastcgi/index.go b/internal/web/actions/default/servers/server/settings/fastcgi/index.go index f8f236bd..e3fca19d 100644 --- a/internal/web/actions/default/servers/server/settings/fastcgi/index.go +++ b/internal/web/actions/default/servers/server/settings/fastcgi/index.go @@ -22,6 +22,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/server/settings/headers/index.go b/internal/web/actions/default/servers/server/settings/headers/index.go index f92eb8f3..6f610890 100644 --- a/internal/web/actions/default/servers/server/settings/headers/index.go +++ b/internal/web/actions/default/servers/server/settings/headers/index.go @@ -21,6 +21,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + // 服务分组设置 groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ ServerId: params.ServerId, diff --git a/internal/web/actions/default/servers/server/settings/http/index.go b/internal/web/actions/default/servers/server/settings/http/index.go index e2de243e..64244b57 100644 --- a/internal/web/actions/default/servers/server/settings/http/index.go +++ b/internal/web/actions/default/servers/server/settings/http/index.go @@ -28,6 +28,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + server, _, isOk := serverutils.FindServer(this.Parent(), params.ServerId) if !isOk { 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 1782cabc..3c85d62b 100644 --- a/internal/web/actions/default/servers/server/settings/https/index.go +++ b/internal/web/actions/default/servers/server/settings/https/index.go @@ -29,6 +29,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + server, _, isOk := serverutils.FindServer(this.Parent(), params.ServerId) if !isOk { return diff --git a/internal/web/actions/default/servers/server/settings/locations/index.go b/internal/web/actions/default/servers/server/settings/locations/index.go index 55f330f6..6e39f9a9 100644 --- a/internal/web/actions/default/servers/server/settings/locations/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/index.go @@ -21,6 +21,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/server/settings/pages/index.go b/internal/web/actions/default/servers/server/settings/pages/index.go index 867d9de0..f756c079 100644 --- a/internal/web/actions/default/servers/server/settings/pages/index.go +++ b/internal/web/actions/default/servers/server/settings/pages/index.go @@ -24,6 +24,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + // 分组设置 groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ ServerId: params.ServerId, diff --git a/internal/web/actions/default/servers/server/settings/redirects/index.go b/internal/web/actions/default/servers/server/settings/redirects/index.go index e3a10a18..cfa8a4c3 100644 --- a/internal/web/actions/default/servers/server/settings/redirects/index.go +++ b/internal/web/actions/default/servers/server/settings/redirects/index.go @@ -20,6 +20,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/server/settings/referers/index.go b/internal/web/actions/default/servers/server/settings/referers/index.go index e9a5dee1..5cf651cb 100644 --- a/internal/web/actions/default/servers/server/settings/referers/index.go +++ b/internal/web/actions/default/servers/server/settings/referers/index.go @@ -23,6 +23,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + this.Data["serverId"] = params.ServerId webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId) 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 88d2748b..ae068b1f 100644 --- a/internal/web/actions/default/servers/server/settings/remoteAddr/index.go +++ b/internal/web/actions/default/servers/server/settings/remoteAddr/index.go @@ -26,6 +26,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + // 服务分组设置 groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ ServerId: params.ServerId, diff --git a/internal/web/actions/default/servers/server/settings/requestLimit/index.go b/internal/web/actions/default/servers/server/settings/requestLimit/index.go index cdf00e5f..5d7c6d97 100644 --- a/internal/web/actions/default/servers/server/settings/requestLimit/index.go +++ b/internal/web/actions/default/servers/server/settings/requestLimit/index.go @@ -23,6 +23,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + // 服务分组设置 groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ ServerId: params.ServerId, diff --git a/internal/web/actions/default/servers/server/settings/rewrite/index.go b/internal/web/actions/default/servers/server/settings/rewrite/index.go index f771e176..c2bac322 100644 --- a/internal/web/actions/default/servers/server/settings/rewrite/index.go +++ b/internal/web/actions/default/servers/server/settings/rewrite/index.go @@ -17,6 +17,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/server/settings/userAgent/index.go b/internal/web/actions/default/servers/server/settings/userAgent/index.go index 7c7e4654..b6778b6c 100644 --- a/internal/web/actions/default/servers/server/settings/userAgent/index.go +++ b/internal/web/actions/default/servers/server/settings/userAgent/index.go @@ -23,6 +23,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + this.Data["serverId"] = params.ServerId webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId) diff --git a/internal/web/actions/default/servers/server/settings/waf/index.go b/internal/web/actions/default/servers/server/settings/waf/index.go index 791285ed..88ed4d54 100644 --- a/internal/web/actions/default/servers/server/settings/waf/index.go +++ b/internal/web/actions/default/servers/server/settings/waf/index.go @@ -24,6 +24,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + // 服务分组设置 groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ ServerId: params.ServerId, diff --git a/internal/web/actions/default/servers/server/settings/web/index.go b/internal/web/actions/default/servers/server/settings/web/index.go index 9cff4535..2982bd28 100644 --- a/internal/web/actions/default/servers/server/settings/web/index.go +++ b/internal/web/actions/default/servers/server/settings/web/index.go @@ -21,6 +21,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + // 分组设置 groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ ServerId: params.ServerId, diff --git a/internal/web/actions/default/servers/server/settings/webp/index.go b/internal/web/actions/default/servers/server/settings/webp/index.go index b410737e..e2c47ab0 100644 --- a/internal/web/actions/default/servers/server/settings/webp/index.go +++ b/internal/web/actions/default/servers/server/settings/webp/index.go @@ -25,6 +25,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + // 服务分组设置 groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ ServerId: params.ServerId, diff --git a/internal/web/actions/default/servers/server/settings/websocket/index.go b/internal/web/actions/default/servers/server/settings/websocket/index.go index da26c6a0..ad81746e 100644 --- a/internal/web/actions/default/servers/server/settings/websocket/index.go +++ b/internal/web/actions/default/servers/server/settings/websocket/index.go @@ -23,6 +23,11 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { + // 只有HTTP服务才支持 + if this.FilterHTTPFamily() { + return + } + // 服务分组设置 groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ ServerId: params.ServerId, diff --git a/internal/web/actions/default/servers/serverutils/server_helper.go b/internal/web/actions/default/servers/serverutils/server_helper.go index 710c6dfe..9eef97bf 100644 --- a/internal/web/actions/default/servers/serverutils/server_helper.go +++ b/internal/web/actions/default/servers/serverutils/server_helper.go @@ -50,7 +50,7 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) { if serverId == 0 { return } - serverIdString := strconv.FormatInt(serverId, 10) + var serverIdString = strconv.FormatInt(serverId, 10) action.Data["serverId"] = serverId // 读取server信息 @@ -95,7 +95,7 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) { } // 协议簇 - family := "" + var family = "" if serverConfig.IsHTTPFamily() { family = "http" } else if serverConfig.IsTCPFamily() {