adam
/
gopherhole
1
0
Fork 0
Code Pull Requests Releases Activity

Compare commits

base: adam:03ccb0c08c6b3b2b127ef39d0cff6c33c94aa7f3
Branches Tags
adam:trunk
...
compare: adam:2167651569eda6168f262ea762de7526c4c153df
Branches Tags
adam:trunk

3 Commits
03ccb0c08c ... 2167651569

Author SHA1 Message Date
Adam Veldhousen 2167651569
chore: update package-lock.json 2021-06-10 10:55:05 -05:00
Adam Veldhousen 4b0589ddb0
feat: add upstream default upstream dns server as CLI flag 2021-06-10 10:51:09 -05:00
Adam Veldhousen 9320c2675a
bugfix: better parsing of client IP for query log 2021-06-10 10:50:35 -05:00
3 changed files with 565 additions and 297 deletions
Show Stats Expand all files Collapse all files

850
client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
internal/dnsHandler.go
View File

@ -20,10 +20,11 @@ func (dm *DomainManager) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
start := time.Now() start := time.Now()
q := r.Question[0] q := r.Question[0]
responseMessage := new(dns.Msg) responseMessage := new(dns.Msg)
ql := QueryLog{ ql := QueryLog{
Started: start.UTC(), Started: start.UTC(),
Protocol: w.RemoteAddr().Network(), Protocol: w.RemoteAddr().Network(),
ClientIP: strings.Split(w.RemoteAddr().String(), ":")[0], ClientIP: w.RemoteAddr().String()[:strings.LastIndex(w.RemoteAddr().String(), ":")],
Domain: q.Name, Domain: q.Name,
Status: NoAnswer, Status: NoAnswer,
} }

9
main.go
View File

@ -13,9 +13,10 @@ import (
) )
var ( var (
dbPath = flag.String("db-path", ".", "Directory to write database files to") dbPath = flag.String("db-path", ".", "Directory to write database files to")
httpAddr = flag.String("http-address", ":80", "Bind address for http server") httpAddr = flag.String("http-address", ":80", "Bind address for http server")
dnsAddr = flag.String("dns-address", ":53", "Bind address for dns server") dnsAddr = flag.String("dns-address", ":53", "Bind address for dns server")
defaultUpstream = flag.String("upstream", "1.1.1.1:53", "default upstream DNS server when no others are specified")
) )
func main() { func main() {
@ -57,7 +58,7 @@ func main() {
Storage: store, Storage: store,
RuleEvaluator: re, RuleEvaluator: re,
Recursors: internal.Recursor{ Recursors: internal.Recursor{
Upstreams: []string{"1.1.1.1:53"}, Upstreams: []string{*defaultUpstream},
Client: dnsClient, Client: dnsClient,
}, },
} }