Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make private ip the same as geoip:private #1061

Open
wants to merge 4 commits into
base: Alpha
Choose a base branch
from
Open

Make private ip the same as geoip:private #1061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
088fdb2
Make private ip the same as geoip:private
hamjin Feb 25, 2024
c49cede
Fix for GeodataMode
hamjin Feb 26, 2024
9b48576
fix: GeoIPMatcher doesn't obey the config when using GeoData
hamjin Feb 26, 2024
c9e273e
Merge branch 'Alpha' into Alpha
hamjin Mar 12, 2024
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
37 changes: 37 additions & 0 deletions common/nnip/netip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,28 @@ import (
"net/netip"
)

// Private IP CIDRs
var privateIPCIDRs = []string{
"0.0.0.0/8",
"10.0.0.0/8",
"100.64.0.0/10",
"127.0.0.0/8",
"169.254.0.0/16",
"172.16.0.0/12",
"192.0.0.0/24",
"192.0.2.0/24",
"192.88.99.0/24",
"192.168.0.0/16",
"198.18.0.0/15",
"198.51.100.0/24",
"203.0.113.0/24",
"224.0.0.0/3",
"::/127",
"fc00::/7",
"fe80::/10",
"ff00::/8",
}

// IpToAddr converts the net.IP to netip.Addr.
// If slice's length is not 4 or 16, IpToAddr returns netip.Addr{}
func IpToAddr(slice net.IP) netip.Addr {
Expand Down Expand Up @@ -51,3 +73,18 @@ func UnMasked(p netip.Prefix) netip.Addr {
}
return addr
}

// IsPrivateIP returns whether IP is private
// If IP is private, return true, else return false
func IsPrivateIP(ip netip.Addr) bool {
for _, network := range privateIPCIDRs {
_, subnet, err := net.ParseCIDR(network)
if err != nil {
continue
}
if subnet.Contains(ip.AsSlice()) {
return true
}
}
return false
}
7 changes: 4 additions & 3 deletions dns/filters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"net/netip"
"strings"

"github.com/metacubex/mihomo/common/nnip"
"github.com/metacubex/mihomo/component/geodata"
"github.com/metacubex/mihomo/component/geodata/router"
"github.com/metacubex/mihomo/component/mmdb"
Expand All @@ -26,7 +27,7 @@ func (gf *geoipFilter) Match(ip netip.Addr) bool {
if !C.GeodataMode {
codes := mmdb.IPInstance().LookupCode(ip.AsSlice())
for _, code := range codes {
if !strings.EqualFold(code, gf.code) && !ip.IsPrivate() {
if !strings.EqualFold(code, gf.code) && !nnip.IsPrivateIP(ip) {
return true
}
}
Expand All @@ -35,13 +36,13 @@ func (gf *geoipFilter) Match(ip netip.Addr) bool {

if geoIPMatcher == nil {
var err error
geoIPMatcher, _, err = geodata.LoadGeoIPMatcher("CN")
geoIPMatcher, _, err = geodata.LoadGeoIPMatcher(gf.code)
if err != nil {
log.Errorln("[GeoIPFilter] LoadGeoIPMatcher error: %s", err.Error())
return false
}
}
return !geoIPMatcher.Match(ip)
return !geoIPMatcher.Match(ip) && !nnip.IsPrivateIP(ip)
}

type ipnetFilter struct {
Expand Down