实现重写规则管理

This commit is contained in:
刘祥超
2020-09-28 16:25:26 +08:00
parent 7f29f97b9f
commit d553757614
37 changed files with 935 additions and 66 deletions

View File

@@ -0,0 +1,100 @@
package rewrite
import (
"encoding/json"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/iwind/TeaGo/actions"
"github.com/iwind/TeaGo/types"
"regexp"
)
type CreatePopupAction struct {
actionutils.ParentAction
}
func (this *CreatePopupAction) Init() {
}
func (this *CreatePopupAction) RunGet(params struct {
WebId int64
}) {
this.Data["webId"] = params.WebId
this.Show()
}
func (this *CreatePopupAction) RunPost(params struct {
WebId int64
Pattern string
Replace string
Mode string
RedirectStatus int
ProxyHost string
IsBreak bool
IsOn bool
Must *actions.Must
}) {
params.Must.
Field("pattern", params.Pattern).
Require("请输入匹配规则").
Expect(func() (message string, success bool) {
_, err := regexp.Compile(params.Pattern)
if err != nil {
return "匹配规则错误:" + err.Error(), false
}
return "", true
})
params.Must.
Field("replace", params.Replace).
Require("请输入目标URL")
// web配置
webConfig, err := webutils.FindWebConfigWithId(this.Parent(), params.WebId)
if err != nil {
this.ErrorPage(err)
return
}
// 创建
createResp, err := this.RPC().HTTPRewriteRuleRPC().CreateHTTPRewriteRule(this.AdminContext(), &pb.CreateHTTPRewriteRuleRequest{
Pattern: params.Pattern,
Replace: params.Replace,
Mode: params.Mode,
RedirectStatus: types.Int32(params.RedirectStatus),
ProxyHost: params.ProxyHost,
IsBreak: params.IsBreak,
IsOn: params.IsOn,
})
if err != nil {
this.ErrorPage(err)
return
}
ref := &serverconfigs.HTTPRewriteRef{
IsOn: true,
RewriteRuleId: createResp.RewriteRuleId,
}
webConfig.RewriteRefs = append(webConfig.RewriteRefs, ref)
refsJSON, err := json.Marshal(webConfig.RewriteRefs)
if err != nil {
this.ErrorPage(err)
return
}
// 设置Web中的重写规则
_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRewriteRules(this.AdminContext(), &pb.UpdateHTTPWebRewriteRulesRequest{
WebId: params.WebId,
RewriteRulesJSON: refsJSON,
})
if err != nil {
this.ErrorPage(err)
return
}
this.Success()
}

View File

@@ -0,0 +1,48 @@
package rewrite
import (
"encoding/json"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
)
type DeleteAction struct {
actionutils.ParentAction
}
func (this *DeleteAction) RunPost(params struct {
WebId int64
RewriteRuleId int64
}) {
webConfig, err := webutils.FindWebConfigWithId(this.Parent(), params.WebId)
if err != nil {
this.ErrorPage(err)
return
}
refs := []*serverconfigs.HTTPRewriteRef{}
for _, ref := range webConfig.RewriteRefs {
if ref.RewriteRuleId == params.RewriteRuleId {
continue
}
refs = append(refs, ref)
}
refsJSON, err := json.Marshal(refs)
if err != nil {
this.ErrorPage(err)
return
}
_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRewriteRules(this.AdminContext(), &pb.UpdateHTTPWebRewriteRulesRequest{
WebId: params.WebId,
RewriteRulesJSON: refsJSON,
})
if err != nil {
this.ErrorPage(err)
return
}
this.Success()
}

View File

