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

IP名单支持IPv6范围

Browse Source
This commit is contained in:
刘祥超
2024-04-06 14:55:29 +08:00
parent a60a7879a7
commit ca0c845759
13 changed files with 137 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/utils/ip_utils.go
View File

@@ -2,28 +2,12 @@ package utils
import (
"bytes"
"encoding/binary"
"errors"
"github.com/iwind/TeaGo/types"
"net"
"strings"
)
// IP2Long 将IP转换为整型
// 为临时过渡的函数
func IP2Long(ip string) uint64 {
var i = net.ParseIP(ip)
if len(i) == 0 {
return 0
}
if i.To4() != nil {
return uint64(binary.BigEndian.Uint32(i.To4()))
}
// TODO 支持IPv6
return 0
}
// ExtractIP 分解IP
// 只支持D段掩码的CIDR
// 最多只记录255个值

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

@@ -1,6 +1,6 @@
package ipadmin
import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils"
import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
@@ -72,29 +72,32 @@ func (this *UpdateIPPopupAction) RunPost(params struct {
Require("请输入开始IP")
// 校验IP格式（ipFrom/ipTo）
var ipFromLong uint64
if !iputils.IsIPv4(params.IpFrom) {
this.Fail("请输入正确的开始IP")
this.FailField("ipFrom", "请输入正确的开始IP")
}
ipFromLong = utils.IP2Long(params.IpFrom)
var ipToLong uint64
if len(params.IpTo) > 0 && !iputils.IsIPv4(params.IpTo) {
this.Fail("请输入正确的结束IP")
this.FailField("ipTo", "请输入正确的结束IP")
}
ipToLong = utils.IP2Long(params.IpTo)
if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
if len(params.IpTo) > 0 && iputils.CompareIP(params.IpFrom, params.IpTo) > 0 {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
}
case "ipv6":
params.Must.
Field("ipFrom", params.IpFrom).
Require("请输入IP")
Require("请输入正确的开始IP")
// 校验IP格式（ipFrom）
if !iputils.IsIPv6(params.IpFrom) {
this.Fail("请输入正确的IPv6地址")
this.FailField("ipFrom", "请输入正确的IPv6地址")
}
if len(params.IpTo) > 0 && !iputils.IsIPv6(params.IpTo) {
this.FailField("ipTo", "请输入正确的IPv6地址")
}
if len(params.IpTo) > 0 && iputils.CompareIP(params.IpFrom, params.IpTo) > 0 {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
}
case "all":
params.IpFrom = "0.0.0.0"

31
internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.go
View File

@@ -1,8 +1,8 @@
package ipadmin
import (
"github.com/TeaOSLab/EdgeAdmin/internal/utils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/actions"
@@ -71,29 +71,32 @@ func (this *UpdateIPPopupAction) RunPost(params struct {
Require("请输入开始IP")
// 校验IP格式（ipFrom/ipTo）
var ipFromLong uint64
if !utils.IsIPv4(params.IpFrom) {
this.Fail("请输入正确的开始IP")
if !iputils.IsIPv4(params.IpFrom) {
this.FailField("ipFrom", "请输入正确的开始IP")
}
ipFromLong = utils.IP2Long(params.IpFrom)
var ipToLong uint64
if len(params.IpTo) > 0 && !utils.IsIPv4(params.IpTo) {
this.Fail("请输入正确的结束IP")
if len(params.IpTo) > 0 && !iputils.IsIPv4(params.IpTo) {
this.FailField("ipTo", "请输入正确的结束IP")
}
ipToLong = utils.IP2Long(params.IpTo)
if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
if len(params.IpTo) > 0 && iputils.CompareIP(params.IpFrom, params.IpTo) > 0 {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
}
case "ipv6":
params.Must.
Field("ipFrom", params.IpFrom).
Require("请输入IP")
Require("请输入正确的开始IP")
// 校验IP格式（ipFrom）
if !utils.IsIPv6(params.IpFrom) {
this.Fail("请输入正确的IPv6地址")
if !iputils.IsIPv6(params.IpFrom) {
this.FailField("ipFrom", "请输入正确的IPv6地址")
}
if len(params.IpTo) > 0 && !iputils.IsIPv6(params.IpTo) {
this.FailField("ipTo", "请输入正确的IPv6地址")
}
if len(params.IpTo) > 0 && iputils.CompareIP(params.IpFrom, params.IpTo) > 0 {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
}
case "all":
params.IpFrom = "0.0.0.0"

32
internal/web/actions/default/servers/iplists/createIPPopup.go
View File

@@ -1,7 +1,6 @@
package iplists
import (
"github.com/TeaOSLab/EdgeAdmin/internal/utils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
@@ -90,19 +89,15 @@ func (this *CreateIPPopupAction) RunPost(params struct {
Field("ipFrom", params.IpFrom).
Require("请输入开始IP")
var ipFromLong uint64
if !iputils.IsIPv4(params.IpFrom) {
this.Fail("请输入正确的开始IP")
this.FailField("ipFrom", "请输入正确的开始IP")
}
ipFromLong = utils.IP2Long(params.IpFrom)
var ipToLong uint64
if len(params.IpTo) > 0 && !iputils.IsIPv4(params.IpTo) {
this.Fail("请输入正确的结束IP")
this.FailField("ipTo", "请输入正确的结束IP")
}
ipToLong = utils.IP2Long(params.IpTo)
if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
if len(params.IpTo) != 0 && iputils.CompareIP(params.IpFrom, params.IpTo) > 0 {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
}
} else if params.Method == "batch" {
@@ -132,7 +127,7 @@ func (this *CreateIPPopupAction) RunPost(params struct {
if net.ParseIP(ipFrom) == nil || net.ParseIP(ipTo) == nil || strings.Contains(ipFrom, ":") || strings.Contains(ipTo, ":") {
this.FailField("ipData", "第"+types.String(index+1)+"行IP格式错误："+line)
}
if utils.IP2Long(ipFrom) > utils.IP2Long(ipTo) {
if len(ipTo) > 0 && iputils.CompareIP(ipFrom, ipTo) > 0 {
ipFrom, ipTo = ipTo, ipFrom
}
batchIPs = append(batchIPs, &ipData{
@@ -147,7 +142,7 @@ func (this *CreateIPPopupAction) RunPost(params struct {
if net.ParseIP(ipFrom) == nil || net.ParseIP(ipTo) == nil || strings.Contains(ipFrom, ":") || strings.Contains(ipTo, ":") {
this.FailField("ipData", "第"+types.String(index+1)+"行IP格式错误："+line)
}
if utils.IP2Long(ipFrom) > utils.IP2Long(ipTo) {
if len(ipTo) > 0 && iputils.CompareIP(ipFrom, ipTo) > 0 {
ipFrom, ipTo = ipTo, ipFrom
}
batchIPs = append(batchIPs, &ipData{
@@ -169,11 +164,18 @@ func (this *CreateIPPopupAction) RunPost(params struct {
if params.Method == "single" {
params.Must.
Field("ipFrom", params.IpFrom).
Require("请输入IP")
Require("请输入正确的开始IP")
// 校验IP格式（ipFrom）
if !iputils.IsIPv6(params.IpFrom) {
this.Fail("请输入正确的IPv6地址")
this.FailField("ipFrom", "请输入正确的IPv6地址")
}
if len(params.IpTo) > 0 && !iputils.IsIPv6(params.IpTo) {
this.FailField("ipTo", "请输入正确的IPv6地址")
}
if len(params.IpTo) > 0 && iputils.CompareIP(params.IpFrom, params.IpTo) > 0 {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
}
} else if params.Method == "batch" {
if len(params.IpData) == 0 {
@@ -202,7 +204,7 @@ func (this *CreateIPPopupAction) RunPost(params struct {
if net.ParseIP(ipFrom) == nil || net.ParseIP(ipTo) == nil || !strings.Contains(ipFrom, ":") || !strings.Contains(ipTo, ":") {
this.FailField("ipData", "第"+types.String(index+1)+"行IP格式错误："+line)
}
if utils.IP2Long(ipFrom) > utils.IP2Long(ipTo) {
if len(ipTo) > 0 && iputils.CompareIP(ipFrom, ipTo) > 0 {
ipFrom, ipTo = ipTo, ipFrom
}
batchIPs = append(batchIPs, &ipData{
@@ -217,7 +219,7 @@ func (this *CreateIPPopupAction) RunPost(params struct {
if net.ParseIP(ipFrom) == nil || net.ParseIP(ipTo) == nil || !strings.Contains(ipFrom, ":") || !strings.Contains(ipTo, ":") {
this.FailField("ipData", "第"+types.String(index+1)+"行IP格式错误："+line)
}
if utils.IP2Long(ipFrom) > utils.IP2Long(ipTo) {
if len(ipTo) > 0 && iputils.CompareIP(ipFrom, ipTo) > 0 {
ipFrom, ipTo = ipTo, ipFrom
}
batchIPs = append(batchIPs, &ipData{

25
internal/web/actions/default/servers/iplists/updateIPPopup.go
View File

@@ -1,6 +1,6 @@
package iplists
import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils"
import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
@@ -71,29 +71,32 @@ func (this *UpdateIPPopupAction) RunPost(params struct {
Require("请输入开始IP")
// 校验IP格式（ipFrom/ipTo）
var ipFromLong uint64
if !iputils.IsIPv4(params.IpFrom) {
this.Fail("请输入正确的开始IP")
this.FailField("ipFrom", "请输入正确的开始IP")
}
ipFromLong = utils.IP2Long(params.IpFrom)
var ipToLong uint64
if len(params.IpTo) > 0 && !iputils.IsIPv4(params.IpTo) {
this.Fail("请输入正确的结束IP")
this.FailField("ipTo", "请输入正确的结束IP")
}
ipToLong = utils.IP2Long(params.IpTo)
if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
if len(params.IpTo) > 0 && iputils.CompareIP(params.IpFrom, params.IpTo) > 0 {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
}
case "ipv6":
params.Must.
Field("ipFrom", params.IpFrom).
Require("请输入IP")
Require("请输入正确的开始IP")
// 校验IP格式（ipFrom）
if !iputils.IsIPv6(params.IpFrom) {
this.Fail("请输入正确的IPv6地址")
this.FailField("ipFrom", "请输入正确的IPv6地址")
}
if len(params.IpTo) > 0 && !iputils.IsIPv6(params.IpTo) {
this.FailField("ipTo", "请输入正确的IPv6地址")
}
if len(params.IpTo) > 0 && iputils.CompareIP(params.IpFrom, params.IpTo) > 0 {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
}
case "all":
params.IpFrom = "0.0.0.0"

4
internal/web/actions/default/servers/server/settings/waf/ipadmin/denyList.go
View File

@@ -63,9 +63,9 @@ func (this *DenyListAction) RunGet(params struct {
this.ErrorPage(err)
return
}
itemMaps := []maps.Map{}
var itemMaps = []maps.Map{}
for _, item := range itemsResp.IpItems {
expiredTime := ""
var expiredTime = ""
if item.ExpiredAt > 0 {
expiredTime = timeutil.FormatTime("Y-m-d H:i:s", item.ExpiredAt)
}

25
internal/web/actions/default/servers/server/settings/waf/ipadmin/updateIPPopup.go
View File

@@ -1,6 +1,6 @@
package ipadmin
import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils"
import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
@@ -71,29 +71,32 @@ func (this *UpdateIPPopupAction) RunPost(params struct {
Require("请输入开始IP")
// 校验IP格式（ipFrom/ipTo）
var ipFromLong uint64
if !iputils.IsIPv4(params.IpFrom) {
this.Fail("请输入正确的开始IP")
this.FailField("ipFrom", "请输入正确的开始IP")
}
ipFromLong = utils.IP2Long(params.IpFrom)
var ipToLong uint64
if len(params.IpTo) > 0 && !iputils.IsIPv4(params.IpTo) {
this.Fail("请输入正确的结束IP")
this.FailField("ipTo", "请输入正确的结束IP")
}
ipToLong = utils.IP2Long(params.IpTo)
if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
if len(params.IpTo) > 0 && iputils.CompareIP(params.IpFrom, params.IpTo) > 0 {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
}
case "ipv6":
params.Must.
Field("ipFrom", params.IpFrom).
Require("请输入IP")
Require("请输入正确的开始IP")
// 校验IP格式（ipFrom）
if !iputils.IsIPv6(params.IpFrom) {
this.Fail("请输入正确的IPv6地址")
this.FailField("ipFrom", "请输入正确的IPv6地址")
}
if len(params.IpTo) > 0 && !iputils.IsIPv6(params.IpTo) {
this.FailField("ipTo", "请输入正确的IPv6地址")
}
if len(params.IpTo) > 0 && iputils.CompareIP(params.IpFrom, params.IpTo) > 0 {
params.IpTo, params.IpFrom = params.IpFrom, params.IpTo
}
case "all":
params.IpFrom = "0.0.0.0"

4
web/public/js/components/iplist/ip-list-table.js
View File

@@ -199,12 +199,12 @@ Vue.component("ip-list-table", {
<td>
<div v-if="item.expiredTime.length > 0">
{{item.expiredTime}}
<div v-if="item.isExpired" style="margin-top: 0.5em">
<div v-if="item.isExpired && item.lifeSeconds == null" style="margin-top: 0.5em">
<span class="ui label tiny basic red">已过期</span>
</div>
<div v-if="item.lifeSeconds != null">
<span class="small grey" v-if="item.lifeSeconds > 0">{{formatSeconds(item.lifeSeconds)}}</span>
<span class="small red">已过期</span>
<span class="small red" v-if="item.lifeSeconds < 0">已过期</span>
</div>
</div>
<span v-else class="disabled">不过期</span>

23
web/views/@default/servers/components/waf/ipadmin/updateIPPopup.html
View File

@@ -34,7 +34,7 @@
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x.x.x.x" v-model="item.ipTo"/>
<p class="comment">表示IP段的时候需要填写此项。</p>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
@@ -48,13 +48,20 @@
<!-- IPv6 -->
<tbody v-if="type == 'ipv6'">
<tr>
<td>IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipFrom"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>开始IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipFrom"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipTo"/>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
<tr>
<td colspan="2"><more-options-indicator></more-options-indicator></td>

11
web/views/@default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.html
View File

@@ -33,7 +33,7 @@
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x.x.x.x" v-model="item.ipTo"/>
<p class="comment">表示IP段的时候需要填写此项。</p>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
@@ -41,12 +41,19 @@
<!-- IPv6 -->
<tbody v-if="type == 'ipv6'">
<tr>
<td>IP *</td>
<td>开始IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipFrom"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipTo"/>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
<tr>

11
web/views/@default/servers/iplists/createIPPopup.html
View File

@@ -42,7 +42,7 @@
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x.x.x.x" style="width: 10em"/>
<p class="comment">表示IP段的时候需要填写此项。</p>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
@@ -50,12 +50,19 @@
<!-- IPv6 -->
<tbody v-if="method == 'single' && type == 'ipv6'">
<tr>
<td>IP *</td>
<td>开始IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" style="width: 20em"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" style="width: 20em"/>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
<!-- 批量添加 -->

23
web/views/@default/servers/iplists/updateIPPopup.html
View File

@@ -33,7 +33,7 @@
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x.x.x.x" v-model="item.ipTo"/>
<p class="comment">表示IP段的时候需要填写此项。</p>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
@@ -47,13 +47,20 @@
<!-- IPv6 -->
<tbody v-if="type == 'ipv6'">
<tr>
<td>IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipFrom"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>开始IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipFrom"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipTo"/>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
<tr>

11
web/views/@default/servers/server/settings/waf/ipadmin/updateIPPopup.html
View File

@@ -33,7 +33,7 @@
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x.x.x.x" v-model="item.ipTo"/>
<p class="comment">表示IP段的时候需要填写此项。</p>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
@@ -41,12 +41,19 @@
<!-- IPv6 -->
<tbody v-if="type == 'ipv6'">
<tr>
<td>IP *</td>
<td>开始IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipFrom"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipTo"/>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
<tr>