black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-02-16 22:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add internal private geoip rule

Browse source
This commit is contained in:
世界 2022-07-03 15:57:09 +08:00
parent 70c0812606
commit dd56b2584b
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adapter/route/router.go
View file

@ -71,7 +71,11 @@ func hasGeoRule(rules []option.Rule) bool {
} }
func isGeoRule(rule option.DefaultRule) bool { func isGeoRule(rule option.DefaultRule) bool {
return len(rule.SourceGeoIP) > 0 || len(rule.GeoIP) > 0 return len(rule.SourceGeoIP) > 0 && common.Any(rule.SourceGeoIP, notPrivateNode) || len(rule.GeoIP) > 0 && common.Any(rule.GeoIP, notPrivateNode)
}
func notPrivateNode(code string) bool {
return code == "private"
} }
func (r *Router) UpdateOutbounds(outbounds []adapter.Outbound) { func (r *Router) UpdateOutbounds(outbounds []adapter.Outbound) {

29
adapter/route/rule_geoip.go
View file

@ -5,6 +5,7 @@ import (
"github.com/sagernet/sing-box/adapter" "github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/log" "github.com/sagernet/sing-box/log"
N "github.com/sagernet/sing/common/network"
) )
var _ RuleItem = (*GeoIPItem)(nil) var _ RuleItem = (*GeoIPItem)(nil)
@ -34,7 +35,7 @@ func NewGeoIPItem(router adapter.Router, logger log.Logger, isSource bool, codes
func (r *GeoIPItem) Match(metadata *adapter.InboundContext) bool { func (r *GeoIPItem) Match(metadata *adapter.InboundContext) bool {
geoReader := r.router.GeoIPReader() geoReader := r.router.GeoIPReader()
if geoReader == nil { if geoReader == nil {
return false return r.match(metadata)
} }
if r.isSource { if r.isSource {
if metadata.SourceGeoIPCode == "" { if metadata.SourceGeoIPCode == "" {
@ -43,9 +44,8 @@ func (r *GeoIPItem) Match(metadata *adapter.InboundContext) bool {
r.logger.Error("query geoip for ", metadata.Source.Addr, ": ", err) r.logger.Error("query geoip for ", metadata.Source.Addr, ": ", err)
return false return false
} }
metadata.SourceGeoIPCode = country.Country.IsoCode metadata.SourceGeoIPCode = strings.ToLower(country.Country.IsoCode)
} }
return r.codeMap[metadata.SourceGeoIPCode]
} else { } else {
if metadata.Destination.IsFqdn() { if metadata.Destination.IsFqdn() {
return false return false
@ -56,7 +56,28 @@ func (r *GeoIPItem) Match(metadata *adapter.InboundContext) bool {
r.logger.Error("query geoip for ", metadata.Destination.Addr, ": ", err) r.logger.Error("query geoip for ", metadata.Destination.Addr, ": ", err)
return false return false
} }
metadata.GeoIPCode = country.Country.IsoCode metadata.GeoIPCode = strings.ToLower(country.Country.IsoCode)
}
}
return r.match(metadata)
}
func (r *GeoIPItem) match(metadata *adapter.InboundContext) bool {
if r.isSource {
if metadata.SourceGeoIPCode == "" {
if !N.IsPublicAddr(metadata.Source.Addr) {
metadata.SourceGeoIPCode = "private"
}
}
return r.codeMap[metadata.SourceGeoIPCode]
} else {
if metadata.Destination.IsFqdn() {
return false
}
if metadata.GeoIPCode == "" {
if !N.IsPublicAddr(metadata.Destination.Addr) {
metadata.GeoIPCode = "private"
}
} }
return r.codeMap[metadata.GeoIPCode] return r.codeMap[metadata.GeoIPCode]
} }