diff --git a/backend/app/service/firewall.go b/backend/app/service/firewall.go index 6ff0748ae..6ae63ca99 100644 --- a/backend/app/service/firewall.go +++ b/backend/app/service/firewall.go @@ -219,51 +219,67 @@ func (u *FirewallService) OperatePortRule(req dto.PortRuleOperate, reload bool) return err } protos := strings.Split(req.Protocol, "/") + itemAddress := strings.Split(strings.TrimSuffix(req.Address, ","), ",") if client.Name() == "ufw" { - if len(req.Address) == 0 { - req.Address = "Anywhere" - } if strings.Contains(req.Port, ",") || strings.Contains(req.Port, "-") { for _, proto := range protos { - req.Port = strings.ReplaceAll(req.Port, "-", ":") - req.Protocol = proto - if err := u.operatePort(client, req); err != nil { - return err + for _, addr := range itemAddress { + if len(addr) == 0 { + addr = "Anywhere" + } + req.Address = addr + req.Port = strings.ReplaceAll(req.Port, "-", ":") + req.Protocol = proto + if err := u.operatePort(client, req); err != nil { + return err + } + _ = u.addPortRecord(req) } - _ = u.addPortRecord(req) } return nil } if req.Protocol == "tcp/udp" { req.Protocol = "" } - if err := u.operatePort(client, req); err != nil { - return err + for _, addr := range itemAddress { + if len(addr) == 0 { + addr = "Anywhere" + } + req.Address = addr + if err := u.operatePort(client, req); err != nil { + return err + } + _ = u.addPortRecord(req) } - _ = u.addPortRecord(req) return nil } itemPorts := req.Port for _, proto := range protos { if strings.Contains(req.Port, "-") { - req.Protocol = proto - if err := u.operatePort(client, req); err != nil { - return err + for _, addr := range itemAddress { + req.Protocol = proto + req.Address = addr + if err := u.operatePort(client, req); err != nil { + return err + } + _ = u.addPortRecord(req) } - _ = u.addPortRecord(req) } else { ports := strings.Split(itemPorts, ",") for _, port := range ports { if len(port) == 0 { continue } - req.Port = port - req.Protocol = proto - if err := u.operatePort(client, req); err != nil { - return err + for _, addr := range itemAddress { + req.Address = addr + req.Port = port + req.Protocol = proto + if err := u.operatePort(client, req); err != nil { + return err + } + _ = u.addPortRecord(req) } - _ = u.addPortRecord(req) } } } @@ -290,6 +306,7 @@ func (u *FirewallService) OperateAddressRule(req dto.AddrRuleOperate, reload boo if err := client.RichRules(fireInfo, req.Operation); err != nil { return err } + req.Address = addr _ = u.addAddressRecord(req) } if reload { diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 829d4f8ad..8e834f966 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1621,8 +1621,8 @@ const message = { allow: 'Allow', deny: 'Deny', addressFormatError: 'Please enter a valid ip address!', - addressHelper1: 'Multiple IP please separated with ",", e.g. 172.16.10.11, 172.16.10.99', - addressHelper2: 'IP segment, e.g. 172.16.10.0/24', + addressHelper1: 'Supports input of single IPs or IP ranges: 172.16.10.11 or 172.16.0.0/24', + addressHelper2: 'For multiple IPs or IP ranges, separate with commas: 172.16.10.11, 172.16.0.0/24', allIP: 'All IP', portRule: 'Port rule', ipRule: 'IP rule', diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index df03ed5ff..d35340f95 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -1538,8 +1538,8 @@ const message = { allow: '放行', deny: '屏蔽', addressFormatError: '請輸入合法的 ip 地址！', - addressHelper1: '多個 IP 請用 "," 隔開：172.16.10.11,172.16.10.99', - addressHelper2: 'IP 段：172.16.0.0/24', + addressHelper1: '支持輸入 IP 或 IP 段：172.16.10.11 或 172.16.0.0/24', + addressHelper2: '多個 IP 或 IP 段 請用 "," 隔開：172.16.10.11,172.16.0.0/24', allIP: '所有 IP', portRule: '端口規則', ipRule: 'IP 規則', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 2092ab623..9dd8f70ed 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1538,8 +1538,8 @@ const message = { allow: '放行', deny: '屏蔽', addressFormatError: '请输入合法的 ip 地址！', - addressHelper1: '多个 IP 请用 "," 隔开：172.16.10.11,172.16.10.99', - addressHelper2: 'IP 段：172.16.0.0/24', + addressHelper1: '支持输入 IP 或 IP 段：172.16.10.11 或 172.16.0.0/24', + addressHelper2: '多个 IP 或 IP 段 请用 "," 隔开：172.16.10.11,172.16.0.0/24', allIP: '所有 IP', portRule: '端口规则', ipRule: 'IP 规则', diff --git a/frontend/src/utils/util.ts b/frontend/src/utils/util.ts index f39b441d9..81da2919d 100644 --- a/frontend/src/utils/util.ts +++ b/frontend/src/utils/util.ts @@ -235,6 +235,19 @@ export function checkIpV4V6(value: string): boolean { } } +export function checkCidr(value: string): boolean { + if (value === '') { + return true; + } + const reg = + /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(?:\/([0-9]|[1-2][0-9]|3[0-2]))?$/; + if (!reg.test(value) && value !== '') { + return true; + } else { + return false; + } +} + export function checkPort(value: string): boolean { if (Number(value) <= 0) { return true; diff --git a/frontend/src/views/host/firewall/ip/index.vue b/frontend/src/views/host/firewall/ip/index.vue index 1fd5f151f..3eb0d3ee8 100644 --- a/frontend/src/views/host/firewall/ip/index.vue +++ b/frontend/src/views/host/firewall/ip/index.vue @@ -277,7 +277,7 @@ const onDelete = async (row: Host.RuleIP | null) => { } } loading.value = true; - await batchOperateRule({ type: 'port', rules: rules }) + await batchOperateRule({ type: 'address', rules: rules }) .then(() => { loading.value = false; MsgSuccess(i18n.global.t('commons.msg.operationSuccess')); diff --git a/frontend/src/views/host/firewall/ip/operate/index.vue b/frontend/src/views/host/firewall/ip/operate/index.vue index ef442a679..107fdc519 100644 --- a/frontend/src/views/host/firewall/ip/operate/index.vue +++ b/frontend/src/views/host/firewall/ip/operate/index.vue @@ -44,14 +44,13 @@