feat: to network modifier
#4524
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
seia-soto
changed the title
to network modifier
|
Despite we marked it's not safe to add one more bit before, but it's still safe to use 31st bit given that we're treating the number as unsigned integer. > const buf = new Uint8Array(4)
undefined
> buf.length
4
> buf[0] = (1 << 31) >>> 24
128
> buf
Uint8Array(4) [ 128, 0, 0, 0 ]
> (buf[0] << 24) >>> 0
2147483648 |
chrmod
reviewed
Dec 12, 2024
| @@ -153,6 +153,7 @@ export const enum NETWORK_FILTER_MASK { | |||
| isHostnameAnchor = 1 << 28, | |||
| isRedirectRule = 1 << 29, | |||
| isRedirect = 1 << 30, | |||
| isTo = 1 << 31, | |||
There was a problem hiding this comment.
why do we need the flag? looks like it is never read
it should not be needed if we convert $to to $denyallow
There was a problem hiding this comment.
This is required to build an original form in toString
There was a problem hiding this comment.
Not sure if this is good enough reason to use the slot in the mask
chrmod
requested changes
Dec 12, 2024
| context('to', () => { | ||
| it('fails when both denyallow and to used', () => { | ||
| network('||foo.com$denyallow=foo.com,to=bar.com', null); | ||
| network('||foo.com$to=foo.com,denyallow=bar.com', null); |
There was a problem hiding this comment.
if both present, can we merge them instead of dropping?
There was a problem hiding this comment.
Yes, we can normalize them.
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.
This partially implements https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#to.
In the documentation,
tois described as:However, we already support entity-based syntax in
Domainsand only thing required is negation according to entity documentation: https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#entityWe still don't support regular expression both in
domainanddenyallowoptions. Same goes forto:*$to=~/regex.../.denyallowwith uBo: ✅ negation and listing ❌ entities ❌ regextowith uBo: ✅ negation and listing ✅ entities ✅ regexdenyallow,towith Ghostery: ✅ negation and listing ✅ entities ❌ regexThis PR negates all hostnames in parse-time to flip the behavior of
denyallowwhentois detected.Also, rejects to parse filter having both
denyallowandtosince both are not likely to be used together.We can merge multiple domains then make it work but then we'll require extra space that allows us to determine which hostname is for
toanddenyallowwhen runningtoString.This PR also fixes
denyallowdomain list not being printed in a correct format fromtoStringmethod. There's a same regression intoStringregrading other network modifiers utilizingDomainslikefromand planned to fix in separate PR.