github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Implement Feedback

Browse Source
This commit is contained in:
Daniel
2020-09-24 17:11:29 +02:00
parent c856b7372a
commit 67cdc52fcd
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firewall/bypassing.go
View File

@@ -15,7 +15,7 @@ func PreventBypassing(conn *network.Connection) (endpoints.EPResult, string, nsu
if strings.ToLower(conn.Entity.Domain) == "use-application-dns.net." {
return endpoints.Denied,
"blocked canary domain to prevent enabling of DNS-over-HTTPs",
nsutil.NxDomain("")
nsutil.NxDomain()
}
return endpoints.NoMatch, "", nil

40
nameserver/nsutil/nsutil.go
View File

@@ -2,6 +2,7 @@ package nsutil
import (
"context"
"errors"
"fmt"
"strings"
@@ -40,7 +41,7 @@ func (rf ResponderFunc) ReplyWithDNS(ctx context.Context, request *dns.Msg) *dns
// ZeroIP is a ResponderFunc than replies with either 0.0.0.0 or :: for
// each A or AAAA question respectively.
func ZeroIP(msg string) ResponderFunc {
func ZeroIP(msgs ...string) ResponderFunc {
return func(ctx context.Context, request *dns.Msg) *dns.Msg {
reply := new(dns.Msg)
hasErr := false
@@ -73,14 +74,16 @@ func ZeroIP(msg string) ResponderFunc {
reply.SetRcode(request, dns.RcodeSuccess)
}
AddMessageToReply(ctx, reply, log.InfoLevel, msg)
for _, msg := range msgs {
AddMessageToReply(ctx, reply, log.InfoLevel, msg)
}
return reply
}
}
// Localhost is a ResponderFunc than replies with localhost IP addresses.
func Localhost(msg string) ResponderFunc {
func Localhost(msgs ...string) ResponderFunc {
return func(ctx context.Context, request *dns.Msg) *dns.Msg {
reply := new(dns.Msg)
hasErr := false
@@ -113,35 +116,43 @@ func Localhost(msg string) ResponderFunc {
reply.SetRcode(request, dns.RcodeSuccess)
}
AddMessageToReply(ctx, reply, log.InfoLevel, msg)
for _, msg := range msgs {
AddMessageToReply(ctx, reply, log.InfoLevel, msg)
}
return reply
}
}
// NxDomain returns a ResponderFunc that replies with NXDOMAIN.
func NxDomain(msg string) ResponderFunc {
func NxDomain(msgs ...string) ResponderFunc {
return func(ctx context.Context, request *dns.Msg) *dns.Msg {
reply := new(dns.Msg).SetRcode(request, dns.RcodeNameError)
AddMessageToReply(ctx, reply, log.InfoLevel, msg)
for _, msg := range msgs {
AddMessageToReply(ctx, reply, log.InfoLevel, msg)
}
return reply
}
}
// Refused returns a ResponderFunc that replies with REFUSED.
func Refused(msg string) ResponderFunc {
func Refused(msgs ...string) ResponderFunc {
return func(ctx context.Context, request *dns.Msg) *dns.Msg {
reply := new(dns.Msg).SetRcode(request, dns.RcodeRefused)
AddMessageToReply(ctx, reply, log.InfoLevel, msg)
for _, msg := range msgs {
AddMessageToReply(ctx, reply, log.InfoLevel, msg)
}
return reply
}
}
// ServerFailure returns a ResponderFunc that replies with SERVFAIL.
func ServerFailure(msg string) ResponderFunc {
func ServerFailure(msgs ...string) ResponderFunc {
return func(ctx context.Context, request *dns.Msg) *dns.Msg {
reply := new(dns.Msg).SetRcode(request, dns.RcodeServerFailure)
AddMessageToReply(ctx, reply, log.InfoLevel, msg)
for _, msg := range msgs {
AddMessageToReply(ctx, reply, log.InfoLevel, msg)
}
return reply
}
}
@@ -149,11 +160,18 @@ func ServerFailure(msg string) ResponderFunc {
// MakeMessageRecord creates an informational resource record that can be added
// to the extra section of a reply.
func MakeMessageRecord(level log.Severity, msg string) (dns.RR, error) { //nolint:interfacer
return dns.NewRR(fmt.Sprintf(
rr, err := dns.NewRR(fmt.Sprintf(
`%s.portmaster. 0 IN TXT "%s"`,
strings.ToLower(level.String()),
msg,
))
if err != nil {
return nil, err
}
if rr == nil {
return nil, errors.New("record is nil")
}
return rr, nil
}
// AddMessageToReply creates an information resource records using

6
network/dns.go
View File

@@ -98,13 +98,13 @@ func (conn *Connection) ReplyWithDNS(ctx context.Context, request *dns.Msg) *dns
// Select request responder.
switch conn.Verdict {
case VerdictBlock:
return nsutil.ZeroIP("").ReplyWithDNS(ctx, request)
return nsutil.ZeroIP().ReplyWithDNS(ctx, request)
case VerdictDrop:
return nil // Do not respond to request.
case VerdictFailed:
return nsutil.ZeroIP("").ReplyWithDNS(ctx, request)
return nsutil.ZeroIP().ReplyWithDNS(ctx, request)
default:
reply := nsutil.ServerFailure("").ReplyWithDNS(ctx, request)
reply := nsutil.ServerFailure().ReplyWithDNS(ctx, request)
nsutil.AddMessageToReply(ctx, reply, log.ErrorLevel, "INTERNAL ERROR: incorrect use of network.Connection's DNS Responder")
return reply
}