bugfix: acl rule pattern match error for tree rule

chuxi · chuxi · commit 5f6905871b0b · 2023-07-30T17:32:55.000+08:00
diff --git a/crates/shadowsocks-service/src/acl/mod.rs b/crates/shadowsocks-service/src/acl/mod.rs
@@ -192,7 +192,7 @@ impl ParsingRules {
     fn add_regex_rule(&mut self, mut rule: String) {
         static TREE_SET_RULE_EQUIV: Lazy<Regex> = Lazy::new(|| {
             RegexBuilder::new(
-                r#"^(?:(?:\((?:\?:)?\^\|\\\.\)|(?:\^\.(?:\+|\*))?\\\.)((?:[\w-]+(?:\\\.)?)+)|\^((?:[\w-]+(?:\\\.)?)+))\$$"#,
+                r#"^(?:(?:\((?:\?:)?\^\|\\\.\)|(?:\^\.(?:\+|\*))?\\\.)((?:[\w-]+(?:\\\.)?)+)|\^((?:[\w-]+(?:\\\.)?)+))\$?$"#,
             )
             .unicode(false)
             .build()

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ impl ParsingRules {`
`192`	`192`	`fn add_regex_rule(&mut self, mut rule: String) {`
`193`	`193`	`static TREE_SET_RULE_EQUIV: Lazy<Regex> = Lazy::new(\|\| {`
`194`	`194`	`RegexBuilder::new(`
`195`		`- r#"^(?:(?:\((?:\?:)?\^\\|\\\.\)\|(?:\^\.(?:\+\|\*))?\\\.)((?:[\w-]+(?:\\\.)?)+)\|\^((?:[\w-]+(?:\\\.)?)+))\$$"#,`
	`195`	`+ r#"^(?:(?:\((?:\?:)?\^\\|\\\.\)\|(?:\^\.(?:\+\|\*))?\\\.)((?:[\w-]+(?:\\\.)?)+)\|\^((?:[\w-]+(?:\\\.)?)+))\$?$"#,`
`196`	`196`	`)`
`197`	`197`	`.unicode(false)`
`198`	`198`	`.build()`