Remzona54/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2026-05-13 13:57:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix nested rule-set match cache isolation

Browse source
This commit is contained in:
世界 2026-03-23 12:26:19 +08:00
parent 6913b11e0a
commit 795d1c2892
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
4 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
adapter/inbound.go
View file

@ -101,6 +101,10 @@ type InboundContext struct {
func (c *InboundContext) ResetRuleCache() {
c.IPCIDRMatchSource = false
c.IPCIDRAcceptEmpty = false
c.ResetRuleMatchCache()
}
func (c *InboundContext) ResetRuleMatchCache() {
c.SourceAddressMatch = false
c.SourcePortMatch = false
c.DestinationAddressMatch = false

8
route/rule/rule_item_rule_set.go
View file

@ -41,10 +41,12 @@ func (r *RuleSetItem) Start() error {
}
func (r *RuleSetItem) Match(metadata *adapter.InboundContext) bool {
metadata.IPCIDRMatchSource = r.ipCidrMatchSource
metadata.IPCIDRAcceptEmpty = r.ipCidrAcceptEmpty
for _, ruleSet := range r.setList {
if ruleSet.Match(metadata) {
nestedMetadata := *metadata
nestedMetadata.ResetRuleMatchCache()
nestedMetadata.IPCIDRMatchSource = r.ipCidrMatchSource
nestedMetadata.IPCIDRAcceptEmpty = r.ipCidrAcceptEmpty
if ruleSet.Match(&nestedMetadata) {
return true
}
}

4
route/rule/rule_set_local.go
View file

@ -203,7 +203,9 @@ func (s *LocalRuleSet) Close() error {
func (s *LocalRuleSet) Match(metadata *adapter.InboundContext) bool {
for _, rule := range s.rules {
if rule.Match(metadata) {
nestedMetadata := *metadata
nestedMetadata.ResetRuleMatchCache()
if rule.Match(&nestedMetadata) {
return true
}
}

4
route/rule/rule_set_remote.go
View file

@ -323,7 +323,9 @@ func (s *RemoteRuleSet) Close() error {
func (s *RemoteRuleSet) Match(metadata *adapter.InboundContext) bool {
for _, rule := range s.rules {
if rule.Match(metadata) {
nestedMetadata := *metadata
nestedMetadata.ResetRuleMatchCache()
if rule.Match(&nestedMetadata) {
return true
}
}