Small changes based on review comments

This commit is contained in:
Patrick Pacher 2020-04-20 08:25:34 +02:00
parent 9deb1623d6
commit 42ccb3e39a
No known key found for this signature in database
GPG key ID: E8CD2DA160925A6D
3 changed files with 14 additions and 1 deletions

View file

@ -273,6 +273,8 @@ func (e *Entity) getDomainLists() {
domains = domainsToInspect
}
domains = makeDistinct(domains)
for _, d := range domains {
log.Tracef("intel: loading domain list for %s", d)
list, err := filterlists.LookupDomain(d)
@ -441,3 +443,12 @@ func buildLookupMap(l []string) filterlists.LookupMap {
return m
}
func makeDistinct(slice []string) []string {
lm := buildLookupMap(slice)
result := make([]string, 0, len(lm))
for key := range lm {
result = append(result, key)
}
return result
}

View file

@ -2,6 +2,7 @@ package nameserver
import (
"context"
"errors"
"fmt"
"net"
"strings"
@ -247,7 +248,7 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, query *dns.Msg) er
// TODO: analyze nxdomain requests, malware could be trying DGA-domains
tracer.Warningf("nameserver: %s requested %s%s: %s", conn.Process(), q.FQDN, q.QType, err)
if _, ok := err.(*resolver.BlockedUpstreamError); ok {
if errors.Is(err, &resolver.BlockedUpstreamError{}) {
conn.Block(err.Error())
} else {
conn.Failed("failed to resolve: " + err.Error())

View file

@ -192,6 +192,7 @@ Examples:
ExternalOptType: "security level",
DefaultValue: status.SecurityLevelsAll,
ValidationRegex: "^(7|6|4)$",
ExpertiseLevel: config.ExpertiseLevelExpert,
})
if err != nil {
return err