增加字符编码/HTTP Header管理

2025-12-07 13:40:24 +08:00 · 2020-09-16 20:29:13 +08:00
parent 5b35be650b
commit 00084a8f66
23 changed files with 827 additions and 50 deletions
--- a/internal/web/actions/default/servers/server/settings/headers/createDeletePopup.go
+++ b/internal/web/actions/default/servers/server/settings/headers/createDeletePopup.go
@@ -0,0 +1,57 @@
+package headers
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type CreateDeletePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreateDeletePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *CreateDeletePopupAction) RunGet(params struct {
+	HeaderPolicyId int64
+}) {
+	this.Data["headerPolicyId"] = params.HeaderPolicyId
+
+	this.Show()
+}
+
+func (this *CreateDeletePopupAction) RunPost(params struct {
+	HeaderPolicyId int64
+	Name           string
+
+	Must *actions.Must
+}) {
+	policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HeaderPolicyId: params.HeaderPolicyId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	policyConfig := &shared.HTTPHeaderPolicy{}
+	err = json.Unmarshal(policyConfigResp.Config, policyConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	deleteHeaders := policyConfig.DeletedHeaders
+	deleteHeaders = append(deleteHeaders, params.Name)
+	_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicyDeletingHeaders(this.AdminContext(), &pb.UpdateHTTPHeaderPolicyDeletingHeadersRequest{
+		HeaderPolicyId: params.HeaderPolicyId,
+		HeaderNames:    deleteHeaders,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}
--- a/internal/web/actions/default/servers/server/settings/headers/createSetPopup.go
+++ b/internal/web/actions/default/servers/server/settings/headers/createSetPopup.go
@@ -0,0 +1,86 @@
+package headers
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type CreateSetPopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreateSetPopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *CreateSetPopupAction) RunGet(params struct {
+	ServerId       int64
+	HeaderPolicyId int64
+}) {
+	this.Data["headerPolicyId"] = params.HeaderPolicyId
+
+	this.Show()
+}
+
+func (this *CreateSetPopupAction) RunPost(params struct {
+	HeaderPolicyId int64
+	Name           string
+	Value          string
+
+	Must *actions.Must
+}) {
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入Header名称")
+
+	configResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HeaderPolicyId: params.HeaderPolicyId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	policyConfig := &shared.HTTPHeaderPolicy{}
+	err = json.Unmarshal(configResp.Config, policyConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 创建Header
+	createHeaderResp, err := this.RPC().HTTPHeaderRPC().CreateHTTPHeader(this.AdminContext(), &pb.CreateHTTPHeaderRequest{
+		Name:  params.Name,
+		Value: params.Value,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	headerId := createHeaderResp.HeaderId
+
+	// 保存
+	policyConfig.SetHeaders = append(policyConfig.SetHeaders, &shared.HTTPHeaderConfig{
+		Id:     headerId,
+		IsOn:   true,
+		Name:   params.Name,
+		Value:  params.Value,
+		Status: nil,
+	})
+	setHeadersJSON, err := json.Marshal(policyConfig.SetHeaders)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicySettingHeaders(this.AdminContext(), &pb.UpdateHTTPHeaderPolicySettingHeadersRequest{
+		HeaderPolicyId: params.HeaderPolicyId,
+		HeadersJSON:    setHeadersJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}
--- a/internal/web/actions/default/servers/server/settings/headers/delete.go
+++ b/internal/web/actions/default/servers/server/settings/headers/delete.go
@@ -0,0 +1,118 @@
+package headers
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+)
+
+// 删除Header
+type DeleteAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteAction) RunPost(params struct {
+	HeaderPolicyId int64
+	Type           string
+	HeaderId       int64
+}) {
+	policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{
+		HeaderPolicyId: params.HeaderPolicyId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	policyConfig := &shared.HTTPHeaderPolicy{}
+	err = json.Unmarshal(policyConfigResp.Config, policyConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	switch params.Type {
+	case "addHeader":
+		result := []*shared.HTTPHeaderConfig{}
+		for _, h := range policyConfig.AddHeaders {
+			if h.Id != params.HeaderId {
+				result = append(result, h)
+			}
+		}
+		resultJSON, err := json.Marshal(result)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicyAddingHeaders(this.AdminContext(), &pb.UpdateHTTPHeaderPolicyAddingHeadersRequest{
+			HeaderPolicyId: params.HeaderPolicyId,
+			HeadersJSON:    resultJSON,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	case "setHeader":
+		result := []*shared.HTTPHeaderConfig{}
+		for _, h := range policyConfig.SetHeaders {
+			if h.Id != params.HeaderId {
+				result = append(result, h)
+			}
+		}
+		resultJSON, err := json.Marshal(result)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicySettingHeaders(this.AdminContext(), &pb.UpdateHTTPHeaderPolicySettingHeadersRequest{
+			HeaderPolicyId: params.HeaderPolicyId,
+			HeadersJSON:    resultJSON,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	case "replace":
+		result := []*shared.HTTPHeaderConfig{}
+		for _, h := range policyConfig.ReplaceHeaders {
+			if h.Id != params.HeaderId {
+				result = append(result, h)
+			}
+		}
+		resultJSON, err := json.Marshal(result)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicyReplacingHeaders(this.AdminContext(), &pb.UpdateHTTPHeaderPolicyReplacingHeadersRequest{
+			HeaderPolicyId: params.HeaderPolicyId,
+			HeadersJSON:    resultJSON,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	case "addTrailer":
+		result := []*shared.HTTPHeaderConfig{}
+		for _, h := range policyConfig.AddTrailers {
+			if h.Id != params.HeaderId {
+				result = append(result, h)
+			}
+		}
+		resultJSON, err := json.Marshal(result)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicyAddingTrailers(this.AdminContext(), &pb.UpdateHTTPHeaderPolicyAddingTrailersRequest{
+			HeaderPolicyId: params.HeaderPolicyId,
+			HeadersJSON:    resultJSON,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	this.Success()
+}
--- a/internal/web/actions/default/servers/server/settings/headers/deleteDeletingHeader.go
+++ b/internal/web/actions/default/servers/server/settings/headers/deleteDeletingHeader.go
@@ -0,0 +1,48 @@
+package headers
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+)
+
+type DeleteDeletingHeaderAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteDeletingHeaderAction) RunPost(params struct {
+	HeaderPolicyId int64
+	HeaderName     string
+}) {
+	policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HeaderPolicyId: params.HeaderPolicyId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	policyConfigJSON := policyConfigResp.Config
+	policyConfig := &shared.HTTPHeaderPolicy{}
+	err = json.Unmarshal(policyConfigJSON, policyConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	headerNames := []string{}
+	for _, h := range policyConfig.DeletedHeaders {
+		if h == params.HeaderName {
+			continue
+		}
+		headerNames = append(headerNames, h)
+	}
+	_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicyDeletingHeaders(this.AdminContext(), &pb.UpdateHTTPHeaderPolicyDeletingHeadersRequest{
+		HeaderPolicyId: params.HeaderPolicyId,
+		HeaderNames:    headerNames,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}
--- a/internal/web/actions/default/servers/server/settings/headers/index.go
+++ b/internal/web/actions/default/servers/server/settings/headers/index.go
@@ -1,7 +1,11 @@
 package headers

 import (
+	"encoding/json"
+	"errors"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 )

 type IndexAction struct {
@@ -16,7 +20,73 @@ func (this *IndexAction) Init() {
 func (this *IndexAction) RunGet(params struct {
 	ServerId int64
 }) {
-	// TODO
+	webConfigResp, err := this.RPC().ServerRPC().FindAndInitServerWebConfig(this.AdminContext(), &pb.FindAndInitServerWebRequest{ServerId: params.ServerId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	webConfig := &serverconfigs.HTTPWebConfig{}
+	err = json.Unmarshal(webConfigResp.Config, webConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 初始化Header
+	webResp, err := this.RPC().HTTPWebRPC().FindEnabledHTTPWeb(this.AdminContext(), &pb.FindEnabledHTTPWebRequest{WebId: webConfig.Id})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	web := webResp.Web
+	if web == nil {
+		this.ErrorPage(errors.New("web should not be nil"))
+		return
+	}
+	isChanged := false
+	if web.RequestHeaderPolicyId <= 0 {
+		createHeaderPolicyResp, err := this.RPC().HTTPHeaderPolicyRPC().CreateHTTPHeaderPolicy(this.AdminContext(), &pb.CreateHTTPHeaderPolicyRequest{})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		headerPolicyId := createHeaderPolicyResp.HeaderPolicyId
+		_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRequestHeaderPolicy(this.AdminContext(), &pb.UpdateHTTPWebRequestHeaderPolicyRequest{
+			WebId:          web.Id,
+			HeaderPolicyId: headerPolicyId,
+		})
+		isChanged = true
+	}
+	if web.ResponseHeaderPolicyId <= 0 {
+		createHeaderPolicyResp, err := this.RPC().HTTPHeaderPolicyRPC().CreateHTTPHeaderPolicy(this.AdminContext(), &pb.CreateHTTPHeaderPolicyRequest{})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		headerPolicyId := createHeaderPolicyResp.HeaderPolicyId
+		_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebResponseHeaderPolicy(this.AdminContext(), &pb.UpdateHTTPWebResponseHeaderPolicyRequest{
+			WebId:          web.Id,
+			HeaderPolicyId: headerPolicyId,
+		})
+		isChanged = true
+	}
+
+	// 重新获取配置
+	if isChanged {
+		webConfigResp, err := this.RPC().ServerRPC().FindAndInitServerWebConfig(this.AdminContext(), &pb.FindAndInitServerWebRequest{ServerId: params.ServerId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		err = json.Unmarshal(webConfigResp.Config, webConfig)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	this.Data["requestHeaderPolicy"] = webConfig.RequestHeaders
+	this.Data["responseHeaderPolicy"] = webConfig.ResponseHeaders

 	this.Show()
 }
--- a/internal/web/actions/default/servers/server/settings/headers/init.go
+++ b/internal/web/actions/default/servers/server/settings/headers/init.go
@@ -13,6 +13,11 @@ func init() {
 			Helper(serverutils.NewServerHelper()).
 			Prefix("/servers/server/settings/headers").
 			Get("", new(IndexAction)).
+			GetPost("/createSetPopup", new(CreateSetPopupAction)).
+			GetPost("/updateSetPopup", new(UpdateSetPopupAction)).
+			GetPost("/createDeletePopup", new(CreateDeletePopupAction)).
+			Post("/deleteDeletingHeader", new(DeleteDeletingHeaderAction)).
+			Post("/delete", new(DeleteAction)).
 			EndAll()
 	})
 }
--- a/internal/web/actions/default/servers/server/settings/headers/updateSetPopup.go
+++ b/internal/web/actions/default/servers/server/settings/headers/updateSetPopup.go
@@ -0,0 +1,63 @@
+package headers
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type UpdateSetPopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateSetPopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *UpdateSetPopupAction) RunGet(params struct {
+	HeaderPolicyId int64
+	HeaderId       int64
+}) {
+	this.Data["headerPolicyId"] = params.HeaderPolicyId
+	this.Data["headerId"] = params.HeaderId
+
+	headerResp, err := this.RPC().HTTPHeaderRPC().FindEnabledHTTPHeaderConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderConfigRequest{HeaderId: params.HeaderId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	headerConfig := &shared.HTTPHeaderConfig{}
+	err = json.Unmarshal(headerResp.Config, headerConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["headerConfig"] = headerConfig
+
+	this.Show()
+}
+
+func (this *UpdateSetPopupAction) RunPost(params struct {
+	HeaderId int64
+	Name     string
+	Value    string
+
+	Must *actions.Must
+}) {
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入Header名称")
+
+	_, err := this.RPC().HTTPHeaderRPC().UpdateHTTPHeader(this.AdminContext(), &pb.UpdateHTTPHeaderRequest{
+		HeaderId: params.HeaderId,
+		Name:     params.Name,
+		Value:    params.Value,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+	}
+
+	this.Success()
+}