him411/UA3F
1
0
Fork 0
mirror of https://github.com/SunBK201/UA3F.git synced 2025-12-16 16:57:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add ipv6 support

Browse Source
This commit is contained in:
SunBK201 2025-11-29 15:50:50 +08:00
parent 68c1952b30
commit 3f98c35e62
7 changed files with 68 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/internal/netfilter/firewall.go
View File

@ -50,6 +50,17 @@ var LAN_CIDRS = []string{
"240.0.0.0/4",
}
var LAN6_CIDRS = []string{
"::/128",
"::1/128",
"::ffff:0:0/96",
"64:ff9b::/96",
"2001:db8::/32",
"fc00::/7",
"fe80::/10",
"ff00::/8",
}
var (
IptRuleIgnoreBrLAN = []string{
"!", "-i", "br-lan",
@ -89,6 +100,10 @@ var (
fmt.Sprintf("ip daddr @%s", LANSET),
"return",
)
NftRuleIgnoreLAN6 = knftables.Concat(
fmt.Sprintf("ip6 daddr @%s", LANSET+"_6"),
"return",
)
NftRuleIgnorePorts = knftables.Concat(
fmt.Sprintf("tcp dport { %s }", SKIP_PORTS),
"return",
@ -194,6 +209,30 @@ func (f *Firewall) NftSetLanIP(tx *knftables.Transaction, table *knftables.Table
}
}
func (f *Firewall) NftSetLanIP6(tx *knftables.Transaction, table *knftables.Table) {
ipset := &knftables.Set{
Name: LANSET + "_6",
Table: table.Name,
Family: table.Family,
Type: "ipv6_addr",
Flags: []knftables.SetFlag{
knftables.IntervalFlag,
},
AutoMerge: knftables.PtrTo(true),
}
tx.Add(ipset)
for _, cidr := range LAN6_CIDRS {
ip6lan := &knftables.Element{
Table: table.Name,
Family: table.Family,
Set: ipset.Name,
Key: []string{cidr},
}
tx.Add(ip6lan)
}
}
func (f *Firewall) IptSetLanIP() error {
if err := ipset.Check(); err != nil {
return err

2
src/internal/server/nfqueue/nfqueue_linux.go
View File

@ -47,7 +47,7 @@ func New(cfg *config.Config, rw *rewrite.Rewriter) *Server {
s.Firewall = netfilter.Firewall{
Nftable: &knftables.Table{
Name: "UA3F",
Family: knftables.IPv4Family,
Family: knftables.InetFamily,
},
NftSetup: s.nftSetup,
NftCleanup: s.nftCleanup,

6
src/internal/server/nfqueue/nftables.go
View File

@ -20,6 +20,7 @@ func (s *Server) nftSetup() error {
tx.Add(s.Nftable)
s.NftSetLanIP(tx, s.Nftable)
s.NftSetLanIP6(tx, s.Nftable)
s.NftSetNfqueue(tx, s.Nftable)
if err := nft.Run(context.TODO(), tx); err != nil {
@ -68,6 +69,11 @@ func (s *Server) NftSetNfqueue(tx *knftables.Transaction, table *knftables.Table
Rule: netfilter.NftRuleIgnoreLAN,
})
tx.Add(&knftables.Rule{
Chain: chain.Name,
Rule: netfilter.NftRuleIgnoreLAN6,
})
tx.Add(&knftables.Rule{
Chain: chain.Name,
Rule: netfilter.NftRuleIgnorePorts,

6
src/internal/server/redirect/nftables.go
View File

@ -20,6 +20,7 @@ func (s *Server) nftSetup() error {
tx.Add(s.Nftable)
s.NftSetLanIP(tx, s.Nftable)
s.NftSetLanIP6(tx, s.Nftable)
s.NftSetRedirect(tx, s.Nftable)
if err := nft.Run(context.TODO(), tx); err != nil {
@ -73,6 +74,11 @@ func (s *Server) NftSetRedirect(tx *knftables.Transaction, table *knftables.Tabl
Rule: netfilter.NftRuleIgnoreLAN,
})
tx.Add(&knftables.Rule{
Chain: chain.Name,
Rule: netfilter.NftRuleIgnoreLAN6,
})
tx.Add(&knftables.Rule{
Chain: chain.Name,
Rule: netfilter.NftRuleIgnorePorts,

2
src/internal/server/redirect/redirect_linux.go
View File

@ -37,7 +37,7 @@ func New(cfg *config.Config, rw *rewrite.Rewriter) *Server {
s.Firewall = netfilter.Firewall{
Nftable: &knftables.Table{
Name: "UA3F",
Family: knftables.IPv4Family,
Family: knftables.InetFamily,
},
NftSetup: s.nftSetup,
NftCleanup: s.nftCleanup,

17
src/internal/server/tproxy/nftables.go
View File

@ -26,6 +26,7 @@ func (s *Server) nftSetup() error {
tx.Add(s.Nftable)
s.NftSetLanIP(tx, s.Nftable)
s.NftSetLanIP6(tx, s.Nftable)
s.NftSetTproxy(tx, s.Nftable)
if err := nft.Run(context.TODO(), tx); err != nil {
@ -66,7 +67,7 @@ func (s *Server) NftSetTproxy(tx *knftables.Transaction, table *knftables.Table)
"meta l4proto tcp",
"mark", s.tproxyFwMark,
"mark set 7894",
fmt.Sprintf("tproxy to 127.0.0.1:%d", s.Cfg.Port),
fmt.Sprintf("tproxy ip to 127.0.0.1:%d", s.Cfg.Port),
"counter accept",
),
})
@ -101,6 +102,11 @@ func (s *Server) NftSetTproxy(tx *knftables.Transaction, table *knftables.Table)
Rule: netfilter.NftRuleIgnoreLAN,
})
tx.Add(&knftables.Rule{
Chain: prerouting.Name,
Rule: netfilter.NftRuleIgnoreLAN6,
})
tx.Add(&knftables.Rule{
Chain: prerouting.Name,
Rule: netfilter.NftRuleIgnorePorts,
@ -130,7 +136,7 @@ func (s *Server) NftSetTproxy(tx *knftables.Transaction, table *knftables.Table)
Rule: knftables.Concat(
"meta l4proto tcp",
"mark", s.tproxyFwMark,
fmt.Sprintf("tproxy to 127.0.0.1:%d", s.Cfg.Port),
fmt.Sprintf("tproxy ip to 127.0.0.1:%d", s.Cfg.Port),
"counter accept",
),
})
@ -141,7 +147,7 @@ func (s *Server) NftSetTproxy(tx *knftables.Transaction, table *knftables.Table)
Rule: knftables.Concat(
"meta l4proto tcp",
"mark set", s.tproxyFwMark,
fmt.Sprintf("tproxy to 127.0.0.1:%d", s.Cfg.Port),
fmt.Sprintf("tproxy ip to 127.0.0.1:%d", s.Cfg.Port),
"counter accept",
),
})
@ -175,6 +181,11 @@ func (s *Server) NftSetTproxy(tx *knftables.Transaction, table *knftables.Table)
Rule: netfilter.NftRuleIgnoreLAN,
})
tx.Add(&knftables.Rule{
Chain: output.Name,
Rule: netfilter.NftRuleIgnoreLAN6,
})
tx.Add(&knftables.Rule{
Chain: output.Name,
Rule: netfilter.NftRuleIgnorePorts,

2
src/internal/server/tproxy/tproxy_linux.go
View File

@ -49,7 +49,7 @@ func New(cfg *config.Config, rw *rewrite.Rewriter) *Server {
s.Firewall = netfilter.Firewall{
Nftable: &knftables.Table{
Name: "UA3F",
Family: knftables.IPv4Family,
Family: knftables.InetFamily,
},
NftSetup: s.nftSetup,
NftCleanup: s.nftCleanup,