From 82ab4328d4956c23427f21ce0a56bc6ba87f01e6 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Mon, 13 Nov 2023 17:39:48 +0300 Subject: [PATCH] all: sync with master; upd chlog --- .github/workflows/build.yml | 2 +- .github/workflows/lint.yml | 2 +- CHANGELOG.md | 69 ++- README.md | 2 +- bamboo-specs/release.yaml | 6 +- bamboo-specs/snapcraft.yaml | 6 +- bamboo-specs/test.yaml | 2 +- client/src/__locales/be.json | 1 - client/src/__locales/cs.json | 4 +- client/src/__locales/da.json | 4 +- client/src/__locales/de.json | 4 +- client/src/__locales/en.json | 4 +- client/src/__locales/es.json | 36 +- client/src/__locales/fa.json | 1 - client/src/__locales/fi.json | 2 +- client/src/__locales/fr.json | 4 +- client/src/__locales/hr.json | 4 +- client/src/__locales/hu.json | 4 +- client/src/__locales/id.json | 4 +- client/src/__locales/it.json | 4 +- client/src/__locales/ja.json | 4 +- client/src/__locales/ko.json | 4 +- client/src/__locales/nl.json | 4 +- client/src/__locales/no.json | 1 - client/src/__locales/pl.json | 4 +- client/src/__locales/pt-br.json | 4 +- client/src/__locales/pt-pt.json | 4 +- client/src/__locales/ro.json | 4 +- client/src/__locales/ru.json | 4 +- client/src/__locales/si-lk.json | 15 +- client/src/__locales/sk.json | 4 +- client/src/__locales/sl.json | 4 +- client/src/__locales/sr-cs.json | 4 +- client/src/__locales/sv.json | 6 +- client/src/__locales/tr.json | 10 +- client/src/__locales/uk.json | 5 +- client/src/__locales/vi.json | 4 +- client/src/__locales/zh-cn.json | 4 +- client/src/__locales/zh-tw.json | 14 +- client/src/components/App/index.css | 5 + .../components/Dashboard/UpstreamAvgTime.js | 4 +- client/src/components/Filters/Form.js | 4 +- .../Filters/Services/ScheduleForm/Modal.js | 4 + client/src/components/Logs/Logs.css | 2 +- .../Settings/Dns/Upstream/Examples.js | 16 + client/src/components/ui/Card.css | 4 + client/src/components/ui/Icons.css | 7 + client/src/components/ui/ReactTable.css | 4 - client/src/helpers/filters/filters.js | 18 + client/src/helpers/trackers/trackers.json | 84 +++- go.mod | 12 +- go.sum | 24 +- internal/confmigrate/migrator_test.go | 5 + internal/dnsforward/access.go | 2 + internal/dnsforward/clientid.go | 6 + internal/dnsforward/config.go | 46 +- internal/dnsforward/dnsforward.go | 5 +- internal/dnsforward/http.go | 222 +++++----- internal/dnsforward/http_test.go | 53 ++- internal/dnsforward/msg.go | 8 +- internal/dnsforward/stats.go | 39 +- .../TestDNSForwardHTTP_handleSetConfig.json | 42 ++ internal/filtering/filter.go | 24 -- internal/filtering/filtering.go | 81 +++- internal/filtering/servicelist.go | 36 ++ internal/home/auth.go | 407 ++---------------- internal/home/auth_internal_test.go | 89 ++++ internal/home/authhttp.go | 352 +++++++++++++++ ...auth_test.go => authhttp_internal_test.go} | 80 ---- internal/home/config.go | 12 +- internal/home/controlinstall.go | 2 +- internal/ipset/ipset_linux.go | 243 ++++++++--- internal/ipset/ipset_linux_internal_test.go | 23 +- internal/stats/stats_internal_test.go | 8 +- internal/stats/stats_test.go | 32 +- internal/stats/unit.go | 19 +- internal/tools/go.mod | 18 +- internal/tools/go.sum | 42 +- scripts/make/go-lint.sh | 2 +- 79 files changed, 1473 insertions(+), 881 deletions(-) create mode 100644 internal/home/auth_internal_test.go create mode 100644 internal/home/authhttp.go rename internal/home/{auth_test.go => authhttp_internal_test.go} (68%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e154dd3..f1c35913 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ 'name': 'build' 'env': - 'GO_VERSION': '1.20.10' + 'GO_VERSION': '1.20.11' 'NODE_VERSION': '16' 'on': diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 11a96f8b..144cc3f4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,7 +1,7 @@ 'name': 'lint' 'env': - 'GO_VERSION': '1.20.10' + 'GO_VERSION': '1.20.11' 'on': 'push': diff --git a/CHANGELOG.md b/CHANGELOG.md index 2759564e..b870b6fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,11 +14,11 @@ and this project adheres to @@ -29,6 +29,62 @@ NOTE: Add new changes ABOVE THIS COMMENT. +## [v0.107.41] - 2023-11-13 + +See also the [v0.107.41 GitHub milestone][ms-v0.107.41]. + +[ms-v0.107.41]: https://github.com/AdguardTeam/AdGuardHome/milestone/76?closed=1 + +### Security + +- Go version has been updated to prevent the possibility of exploiting the + CVE-2023-45283 and CVE-2023-45284 Go vulnerabilities fixed in + [Go 1.20.11][go-1.20.11]. + +### Added + +- Ability to specify subnet lengths for IPv4 and IPv6 addresses, used for rate + limiting requests, in the configuration file ([#6368]). +- Ability to specify multiple domain specific upstreams per line, e.g. + `[/domain1/../domain2/]upstream1 upstream2 .. upstreamN` ([#4977]). + +### Changed + +- The height of ready-to-use filter lists has been increased ([#6358]). +- Improved authentication failure logging ([#6357]). + +#### Configuration Changes + +- New properties `dns.ratelimit_subnet_len_ipv4` and + `dns.ratelimit_subnet_len_ipv6` in the configuration file ([#6368]). + +### Fixed + +- Missing timezone on schedule form submission ([#6401]). +- Average request processing time calculation ([#6220]). +- Redundant shortening long client names in the Top Clients table ([#6338]). +- Scrolling column headers in the tables ([#6337]). +- `$important,dnsrewrite` rules do not take precedence over allowlist rules + ([#6204]). +- Dark mode DNS rewrite background ([#6329]). +- Issues with QUIC and HTTP/3 upstreams on Linux ([#6335]). + +[#4977]: https://github.com/AdguardTeam/AdGuardHome/issues/4977 +[#6204]: https://github.com/AdguardTeam/AdGuardHome/issues/6204 +[#6220]: https://github.com/AdguardTeam/AdGuardHome/issues/6220 +[#6329]: https://github.com/AdguardTeam/AdGuardHome/issues/6329 +[#6335]: https://github.com/AdguardTeam/AdGuardHome/issues/6335 +[#6337]: https://github.com/AdguardTeam/AdGuardHome/issues/6337 +[#6338]: https://github.com/AdguardTeam/AdGuardHome/issues/6338 +[#6357]: https://github.com/AdguardTeam/AdGuardHome/issues/6357 +[#6358]: https://github.com/AdguardTeam/AdGuardHome/issues/6358 +[#6368]: https://github.com/AdguardTeam/AdGuardHome/issues/6368 +[#6401]: https://github.com/AdguardTeam/AdGuardHome/issues/6401 + +[go-1.20.11]: https://groups.google.com/g/golang-announce/c/4tU8LZfBFkY/m/d-jSKR_jBwAJ + + + ## [v0.107.40] - 2023-10-18 See also the [v0.107.40 GitHub milestone][ms-v0.107.40]. @@ -2557,11 +2613,12 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2]. -[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.40...HEAD +[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.41...HEAD +[v0.107.41]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.40...v0.107.41 [v0.107.40]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.39...v0.107.40 [v0.107.39]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.38...v0.107.39 [v0.107.38]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.37...v0.107.38 diff --git a/README.md b/README.md index 82c618b3..1a6937f1 100644 --- a/README.md +++ b/README.md @@ -201,7 +201,7 @@ opinion, this cannot be legitimately counted as a Pi-Hole's feature. | Cross-platform | ✅ | ❌ (not natively, only via Docker) | | Running as a DNS-over-HTTPS or DNS-over-TLS server | ✅ | ❌ (requires additional software) | | Blocking phishing and malware domains | ✅ | ❌ (requires non-default blocklists) | -| Parental control (blocking adult domains) | ✅ | ❌ | +| Parental control (blocking adult domains) | ✅ | ❌ (requires non-default blocklists) | | Force Safe search on search engines | ✅ | ❌ | | Per-client (device) configuration | ✅ | ✅ | | Access settings (choose who can use AGH DNS) | ✅ | ❌ | diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml index f868e363..8743a21a 100644 --- a/bamboo-specs/release.yaml +++ b/bamboo-specs/release.yaml @@ -7,7 +7,7 @@ # Make sure to sync any changes with the branch overrides below. 'variables': 'channel': 'edge' - 'dockerGo': 'adguard/golang-ubuntu:7.4' + 'dockerGo': 'adguard/golang-ubuntu:7.5' 'stages': - 'Build frontend': @@ -272,7 +272,7 @@ # need to build a few of these. 'variables': 'channel': 'beta' - 'dockerGo': 'adguard/golang-ubuntu:7.4' + 'dockerGo': 'adguard/golang-ubuntu:7.5' # release-vX.Y.Z branches are the branches from which the actual final # release is built. - '^release-v[0-9]+\.[0-9]+\.[0-9]+': @@ -287,4 +287,4 @@ # are the ones that actually get released. 'variables': 'channel': 'release' - 'dockerG