Replaces 'Whitelist' with 'Allowlist' #8305
Open
Conversation
This file contains 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
2 tasks
cwmoriarty
commented
Feb 11, 2025
| @@ -60,7 +60,7 @@ public function updateBlocklistAction() | |||
|
|
|||
| // strip off any trailing dot | |||
| $value = rtrim($domain, '.'); | |||
| $wl = explode(',', (string)$mdl->dnsbl->whitelists); | |||
| $wl = explode(',', (string)$mdl->dnsbl->allowlists); | |||
There was a problem hiding this comment.
$wl could have been changed to $al too, I guess.
There was a problem hiding this comment.
here is the thing I was afraid of: changing model field names forces data loss for everyone using the feature
fichtner
reviewed
Feb 11, 2025
| <id>unbound.dnsbl.whitelists</id> | ||
| <label>Whitelist Domains</label> | ||
| <id>unbound.dnsbl.allowlists</id> | ||
| <label>Allowlist Domains</label> |
fichtner
reviewed
Feb 11, 2025
| <type>select_multiple</type> | ||
| <style>tokenize</style> | ||
| <allownew>true</allownew> | ||
| <help>List of domains to whitelist. You can use regular expressions.</help> | ||
| <help>List of domains to allowlist. You can use regular expressions.</help> |
fichtner
reviewed
Feb 11, 2025
| @@ -37,7 +37,7 @@ class DefaultBlocklistHandler(BaseBlocklistHandler): | |||
| def __init__(self): | |||
| super().__init__('/usr/local/etc/unbound/unbound-blocklists.conf') | |||
| self.priority = 100 | |||
| self._whitelist_pattern = self._get_excludes() | |||
| self._allowlist_pattern = self._get_excludes() | |||
There was a problem hiding this comment.
the changes in this script are likely ok
fichtner
reviewed
Feb 11, 2025
| @@ -85,9 +85,9 @@ custom_{{loop.index}}={{uri}} | |||
| [exclude] | |||
| # exclude localhost entries | |||
| default_pattern_1=.*localhost$ | |||
| {% if not helpers.empty('OPNsense.unboundplus.dnsbl.whitelists')%} | |||
| {% if not helpers.empty('OPNsense.unboundplus.dnsbl.allowlists')%} | |||
There was a problem hiding this comment.
model changes again here and below
fichtner
reviewed
Feb 11, 2025
| @@ -75,7 +75,7 @@ public function totalsAction($maximum) | |||
| } | |||
| } | |||
|
|
|||
| $parsed['whitelisted_domains'] = array_keys($nodes['dnsbl']['whitelists']); | |||
| $parsed['allowlisted_domains'] = array_keys($nodes['dnsbl']['allowlists']); | |||
There was a problem hiding this comment.
return key is ok access key is difficult, GUI changes are probably ok either way
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Built and tested on