Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
64e6048
AGH-180 Fix panic dnscrypt
makazantsev Sep 23, 2026
045ba86
ADG-12585 Upd all
EugeneOne1 Sep 23, 2026
c0a26e3
ADG-1: Add ephemeral job key
bratishka-bot Sep 24, 2026
27fbabe
AGH-177 design review UI fixes
IldarKamalov Sep 25, 2026
b08c2e5
AGH-169 Fix ratelimit allowlist
makazantsev Sep 25, 2026
388ee05
AGNDS-4443 Fix exec bit
EugeneOne1 Sep 28, 2026
75a2928
AGDNS-4443 Fix windows extension
EugeneOne1 Sep 28, 2026
7ccadb1
AGDNS-4443 Fix snap
Mizzick Sep 28, 2026
9c55641
AGH-31 Add-more-confs
Mizzick Sep 29, 2026
5ce990b
AGDNS-4443 imp-beta-workflow
EugeneOne1 Sep 29, 2026
a308a74
AGH-177 add client v2 translations
IldarKamalov Sep 29, 2026
7a0ab04
AGH-191 Fix update panic
makazantsev Sep 30, 2026
349c0b6
AGH-177 Remove redundant i18n lines
EugeneOne1 Sep 30, 2026
73d4aab
ADG-12585 upd-all
EugeneOne1 Sep 30, 2026
bfd64d2
AGH-160 Refactor-doh
Mizzick Oct 1, 2026
89e2190
home: do not loop after the first shutdown;
makazantsev Oct 1, 2026
6d0e7f3
AGH-173 fix client v2 CIDR and identifier validation
IldarKamalov Oct 1, 2026
764aa25
AGH-179 fix client v1 DHCPv4 save, subnet and IPv6 CIDR validation
IldarKamalov Oct 2, 2026
9b6f5f3
AGH-15 exchange ctx (9)
masterkusok Oct 2, 2026
fe41592
AGDNS-4443 Remove-gh-prerelease
EugeneOne1 Oct 2, 2026
80732eb
AGH-31 Use-confs
Mizzick Oct 6, 2026
b2f3948
AGH-228 fixed ip addresses sort function
IldarKamalov Oct 6, 2026
07afcda
ADG-12585 Upd bootstrap IP
makazantsev Oct 7, 2026
8dedd32
AGH-31 Use-confs-http
Mizzick Oct 8, 2026
9b236a7
Merge remote-tracking branch 'upstream/master' into chore/sync-upstre…
KS-OTO Oct 12, 2026
5f39cd6
chore: re-apply custom login path on new auth architecture, disable u…
KS-OTO Oct 12, 2026
17b8c54
ci: bump Go to 1.27.1 to match upstream go.mod
KS-OTO Oct 12, 2026
7fe7af1
fix: collapse double blank line left by merge conflict resolution
KS-OTO Oct 12, 2026
b617d0f
fix: align HTTPConfig fields for fieldalignment lint
KS-OTO Oct 12, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'env':
'BASE_IMAGE': |-
${{ vars.BASE_IMAGE || 'adguard/go-builder:1.26.8--1' }}
${{ vars.BASE_IMAGE || 'adguard/go-builder:1.27.1--1' }}
'BUILD_DIR': |-
build
'CHANNEL': |-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
- 'name': 'Set up Go'
'uses': 'actions/setup-go@v5'
'with':
'go-version': '1.26.8'
'go-version': '1.27.1'

