修复三种配置路径丢失订阅 DNS 策略的问题 - #1320
Open
yorkyang2333 wants to merge 3 commits into
Open
Conversation
ShellCrash previously rebuilt the DNS section from its own defaults and dropped subscription-specific nameserver-policy entries. Merge subscription DNS with managed fields and user overrides into one YAML section so provider-specific node resolution survives config generation. Also preserve DNS sections in provider templates, fix the encrypted DNS resolver preset, and add regression coverage for block and flow YAML plus override precedence.
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 05306ffdc7
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Owner
|
#1309 |
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ShellCrash 在处理订阅配置时会重新构造顶层 dns，导致订阅中的 dns.nameserver-policy 等字段被丢弃。本 PR 修复 b) 本地生成、c) 在线生成和 e) 在线获取三种路径：c) 和 e) 下载配置后，在 modify_yaml 中合并原始 DNS、ShellCrash 管理字段和 yamls/user.yaml 覆写；b) 本地生成时保留 provider 模板中的 DNS 配置。合并优先级为用户覆写高于 ShellCrash 管理字段，高于订阅原始配置中未管理的字段，因此 provider-specific nameserver-policy 可以继续保留。同时修复一键配置加密 DNS 时将 DoH URL 写入 dns_resolver 的问题。