-
Notifications
You must be signed in to change notification settings - Fork 244
Add support for regular expressions in $app
modifier
#714
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
Draft
SelYui
wants to merge
2
commits into
AdguardTeam:master
Choose a base branch
from
SelYui:feature/AG-35374
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -435,10 +435,20 @@ If you want the rule not to be applied to certain apps, start the app name with | |
- `||baddomain.com^$app=~org.example.app` — a rule to block requests that match the specified mask and are sent from any app except for the `org.example.app`. | ||
- `||baddomain.com^$app=~org.example.app1|~org.example.app2` — same as above, but now two apps are excluded: `org.example.app1` and `org.example.app2`. | ||
|
||
You can use regular expressions in the `$app` modifier by enclosing them in forward slashes `/.../`. This allows for more flexible matching — for example, targeting a group of apps from the same publisher or matching complex patterns. | ||
|
||
- `||baddomain.com^$app=/org\.example\.[a-z0-9_]+/` — applies to all apps whose package name starts with `org.example` (e.g. `org.example.app1`, `org.example.utility`, etc.). | ||
- `||baddomain.com^$app=/^org\.example\.app$|^org\.example\.[ab].*/` — applies to `org.example.app` and to any app whose package starts with `org.example.a` or `org.example.b`. | ||
|
||
The `$app` modifier supports combining plain app names, negated app names, and regular expressions in the same rule. | ||
|
||
- `||baddomain.com^$app=org.example.app|~org.example.excluded|/org\.example\.[a-z]+/` — applies to `org.example.app`, to all matching `org.example.[a-z]+` apps, and excludes `org.example.excluded`. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A negation and a non-negated expression cannot be in the same expression, because ~ essentially matches "everything except", and can only be combined with other ~ expressions to expand that "except". Otherwise, it leads to too many possible interpretations. |
||
|
||
:::caution Restrictions | ||
|
||
Apps in the modifier value cannot have a wildcard, e.g. `$app=com.*.music`. | ||
Rules with such modifier are considered invalid. | ||
Use regular expressions instead: `$app=/com\..*\.music/`. | ||
|
||
::: | ||
|
||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
$
and,
should be escaped in modifiers, since unescaped$
means modifiers start, and,
is modifiers separator.