Skip to content

[pull] master from AdguardTeam:master #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
May 22, 2026
Merged

[pull] master from AdguardTeam:master #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,22 @@ NOTE: Add new changes BELOW THIS COMMENT.

- New `reason` query parameter in `GET /control/querylog`. See `openapi/openapi.yaml` for the full description.

### Changed

- Duration values in YAML configuration file now support `d` (days) units and has been updated.

**NOTE:** Any rollback to version below the `v0.107.76` should convert the values back to hours.

### Deprecated

- Query parameter `response_status` in `GET /control/querylog` is now deprecated. Use new `reason` query parameter instead.

### Fixed

- DNS caching with disabled DNSSEC ([#8384]).

[#8384]: https://github.com/AdguardTeam/AdGuardHome/issues/8384

<!--
NOTE: Add new changes ABOVE THIS COMMENT.
-->
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/AdguardTeam/AdGuardHome
go 1.26.3

require (
github.com/AdguardTeam/dnsproxy v0.81.3
github.com/AdguardTeam/golibs v0.35.12
github.com/AdguardTeam/dnsproxy v0.81.4
github.com/AdguardTeam/golibs v0.35.13
github.com/AdguardTeam/urlfilter v0.23.2
github.com/NYTimes/gziphandler v1.1.1
github.com/ameshkov/dnscrypt/v2 v2.4.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ cloud.google.com/go/auth v0.20.0 h1:kXTssoVb4azsVDoUiF8KvxAqrsQcQtB53DcSgta74CA=
cloud.google.com/go/auth v0.20.0/go.mod h1:942/yi/itH1SsmpyrbnTMDgGfdy2BUqIKyd0cyYLc5Q=
cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
github.com/AdguardTeam/dnsproxy v0.81.3 h1:WT2ylABCqTDs0vCg6Ik5K6pOfn7Zxnonfk2MpLGvNY4=
github.com/AdguardTeam/dnsproxy v0.81.3/go.mod h1:jcrlawxdZ+jh0TpCfPhT63LmVFuZETH495Sn9bAvQ8s=
github.com/AdguardTeam/golibs v0.35.12 h1:ONAzF/3JG2xp5Xq2G9EChbJiXjkouGjTGLzM8bSEYQQ=
github.com/AdguardTeam/golibs v0.35.12/go.mod h1:8EEGG4auTDd8HV3tBETXLkuxDH9lk9vvFbJn+wbmypg=
github.com/AdguardTeam/dnsproxy v0.81.4 h1:eFM8wzA9sNcK473FdWiy1VRhbgpEM5KighAoJ48O31c=
github.com/AdguardTeam/dnsproxy v0.81.4/go.mod h1:q7Wiq4iiABAFn6EzPqDWhUbXeVcI5O+RvZH/hmXoAaI=
github.com/AdguardTeam/golibs v0.35.13 h1:sflm5/sWhiGwUXNAZObiqVMkdg8HeYVFK2A0oJ27hbU=
github.com/AdguardTeam/golibs v0.35.13/go.mod h1:8EEGG4auTDd8HV3tBETXLkuxDH9lk9vvFbJn+wbmypg=
github.com/AdguardTeam/urlfilter v0.23.2 h1:EiS/PQZO/X2S6cduFW6BBoRLyjd6SqZj1ZiFbU1KaFE=
github.com/AdguardTeam/urlfilter v0.23.2/go.mod h1:JteAKoeka1Yr2oZ3P94dqYBfPOHWyFaOcu3uZa9Yl+I=
github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
Expand Down
4 changes: 2 additions & 2 deletions internal/configmigrate/migrations_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1433,7 +1433,7 @@ func TestUpgradeSchema22to23(t *testing.T) {
want: yobj{
"http": yobj{
"address": "1.2.3.4:8081",
"session_ttl": "720h",
"session_ttl": "30d",
},
"schema_version": newSchemaVer,
},
Expand All @@ -1447,7 +1447,7 @@ func TestUpgradeSchema22to23(t *testing.T) {
want: yobj{
"http": yobj{
"address": "[2001:db8::1]:8081",
"session_ttl": "720h",
"session_ttl": "30d",
},
"schema_version": newSchemaVer,
},
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v12/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dns:
parental_sensitivity: 0
blocked_response_ttl: 10
querylog_enabled: true
querylog_interval: 720h
querylog_interval: 30d
upstream_dns:
- tls://1.1.1.1
- tls://1.0.0.1
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v13/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dns:
parental_sensitivity: 0
blocked_response_ttl: 10
querylog_enabled: true
querylog_interval: 720h
querylog_interval: 30d
upstream_dns:
- tls://1.1.1.1
- tls://1.0.0.1
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v13/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dns:
parental_sensitivity: 0
blocked_response_ttl: 10
querylog_enabled: true
querylog_interval: 720h
querylog_interval: 30d
upstream_dns:
- tls://1.1.1.1
- tls://1.0.0.1
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v14/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dns:
parental_sensitivity: 0
blocked_response_ttl: 10
querylog_enabled: true
querylog_interval: 720h
querylog_interval: 30d
upstream_dns:
- tls://1.1.1.1
- tls://1.0.0.1
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v14/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dns:
parental_sensitivity: 0
blocked_response_ttl: 10
querylog_enabled: true
querylog_interval: 720h
querylog_interval: 30d
upstream_dns:
- tls://1.1.1.1
- tls://1.0.0.1
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v15/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dns:
blocked_response_ttl: 10
querylog_enabled: true
querylog_file_enabled: true
querylog_interval: 720h
querylog_interval: 30d
querylog_size_memory: 1000
upstream_dns:
- tls://1.1.1.1
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v15/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
os:
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v16/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
os:
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v16/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v17/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v17/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v18/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v18/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v19/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v19/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
Expand Down
2 changes: 1 addition & 1 deletion internal/configmigrate/testdata/TestMigrateConfig_Migrate/v20/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
Expand Down
4 changes: 2 additions & 2 deletions internal/configmigrate/testdata/TestMigrateConfig_Migrate/v20/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
enabled: true
interval: 240h
interval: 10d
ignored: []
os:
group: ''
Expand Down
4 changes: 2 additions & 2 deletions internal/configmigrate/testdata/TestMigrateConfig_Migrate/v21/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
enabled: true
interval: 240h
interval: 10d
ignored: []
os:
group: ''
Expand Down
4 changes: 2 additions & 2 deletions internal/configmigrate/testdata/TestMigrateConfig_Migrate/v21/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
enabled: true
interval: 240h
interval: 10d
ignored: []
os:
group: ''
Expand Down
4 changes: 2 additions & 2 deletions internal/configmigrate/testdata/TestMigrateConfig_Migrate/v22/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
enabled: true
interval: 240h
interval: 10d
ignored: []
os:
group: ''
Expand Down
4 changes: 2 additions & 2 deletions internal/configmigrate/testdata/TestMigrateConfig_Migrate/v22/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
enabled: true
interval: 240h
interval: 10d
ignored: []
os:
group: ''
Expand Down
4 changes: 2 additions & 2 deletions internal/configmigrate/testdata/TestMigrateConfig_Migrate/v23/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
enabled: true
interval: 240h
interval: 10d
ignored: []
os:
group: ''
Expand Down
4 changes: 2 additions & 2 deletions internal/configmigrate/testdata/TestMigrateConfig_Migrate/v23/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
enabled: true
interval: 240h
interval: 10d
ignored: []
os:
group: ''
Expand Down
4 changes: 2 additions & 2 deletions internal/configmigrate/testdata/TestMigrateConfig_Migrate/v24/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
enabled: true
interval: 240h
interval: 10d
ignored: []
os:
group: ""
Expand Down
4 changes: 2 additions & 2 deletions internal/configmigrate/testdata/TestMigrateConfig_Migrate/v24/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
enabled: true
interval: 240h
interval: 10d
ignored: []
os:
group: ''
Expand Down
4 changes: 2 additions & 2 deletions internal/configmigrate/testdata/TestMigrateConfig_Migrate/v25/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
enabled: true
interval: 240h
interval: 10d
ignored: []
os:
group: ''
Expand Down
4 changes: 2 additions & 2 deletions internal/configmigrate/testdata/TestMigrateConfig_Migrate/v25/output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
enabled: true
interval: 240h
interval: 10d
ignored: []
os:
group: ''
Expand Down
4 changes: 2 additions & 2 deletions internal/configmigrate/testdata/TestMigrateConfig_Migrate/v26/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ user_rules: []
querylog:
enabled: true
file_enabled: true
interval: 720h
interval: 30d
size_memory: 1000
ignored: []
statistics:
enabled: true
interval: 240h
interval: 10d
ignored: []
os:
group: ''
Expand Down
Loading
Loading