vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-01 18:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Further logging improvements

Browse source
This commit is contained in:
Daniel 2020-09-24 22:44:27 +02:00
parent 0f2e3cdb2f
commit 00de73d65e
4 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
nameserver/nameserver.go
View file

@ -108,7 +108,7 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, request *dns.Msg)
// Return with server failure if offline. // Return with server failure if offline.
if netenv.GetOnlineStatus() == netenv.StatusOffline && if netenv.GetOnlineStatus() == netenv.StatusOffline &&
!netenv.IsConnectivityDomain(q.FQDN) { !netenv.IsConnectivityDomain(q.FQDN) {
tracer.Debugf("namserver: not resolving %s, device is offline", q.FQDN) tracer.Debugf("nameserver: not resolving %s, device is offline", q.FQDN)
return reply(nsutil.ServerFailure("resolving disabled, device is offline")) return reply(nsutil.ServerFailure("resolving disabled, device is offline"))
} }
@ -121,8 +121,8 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, request *dns.Msg)
// Handle request for localhost. // Handle request for localhost.
if strings.HasSuffix(q.FQDN, "localhost.") { if strings.HasSuffix(q.FQDN, "localhost.") {
tracer.Tracef("namserver: returning localhost records") tracer.Tracef("nameserver: returning localhost records")
return reply(nsutil.Localhost("")) return reply(nsutil.Localhost())
} }
// Authenticate request - only requests from the local host, but with any of its IPs, are allowed. // Authenticate request - only requests from the local host, but with any of its IPs, are allowed.
@ -197,14 +197,14 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, request *dns.Msg)
// React to special errors. // React to special errors.
switch { switch {
case errors.Is(err, resolver.ErrNotFound): case errors.Is(err, resolver.ErrNotFound):
tracer.Tracef("namserver: NXDomain via error") tracer.Tracef("nameserver: NXDomain via error: %s", err)
return reply(nsutil.NxDomain("")) return reply(nsutil.NxDomain("nxdomain: " + err.Error()))
case errors.Is(err, resolver.ErrBlocked): case errors.Is(err, resolver.ErrBlocked):
tracer.Tracef("namserver: block via error") tracer.Tracef("nameserver: block via error: %s", err)
return reply(nsutil.ZeroIP("")) return reply(nsutil.ZeroIP("blocked: " + err.Error()))
case errors.Is(err, resolver.ErrLocalhost): case errors.Is(err, resolver.ErrLocalhost):
tracer.Tracef("namserver: returning localhost records") tracer.Tracef("nameserver: returning localhost records")
return reply(nsutil.Localhost("")) return reply(nsutil.Localhost())
default: default:
tracer.Warningf("nameserver: failed to resolve %s: %s", q.ID(), err) tracer.Warningf("nameserver: failed to resolve %s: %s", q.ID(), err)
return reply(nsutil.ServerFailure("internal error: " + err.Error())) return reply(nsutil.ServerFailure("internal error: " + err.Error()))
@ -230,7 +230,7 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, request *dns.Msg)
// Request was blocked by the firewall. // Request was blocked by the firewall.
switch conn.Verdict { switch conn.Verdict {
case network.VerdictBlock, network.VerdictDrop, network.VerdictFailed: case network.VerdictBlock, network.VerdictDrop, network.VerdictFailed:
tracer.Infof("nameserver: request for %s from %s %s", q.ID(), conn.Process(), conn.Verdict.Verb()) tracer.Infof("nameserver: %s request for %s from %s", conn.Verdict.Verb(), q.ID(), conn.Process())
return reply(conn, conn) return reply(conn, conn)
} }
} }
@ -239,6 +239,6 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, request *dns.Msg)
defer network.SaveOpenDNSRequest(conn) defer network.SaveOpenDNSRequest(conn)
// Reply with successful response. // Reply with successful response.
tracer.Infof("nameserver: returning %s response %s to %s", conn.Verdict.Verb(), q.ID(), conn.Process()) tracer.Infof("nameserver: returning %s response for %s to %s", conn.Verdict.Verb(), q.ID(), conn.Process())
return reply(rrCache, conn, rrCache) return reply(rrCache, conn, rrCache)
} }

4
resolver/resolve.go
View file

@ -121,6 +121,9 @@ func Resolve(ctx context.Context, q *Query) (rrCache *RRCache, err error) {
} }
// log // log
// try adding a context tracer
ctx, tracer := log.AddTracer(ctx)
defer tracer.Submit()
log.Tracer(ctx).Tracef("resolver: resolving %s%s", q.FQDN, q.QType) log.Tracer(ctx).Tracef("resolver: resolving %s%s", q.FQDN, q.QType)
// check query compliance // check query compliance
@ -225,6 +228,7 @@ func checkCache(ctx context.Context, q *Query) *RRCache {
// resolve async // resolve async
module.StartWorker("resolve async", func(ctx context.Context) error { module.StartWorker("resolve async", func(ctx context.Context) error {
ctx, tracer := log.AddTracer(ctx) ctx, tracer := log.AddTracer(ctx)
defer tracer.Submit()
tracer.Debugf("resolver: resolving %s async", q.ID()) tracer.Debugf("resolver: resolving %s async", q.ID())
_, err := resolveAndCache(ctx, q, nil) _, err := resolveAndCache(ctx, q, nil)
if err != nil { if err != nil {

2
resolver/reverse.go
View file

@ -14,7 +14,7 @@ func ResolveIPAndValidate(ctx context.Context, ip string, securityLevel uint8) (
// get reversed DNS address // get reversed DNS address
reverseIP, err := dns.ReverseAddr(ip) reverseIP, err := dns.ReverseAddr(ip)
if err != nil { if err != nil {
log.Tracef("resolver: failed to get reverse address of %s: %s", ip, err) log.Tracer(ctx).Tracef("resolver: failed to get reverse address of %s: %s", ip, err)
return "", ErrInvalid return "", ErrInvalid
} }

2
resolver/scopes.go
View file

@ -158,7 +158,7 @@ addNextResolver:
for _, resolver := range addResolvers { for _, resolver := range addResolvers {
// check for compliance // check for compliance
if err := resolver.checkCompliance(ctx, q); err != nil { if err := resolver.checkCompliance(ctx, q); err != nil {
log.Tracef("skipping non-compliant resolver %s: %s", resolver.GetName(), err) log.Tracer(ctx).Tracef("skipping non-compliant resolver %s: %s", resolver.GetName(), err)
continue continue
} }