Refactor entity list handling

profile/endpoints/endpoint-lists.go

@@ -10,21 +10,19 @@ import (
 type EndpointLists struct {
 	EndpointBase
 
-	ListSet *intel.ListSet
+	ListSet []string
 	Lists   string
 	Reason  string
 }
 
 // Matches checks whether the given entity matches this endpoint definition.
 func (ep *EndpointLists) Matches(entity *intel.Entity) (result EPResult, reason string) {
-	lists, ok := entity.GetLists()
-	if !ok {
-		return Undeterminable, ""
-	}
-	matched := ep.ListSet.MatchSet(lists)
-	if len(matched) > 0 {
-		return ep.matchesPPP(entity), ep.Reason
+	entity.LoadLists()
+
+	if entity.MatchLists(ep.ListSet) {
+		return ep.matchesPPP(entity), entity.ListBlockReason().String()
 	}
+
 	return NoMatch, ""
 }
 
@@ -36,7 +34,7 @@ func parseTypeList(fields []string) (Endpoint, error) {
 	if strings.HasPrefix(fields[1], "L:") {
 		lists := strings.Split(strings.TrimPrefix(fields[1], "L:"), ",")
 		ep := &EndpointLists{
-			ListSet: intel.NewListSet(lists),
+			ListSet: lists,
 			Lists:   "L:" + strings.Join(lists, ","),
 			Reason:  "matched lists " + strings.Join(lists, ","),
 		}

profile/endpoints/endpoint.go

@@ -11,7 +11,7 @@ import (
 
 // Endpoint describes an Endpoint Matcher
 type Endpoint interface {
-	Matches(entity *intel.Entity) (result EPResult, reason string)
+	Matches(entity *intel.Entity) (EPResult, string)
 	String() string
 }
 

profile/profile-layered.go

@@ -243,27 +243,27 @@ func (lp *LayeredProfile) MatchFilterLists(entity *intel.Entity) (endpoints.EPRe
 	entity.ResolveSubDomainLists(lp.FilterSubDomains())
 	entity.EnableCNAMECheck(lp.FilterCNAMEs())
 
-	lookupMap, hasLists := entity.GetListsMap()
-	if !hasLists {
-		return endpoints.NoMatch, ""
-	}
-
 	for _, layer := range lp.layers {
-		if reason := lookupMap.Match(layer.filterListIDs); reason != "" {
-			return endpoints.Denied, reason
-		}
-
-		// only check the first layer that has filter list
-		// IDs defined.
+		// search for the first layer that has filterListIDs set
 		if len(layer.filterListIDs) > 0 {
+			entity.LoadLists()
+
+			if entity.MatchLists(layer.filterListIDs) {
+				return endpoints.Denied, entity.ListBlockReason().String()
+			}
+
 			return endpoints.NoMatch, ""
 		}
 	}
 
 	cfgLock.RLock()
 	defer cfgLock.RUnlock()
-	if reason := lookupMap.Match(cfgFilterLists); reason != "" {
-		return endpoints.Denied, reason
+	if len(cfgFilterLists) > 0 {
+		entity.LoadLists()
+
+		if entity.MatchLists(cfgFilterLists) {
+			return endpoints.Denied, entity.ListBlockReason().String()
+		}
 	}
 
 	return endpoints.NoMatch, ""