From 2ffea605cffd38604f46338857c772d44494798f Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Fri, 30 Sep 2022 16:57:33 +0300 Subject: [PATCH] Pull request: home: fix client blocked svcs Merge in DNS/adguard-home from fix-blocked-svcs to master Squashed commit of the following: commit 7e4ccbeb8866501c8f488efa76f7ce32369416ec Author: Eugene Burkov Date: Fri Sep 30 16:48:27 2022 +0300 all: imp log of changes commit 171836fb8033ac1b7fc3ed3f4bd18669795fe1dd Author: Eugene Burkov Date: Fri Sep 30 16:22:07 2022 +0300 all: log changes commit f5cde0a75a84b8efe59154ad019846ea06ec7c08 Author: Eugene Burkov Date: Fri Sep 30 16:04:14 2022 +0300 home: fix client blocked svcs --- CHANGELOG.md | 2 +- internal/home/clients.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e8ab36190a..a75ffcc30b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to ### Fixed +- User-specific blocked services not applying correctly. - `only application/json is allowed` errors in various APIs ([#4970]). [#4970]: https://github.com/AdguardTeam/AdGuardHome/issues/4970 @@ -39,7 +40,6 @@ See also the [v0.107.15 GitHub milestone][ms-v0.107.15]. --> - ## [v0.107.14] - 2022-09-29 See also the [v0.107.14 GitHub milestone][ms-v0.107.14]. diff --git a/internal/home/clients.go b/internal/home/clients.go index 7396e8c68de..618028318fe 100644 --- a/internal/home/clients.go +++ b/internal/home/clients.go @@ -244,6 +244,10 @@ func (clients *clientsContainer) addFromConfig(objects []*clientObject) { } } + if cli.BlockedServices == nil && cli.UseOwnBlockedServices { + cli.BlockedServices = []string{} + } + for _, t := range o.Tags { if clients.allTags.Has(t) { cli.Tags = append(cli.Tags, t)