Skip to content

chore: sync upstream AdguardTeam/AdGuardHome (2026-09-22..2026-10-12) - #7

Merged
KS-OTO merged 29 commits into
masterfrom
chore/sync-upstream-20261012
Oct 13, 2026
Merged

KS-OTO merged 29 commits into
masterfrom
chore/sync-upstream-20261012

Conversation

@KS-OTO

@KS-OTO KS-OTO commented Oct 12, 2026

Copy link
Copy Markdown
Owner

上游同步

  • 合并 upstream/master(24 个上游提交,merge-base 4cbddce → 8dedd32)
  • 上游重构:HTTP/DNS 配置迁移至 internal/configmgr,认证中间件 isPublicResource 改为单参数,移除 doHRoutes 机制

fork 定制重放

  • configmgr.HTTPConfig.LoginPath(http.login_path)在新 configmgr 包上重新落地
  • handleCustomLoginAccess/handlePublicAccess/handleAuthenticatedUser/handleLogout 行为保持:自定义登录路径重写、原始 /login.html 403、根路径 403、登出重定向
  • 新增 TestAuthMiddlewareDefault_customLoginPath* 回归测试(8 场景 + 重写断言)
  • 上游自身 release.yaml/snapcraft.yaml 依赖 AdGuard 私有基础设施(私有可复用 workflow/内部 runner),在本 fork 上启动即失败(此前每日定时失败的根因),已移除其 schedule 触发器
  • client_v2/webpack.common.js: fileURLToPath 修复 Windows 宿主机构建前端时的路径拼接
  • ci.yaml/release.yml: Go 版本对齐上游 go.mod 1.27.1

CI 将执行 Go 构建与 internal/home 测试验证。

makazantsev and others added 29 commits September 23, 2026 17:49
Co-authored-by: Eugene Burkov <e.burkov@adguard.com>
* all: upd dnsproxy

* all: upd dnsproxy

* all: upd dnsproxy

* all: upd dnscrypt

* all: upd dnsproxy
* configmgr: add more confs

* configmgr: imp code

* all: use configmgr stats

* all: use configmgr dns

* all: rm dnsforward.UpstreamMode

* dnsforward: imp code
…am-20261012

# Conflicts:
#	internal/home/auth.go
#	internal/home/authglinet.go
#	internal/home/authhttp.go
#	internal/home/config.go
…pstream-only workflow schedules

- configmgr.HTTPConfig.LoginPath re-applied after upstream configmgr migration
- isPublicResource restored to upstream single-arg signature; custom path
  handling lives in handleCustomLoginAccess + handlePublicAccess
- regression tests for custom login path behavior
- release.yaml/snapcraft.yaml: schedule triggers removed (upstream-only
  infrastructure, startup failure on this fork)
- webpack.common.js: fileURLToPath for Windows host builds
@KS-OTO
KS-OTO merged commit 54b8d75 into master Oct 13, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants