Merge: * blocked-services: remove Messenger

* commit '5dc7b848dffaa0cd3cd3ca55080af90bdda2fec0':
  * blocked-services: remove unknown service names
  * blocked-services: remove Messenger

client/src/helpers/constants.js

@@ -187,10 +187,6 @@ export const SERVICES = [
         id: 'snapchat',
         name: 'Snapchat',
     },
-    {
-        id: 'messenger',
-        name: 'Messenger',
-    },
     {
         id: 'twitch',
         name: 'Twitch',

home/blocked_services.go

@@ -21,10 +21,9 @@ type svc struct {
 // client/src/components/ui/Icons.js
 var serviceRulesArray = []svc{
 	{"whatsapp", []string{"||whatsapp.net^", "||whatsapp.com^"}},
-	{"facebook", []string{"||facebook.com^", "||facebook.net^", "||fbcdn.net^", "||fb.me^", "||fb.com^", "||fbsbx.com^"}},
+	{"facebook", []string{"||facebook.com^", "||facebook.net^", "||fbcdn.net^", "||fb.me^", "||fb.com^", "||fbsbx.com^", "||messenger.com^"}},
 	{"twitter", []string{"||twitter.com^", "||t.co^", "||twimg.com^"}},
 	{"youtube", []string{"||youtube.com^", "||ytimg.com^", "||youtu.be^", "||googlevideo.com^", "||youtubei.googleapis.com^"}},
-	{"messenger", []string{"||fb.com^", "||facebook.com^", "||messenger.com^"}},
 	{"twitch", []string{"||twitch.tv^", "||ttvnw.net^"}},
 	{"netflix", []string{"||nflxext.com^", "||netflix.com^"}},
 	{"instagram", []string{"||instagram.com^", "||cdninstagram.com^"}},
@@ -136,6 +135,12 @@ func initServices() {
 	}
 }
 
+// Return TRUE if a blocked service name is known
+func blockedSvcKnown(s string) bool {
+	_, ok := serviceRules[s]
+	return ok
+}
+
 // ApplyBlockedServices - set blocked services settings for this DNS request
 func ApplyBlockedServices(setts *dnsfilter.RequestFilteringSettings, list []string) {
 	setts.ServicesRules = []dnsfilter.ServiceEntry{}

home/clients.go

@@ -140,11 +140,18 @@ func (clients *clientsContainer) addFromConfig(objects []clientObject) {
 			SafeBrowsingEnabled: cy.SafeBrowsingEnabled,
 
 			UseOwnBlockedServices: !cy.UseGlobalBlockedServices,
-			BlockedServices:       cy.BlockedServices,
 
 			Upstreams: cy.Upstreams,
 		}
 
+		for _, s := range cy.BlockedServices {
+			if !blockedSvcKnown(s) {
+				log.Debug("Clients: skipping unknown blocked-service '%s'", s)
+				continue
+			}
+			cli.BlockedServices = append(cli.BlockedServices, s)
+		}
+
 		for _, t := range cy.Tags {
 			if !clients.tagKnown(t) {
 				log.Debug("Clients: skipping unknown tag '%s'", t)

home/config.go

@@ -234,6 +234,16 @@ func parseConfig() error {
 		return err
 	}
 
+	bsvcs := []string{}
+	for _, s := range config.DNS.BlockedServices {
+		if !blockedSvcKnown(s) {
+			log.Debug("skipping unknown blocked-service '%s'", s)
+			continue
+		}
+		bsvcs = append(bsvcs, s)
+	}
+	config.DNS.BlockedServices = bsvcs
+
 	if !checkFiltersUpdateIntervalHours(config.DNS.FiltersUpdateIntervalHours) {
 		config.DNS.FiltersUpdateIntervalHours = 24
 	}