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

Simplify secure DNS bypass message creation

Browse source
This commit is contained in:
Daniel 2022-03-01 16:31:33 +01:00
parent fc1635d5ae
commit 141a95702c
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
compat/notify.go
View file

@ -44,7 +44,7 @@ var (
secureDNSBypassIssue = &appIssue{
id: "compat:secure-dns-bypass-%s",
title: "Detected %s Bypass Attempt",
message: `%s is bypassing Portmaster's firewall functions through its Secure DNS resolver. Portmaster can no longer protect or filter connections coming from %s. Disable Secure DNS within %s to restore functionality.
message: `[APPNAME] is bypassing Portmaster's firewall functions through its Secure DNS resolver. Portmaster can no longer protect or filter connections coming from [APPNAME]. Disable Secure DNS within [APPNAME] to restore functionality.
Rest assured that Portmaster already handles Secure DNS for your whole device.`,
// TODO: Add this when the new docs page is finished:
// , or [find out about other options](link to new docs page)
@ -53,7 +53,7 @@ Rest assured that Portmaster already handles Secure DNS for your whole device.`,
multiPeerUDPTunnelIssue = &appIssue{
id: "compat:multi-peer-udp-tunnel-%s",
title: "Detected SPN Incompatibility in %s",
message: "Portmaster detected that %s is trying to connect to multiple servers via the SPN using a single UDP connection. This is common for technologies such as torrents. Unfortunately, the SPN does not support this feature currently. You can try to change this behavior within the affected app or you could exempt it from using the SPN.",
message: "Portmaster detected that [APPNAME] is trying to connect to multiple servers via the SPN using a single UDP connection. This is common for technologies such as torrents. Unfortunately, the SPN does not support this feature currently. You can try to change this behavior within the affected app or you could exempt it from using the SPN.",
level: notifications.Warning,
}
)
@ -125,11 +125,7 @@ func (issue *appIssue) notify(proc *process.Process) {
)
// Build message.
messageAppNameReplaces := make([]interface{}, strings.Count(issue.message, "%s"))
for i := range messageAppNameReplaces {
messageAppNameReplaces[i] = p.Name
}
message := fmt.Sprintf(issue.message, messageAppNameReplaces...)
message := strings.ReplaceAll(issue.message, "[APPNAME]", p.Name)
// Check if we already have this notification.
eventID := fmt.Sprintf(issue.id, p.ID)

2
nameserver/nameserver.go
View file

@ -201,7 +201,7 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, request *dns.Msg)
return
}
// Mark successfull queries as internal in order to hide them in the simple interface.
// Mark successful queries as internal in order to hide them in the simple interface.
// These requests were most probably made for another process and only add confusion if listed.
if conn.Process().IsSystemResolver() {
conn.Internal = true