black-internet-days-ahead/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-27 19:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(common): strmatcher match domain safety

Browse source
This commit is contained in:
mengskysama 2023-08-23 01:21:27 +08:00 committed by yuhan6665
parent cd1d000860
commit fce86aad33
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/strmatcher/ac_automaton_matcher.go
View file

@ -225,7 +225,11 @@ func (ac *ACAutomaton) Match(s string) bool {
// 2. the match string is through a fail edge. NOT FULL MATCH // 2. the match string is through a fail edge. NOT FULL MATCH
// 2.1 Through a fail edge, but there exists a valid node. SUBSTR // 2.1 Through a fail edge, but there exists a valid node. SUBSTR
for i := len(s) - 1; i >= 0; i-- { for i := len(s) - 1; i >= 0; i-- {
idx := char2Index[s[i]] chr := int(s[i])
if chr >= len(char2Index) {
return false
}
idx := char2Index[chr]
fullMatch = fullMatch && ac.trie[node][idx].edgeType fullMatch = fullMatch && ac.trie[node][idx].edgeType
node = ac.trie[node][idx].nextNode node = ac.trie[node][idx].nextNode
switch ac.exists[node].matchType { switch ac.exists[node].matchType {

5
common/strmatcher/strmatcher_test.go
View file

@ -217,6 +217,10 @@ func TestACAutomaton(t *testing.T) {
pattern: "vvgoogle.com", pattern: "vvgoogle.com",
res: true, res: true,
}, },
{
pattern: "½",
res: false,
},
} }
for _, test := range cases2Output { for _, test := range cases2Output {
if m := ac.Match(test.pattern); m != test.res { if m := ac.Match(test.pattern); m != test.res {
@ -224,7 +228,6 @@ func TestACAutomaton(t *testing.T) {
} }
} }
} }
{ {
cases3Input := []struct { cases3Input := []struct {
pattern string pattern string