From a25f9eba45f2fa212695f02d7635979b2610f1c0 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 7 Jan 2021 12:39:37 +0100 Subject: [PATCH 1/3] Move filterlist settings to separate category --- profile/config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/profile/config.go b/profile/config.go index ac95d419..21b52f79 100644 --- a/profile/config.go +++ b/profile/config.go @@ -278,7 +278,7 @@ The lists are automatically updated every hour using incremental updates. Annotations: config.Annotations{ config.DisplayHintAnnotation: "filter list", config.DisplayOrderAnnotation: cfgOptionFilterListsOrder, - config.CategoryAnnotation: "Rules", + config.CategoryAnnotation: "Filter Lists", }, ValidationRegex: `^[a-zA-Z0-9\-]+$`, }) @@ -320,7 +320,7 @@ The lists are automatically updated every hour using incremental updates. Annotations: config.Annotations{ config.DisplayHintAnnotation: status.DisplayHintSecurityLevel, config.DisplayOrderAnnotation: cfgOptionFilterSubDomainsOrder, - config.CategoryAnnotation: "Rules", + config.CategoryAnnotation: "Filter Lists", }, }) if err != nil { From a23c0fffa9c582f64267a9a92840d77409f59164 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 7 Jan 2021 12:39:54 +0100 Subject: [PATCH 2/3] Increase default prompt timeout to 60s --- firewall/config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firewall/config.go b/firewall/config.go index 7bc9052b..4119e27f 100644 --- a/firewall/config.go +++ b/firewall/config.go @@ -70,7 +70,7 @@ func registerConfig() error { Description: "How long the Portmaster will wait for a reply to a prompt notification. Please note that Desktop Notifications might not respect this or have their own limits.", OptType: config.OptTypeInt, ExpertiseLevel: config.ExpertiseLevelUser, - DefaultValue: 20, + DefaultValue: 60, Annotations: config.Annotations{ config.DisplayOrderAnnotation: cfgOptionAskTimeoutOrder, config.UnitAnnotation: "seconds", @@ -80,7 +80,7 @@ func registerConfig() error { if err != nil { return err } - askTimeout = config.Concurrent.GetAsInt(CfgOptionAskTimeoutKey, 15) + askTimeout = config.Concurrent.GetAsInt(CfgOptionAskTimeoutKey, 60) devMode = config.Concurrent.GetAsBool(core.CfgDevModeKey, false) apiListenAddress = config.GetAsString(api.CfgDefaultListenAddressKey, "") From ae32a2e29a16a801a09083a3bf4d390d7663c082 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 7 Jan 2021 12:40:06 +0100 Subject: [PATCH 3/3] Fix typo --- firewall/interception/nfq/nfq.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firewall/interception/nfq/nfq.go b/firewall/interception/nfq/nfq.go index afddffa5..f4f0fe99 100644 --- a/firewall/interception/nfq/nfq.go +++ b/firewall/interception/nfq/nfq.go @@ -145,7 +145,7 @@ func (q *Queue) handleError(e error) int { // Check if the queue was already closed. Unfortunately, the exposed error // variable is in an internal stdlib package. Therefore, check for the error // string instead. :( - // Offical error variable is defined here: + // Official error variable is defined here: // https://github.com/golang/go/blob/0e85fd7561de869add933801c531bf25dee9561c/src/internal/poll/fd.go#L24 if !strings.HasSuffix(e.Error(), "use of closed file") { log.Errorf("nfqueue: encountered error while receiving packets: %s\n", e.Error())