mirror of
https://hubproxy.babadafafafafa.cn/https://github.com/1Panel-dev/1Panel.git
synced 2026-09-21 00:24:12 +08:00
f35b0deb29
Port forwarding no longer shares the filter client. FilterClient keeps only
filter capabilities, and forwarding gets its own adapter, service and boot
replay:
- utils/firewall/forwarding holds the provider adapters. firewalld uses native
forward-port, ufw and iptables share the NAT implementation moved out of
client/iptables/forward.go.
- service/forwarding.go owns base info, search, operate, enable and replay.
The API keeps its routes and dispatches on name/type/operate.
- init/firewall replays forwarding through that service instead of loading NAT
rule files inline.
Also adds 1PANEL_FORWARD to the IptablesOp name enum: the frontend already
sends {"name":"1PANEL_FORWARD","operate":"init-forward"} and the validator
rejected it with 400 before reaching the service. Besides that, the only
observable difference is that a forward-tab search no longer triggers the
port/address record cleanup goroutine on the side.
44 lines
1.3 KiB
Go
44 lines
1.3 KiB
Go
package dto
|
|
|
|
type ForwardRuleSearch struct {
|
|
PageInfo
|
|
Info string `json:"info"`
|
|
Status string `json:"status"`
|
|
Strategy string `json:"strategy"`
|
|
}
|
|
|
|
// ForwardRule preserves the existing firewall search response shape while
|
|
// keeping forwarding data separate from the filter client model.
|
|
type ForwardRule struct {
|
|
ID uint `json:"id"`
|
|
Chain string `json:"chain"`
|
|
Family string `json:"family"`
|
|
Address string `json:"address"`
|
|
Port string `json:"port"`
|
|
Protocol string `json:"protocol"`
|
|
Strategy string `json:"strategy"`
|
|
|
|
Num string `json:"num"`
|
|
TargetIP string `json:"targetIP"`
|
|
TargetPort string `json:"targetPort"`
|
|
Interface string `json:"interface"`
|
|
|
|
UsedStatus string `json:"usedStatus"`
|
|
Description string `json:"description"`
|
|
}
|
|
|
|
type ForwardRuleOperate struct {
|
|
ForceDelete bool `json:"forceDelete"`
|
|
Rules []ForwardRuleOperation `json:"rules"`
|
|
}
|
|
|
|
type ForwardRuleOperation struct {
|
|
Operation string `json:"operation" validate:"required,oneof=add remove"`
|
|
Num string `json:"num"`
|
|
Protocol string `json:"protocol" validate:"required,oneof=tcp udp tcp/udp"`
|
|
Interface string `json:"interface"`
|
|
Port string `json:"port" validate:"required"`
|
|
TargetIP string `json:"targetIP"`
|
|
TargetPort string `json:"targetPort" validate:"required"`
|
|
}
|