Skip to content
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.

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

feat: add dns.ipset_file setting #4686

Merged
merged 1 commit into from Sep 12, 2022
Merged

Conversation

hellodword
Copy link
Contributor

@hellodword hellodword commented Jun 23, 2022

just like the upstream_dns_file

@zhudan
Copy link

zhudan commented Aug 11, 2022

follow !

need this, dynamic update ipset domain

@ainar-g
Copy link
Contributor

ainar-g commented Sep 6, 2022

Good day and apologies for the long wait. It's generally better to propose a feature in an issue first, but since it's already done, can I ask, what is the problem you are trying to solve? Is the ipset configuration really getting this large?

@ainar-g ainar-g added the waiting for data Waiting for users to provide more data. label Sep 6, 2022
@hellodword
Copy link
Contributor Author

hellodword commented Sep 6, 2022

Good day and apologies for the long wait. It's generally better to propose a feature in an issue first, but since it's already done, can I ask, what is the problem you are trying to solve? Is the ipset configuration really getting this large?

For example:

https://github.com/hellodword/GFWList2AGH-ipset/blob/assets/ipset.txt

@ainar-g
Copy link
Contributor

ainar-g commented Sep 7, 2022

I can see that these are lists of upstreams, correct? How is it related to ipsets?

@hellodword
Copy link
Contributor Author

hellodword commented Sep 8, 2022

I can see that these are lists of upstreams, correct? How is it related to ipsets?

For most usage in my country, upstream_dns_file protects our DNS, ipset define the whitelist or blacklist to pass through the firewall via VPN.

So the ipset often has simliar content and size with the upstream_dns_file.

@hellodword
Copy link
Contributor Author

hellodword commented Sep 8, 2022

For example:

upstream_dns_file:

https://doh.pub:443/dns-query
[/github.com/google.com/]tls://8.8.4.4

ipset:

ipset:
- github.com,google.com/ipset-for-vpn

@ainar-g ainar-g self-requested a review Sep 8, 2022
@ainar-g
Copy link
Contributor

ainar-g commented Sep 8, 2022

Hm, I see. We'll review the change then.

Copy link
Contributor

@ainar-g ainar-g left a comment

Please also:

  1. Merge the current master branch or rebase your branch on top of it, optionally with a squash.

  2. Describe the changes in CHANGELOG.md.

internal/dnsforward/config.go Outdated Show resolved Hide resolved
internal/dnsforward/dnsforward.go Outdated Show resolved Hide resolved
@ainar-g ainar-g self-assigned this Sep 8, 2022
@ainar-g ainar-g added feature request P3: Medium and removed waiting for data Waiting for users to provide more data. labels Sep 8, 2022
@ainar-g ainar-g added this to the v0.107.13 milestone Sep 8, 2022
adguard pushed a commit that referenced this pull request Sep 12, 2022
Updates #4686.

* commit '10a8f7964482fd07502ac041ef92b4ea8adb3c3a':
  all: imp chlog
  all: imp docs
  feat: add dns.ipset_file setting
@adguard adguard merged commit 451fd7c into AdguardTeam:master Sep 12, 2022
@ainar-g
Copy link
Contributor

ainar-g commented Sep 12, 2022

Thanks for the contribution!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants