Move resolving unbreak filter list IDs to filterlists module

firewall/filter.go

@@ -2,19 +2,12 @@ package firewall
 
 import (
 	"github.com/safing/portbase/config"
-	"github.com/safing/portbase/log"
 	"github.com/safing/portbase/modules"
 	"github.com/safing/portbase/modules/subsystems"
 	_ "github.com/safing/portmaster/core"
-	"github.com/safing/portmaster/intel/filterlists"
 )
 
-var (
-	filterModule *modules.Module
-
-	unbreakFilterListIDs         = []string{"UNBREAK"}
-	resolvedUnbreakFilterListIDs []string
-)
+var filterModule *modules.Module
 
 func init() {
 	filterModule = modules.Register("filter", filterPrep, filterStart, nil, "core", "intel")
@@ -51,12 +44,5 @@ func filterPrep() (err error) {
 func filterStart() error {
 	getConfig()
 
-	// TODO: Re-resolve IDs when filterlist index changes.
-	resolvedIDs, err := filterlists.ResolveListIDs(unbreakFilterListIDs)
-	if err != nil {
-		log.Warningf("filter: failed to resolve unbreak filter list IDs: %s", err)
-	} else {
-		resolvedUnbreakFilterListIDs = resolvedIDs
-	}
 	return nil
 }

firewall/master.go

@@ -8,6 +8,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/safing/portmaster/intel/filterlists"
+
 	"github.com/agext/levenshtein"
 	"golang.org/x/net/publicsuffix"
 
@@ -435,6 +437,7 @@ func checkFilterLists(ctx context.Context, conn *network.Connection, p *profile.
 	switch result {
 	case endpoints.Denied:
 		// If the connection matches a filter list, check if the "unbreak" list matches too and abort blocking.
+		resolvedUnbreakFilterListIDs := filterlists.GetUnbreakFilterListIDs()
 		for _, blockedListID := range conn.Entity.BlockedByLists {
 			for _, unbreakListID := range resolvedUnbreakFilterListIDs {
 				if blockedListID == unbreakListID {