Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions agent/utils/firewall/client/iptables/forward.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
)

func AddForward(protocol, srcPort, dest, destPort, iface string, save bool) error {
// iptabels destPort 范围端口规则为:%d-%d
destPort = strings.ReplaceAll(destPort, ":", "-")
if dest != "" && dest != "127.0.0.1" && dest != "localhost" {
iptablesArg := fmt.Sprintf("-A %s", Chain1PanelPreRouting)
if iface != "" {
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2915,6 +2915,7 @@ const message = {
targetPort: 'Destination port',
forwardHelper1: 'If you want to forward to the local port, the destination IP should be set to "127.0.0.1".',
forwardHelper2: 'Leave the destination IP blank to forward to the local port.',
forwardPortHelper: 'Support port range, e.g. 80:90',
forwardInboundInterface: 'Forward Inbound Network Interface',
exportHelper: 'About to export {0} firewall rules. Continue?',
importSuccess: 'Successfully imported {0} rules',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2703,6 +2703,7 @@ const message = {
targetPort: '目标端口',
forwardHelper1: '如果是本机端口转发,目标IP为:127.0.0.1',
forwardHelper2: '如果目标IP不填写,则默认为本机端口转发',
forwardPortHelper: '支持端口范围,如:80:90',
forwardInboundInterface: '转发入站网卡',
exportHelper: '即将导出 {0} 条防火墙规则,是否继续?',
importSuccess: '成功导入 {0} 条规则',
Expand Down
19 changes: 17 additions & 2 deletions frontend/src/views/host/firewall/forward/operate/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

<el-form-item :label="$t('firewall.sourcePort')" prop="port">
<el-input clearable v-model.trim="dialogData.rowData!.port" />
<span class="input-help">{{ $t('firewall.forwardPortHelper') }}</span>
</el-form-item>

<el-form-item :label="$t('firewall.targetIP')" prop="targetIP">
Expand All @@ -24,6 +25,7 @@

<el-form-item :label="$t('firewall.targetPort')" prop="targetPort">
<el-input clearable v-model.trim="dialogData.rowData!.targetPort" />
<span class="input-help">{{ $t('firewall.forwardPortHelper') }}</span>
</el-form-item>

<el-form-item :label="$t('firewall.forwardInboundInterface')" prop="interface">
Expand Down Expand Up @@ -103,8 +105,21 @@ function checkPortRule(rule: any, value: string, callback: any) {
if (!value) {
return callback(new Error(i18n.global.t('firewall.portFormatError')));
}
if (checkPort(value)) {
return callback(new Error(i18n.global.t('firewall.portFormatError')));
if (value.indexOf(':') !== -1) {
const ports = value.split(':');
if (ports.length !== 2) {
return callback(new Error(i18n.global.t('firewall.portFormatError')));
}
if (checkPort(ports[0]) || checkPort(ports[1])) {
return callback(new Error(i18n.global.t('firewall.portFormatError')));
}
if (Number(ports[0]) > Number(ports[1])) {
return callback(new Error(i18n.global.t('firewall.portFormatError')));
}
} else {
if (checkPort(value)) {
return callback(new Error(i18n.global.t('firewall.portFormatError')));
}
}
callback();
}
Expand Down
Loading