增加字符编码/HTTP Header管理

2025-12-28 00:06:36 +08:00 · 2020-09-16 20:29:18 +08:00
parent eae2e63db3
commit 58bce36fb3
18 changed files with 857 additions and 117 deletions
--- a/internal/rpc/services/service_base.go
+++ b/internal/rpc/services/service_base.go
@@ -0,0 +1,4 @@
+package services
+
+type BaseService struct {
+}
--- a/internal/rpc/services/service_http_header.go
+++ b/internal/rpc/services/service_http_header.go
@@ -0,0 +1,61 @@
+package services
+
+import (
+	"context"
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type HTTPHeaderService struct {
+}
+
+// 创建Header
+func (this *HTTPHeaderService) CreateHTTPHeader(ctx context.Context, req *pb.CreateHTTPHeaderRequest) (*pb.CreateHTTPHeaderResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	headerId, err := models.SharedHTTPHeaderDAO.CreateHeader(req.Name, req.Value)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.CreateHTTPHeaderResponse{HeaderId: headerId}, nil
+}
+
+// 修改Header
+func (this *HTTPHeaderService) UpdateHTTPHeader(ctx context.Context, req *pb.UpdateHTTPHeaderRequest) (*pb.UpdateHTTPHeaderResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedHTTPHeaderDAO.UpdateHeader(req.HeaderId, req.Name, req.Value)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.UpdateHTTPHeaderResponse{}, nil
+}
+
+// 查找配置
+func (this *HTTPHeaderService) FindEnabledHTTPHeaderConfig(ctx context.Context, req *pb.FindEnabledHTTPHeaderConfigRequest) (*pb.FindEnabledHTTPHeaderConfigResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	config, err := models.SharedHTTPHeaderDAO.ComposeHeaderConfig(req.HeaderId)
+	if err != nil {
+		return nil, err
+	}
+	configData, err := json.Marshal(config)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.FindEnabledHTTPHeaderConfigResponse{Config: configData}, nil
+}
--- a/internal/rpc/services/service_http_header_policy.go
+++ b/internal/rpc/services/service_http_header_policy.go
@@ -0,0 +1,122 @@
+package services
+
+import (
+	"context"
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type HTTPHeaderPolicyService struct {
+}
+
+// 查找策略配置
+func (this *HTTPHeaderPolicyService) FindEnabledHTTPHeaderPolicyConfig(ctx context.Context, req *pb.FindEnabledHTTPHeaderPolicyConfigRequest) (*pb.FindEnabledHTTPHeaderPolicyConfigResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	config, err := models.SharedHTTPHeaderPolicyDAO.ComposeHeaderPolicyConfig(req.HeaderPolicyId)
+	if err != nil {
+		return nil, err
+	}
+
+	configData, err := json.Marshal(config)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.FindEnabledHTTPHeaderPolicyConfigResponse{Config: configData}, nil
+}
+
+// 创建策略
+func (this *HTTPHeaderPolicyService) CreateHTTPHeaderPolicy(ctx context.Context, req *pb.CreateHTTPHeaderPolicyRequest) (*pb.CreateHTTPHeaderPolicyResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	headerPolicyId, err := models.SharedHTTPHeaderPolicyDAO.CreateHeaderPolicy()
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.CreateHTTPHeaderPolicyResponse{HeaderPolicyId: headerPolicyId}, nil
+}
+
+// 修改AddHeaders
+func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicyAddingHeaders(ctx context.Context, req *pb.UpdateHTTPHeaderPolicyAddingHeadersRequest) (*pb.UpdateHTTPHeaderPolicyAddingHeadersResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedHTTPHeaderPolicyDAO.UpdateAddingHeaders(req.HeaderPolicyId, req.HeadersJSON)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.UpdateHTTPHeaderPolicyAddingHeadersResponse{}, nil
+}
+
+// 修改SetHeaders
+func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicySettingHeaders(ctx context.Context, req *pb.UpdateHTTPHeaderPolicySettingHeadersRequest) (*pb.UpdateHTTPHeaderPolicySettingHeadersResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedHTTPHeaderPolicyDAO.UpdateSettingHeaders(req.HeaderPolicyId, req.HeadersJSON)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.UpdateHTTPHeaderPolicySettingHeadersResponse{}, nil
+}
+
+// 修改AddTrailers
+func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicyAddingTrailers(ctx context.Context, req *pb.UpdateHTTPHeaderPolicyAddingTrailersRequest) (*pb.UpdateHTTPHeaderPolicyAddingTrailersResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedHTTPHeaderPolicyDAO.UpdateAddingTrailers(req.HeaderPolicyId, req.HeadersJSON)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.UpdateHTTPHeaderPolicyAddingTrailersResponse{}, nil
+}
+
+// 修改ReplaceHeaders
+func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicyReplacingHeaders(ctx context.Context, req *pb.UpdateHTTPHeaderPolicyReplacingHeadersRequest) (*pb.UpdateHTTPHeaderPolicyReplacingHeadersResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedHTTPHeaderPolicyDAO.UpdateReplacingHeaders(req.HeaderPolicyId, req.HeadersJSON)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.UpdateHTTPHeaderPolicyReplacingHeadersResponse{}, nil
+}
+
+// 修改删除的Headers
+func (this *HTTPHeaderPolicyService) UpdateHTTPHeaderPolicyDeletingHeaders(ctx context.Context, req *pb.UpdateHTTPHeaderPolicyDeletingHeadersRequest) (*pb.UpdateHTTPHeaderPolicyDeletingHeadersResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedHTTPHeaderPolicyDAO.UpdateDeletingHeaders(req.HeaderPolicyId, req.HeaderNames)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.UpdateHTTPHeaderPolicyDeletingHeadersResponse{}, nil
+}
--- a/internal/rpc/services/service_http_web.go
+++ b/internal/rpc/services/service_http_web.go
@@ -48,6 +48,9 @@ func (this *HTTPWebService) FindEnabledHTTPWeb(ctx context.Context, req *pb.Find
 	result.IsOn = web.IsOn == 1
 	result.Root = web.Root
 	result.GzipId = int64(web.GzipId)
+	result.Charset = web.Charset
+	result.RequestHeaderPolicyId = int64(web.RequestHeaderPolicyId)
+	result.ResponseHeaderPolicyId = int64(web.ResponseHeaderPolicyId)
 	return &pb.FindEnabledHTTPWebResponse{Web: result}, nil
 }

@@ -82,3 +85,51 @@ func (this *HTTPWebService) UpdateHTTPWebGzip(ctx context.Context, req *pb.Updat

 	return &pb.UpdateHTTPWebGzipResponse{}, nil
 }
+
+// 修改字符集配置
+func (this *HTTPWebService) UpdateHTTPWebCharset(ctx context.Context, req *pb.UpdateHTTPWebCharsetRequest) (*pb.UpdateHTTPWebCharsetResponse, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedHTTPWebDAO.UpdateWebCharset(req.WebId, req.Charset)
+	if err != nil {
+		return nil, err
+	}
+	return &pb.UpdateHTTPWebCharsetResponse{}, nil
+}
+
+// 更改请求Header策略
+func (this *HTTPWebService) UpdateHTTPWebRequestHeaderPolicy(ctx context.Context, req *pb.UpdateHTTPWebRequestHeaderPolicyRequest) (*pb.UpdateHTTPWebRequestHeaderPolicyResponse, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedHTTPWebDAO.UpdateHTTPWebRequestHeaderPolicy(req.WebId, req.HeaderPolicyId)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.UpdateHTTPWebRequestHeaderPolicyResponse{}, nil
+}
+
+// 更改响应Header策略
+func (this *HTTPWebService) UpdateHTTPWebResponseHeaderPolicy(ctx context.Context, req *pb.UpdateHTTPWebResponseHeaderPolicyRequest) (*pb.UpdateHTTPWebResponseHeaderPolicyResponse, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedHTTPWebDAO.UpdateHTTPWebResponseHeaderPolicy(req.WebId, req.HeaderPolicyId)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.UpdateHTTPWebResponseHeaderPolicyResponse{}, nil
+
+}
--- a/internal/rpc/services/service_server.go
+++ b/internal/rpc/services/service_server.go
@@ -562,16 +562,32 @@ func (this *ServerService) FindServerReverseProxyConfig(ctx context.Context, req
 }

 // 初始化Web设置
-func (this *ServerService) InitServerWeb(ctx context.Context, req *pb.InitServerWebRequest) (*pb.InitServerWebResponse, error) {
+func (this *ServerService) FindAndInitServerWebConfig(ctx context.Context, req *pb.FindAndInitServerWebRequest) (*pb.FindAndInitServerWebResponse, error) {
 	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
 	if err != nil {
 		return nil, err
 	}

-	webId, err := models.SharedServerDAO.InitServerWeb(req.ServerId)
+	webId, err := models.SharedServerDAO.FindServerWebId(req.ServerId)
 	if err != nil {
 		return nil, err
 	}

-	return &pb.InitServerWebResponse{WebId: webId}, nil
+	if webId == 0 {
+		webId, err = models.SharedServerDAO.InitServerWeb(req.ServerId)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	config, err := models.SharedHTTPWebDAO.ComposeWebConfig(webId)
+	if err != nil {
+		return nil, err
+	}
+	configJSON, err := json.Marshal(config)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.FindAndInitServerWebResponse{Config: configJSON}, nil
 }