- 'name': 'Build'
'run': 'go build -v ./...'
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/private.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'env':
'BASE_IMAGE': |-
${{ vars.BASE_IMAGE || 'adguard/go-builder:1.26.8--1' }}
${{ vars.BASE_IMAGE || 'adguard/go-builder:1.27.1--1' }}
'CACHE_BUSTER': |-
${{ inputs.cache_buster || '0' }}
'CLIENT_DIR': |-
Expand Down Expand Up @@ -76,6 +76,7 @@
- 'ephemeral'
- 'ephemeral-mac'
- '${{ vars.BUILD_IMAGE_VERSION_MACOS }}'
- 'ephemeral-job-key-${{ github.run_id }}-${{ github.job }}-${{ strategy.job-index || 0 }}'
'steps':
- 'uses': 'actions/checkout@v6'
'with':
Expand Down Expand Up @@ -110,6 +111,7 @@
- '${{ vars.BUILD_IMAGE_VERSION_WINDOWS_GO }}'
- 'ephemeral-limit-memory-8192'
- 'ephemeral-limit-cpu-4'
- 'ephemeral-job-key-${{ github.run_id }}-${{ github.job }}-${{ strategy.job-index || 0 }}'
'steps':
- 'uses': 'actions/checkout@v6'
'with':
Expand Down
31 changes: 16 additions & 15 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'env':
'BASE_IMAGE': |-
${{ vars.BASE_IMAGE || 'adguard/go-builder:1.26.8--1' }}
${{ vars.BASE_IMAGE || 'adguard/go-builder:1.27.1--1' }}
'BUILD_DIR': |-
build
'CHANNEL': |-
Expand All @@ -12,7 +12,6 @@
'CLIENT_DIR': |-
${{ case(
startsWith(github.ref_name, 'release-v'), 'client',
startsWith(github.ref_name, 'beta-v'), 'client',
'client_v2'
) }}
'DIST_DIR': |-
Expand Down Expand Up @@ -197,9 +196,15 @@
VERSION=${{ needs.Build.outputs.app_version }}
- 'uses': 'actions/upload-artifact@v7'
'with':
'name': 'adguardhome'
'name': 'adguardhome-static'
'path': |
${{ env.DIST_DIR }}/*.*
- 'uses': 'actions/upload-artifact@v7'
'with':
'name': 'adguardhome-github'
'path': |
${{ env.DIST_DIR }}/*.*
!${{ env.DIST_DIR }}/version.json
'DeployToStaticStorage':
'if': |
${{ github.repository_owner == 'AdGuardSoftwareLimited' }}
Expand All @@ -218,7 +223,7 @@
startsWith(github.ref_name, 'beta-v'), 'beta',
'edge'
) }}
'artifact-name': 'adguardhome'
'artifact-name': 'adguardhome-static'
'environment': |-
${{ case(
startsWith(github.ref_name, 'release-v'), 'release',
Expand Down Expand Up @@ -277,7 +282,8 @@
'id-token': 'write'
'uses': 'AdGuardSoftwareLimited/actions/.github/workflows/create-gh-release.yml@master'
'with':
'artifact_name': 'adguardhome'
'artifact_name': 'adguardhome-github'
# TODO(e.burkov): Set the 'prerelease' argument based on the channel.
'draft': true
# Use the actual application version, e.g. v0.108.1, as the tag, and not
# the branch name, so that it matches the announcement_url written to
Expand All @@ -286,17 +292,12 @@
'team': 'go'
'target_repo': 'AdguardTeam/AdGuardHome'
'name': 'Build and publish releases'
# NOTE: The schedule trigger is removed in this fork. This workflow is
# upstream-only: it references reusable workflows from the private
# AdGuardSoftwareLimited/actions repository, which this fork cannot access, so
# any run fails at startup. Releases in this fork are built by release.yml on
# version tags.
'on':
# Only the daily schedule runs automatically, on the default branch. Builds
# for the beta-v* and release-v* branches are manual and must be triggered via
# workflow_dispatch with the corresponding branch selected.
'schedule':
# Don't use minute values that end with a zero or a five as these are often
# used in CI and so resources during these minutes can be quite busy.
#
# GitHub Actions uses standard 5-field POSIX cron: runs at 13:42 UTC on
# weekdays (Mon-Fri).
- cron: '42 13 * * 1-5'
'workflow_dispatch':
'inputs':
'cache_buster':
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'v*'

env:
GO_VERSION: '1.26.8'
GO_VERSION: '1.27.1'
NODE_VERSION: '24'

jobs:
Expand Down
16 changes: 3 additions & 13 deletions .github/workflows/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,10 @@ jobs:
'secrets': |
SNAPCRAFT_STORE_CREDENTIALS=${{ env.SNAPCRAFT_STORE_CREDENTIALS }}
'name': 'Build and publish Snapcraft release'
# NOTE: The schedule trigger is removed in this fork. This workflow is
# upstream-only: it targets AdGuard's internal runners and publishes to the
# upstream Snap store, which this fork cannot do.
'on':
# Only the daily schedule runs automatically, on the default branch. Builds
# for the beta-v* and release-v* branches are manual and must be triggered via
# workflow_dispatch with the corresponding branch selected.
'schedule':
# Don't use minute values that end with a zero or a five as these are often
# used in CI and so resources during these minutes can be quite busy.
#
# NOTE: The time is chosen to be exactly one hour after the main release
# build as defined as in release.yaml.
#
# GitHub Actions uses standard 5-field POSIX cron: runs at 14:42 UTC on
# weekdays (Mon-Fri).
- cron: '42 14 * * 1-5'
'workflow_dispatch':
'inputs':
'cache_buster':
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'env':
'CLIENT_DIR': 'client'
'GO_VERSION': '1.26.8'
'GO_VERSION': '1.27.1'
'NODE_VERSION': '24'
'jobs':
'ESLint':
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.twosky.json
CHANGELOG.md
1 change: 0 additions & 1 deletion .twosky.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
"uk": "Українська",
"vi": "Tiếng Việt",
"zh-cn": "简体中文",
"zh-hk": "繁體中文(香港)",
"zh-tw": "正體中文(台灣)"
},
"metadata": {
Expand Down
37 changes: 33 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,46 @@ NOTE: Add new changes BELOW THIS COMMENT.

### Security

- Go version has been updated to prevent the possibility of exploiting the Go vulnerabilities fixed in [1.26.8][go-1.26.8].
- Go version has been updated to prevent the possibility of exploiting the Go vulnerabilities fixed in [1.27.1][go-1.27.1].

### Fixed

- Reading partially received TCP prefix.

- A panic when updating AdGuard Home binary via the command line with `use_private_ptr_resolvers` set to true ([#8613]).

- `log.enabled` set to `false` leaving the legacy logger enabled ([#8565]).

- DHCP server persisting uncommitted leases with zero expiry after `DHCPDISCOVER` messages ([#8572]).

[#8565]: https://github.com/AdguardTeam/AdGuardHome/issues/8565
[#8572]: https://github.com/AdguardTeam/AdGuardHome/issues/8572
[go-1.26.8]: https://groups.google.com/g/golang-announce/c/QiTRm-HGGtI
- DHCPv4 settings not being saved when an IPv6-capable interface is selected and DHCPv6 is not configured ([#8608]).

- DHCP not being enabled when only the DHCPv6 section is configured.

- DHCP IPv4 range subnet validation not working ([#8609]).

- Client ID validation rejecting valid IPv6 CIDRs with an embedded dotted-decimal IPv4 address ([#8610]).

- Client ID validation accepting IPv4 addresses with leading-zero octets (`192.168.01.1`), malformed MAC addresses, and ClientIDs with leading or trailing hyphens.

- IP addresses being sorted lexicographically instead of numerically in the web interface ([#8636]).

- Invalid secondary bootstrap resolver IPv4 address ([#8637]).

### Removed

- The support for macOS 13 Ventura, see [Go 1.27 release notes][go-1.27.1-notes].

[#8565]: https://github.com/AdguardTeam/AdGuardHome/issues/8565
[#8572]: https://github.com/AdguardTeam/AdGuardHome/issues/8572
[#8608]: https://github.com/AdguardTeam/AdGuardHome/issues/8608
[#8609]: https://github.com/AdguardTeam/AdGuardHome/issues/8609
[#8610]: https://github.com/AdguardTeam/AdGuardHome/issues/8610
[#8613]: https://github.com/AdguardTeam/AdGuardHome/issues/8613
[#8636]: https://github.com/AdguardTeam/AdGuardHome/issues/8636
[#8637]: https://github.com/AdguardTeam/AdGuardHome/issues/8637
[go-1.27.1]: https://groups.google.com/g/golang-announce/c/QiTRm-HGGtI
[go-1.27.1-notes]: https://go.dev/doc/go1.27#darwin

<!--
NOTE: Add new changes ABOVE THIS COMMENT.
Expand Down
18 changes: 13 additions & 5 deletions LOCAL_MODIFICATIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,23 @@

**修改文件:**

- `internal/home/config.go` — `httpConfig` 新增 `LoginPath` 字段
- `internal/configmgr/http.go` — `HTTPConfig` 新增 `LoginPath` 字段(2026-10 上游重构后,HTTP 配置由 `internal/home` 迁移至 `configmgr` 包)
- `internal/home/authhttp.go` — 认证中间件支持自定义登录路径
- `isPublicResource`:配置自定义路径后,原始 `/login.*` 不再是公开资源
- `handlePublicAccess`:自定义路径请求内部重写为 `/login.html`;原始路径返回 403;根路径返回 403
- `handleCustomLoginAccess`:自定义路径请求内部重写为 `/login.html`;原始 `/login.html` 返回 403
- `handlePublicAccess`:根路径与 `/index.html` 在配置自定义路径时返回 403
- `handleAuthenticatedUser`:已认证用户访问自定义路径也重定向到 `/`
- `handleLogout`:登出后重定向到自定义路径
- `internal/home/auth.go` — 将 `LoginPath` 配置传入认证中间件
- `internal/home/authglinet.go` — 适配 `isPublicResource` 签名变更
- `internal/home/authhttp_internal_test.go` — 更新测试用例
- `internal/home/authglinet.go` — 适配上游 `isPublicResource` 签名
- `internal/home/authhttp_internal_test.go` — `TestAuthMiddlewareDefault_customLoginPath*` 回归测试

### 上游 workflow 禁用

上游的 `release.yaml` 与 `snapcraft.yaml` 依赖 AdGuard 私有基础设施(`AdGuardSoftwareLimited/actions` 私有可复用 workflow、内部 runner),在本 fork 上永远无法运行(`release.yaml` 每日定时触发且启动即失败)。fork 已移除二者的 `schedule` 触发器,保留 `workflow_dispatch`。fork 的发布由 tag 触发的 `release.yml` 完成。

### 本地构建修复

- `client_v2/webpack.common.js` — 用 `fileURLToPath(import.meta.url)` 计算 `__dirname`,修复 Windows 宿主机上 `/D:/...` 路径拼接错误(上游仅在 Linux docker 中构建前端,未暴露此问题)

### 上游自动同步

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ DIST_DIR = dist
GOAMD64 = v1
GOPROXY = https://proxy.golang.org|direct
GOTELEMETRY = off
GOTOOLCHAIN = go1.26.8
GOTOOLCHAIN = go1.27.1
GPG_KEY = devteam@adguard.com
GPG_KEY_PASSPHRASE = not-a-real-password
NPM = npm
Expand Down
2 changes: 1 addition & 1 deletion client/src/__locales/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
"descr": "Апісанне",
"details": "Падрабязнасці",
"dhcp_add_static_lease": "Дадаць статычную арэнду",
"dhcp_config_saved": "Канфігурацыя DHCP-сервера паспяхова захавана",
"dhcp_config_saved": "Канфігурацыя DHCP паспяхова захавана",
"dhcp_description": "Калі ваш роўтар не падае налады DHCP, вы можаце выкарыстоўваць уласны ўбудаваны DHCP-сервер AdGuard.",
"dhcp_disable": "Адключыць сервер DHCP",
"dhcp_dynamic_ip_found": "Ваша сістэма выкарыстоўвае дынамічную канфігурацыю IP-адраса для інтэрфейсу <0>{{interfaceName}}</0>. Неабходна задаць статычны IP-адрас для выкарыстання сервера DHCP. Ваш бягучы IP-адрас: <0>{{ipAddress}}</0>. AdGuard Home аўтаматычна прызначыць яго ў якасці статычнага, калі вы націснеце кнопку «Уключыць DHCP».",
Expand Down
2 changes: 1 addition & 1 deletion client/src/__locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"blocking_mode_refused": "REFUSED : Répondre avec le code REFUSED",
"blocklist": "Liste de blocage",
"bootstrap_dns": "Serveurs DNS d'amorçage",
"bootstrap_dns_desc": "Les adresses IP des serveurs DNS utilisées pour résoudre les adresses IP des résolveurs DoH/DoT que vous spécifiez comme en amont. Les commentaires ne sont pas autorisés.",
"bootstrap_dns_desc": "Les adresses IP des serveurs DNS utilisés pour résoudre les noms d'hôte des résolveurs en amont DNS-over-HTTPS/DNS-over-TLS. Saisissez une adresse IP par ligne. Les commentaires doivent commencer sur une nouvelle ligne par le caractère #. Les lignes vides et les commentaires sont ignorés.",
"cache_cleared": "Le cache DNS a été vidé",
"cache_enabled": "Activer le cache",
"cache_enabled_desc": "Stockez les réponses DNS localement.",
Expand Down
2 changes: 1 addition & 1 deletion client/src/__locales/hr.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"blocking_mode_refused": "REFUSED: Odgovorite s REFUSED kôdom",
"blocklist": "Popis nedopuštenih",
"bootstrap_dns": "Bootstrap DNS poslužitelji",
"bootstrap_dns_desc": "IP adrese DNS poslužitelja koji se koriste za rješavanje IP adresa DoH/DoT razrjeđivača koje navedete kao uzvodne. Komentari nisu dopušteni.",
"bootstrap_dns_desc": "IP adrese DNS poslužitelja koje se upotrebljavaju za razrješavanje naziva glavnih računala uzvodnih DNS-over-HTTPS/DNS-over-TLS razrješivača. Unesite po jednu IP adresu u svaki redak. Komentari moraju započeti u novom retku znakom #. Prazni retci i komentari se zanemaruju.\nOpen AI • ChatGPT Pre-Translate\nIP adrese DNS poslužitelja koji se koriste za razrješavanje naziva hostova uzvodnih DoH/DoT razrješivača. Unesite jednu IP adresu po retku. Komentari moraju započeti u novom retku sa znakom #. Prazni retci i komentari se zanemaruju.",
"cache_cleared": "DNS predmemorija je uspješno izbrisana",
"cache_enabled": "Omogući predmemoriju",
"cache_enabled_desc": "Pohrani DNS Odgovore lokalno.",
Expand Down
2 changes: 1 addition & 1 deletion client/src/__locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"blocking_mode_refused": "REFUSED: Risposta con codice di REFUSED",
"blocklist": "Lista nera",
"bootstrap_dns": "Server DNS bootstrap",
"bootstrap_dns_desc": "Indirizzi IP dei server DNS utilizzati per risolvere gli indirizzi IP dei resolver DoH/DoT specificati come upstream. I commenti non sono ammessi.",
"bootstrap_dns_desc": "Indirizzi IP dei server DNS utilizzati per risolvere i nomi host dei resolver upstream DoH/DoT. Inserisci un indirizzo IP per riga. I commenti devono iniziare su una nuova riga con #. Le righe vuote e i commenti vengono ignorati.",
"cache_cleared": "Cache DNS è stata cancellata correttamente",
"cache_enabled": "Abilita la cache",
"cache_enabled_desc": "Memorizza localmente le risposte DNS.",
Expand Down
2 changes: 1 addition & 1 deletion client/src/__locales/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@
"query_log": "Query log",
"query_log_clear": "Querylogboeken wissen",
"query_log_cleared": "Het querylogboek is succesvol gewist",
"query_log_configuration": "Logbestanden instellingen",
"query_log_configuration": "Logboeken instellingen",
"query_log_confirm_clear": "Weet je zeker dat je het hele querylogboek wilt wissen?",
"query_log_disabled": "Het query logboek is uitgeschakeld en kan worden geconfigureerd in de <0>instellingen</0>",
"query_log_enable": "Log bestanden inschakelen",
Expand Down
2 changes: 1 addition & 1 deletion client/src/__locales/pt-br.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"blocking_mode_refused": "REFUSED: responder com o código REFUSED",
"blocklist": "Lista de bloqueio",
"bootstrap_dns": "Servidores DNS de inicialização",
"bootstrap_dns_desc": "Endereços IP de servidores DNS usados para resolver endereços IP dos resolvedores DoH/DoT que você especifica como upstreams. Comentários não são permitidos.",
"bootstrap_dns_desc": "Endereços IP de servidores DNS usados para resolver os nomes de host dos resolvedores upstream DoH/DoT. Insira um endereço IP por linha. Comentários devem começar em uma nova linha com #. Linhas vazias e comentários são ignorados.",
"cache_cleared": "Cache DNS limpo com sucesso",
"cache_enabled": "Ativar cache",
"cache_enabled_desc": "Armazenar as respostas DNS localmente.",
Expand Down
2 changes: 1 addition & 1 deletion client/src/__locales/pt-pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"blocking_mode_refused": "REFUSED: responder com o código REFUSED",
"blocklist": "Lista de bloqueio",
"bootstrap_dns": "Servidores DNS de arranque",
"bootstrap_dns_desc": "Endereços IP de servidores DNS usados para resolver endereços IP dos resolvedores DoH/DoT que você especifica como upstreams. Comentários não são permitidos.",
"bootstrap_dns_desc": "Endereços IP de servidores DNS usados para resolver os nomes de host dos resolvedores upstream DoH/DoT. Insira um endereço IP por linha. Comentários devem começar numa nova linha com #. Linhas vazias e comentários são ignorados.",
"cache_cleared": "O cache DNS foi apagado com sucesso",
"cache_enabled": "Ativar cache",
"cache_enabled_desc": "Armazene as respostas DNS localmente.",
Expand Down
Loading
Loading