+ dnsfilter: use global and per-client BlockedServices array

dnsforward/dnsforward.go

@@ -96,6 +96,10 @@ type FilteringConfig struct {
 	ParentalBlockHost     string `yaml:"parental_block_host"`
 	SafeBrowsingBlockHost string `yaml:"safebrowsing_block_host"`
 
+	// Names of services to block (globally).
+	// Per-client settings can override this configuration.
+	BlockedServices []string `json:"blocked_services"`
+
 	dnsfilter.Config `yaml:",inline"`
 }
 

dnsforward/querylog.go

@@ -186,6 +186,10 @@ func (l *queryLog) getQueryLog() []map[string]interface{} {
 			jsonEntry["filterId"] = entry.Result.FilterID
 		}
 
+		if len(entry.Result.ServiceName) != 0 {
+			jsonEntry["service_name"] = entry.Result.ServiceName
+		}
+
 		answers := answerToMap(a)
 		if answers != nil {
 			jsonEntry["answer"] = answers