xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: panic when add 4in6 ipcidr

Browse source
This commit is contained in:
gVisor bot 2023-06-26 21:04:26 +08:00
parent ea6e63e94c
commit 90d3fdc036
2 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
component/trie/ipcidr_trie.go
View file

@ -1,8 +1,9 @@
package trie package trie
import ( import (
"github.com/Dreamacro/clash/log"
"net" "net"
"github.com/Dreamacro/clash/log"
) )
type IPV6 bool type IPV6 bool
@ -47,11 +48,10 @@ func (trie *IpCidrTrie) AddIpCidrForString(ipCidr string) error {
} }
func (trie *IpCidrTrie) IsContain(ip net.IP) bool { func (trie *IpCidrTrie) IsContain(ip net.IP) bool {
ip, isIpv4 := checkAndConverterIp(ip)
if ip == nil { if ip == nil {
return false return false
} }
isIpv4 := len(ip) == net.IPv4len
var groupValues []uint32 var groupValues []uint32
var ipCidrNode *IpCidrNode var ipCidrNode *IpCidrNode
@ -71,7 +71,13 @@ func (trie *IpCidrTrie) IsContain(ip net.IP) bool {
} }
func (trie *IpCidrTrie) IsContainForString(ipString string) bool { func (trie *IpCidrTrie) IsContainForString(ipString string) bool {
return trie.IsContain(net.ParseIP(ipString)) ip := net.ParseIP(ipString)
// deal with 4in6
actualIp := ip.To4()
if actualIp == nil {
actualIp = ip
}
return trie.IsContain(actualIp)
} }
func ipCidrToSubIpCidr(ipNet *net.IPNet) ([]net.IP, int, bool, error) { func ipCidrToSubIpCidr(ipNet *net.IPNet) ([]net.IP, int, bool, error) {
@ -82,9 +88,8 @@ func ipCidrToSubIpCidr(ipNet *net.IPNet) ([]net.IP, int, bool, error) {
isIpv4 bool isIpv4 bool
err error err error
) )
isIpv4 = len(ipNet.IP) == net.IPv4len
ip, isIpv4 := checkAndConverterIp(ipNet.IP) ipList, newMaskSize, err = subIpCidr(ipNet.IP, maskSize, isIpv4)
ipList, newMaskSize, err = subIpCidr(ip, maskSize, isIpv4)
return ipList, newMaskSize, isIpv4, err return ipList, newMaskSize, isIpv4, err
} }
@ -238,18 +243,3 @@ func search(root *IpCidrNode, groupValues []uint32) *IpCidrNode {
return nil return nil
} }
// return net.IP To4 or To16 and is ipv4
func checkAndConverterIp(ip net.IP) (net.IP, bool) {
ipResult := ip.To4()
if ipResult == nil {
ipResult = ip.To16()
if ipResult == nil {
return nil, false
}
return ipResult, false
}
return ipResult, true
}

11
component/trie/trie_test.go
View file

@ -3,8 +3,9 @@ package trie
import ( import (
"net" "net"
"testing" "testing"
"github.com/stretchr/testify/assert"
) )
import "github.com/stretchr/testify/assert"
func TestIpv4AddSuccess(t *testing.T) { func TestIpv4AddSuccess(t *testing.T) {
trie := NewIpCidrTrie() trie := NewIpCidrTrie()
@ -96,5 +97,11 @@ func TestIpv6Search(t *testing.T) {
assert.Equal(t, true, trie.IsContainForString("2001:67c:4e8:9666::1213")) assert.Equal(t, true, trie.IsContainForString("2001:67c:4e8:9666::1213"))
assert.Equal(t, false, trie.IsContain(net.ParseIP("22233:22"))) assert.Equal(t, false, trie.IsContain(net.ParseIP("22233:22")))
}
func TestIpv4InIpv6(t *testing.T) {
trie := NewIpCidrTrie()
// Boundary testing
assert.NoError(t, trie.AddIpCidrForString("::ffff:198.18.5.138/128"))
} }