miracle091/dnscrypt-proxy
miracle091
/
dnscrypt-proxy
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use critibitgo

This commit is contained in:
Frank Denis 2018-04-07 16:59:10 +02:00
parent 58c7ff3d2f
commit 5c86191e43
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dnscrypt-proxy/pattern_matcher.go
View File

@ -5,7 +5,8 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/hashicorp/go-immutable-radix" "github.com/k-sone/critbitgo"
"github.com/jedisct1/dlog" "github.com/jedisct1/dlog"
) )
@ -20,8 +21,8 @@ const (
) )
type PatternMatcher struct { type PatternMatcher struct {
blockedPrefixes *iradix.Tree blockedPrefixes *critbitgo.Trie
blockedSuffixes *iradix.Tree blockedSuffixes *critbitgo.Trie
blockedSubstrings []string blockedSubstrings []string
blockedPatterns []string blockedPatterns []string
indirectVals map[string]interface{} indirectVals map[string]interface{}
@ -29,8 +30,8 @@ type PatternMatcher struct {
func NewPatternPatcher() *PatternMatcher { func NewPatternPatcher() *PatternMatcher {
patternMatcher := PatternMatcher{ patternMatcher := PatternMatcher{
blockedPrefixes: iradix.New(), blockedPrefixes: critbitgo.NewTrie(),
blockedSuffixes: iradix.New(), blockedSuffixes: critbitgo.NewTrie(),
} }
return &patternMatcher return &patternMatcher
} }
@ -92,9 +93,9 @@ func (patternMatcher *PatternMatcher) Add(pattern string, val interface{}, posit
patternMatcher.indirectVals[pattern] = val patternMatcher.indirectVals[pattern] = val
} }
case PatternTypePrefix: case PatternTypePrefix:
patternMatcher.blockedPrefixes, _, _ = patternMatcher.blockedPrefixes.Insert([]byte(pattern), val) patternMatcher.blockedPrefixes.Insert([]byte(pattern), val)
case PatternTypeSuffix: case PatternTypeSuffix:
patternMatcher.blockedSuffixes, _, _ = patternMatcher.blockedSuffixes.Insert([]byte(StringReverse(pattern)), val) patternMatcher.blockedSuffixes.Insert([]byte(StringReverse(pattern)), val)
default: default:
dlog.Fatal("Unexpected block type") dlog.Fatal("Unexpected block type")
} }
@ -107,14 +108,14 @@ func (patternMatcher *PatternMatcher) Eval(qName string) (reject bool, reason st
} }
revQname := StringReverse(qName) revQname := StringReverse(qName)
if match, xval, found := patternMatcher.blockedSuffixes.Root().LongestPrefix([]byte(revQname)); found { if match, xval, found := patternMatcher.blockedSuffixes.LongestPrefix([]byte(revQname)); found {
if len(match) == len(qName) || revQname[len(match)] == '.' { if len(match) == len(qName) || revQname[len(match)] == '.' {
return true, "*." + StringReverse(string(match)), xval return true, "*." + StringReverse(string(match)), xval
} }
if len(match) < len(revQname) && len(revQname) > 0 { if len(match) < len(revQname) && len(revQname) > 0 {
if i := strings.LastIndex(revQname, "."); i > 0 { if i := strings.LastIndex(revQname, "."); i > 0 {
pName := revQname[:i] pName := revQname[:i]
if match, _, found := patternMatcher.blockedSuffixes.Root().LongestPrefix([]byte(pName)); found { if match, _, found := patternMatcher.blockedSuffixes.LongestPrefix([]byte(pName)); found {
if len(match) == len(pName) || pName[len(match)] == '.' { if len(match) == len(pName) || pName[len(match)] == '.' {
return true, "*." + StringReverse(string(match)), xval return true, "*." + StringReverse(string(match)), xval
} }
@ -123,7 +124,7 @@ func (patternMatcher *PatternMatcher) Eval(qName string) (reject bool, reason st
} }
} }
if match, xval, found := patternMatcher.blockedPrefixes.Root().LongestPrefix([]byte(qName)); found { if match, xval, found := patternMatcher.blockedPrefixes.LongestPrefix([]byte(qName)); found {
return true, string(match) + "*", xval return true, string(match) + "*", xval
} }