Adding openfish as source test 3
This commit is contained in:
parent
d924964feb
commit
01694e1e5c
|
@ -1,5 +1,19 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
|
<component name="IssueNavigationConfiguration">
|
||||||
|
<option name="links">
|
||||||
|
<list>
|
||||||
|
<IssueNavigationLink>
|
||||||
|
<option name="issueRegexp" value="[A-Z]+\-\d+" />
|
||||||
|
<option name="linkRegexp" value="http://support.matrix.lan/issue/$0" />
|
||||||
|
</IssueNavigationLink>
|
||||||
|
<IssueNavigationLink>
|
||||||
|
<option name="issueRegexp" value="[A-Z]+\-\d+" />
|
||||||
|
<option name="linkRegexp" value="https://kb.mypdns.org/issue/$0" />
|
||||||
|
</IssueNavigationLink>
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="" vcs="Git" />
|
<mapping directory="" vcs="Git" />
|
||||||
</component>
|
</component>
|
||||||
|
|
90
README.md
90
README.md
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
[![uBlock syntax](_public/icons/ublock-origin-syntax.svg)](https://github.com/gorhill/uBlock/wiki/Static-filter-syntax)
|
[![uBlock syntax](_public/icons/ublock-origin-syntax.svg)](https://github.com/gorhill/uBlock/wiki/Static-filter-syntax)
|
||||||
[![AdGuard syntax](_public/icons/adguard-syntax.svg)](https://kb.adguard.com/en/general/how-to-create-your-own-ad-filters)
|
[![AdGuard syntax](_public/icons/adguard-syntax.svg)](https://kb.adguard.com/en/general/how-to-create-your-own-ad-filters)
|
||||||
[![ko-fi](_public/icons/ko-fi.png)](https://ko-fi.com/X8X37FUGU)
|
[![ko-fi](_public/icons/ko-fi.png)](https://ko-fi.com/X8X37FUGU)
|
||||||
|
@ -12,6 +11,7 @@ will in some degree be a supportive to the more common know filters like
|
||||||
[EasyList][EasyList] or [AdGuard][AdGuard].
|
[EasyList][EasyList] or [AdGuard][AdGuard].
|
||||||
|
|
||||||
## About
|
## About
|
||||||
|
|
||||||
Some important notes is this project started as a private project,
|
Some important notes is this project started as a private project,
|
||||||
however as the time how parsed by, it looks like other users are using
|
however as the time how parsed by, it looks like other users are using
|
||||||
one or more of our rules and filter, just as we are including 3rd party
|
one or more of our rules and filter, just as we are including 3rd party
|
||||||
|
@ -21,8 +21,8 @@ This means the precision in the filtering rules might not be as sharp as
|
||||||
they could have been if this have been a major part of my portfolio,but
|
they could have been if this have been a major part of my portfolio,but
|
||||||
this is purely a side project.
|
this is purely a side project.
|
||||||
|
|
||||||
|
|
||||||
## Disclaimer
|
## Disclaimer
|
||||||
|
|
||||||
I can't guarantee these filers won't cause problems. If you found
|
I can't guarantee these filers won't cause problems. If you found
|
||||||
problems, [report][issues] it by filling in all the mandatory items in
|
problems, [report][issues] it by filling in all the mandatory items in
|
||||||
Issue template; otherwise reports can be ignored. Anyone who uses any of
|
Issue template; otherwise reports can be ignored. Anyone who uses any of
|
||||||
|
@ -32,14 +32,15 @@ from the use of the filters/codes. Unless Subscribe link is provided
|
||||||
these filters are assumed to be copied and pasted, or imported, into My
|
these filters are assumed to be copied and pasted, or imported, into My
|
||||||
filters/rules (Adblock Plus / uBlock Origin) or User Rules (AdGuard).
|
filters/rules (Adblock Plus / uBlock Origin) or User Rules (AdGuard).
|
||||||
|
|
||||||
|
|
||||||
## Webfront
|
## Webfront
|
||||||
|
|
||||||
Our HTML front end can be found at
|
Our HTML front end can be found at
|
||||||
- 0xacab: <https://my-privacy-dns.itcouldbewor.se/adblocker-rules/>
|
|
||||||
|
- 0xacab: <https://mypdns.github.io/adblocker-rules/>
|
||||||
- GitHub: No longer Supported as they have incorporated SpyWare
|
- GitHub: No longer Supported as they have incorporated SpyWare
|
||||||
|
|
||||||
|
|
||||||
## Subscribe to the rules
|
## Subscribe to the rules
|
||||||
|
|
||||||
[Click here to activate these rules in your Adblocker][Subscribe]
|
[Click here to activate these rules in your Adblocker][Subscribe]
|
||||||
|
|
||||||
The following Lnks will provide you with different resulting filters.
|
The following Lnks will provide you with different resulting filters.
|
||||||
|
@ -50,19 +51,22 @@ the abp filter script.
|
||||||
- 0xacab edition via [adblocker.mypdns.org][Subscribe]
|
- 0xacab edition via [adblocker.mypdns.org][Subscribe]
|
||||||
- Github No longer Supported
|
- Github No longer Supported
|
||||||
|
|
||||||
You should also be able to subscripbe directly to the rules by
|
You should also be able to subscribe directly to the rules by
|
||||||
right-click any of the following urls, choose <Adblocker> =>
|
right-click any of the following urls, choose `<Adblocker>` =>
|
||||||
<Subscribe to the filterlist>
|
`<Subscribe to the filterlist>`
|
||||||
|
|
||||||
- <a href="abp:subscribe?location=https://my-privacy-dns.itcouldbewor.se/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20%E2%80%93%20Adblock%20Rules&requiresLocation=https://my-privacy-dns.itcouldbewor.se/adblocker-rules/blockrules.txt&requiresTitle=My%20Privacy%20DNS%20%E2%80%93%20Adblock%20Rules%20%E2%80%93%200xacab%20Edition"
|
- <a href="abp:
|
||||||
title="Subscribe to My Privacy DNS adblocker rurless (0xacab
|
subscribe?location=https://mypdns.github.io/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20%E2%80%93%20Adblock%20Rules&requiresLocation=https://mypdns.github.io/adblocker-rules/blockrules.txt&requiresTitle=My%20Privacy%20DNS%20%E2%80%93%20Adblock%20Rules%20%E2%80%93%20github%20Edition"
|
||||||
edition)">adblocker.mypdns.org | Adblock Rules (0xacab edition)
|
title="Subscribe to My Privacy DNS adblocker rules (0xacab
|
||||||
|
edition)">adblocker.mypdns.org | Adblock Rules (github edition)
|
||||||
</a>
|
</a>
|
||||||
- mypdns.github.io | No longer Supported
|
- ~~mypdns.github.io~~ | No longer Supported
|
||||||
|
|
||||||
## Issues and comments
|
## Issues and comments
|
||||||
|
|
||||||
The one and only place to report any issues or post a comment are as
|
The one and only place to report any issues or post a comment are as
|
||||||
following:
|
following:
|
||||||
|
|
||||||
- [Issues][issues] with any rules is reported on the My Privacy DNS Site.
|
- [Issues][issues] with any rules is reported on the My Privacy DNS Site.
|
||||||
- Commit Comments are posted on the individual [commit][commits]'s on
|
- Commit Comments are posted on the individual [commit][commits]'s on
|
||||||
the My Privacy DNS Site, in case you don't think it need a
|
the My Privacy DNS Site, in case you don't think it need a
|
||||||
|
@ -80,7 +84,7 @@ We do no longer operate at `Github` do to there anti-privacy terms of usage.
|
||||||
## File structure
|
## File structure
|
||||||
|
|
||||||
| File naming | Supported filter types |
|
| File naming | Supported filter types |
|
||||||
| :--------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|:-----------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||||
| `_domain.` | These filter lists is to ad rules based on a domain specific level. ***IF / WHEN*** a rules is covering more than one domain, you should add it to the corresponding `_rule` filters |
|
| `_domain.` | These filter lists is to ad rules based on a domain specific level. ***IF / WHEN*** a rules is covering more than one domain, you should add it to the corresponding `_rule` filters |
|
||||||
| `_rule` | The place for rules covering more than one domain. |
|
| `_rule` | The place for rules covering more than one domain. |
|
||||||
| `adult_*.blacklist` | This is as the filename indicating the place to add NSFW ONLY contents *AND* only if it do not match any other filter(s) |
|
| `adult_*.blacklist` | This is as the filename indicating the place to add NSFW ONLY contents *AND* only if it do not match any other filter(s) |
|
||||||
|
@ -93,32 +97,35 @@ We do no longer operate at `Github` do to there anti-privacy terms of usage.
|
||||||
| `spyware_*.blacklist` | Filter preventing any kind of tracking, spying and alike. If you have to ask, you need to read [SpyWare Wiki](https://0xacab.org/my-privacy-dns/matrix/-/wikis/Categories/Spyware/SpyWare) |
|
| `spyware_*.blacklist` | Filter preventing any kind of tracking, spying and alike. If you have to ask, you need to read [SpyWare Wiki](https://0xacab.org/my-privacy-dns/matrix/-/wikis/Categories/Spyware/SpyWare) |
|
||||||
| `whitelist_*.whitelist` | Probably not very used... But it can come in handy sometimes protecting something to keep is spinning.... |
|
| `whitelist_*.whitelist` | Probably not very used... But it can come in handy sometimes protecting something to keep is spinning.... |
|
||||||
|
|
||||||
|
|
||||||
### Sorting filters
|
### Sorting filters
|
||||||
|
|
||||||
We are sorting the rules based on the second level domain in the `_domain.`
|
We are sorting the rules based on the second level domain in the `_domain.`
|
||||||
filters. In the `_rule` we sort based on the letter/number `[a-zA-Z0-9]`
|
filters. In the `_rule` we sort based on the letter/number `[a-zA-Z0-9]`
|
||||||
disregarding the actual filter first are present at the 3rd argument.
|
disregarding the actual filter first are present at the 3rd argument.
|
||||||
|
|
||||||
|
|
||||||
#### Example
|
#### Example
|
||||||
|
|
||||||
In this rules we like to hide the `.modal-backdrop` but to actually succeed
|
In this rules we like to hide the `.modal-backdrop` but to actually succeed
|
||||||
with this, will need some more arguments.
|
with this, will need some more arguments.
|
||||||
|
|
||||||
```css
|
```css
|
||||||
##.show.fade.modal-backdrop
|
#
|
||||||
|
#
|
||||||
|
.show.fade.modal-backdrop
|
||||||
```
|
```
|
||||||
|
|
||||||
This should be sorted by the first `s`
|
This should be sorted by the first `s`
|
||||||
|
|
||||||
## Filter Inclusion - Exclusions
|
## Filter Inclusion - Exclusions
|
||||||
|
|
||||||
We will only in sevier cases include any rules that could/can be blocked
|
We will only in sevier cases include any rules that could/can be blocked
|
||||||
by a DNS related firewall like DNS RPZ.
|
by a DNS related firewall like DNS RPZ.
|
||||||
|
|
||||||
**IF** a rules is included, this will be to support the tor-browser where
|
**IF** a rules is included, this will be to support the tor-browser where
|
||||||
any local firewall rule is bypassed.
|
any local firewall rule is bypassed.
|
||||||
|
|
||||||
|
|
||||||
## Writing filter guides
|
## Writing filter guides
|
||||||
|
|
||||||
Howto? block whitelisted spyware: (~~`https://github.com/easylist/easylist/issues/4529`~~
|
Howto? block whitelisted spyware: (~~`https://github.com/easylist/easylist/issues/4529`~~
|
||||||
SpyWare infected domain)
|
SpyWare infected domain)
|
||||||
|
|
||||||
|
@ -128,8 +135,8 @@ SpyWare infected domain)
|
||||||
Example (single modifier): `$script`
|
Example (single modifier): `$script`
|
||||||
Example (multiple modifiers): `$document,frame,script,stylesheet`
|
Example (multiple modifiers): `$document,frame,script,stylesheet`
|
||||||
|
|
||||||
|
|
||||||
## Counter other's rules
|
## Counter other's rules
|
||||||
|
|
||||||
You can't use `badfilter` modifiers for cosmetic rules.
|
You can't use `badfilter` modifiers for cosmetic rules.
|
||||||
|
|
||||||
For example, `#@#.ads` can't be disabled with `#@#.ads$badfilter`
|
For example, `#@#.ads` can't be disabled with `#@#.ads$badfilter`
|
||||||
|
@ -152,30 +159,42 @@ will work, since `#@#.ads` only disables/whitelists `##.ads.`
|
||||||
* `$empty`: Results in a fake empty page being loaded, instead of an
|
* `$empty`: Results in a fake empty page being loaded, instead of an
|
||||||
error page.
|
error page.
|
||||||
|
|
||||||
|
|
||||||
## Source URI's
|
## Source URI's
|
||||||
|
|
||||||
How to write filters: <https://help.eyeo.com/en/adblockplus/how-to-write-filters>
|
How to write filters: <https://help.eyeo.com/en/adblockplus/how-to-write-filters>
|
||||||
|
|
||||||
|
|
||||||
### badfilter example
|
### badfilter example
|
||||||
|
|
||||||
If the original rule was like
|
If the original rule was like
|
||||||
|
|
||||||
```css
|
```css
|
||||||
@@/advertise.js$script,domain=example.com|xyz.com
|
@
|
||||||
|
@
|
||||||
|
/
|
||||||
|
advertise.js$ script, domain
|
||||||
|
|
||||||
|
=
|
||||||
|
example.com |xyz.com
|
||||||
```
|
```
|
||||||
|
|
||||||
Then
|
Then
|
||||||
|
|
||||||
```css
|
```css
|
||||||
@@/advertise.js$script,domain=example.com,badfilter
|
@
|
||||||
|
@
|
||||||
|
/
|
||||||
|
advertise.js$ script, domain
|
||||||
|
|
||||||
|
=
|
||||||
|
example.com, badfilter
|
||||||
```
|
```
|
||||||
|
|
||||||
is a valid filter, it disables the whitelisted rule only on `example.com`.
|
is a valid filter, it disables the whitelisted rule only on `example.com`.
|
||||||
|
|
||||||
See the dialogue at [github][dialogue]
|
See the dialogue at [github][dialogue]
|
||||||
|
|
||||||
|
|
||||||
## External resources
|
## External resources
|
||||||
|
|
||||||
@Yuki2718 `/adblock` (~~`https://github.com/Yuki2718/adblock`~~ Spyware
|
@Yuki2718 `/adblock` (~~`https://github.com/Yuki2718/adblock`~~ Spyware
|
||||||
infected domain) (Pretty much all the rules)
|
infected domain) (Pretty much all the rules)
|
||||||
|
|
||||||
|
@ -201,13 +220,22 @@ Spyware infected domain)
|
||||||
And everyone else I've forgot to mention here.
|
And everyone else I've forgot to mention here.
|
||||||
Have a look in the [source list](/adblocker-rules.template)
|
Have a look in the [source list](/adblocker-rules.template)
|
||||||
|
|
||||||
|
## Sponsors
|
||||||
|
|
||||||
|
- Jetbrains, Provided free licence to any members, who have been working more than 3 month for My Privacy DNS open
|
||||||
|
source project https://www.jetbrains.com/community/opensource/.
|
||||||
|
|
||||||
|
## Build tools
|
||||||
|
|
||||||
|
we uses the HostlistCompiler https://github.com/AdguardTeam/HostlistCompiler to build our lists
|
||||||
|
|
||||||
## Official mirrors
|
## Official mirrors
|
||||||
|
|
||||||
The following repositories are official mirrors and should (when things
|
The following repositories are official mirrors and should (when things
|
||||||
goes right) be updated by [push on commit][poc]
|
goes right) be updated by [push on commit][poc]
|
||||||
|
|
||||||
| Project | Host | Metode (push \| pull) |
|
| Project | Host | Metode (push \| pull) |
|
||||||
| :-------------- | :--------------------------------------------------------- | --------------------: |
|
|:----------------|:-----------------------------------------------------------|----------------------:|
|
||||||
| Adblocker Rules | `https://git.disroot.org/my-privacy-dns/adblocker-rules` | push |
|
| Adblocker Rules | `https://git.disroot.org/my-privacy-dns/adblocker-rules` | push |
|
||||||
| Adblocker Rules | `https://git.kescher.at/my-privacy-dns/adblocker-rules` | pull |
|
| Adblocker Rules | `https://git.kescher.at/my-privacy-dns/adblocker-rules` | pull |
|
||||||
| Adblocker Rules | `https://gitea.slowb.ro/spirillen/adblocker-rules` | pull |
|
| Adblocker Rules | `https://gitea.slowb.ro/spirillen/adblocker-rules` | pull |
|
||||||
|
@ -222,20 +250,32 @@ goes right) be updated by [push on commit][poc]
|
||||||
| Matrix | `https://notabug.org/my-privacy-dns/matrix` | pull |
|
| Matrix | `https://notabug.org/my-privacy-dns/matrix` | pull |
|
||||||
|
|
||||||
## Tanks to
|
## Tanks to
|
||||||
|
|
||||||
Thanks to @Yuki2718, @THEtomaso, @krystian3w and everyone else who is
|
Thanks to @Yuki2718, @THEtomaso, @krystian3w and everyone else who is
|
||||||
spreading the knowledge of how rules should be made :smiley:
|
spreading the knowledge of how rules should be made :smiley:
|
||||||
|
|
||||||
<!-- Own Links -->
|
<!-- Own Links -->
|
||||||
|
|
||||||
[issues]: https://github.com/mypdns/adblocker-rules/issues
|
[issues]: https://github.com/mypdns/adblocker-rules/issues
|
||||||
|
|
||||||
[commits]: https://github.com/mypdns/adblocker-rules
|
[commits]: https://github.com/mypdns/adblocker-rules
|
||||||
|
|
||||||
[support]: https://0xacab.org/my-privacy-dns/support
|
[support]: https://0xacab.org/my-privacy-dns/support
|
||||||
[Subscribe]: abp:subscribe?location=https://my-privacy-dns.itcouldbewor.se/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20%E2%80%93%200xacab%20Edition%20%E2%80%93%20Adblock%20Rules
|
|
||||||
|
[Subscribe]: abp:subscribe?location=https://mypdns.github.io/adblocker-rules/blockrules.txt&title=My%20Privacy%20DNS%20%E2%80%93%200xacab%20Edition%20%E2%80%93%20Adblock%20Rules
|
||||||
|
|
||||||
<!-- External Links -->
|
<!-- External Links -->
|
||||||
|
|
||||||
[redirect-engine]: https://github.com/gorhill/uBlock/blob/master/src/js/redirect-engine.js
|
[redirect-engine]: https://github.com/gorhill/uBlock/blob/master/src/js/redirect-engine.js
|
||||||
|
|
||||||
[dialogue]: https://github.com/My-External-Stuff/ublockorigin-rules/commit/c01ba1a5a0d73a89c911ab11d1322631fe3d0540
|
[dialogue]: https://github.com/My-External-Stuff/ublockorigin-rules/commit/c01ba1a5a0d73a89c911ab11d1322631fe3d0540
|
||||||
|
|
||||||
[slightly_smaller_selection]: https://github.com/AdguardTeam/AdguardBrowserExtension/blob/master/Extension/lib/filter/rules/scriptlets/redirects.yml
|
[slightly_smaller_selection]: https://github.com/AdguardTeam/AdguardBrowserExtension/blob/master/Extension/lib/filter/rules/scriptlets/redirects.yml
|
||||||
|
|
||||||
[EasyList]: https://github.com/easylist/easylist
|
[EasyList]: https://github.com/easylist/easylist
|
||||||
|
|
||||||
[easylist.to]: https://easylist.to
|
[easylist.to]: https://easylist.to
|
||||||
|
|
||||||
[AdGuard]: https://adguard.com/
|
[AdGuard]: https://adguard.com/
|
||||||
|
|
||||||
[poc]: https://0xacab.org/help/user/project/repository/mirror/push.md "Push mirroring"
|
[poc]: https://0xacab.org/help/user/project/repository/mirror/push.md "Push mirroring"
|
||||||
|
|
|
@ -1744,16 +1744,7 @@
|
||||||
{
|
{
|
||||||
"namw": "openphish feed",
|
"namw": "openphish feed",
|
||||||
"source": "https://openphish.com/feed.txt",
|
"source": "https://openphish.com/feed.txt",
|
||||||
"type": "hosts",
|
"type": "hosts"
|
||||||
"transformations": [
|
|
||||||
"RemoveComments",
|
|
||||||
"Compress",
|
|
||||||
"Validate",
|
|
||||||
"Deduplicate",
|
|
||||||
"RemoveEmptyLines",
|
|
||||||
"TrimLines",
|
|
||||||
"InsertFinalNewLine"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"transformations": [
|
"transformations": [
|
||||||
|
|
Loading…
Reference in New Issue