forked from folbricht/routedns
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed and working - Date: Thu Feb 16 11:38:28 CST 2023
- Loading branch information
1 parent
bdbd028
commit bab1de4
Showing
6 changed files
with
176 additions
and
154 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,118 +1,118 @@ | ||
| package rdns | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net" | ||
| "strings" | ||
|
|
||
| "github.com/miekg/dns" | ||
| ) | ||
|
|
||
| // DomainDB holds a list of domain strings (potentially with wildcards). Matching | ||
| // logic: | ||
| // domain.com: matches just domain.com and not subdomains | ||
| // .domain.com: matches domain.com and all subdomains | ||
| // *.domain.com: matches all subdomains but not domain.com | ||
| type DomainDB struct { | ||
| name string | ||
| root node | ||
| loader BlocklistLoader | ||
| } | ||
|
|
||
| type node map[string]node | ||
|
|
||
| var _ BlocklistDB = &DomainDB{} | ||
|
|
||
| // NewDomainDB returns a new instance of a matcher for a list of regular expressions. | ||
| func NewDomainDB(name string, loader BlocklistLoader) (*DomainDB, error) { | ||
| rules, err := loader.Load() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| root := make(node) | ||
| for _, r := range rules { | ||
| r = strings.TrimSpace(r) | ||
|
|
||
| // Strip trailing . in case the list has FQDN names with . suffixes. | ||
| r = strings.TrimSuffix(r, ".") | ||
|
|
||
| // Break up the domain into its parts and iterare backwards over them, building | ||
| // a graph of maps | ||
| parts := strings.Split(r, ".") | ||
| n := root | ||
| for i := len(parts) - 1; i >= 0; i-- { | ||
| part := parts[i] | ||
|
|
||
| // Only allow wildcards as the first domain part, and not in a string | ||
| if strings.Contains(part, "*") && (i > 0 || len(part) != 1) { | ||
| return nil, fmt.Errorf("invalid blocklist item: '%s'", part) | ||
| } | ||
|
|
||
| subNode, ok := n[part] | ||
| if !ok { | ||
| subNode = make(node) | ||
| n[part] = subNode | ||
| } | ||
| n = subNode | ||
| } | ||
| } | ||
| return &DomainDB{name, root, loader}, nil | ||
| } | ||
|
|
||
| func (m *DomainDB) Reload() (BlocklistDB, error) { | ||
| return NewDomainDB(m.name, m.loader) | ||
| } | ||
|
|
||
| func (m *DomainDB) Match(q dns.Question) (net.IP, string, *BlocklistMatch, bool) { | ||
| s := strings.TrimSuffix(q.Name, ".") | ||
| var matched []string | ||
| parts := strings.Split(s, ".") | ||
| n := m.root | ||
| for i := len(parts) - 1; i >= 0; i-- { | ||
| part := parts[i] | ||
| subNode, ok := n[part] | ||
| if !ok { | ||
| return nil, "", nil, false | ||
| } | ||
| matched = append(matched, part) | ||
| if _, ok := subNode[""]; ok { // exact and sub-domain match | ||
| return nil, | ||
| "", | ||
| &BlocklistMatch{ | ||
| List: m.name, | ||
| Rule: matchedDomainParts(".", matched), | ||
| }, | ||
| true | ||
| } | ||
| if _, ok := subNode["*"]; ok && i > 0 { // wildcard match on sub-domains | ||
| return nil, | ||
| "", | ||
| &BlocklistMatch{ | ||
| List: m.name, | ||
| Rule: matchedDomainParts("*.", matched), | ||
| }, | ||
| true | ||
| } | ||
| n = subNode | ||
| } | ||
| return nil, | ||
| "", | ||
| &BlocklistMatch{ | ||
| List: m.name, | ||
| Rule: matchedDomainParts("", matched), | ||
| }, | ||
| len(n) == 0 // exact match | ||
| } | ||
|
|
||
| func (m *DomainDB) String() string { | ||
| return "Domain" | ||
| } | ||
|
|
||
| // Turn a list of matched domain fragments into a domain (rule) | ||
| func matchedDomainParts(prefix string, p []string) string { | ||
| for i := len(p)/2 - 1; i >= 0; i-- { | ||
| opp := len(p) - 1 - i | ||
| p[i], p[opp] = p[opp], p[i] | ||
| } | ||
| return prefix + strings.Join(p, ".") | ||
| } | ||
| package rdns | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net" | ||
| "strings" | ||
|
|
||
| "github.com/miekg/dns" | ||
| ) | ||
|
|
||
| // DomainDB holds a list of domain strings (potentially with wildcards). Matching | ||
| // logic: | ||
| // domain.com: matches just domain.com and not subdomains | ||
| // .domain.com: matches domain.com and all subdomains | ||
| // *.domain.com: matches all subdomains but not domain.com | ||
| type DomainDB struct { | ||
| name string | ||
| root node | ||
| loader BlocklistLoader | ||
| } | ||
|
|
||
| type node map[string]node | ||
|
|
||
| var _ BlocklistDB = &DomainDB{} | ||
|
|
||
| // NewDomainDB returns a new instance of a matcher for a list of regular expressions. | ||
| func NewDomainDB(name string, loader BlocklistLoader) *DomainDB { | ||
| return &DomainDB{name, nil, loader} | ||
| } | ||
|
|
||
| func (m *DomainDB) Reload() (BlocklistDB, error) { | ||
| rules, err := m.loader.Load() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| root := make(node) | ||
| for _, r := range rules { | ||
| r = strings.TrimSpace(r) | ||
|
|
||
| // Strip trailing . in case the list has FQDN names with . suffixes. | ||
| r = strings.TrimSuffix(r, ".") | ||
|
|
||
| // Break up the domain into its parts and iterate backwards over them, building | ||
| // a graph of maps | ||
| parts := strings.Split(r, ".") | ||
| n := root | ||
| for i := len(parts) - 1; i >= 0; i-- { | ||
| part := parts[i] | ||
|
|
||
| // Only allow wildcards as the first domain part, and not in a string | ||
| if strings.Contains(part, "*") && (i > 0 || len(part) != 1) { | ||
| return nil, fmt.Errorf("invalid blocklist item: '%s'", part) | ||
| } | ||
|
|
||
| subNode, ok := n[part] | ||
| if !ok { | ||
| subNode = make(node) | ||
| n[part] = subNode | ||
| } | ||
| n = subNode | ||
| } | ||
| } | ||
| return &DomainDB{m.name, root, m.loader}, nil | ||
| } | ||
|
|
||
| func (m *DomainDB) Match(q dns.Question) (net.IP, string, *BlocklistMatch, bool) { | ||
| s := strings.TrimSuffix(q.Name, ".") | ||
| var matched []string | ||
| parts := strings.Split(s, ".") | ||
| n := m.root | ||
| for i := len(parts) - 1; i >= 0; i-- { | ||
| part := parts[i] | ||
| subNode, ok := n[part] | ||
| if !ok { | ||
| return nil, "", nil, false | ||
| } | ||
| matched = append(matched, part) | ||
| if _, ok := subNode[""]; ok { // exact and sub-domain match | ||
| return nil, | ||
| "", | ||
| &BlocklistMatch{ | ||
| List: m.name, | ||
| Rule: matchedDomainParts(".", matched), | ||
| }, | ||
| true | ||
| } | ||
| if _, ok := subNode["*"]; ok && i > 0 { // wildcard match on sub-domains | ||
| return nil, | ||
| "", | ||
| &BlocklistMatch{ | ||
| List: m.name, | ||
| Rule: matchedDomainParts("*.", matched), | ||
| }, | ||
| true | ||
| } | ||
| n = subNode | ||
| } | ||
| return nil, | ||
| "", | ||
| &BlocklistMatch{ | ||
| List: m.name, | ||
| Rule: matchedDomainParts("", matched), | ||
| }, | ||
| len(n) == 0 // exact match | ||
| } | ||
|
|
||
| func (m *DomainDB) String() string { | ||
| return "Domain" | ||
| } | ||
|
|
||
| // Turn a list of matched domain fragments into a domain (rule) | ||
| func matchedDomainParts(prefix string, p []string) string { | ||
| for i := len(p)/2 - 1; i >= 0; i-- { | ||
| opp := len(p) - 1 - i | ||
| p[i], p[opp] = p[opp], p[i] | ||
| } | ||
| return prefix + strings.Join(p, ".") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.