fix(adblock): resolve race condition on rapid DNS domain changes#1673
Merged
Conversation
gsanchietti
force-pushed
the
issue1572
branch
2 times, most recently
from
21f1d37 to
ead35d9
Compare
gsanchietti
force-pushed
the
adblock-update
branch
from
dc7da95 to
d1a7eaa
Compare
Tbaile
approved these changes
May 15, 2026
Collaborator
Tbaile
left a comment
Tbaile
left a comment
There was a problem hiding this comment.
Fine by me, we should remove
/etc/adblock/adblock.allowlist
/etc/adblock/adblock.blocklist
from the config files of adblock
Member
Author
I'm doing it |
gsanchietti
force-pushed
the
adblock-update
branch
from
d1a7eaa to
c8c485c
Compare
Store Threat Shield DNS local allow and block list edits in UCI so rapid API calls no longer rewrite adblock files or restart the service immediately. Write the physical adblock list files during the next reload, add a one-shot migration for existing list files, and document the staged workflow for the affected API methods. Refs NethServer#1572 Assisted-by: Copilot:gpt-5.4
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.
Summary
Rebase the DNS local allow/block list race fix onto the updated
adblock-updatebranch.Store Threat Shield DNS local list changes in UCI, write the adblock
allow/block list files during reload, and migrate existing list files
to the new staged storage.
Supersedes #1663.
Related
See #1572
UI changes: NethServer/nethsecurity-ui#766
How to test
allow/block entries quickly with
api-cli ns.threatshield dns-add-*.api-cli ns.threatshield dns-list-allowedanddns-list-blockedreturn all staged entries before commit./etc/adblock/adblock.allowlistand/etc/adblock/adblock.blockliststay unchanged before commit.uci commit adblock && reload_config.Dependencies