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

Disable prompting when re-evaluating connections

Browse source
This commit is contained in:
Daniel 2023-01-30 13:57:58 +01:00
parent 99185ba125
commit c6de741ed8
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
firewall/master.go
View file

@ -116,7 +116,11 @@ func decideOnConnection(ctx context.Context, conn *network.Connection, pkt packe
case profile.DefaultActionPermit: case profile.DefaultActionPermit:
conn.Accept("allowed by default action", profile.CfgOptionDefaultActionKey) conn.Accept("allowed by default action", profile.CfgOptionDefaultActionKey)
case profile.DefaultActionAsk: case profile.DefaultActionAsk:
prompt(ctx, conn, pkt) // Only prompt if there has not been a decision already.
// This prevents prompts from being created when re-evaluating connections.
if conn.Verdict.Firewall == network.VerdictUndecided {
prompt(ctx, conn)
}
default: default:
conn.Deny("blocked by default action", profile.CfgOptionDefaultActionKey) conn.Deny("blocked by default action", profile.CfgOptionDefaultActionKey)
} }

11
firewall/prompt.go
View file

@ -10,7 +10,6 @@ import (
"github.com/safing/portbase/notifications" "github.com/safing/portbase/notifications"
"github.com/safing/portmaster/intel" "github.com/safing/portmaster/intel"
"github.com/safing/portmaster/network" "github.com/safing/portmaster/network"
"github.com/safing/portmaster/network/packet"
"github.com/safing/portmaster/profile" "github.com/safing/portmaster/profile"
"github.com/safing/portmaster/profile/endpoints" "github.com/safing/portmaster/profile/endpoints"
) )
@ -47,9 +46,9 @@ type promptProfile struct {
LinkedPath string LinkedPath string
} }
func prompt(ctx context.Context, conn *network.Connection, pkt packet.Packet) { func prompt(ctx context.Context, conn *network.Connection) {
// Create notification. // Create notification.
n := createPrompt(ctx, conn, pkt) n := createPrompt(ctx, conn)
if n == nil { if n == nil {
// createPrompt returns nil when no further action should be taken. // createPrompt returns nil when no further action should be taken.
return return
@ -81,11 +80,11 @@ func prompt(ctx context.Context, conn *network.Connection, pkt packet.Packet) {
} }
} }
// promptIDPrefix is an identifier for privacy filter prompts. This is also use // promptIDPrefix is an identifier for privacy filter prompts. This is also used
// in the UI, so don't change! // in the UI, so don't change!
const promptIDPrefix = "filter:prompt" const promptIDPrefix = "filter:prompt"
func createPrompt(ctx context.Context, conn *network.Connection, pkt packet.Packet) (n *notifications.Notification) { func createPrompt(ctx context.Context, conn *network.Connection) (n *notifications.Notification) {
expires := time.Now().Add(time.Duration(askTimeout()) * time.Second).Unix() expires := time.Now().Add(time.Duration(askTimeout()) * time.Second).Unix()
// Get local profile. // Get local profile.
@ -110,7 +109,7 @@ func createPrompt(ctx context.Context, conn *network.Connection, pkt packet.Pack
promptIDPrefix, promptIDPrefix,
localProfile.ID, localProfile.ID,
conn.Inbound, conn.Inbound,
pkt.Info().RemoteIP(), conn.Entity.IP,
) )
default: // connection to domain default: // connection to domain
nID = fmt.Sprintf( nID = fmt.Sprintf(

2
network/connection.go
View file

@ -119,7 +119,7 @@ type Connection struct { //nolint:maligned // TODO: fix alignment
// This is different from the Firewall verdict in order to guarantee proper // This is different from the Firewall verdict in order to guarantee proper
// transition between verdicts that need the connection to be re-established. // transition between verdicts that need the connection to be re-established.
Active Verdict Active Verdict
// Firewall holsd the last (most recent) decision by the firewall. // Firewall holds the last (most recent) decision by the firewall.
Firewall Verdict Firewall Verdict
} }
// Reason holds information justifying the verdict, as well as additional // Reason holds information justifying the verdict, as well as additional