TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-12-28 13:36:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

IP名单新增IPv6和所有IP两种类型

Browse Source
This commit is contained in:
刘祥超
2021-02-02 15:25:11 +08:00
parent e22a9d061c
commit a0635a97d5
25 changed files with 681 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
internal/web/actions/default/servers/components/waf/ipadmin/createIPPopup.go
View File

@@ -21,7 +21,7 @@ func (this *CreateIPPopupAction) RunGet(params struct {
FirewallPolicyId int64
Type string
}) {
this.Data["type"] = params.Type
this.Data["listType"] = params.Type
listId, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledPolicyIPListIdWithType(this.AdminContext(), params.FirewallPolicyId, params.Type)
if err != nil {
@@ -40,33 +40,46 @@ func (this *CreateIPPopupAction) RunPost(params struct {
IpTo string
ExpiredAt int64
Reason string
Type string
Must *actions.Must
CSRF *actionutils.CSRF
}) {
// TODO 校验ListId所属用户
params.Must.
Field("ipFrom", params.IpFrom).
Require("请输入开始IP")
switch params.Type {
case "ipv4":
params.Must.
Field("ipFrom", params.IpFrom).
Require("请输入开始IP")
// 校验IP格式（ipFrom/ipTo）
ipFromLong := utils.IP2Long(params.IpFrom)
if len(params.IpFrom) > 0 {
if ipFromLong == 0 {
// 校验IP格式（ipFrom/ipTo）
var ipFromLong uint64
if !utils.IsIPv4(params.IpFrom) {
this.Fail("请输入正确的开始IP")
}
}
ipFromLong = utils.IP2Long(params.IpFrom)
ipToLong := utils.IP2Long(params.IpTo)
if len(params.IpTo) > 0 {
if ipToLong == 0 {
var ipToLong uint64
if len(params.IpTo) > 0 && !utils.IsIPv4(params.IpTo) {
ipToLong = utils.IP2Long(params.IpTo)
this.Fail("请输入正确的结束IP")
}
}
if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
}
case "ipv6":
params.Must.
Field("ipFrom", params.IpFrom).
Require("请输入IP")
// 校验IP格式（ipFrom）
if !utils.IsIPv6(params.IpFrom) {
this.Fail("请输入正确的IPv6地址")
}
case "all":
params.IpFrom = "0.0.0.0"
}
createResp, err := this.RPC().IPItemRPC().CreateIPItem(this.AdminContext(), &pb.CreateIPItemRequest{
@@ -75,6 +88,7 @@ func (this *CreateIPPopupAction) RunPost(params struct {
IpTo: params.IpTo,
ExpiredAt: params.ExpiredAt,
Reason: params.Reason,
Type: params.Type,
})
if err != nil {
this.ErrorPage(err)

1
internal/web/actions/default/servers/components/waf/ipadmin/lists.go
View File

@@ -63,6 +63,7 @@ func (this *ListsAction) RunGet(params struct {
"ipTo": item.IpTo,
"expiredTime": expiredTime,
"reason": item.Reason,
"type": item.Type,
})
}
this.Data["items"] = itemMaps

45
internal/web/actions/default/servers/components/waf/ipadmin/updateIPPopup.go
View File

@@ -37,8 +37,11 @@ func (this *UpdateIPPopupAction) RunGet(params struct {
"ipTo": item.IpTo,
"expiredAt": item.ExpiredAt,
"reason": item.Reason,
"type": item.Type,
}
this.Data["type"] = item.Type
this.Show()
}
@@ -50,6 +53,7 @@ func (this *UpdateIPPopupAction) RunPost(params struct {
IpTo string
ExpiredAt int64
Reason string
Type string
Must *actions.Must
CSRF *actionutils.CSRF
@@ -59,27 +63,39 @@ func (this *UpdateIPPopupAction) RunPost(params struct {
// TODO 校验ItemId所属用户
params.Must.
Field("ipFrom", params.IpFrom).
Require("请输入开始IP")
switch params.Type {
case "ipv4":
params.Must.
Field("ipFrom", params.IpFrom).
Require("请输入开始IP")
// 校验IP格式（ipFrom/ipTo）
ipFromLong := utils.IP2Long(params.IpFrom)
if len(params.IpFrom) > 0 {
if ipFromLong == 0 {
// 校验IP格式（ipFrom/ipTo）
var ipFromLong uint64
if !utils.IsIPv4(params.IpFrom) {
this.Fail("请输入正确的开始IP")
}
}
ipFromLong = utils.IP2Long(params.IpFrom)
ipToLong := utils.IP2Long(params.IpTo)
if len(params.IpTo) > 0 {
if ipToLong == 0 {
var ipToLong uint64
if len(params.IpTo) > 0 && !utils.IsIPv4(params.IpTo) {
ipToLong = utils.IP2Long(params.IpTo)
this.Fail("请输入正确的结束IP")
}
}
if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
}
case "ipv6":
params.Must.
Field("ipFrom", params.IpFrom).
Require("请输入IP")
// 校验IP格式（ipFrom）
if !utils.IsIPv6(params.IpFrom) {
this.Fail("请输入正确的IPv6地址")
}
case "all":
params.IpFrom = "0.0.0.0"
}
_, err := this.RPC().IPItemRPC().UpdateIPItem(this.AdminContext(), &pb.UpdateIPItemRequest{
@@ -88,6 +104,7 @@ func (this *UpdateIPPopupAction) RunPost(params struct {
IpTo: params.IpTo,
ExpiredAt: params.ExpiredAt,
Reason: params.Reason,
Type: params.Type,
})
if err != nil {
this.ErrorPage(err)