@@ -2,6 +2,7 @@ package rewrite
import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
)
type IndexAction struct {
@@ -16,7 +17,18 @@ func (this *IndexAction) Init() {
func (this *IndexAction) RunGet(params struct {
ServerId int64
}) {
// TODO
webConfig, err := webutils.FindWebConfigWithServerId(this.Parent(), params.ServerId)
if err != nil {
this.ErrorPage(err)
return
}
this.Data["webId"] = webConfig.Id
if len(webConfig.RewriteRules) == 0 {
this.Data["rewriteRules"] = []interface{}{}
} else {
this.Data["rewriteRules"] = webConfig.RewriteRules
}
this.Show()
}

View File

@@ -13,6 +13,10 @@ func init() {
Helper(serverutils.NewServerHelper()).
Prefix("/servers/server/settings/rewrite").
Get("", new(IndexAction)).
GetPost("/createPopup", new(CreatePopupAction)).
GetPost("/updatePopup", new(UpdatePopupAction)).
Post("/delete", new(DeleteAction)).
Post("/sort", new(SortAction)).
EndAll()
})
}

View File

@@ -0,0 +1,50 @@
package rewrite
import (
"encoding/json"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
)
type SortAction struct {
actionutils.ParentAction
}
func (this *SortAction) RunPost(params struct {
WebId int64
RewriteRuleIds []int64
}) {
webConfig, err := webutils.FindWebConfigWithId(this.Parent(), params.WebId)
if err != nil {
this.ErrorPage(err)
return
}
refsMap := map[int64]*serverconfigs.HTTPRewriteRef{}
for _, ref := range webConfig.RewriteRefs {
refsMap[ref.RewriteRuleId] = ref
}
newRefs := []*serverconfigs.HTTPRewriteRef{}
for _, rewriteRuleId := range params.RewriteRuleIds {
ref, ok := refsMap[rewriteRuleId]
if ok {
newRefs = append(newRefs, ref)
}
}
refsJSON, err := json.Marshal(newRefs)
if err != nil {
this.ErrorPage(err)
return
}
_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRewriteRules(this.AdminContext(), &pb.UpdateHTTPWebRewriteRulesRequest{
WebId: params.WebId,
RewriteRulesJSON: refsJSON,
})
if err != nil {
this.ErrorPage(err)
return
}
this.Success()
}

View File

@@ -0,0 +1,93 @@
package rewrite
import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/actions"
"github.com/iwind/TeaGo/types"
"regexp"
)
type UpdatePopupAction struct {
actionutils.ParentAction
}
func (this *UpdatePopupAction) Init() {
}
func (this *UpdatePopupAction) RunGet(params struct {
WebId int64
RewriteRuleId int64
}) {
this.Data["webId"] = params.WebId
webConfig, err := webutils.FindWebConfigWithId(this.Parent(), params.WebId)
if err != nil {
this.ErrorPage(err)
return
}
isFound := false
for _, rewriteRule := range webConfig.RewriteRules {
if rewriteRule.Id == params.RewriteRuleId {
this.Data["rewriteRule"] = rewriteRule
isFound = true
break
}
}
if !isFound {
this.WriteString("找不到要修改的重写规则")
return
}
this.Show()
}
func (this *UpdatePopupAction) RunPost(params struct {
WebId int64
RewriteRuleId int64
Pattern string
Replace string
Mode string
RedirectStatus int
ProxyHost string
IsBreak bool
IsOn bool
Must *actions.Must
}) {
params.Must.
Field("pattern", params.Pattern).
Require("请输入匹配规则").
Expect(func() (message string, success bool) {
_, err := regexp.Compile(params.Pattern)
if err != nil {
return "匹配规则错误:" + err.Error(), false
}
return "", true
})
params.Must.
Field("replace", params.Replace).
Require("请输入目标URL")
// 修改
_, err := this.RPC().HTTPRewriteRuleRPC().UpdateHTTPRewriteRule(this.AdminContext(), &pb.UpdateHTTPRewriteRuleRequest{
RewriteRuleId: params.RewriteRuleId,
Pattern: params.Pattern,
Replace: params.Replace,
Mode: params.Mode,
RedirectStatus: types.Int32(params.RedirectStatus),
ProxyHost: params.ProxyHost,
IsBreak: params.IsBreak,
IsOn: params.IsOn,
})
if err != nil {
this.ErrorPage(err)
return
}
this.Success()
}