Merge pull request #374 from safing/fix/patch-set-5

Improve logging and settings wording

firewall/filter.go

@@ -24,9 +24,9 @@ func init() {
 		filterModule,
 		"config:filter/",
 		&config.Option{
-			Name:           "Privacy Filter",
+			Name:           "Privacy Filter Module",
 			Key:            CfgOptionEnableFilterKey,
-			Description:    "Enable the DNS and Network Filter.",
+			Description:    "Start the Privacy Filter module. If turned off, all privacy filter protections are fully disabled on this device.",
 			OptType:        config.OptTypeBool,
 			ExpertiseLevel: config.ExpertiseLevelUser,
 			ReleaseLevel:   config.ReleaseLevelBeta,

firewall/master.go

@@ -173,12 +173,12 @@ func checkSelfCommunication(ctx context.Context, conn *network.Connection, _ *pr
 				DstPort:  pktInfo.DstPort,
 			}, true)
 			if err != nil {
-				log.Tracer(ctx).Warningf("filter: failed to find local peer process PID: %s", err)
+				log.Tracer(ctx).Debugf("filter: failed to find local peer process PID: %s", err)
 			} else {
 				// get primary process
 				otherProcess, err := process.GetOrFindProcess(ctx, otherPid)
 				if err != nil {
-					log.Tracer(ctx).Warningf("filter: failed to find load local peer process with PID %d: %s", otherPid, err)
+					log.Tracer(ctx).Debugf("filter: failed to find load local peer process with PID %d: %s", otherPid, err)
 				} else if otherProcess.Path == conn.Process().Path {
 					conn.Accept("process internal connection", noReasonOptionKey)
 					conn.Internal = true
@@ -346,7 +346,6 @@ func checkBypassPrevention(ctx context.Context, conn *network.Connection, p *pro
 		case endpoints.Permitted:
 			conn.AcceptWithContext("bypass prevention: "+reason, profile.CfgOptionPreventBypassingKey, reasonCtx)
 			return true
-		case endpoints.NoMatch:
 		}
 	}
 	return false

network/proc/pids_by_user.go

@@ -50,7 +50,9 @@ func updatePids() {
 
 			statData, err := os.Stat(fmt.Sprintf("/proc/%d", pid))
 			if err != nil {
-				log.Warningf("proc: could not stat /proc/%d: %s", pid, err)
+				if !os.IsNotExist(err) {
+					log.Warningf("proc: could not stat /proc/%d: %s", pid, err)
+				}
 				continue entryLoop
 			}
 			sys, ok := statData.Sys().(*syscall.Stat_t)

profile/config.go

@@ -98,7 +98,7 @@ var (
 
 	// Permanent Verdicts Order = 96
 
-	CfgOptionUseSPNKey   = "spn/useSPN"
+	CfgOptionUseSPNKey   = "spn/use"
 	cfgOptionUseSPN      config.BoolOption
 	cfgOptionUseSPNOrder = 129
 )
@@ -524,7 +524,7 @@ Please note that if you are using the system resolver, bypass attempts might be
 	err = config.Register(&config.Option{
 		Name:         "Use SPN",
 		Key:          CfgOptionUseSPNKey,
-		Description:  "Route connections through the Safing Privacy Network. If it is disabled or unavailable for any reason, connections will be blocked.",
+		Description:  "Protect network traffic with the Safing Privacy Network. If the SPN is not available or the connection is interrupted, network traffic will be blocked.",
 		OptType:      config.OptTypeBool,
 		DefaultValue: true,
 		Annotations: config.Annotations{