mirror of
https://github.com/privacy-protection-tools/anti-AD.git
synced 2025-01-22 22:39:16 +08:00
update
This commit is contained in:
gently
parent
f7cc3321e5
commit
aac3448189
13
.github/ISSUE_TEMPLATE/--------.md
vendored
13
.github/ISSUE_TEMPLATE/--------.md
vendored
@ -1,13 +0,0 @@
|
|||||||
---
|
|
||||||
name: 报告误拦截，误杀
|
|
||||||
about: 报告误拦截，误杀
|
|
||||||
title: "[误杀]"
|
|
||||||
labels: bug, 误杀
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
域名：ppp.net
|
|
||||||
发生时间：xxx年xx月xx日
|
|
||||||
使用的列表： （具体的文件，例如/anti-ad-easylist.txt, /dist/anti-ad-surge-full.txt等等）
|
|
||||||
问题描述：
|
|
||||||
12
.github/ISSUE_TEMPLATE/----.md
vendored
12
.github/ISSUE_TEMPLATE/----.md
vendored
@ -1,12 +0,0 @@
|
|||||||
---
|
|
||||||
name: 新增拦截
|
|
||||||
about: 我发现了需要拦截的域名
|
|
||||||
title: "[新增拦截]"
|
|
||||||
labels: 新增
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
域名:
|
|
||||||
出现场景：
|
|
||||||
补充说明：
|
|
||||||
21
.github/config.yml
vendored
21
.github/config.yml
vendored
@ -1,21 +0,0 @@
|
|||||||
# Configuration for welcome - https://github.com/behaviorbot/welcome
|
|
||||||
|
|
||||||
# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
|
|
||||||
|
|
||||||
# Comment to be posted to on first time issues
|
|
||||||
newIssueWelcomeComment: >
|
|
||||||
Thank you for opening your first issue in this repo. It’s people like you who make anti-AD better!
|
|
||||||
|
|
||||||
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
|
|
||||||
|
|
||||||
# Comment to be posted to on PRs from first time contributors in your repository
|
|
||||||
newPRWelcomeComment: >
|
|
||||||
Thank you for submitting this pull request! We’ll get back to you as soon as we can!
|
|
||||||
|
|
||||||
# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
|
|
||||||
|
|
||||||
# Comment to be posted to on pull requests merged by a first time user
|
|
||||||
firstPRMergeComment: >
|
|
||||||
Congrats on merging your first pull request! We here at behaviorbot are proud of you!
|
|
||||||
|
|
||||||
# It is recommended to include as many gifs and emojis as possible!
|
|
||||||
25
.github/workflows/build-addr.yml
vendored
25
.github/workflows/build-addr.yml
vendored
@ -1,25 +0,0 @@
|
|||||||
name: Auto build new list
|
|
||||||
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: "25 01 */3 * *"
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@main
|
|
||||||
- name: Run start-ci.sh
|
|
||||||
run: |
|
|
||||||
sudo update-alternatives --set php /usr/bin/php7.4
|
|
||||||
./scripts/start-ci.sh
|
|
||||||
- name: Commit files
|
|
||||||
run: |
|
|
||||||
git config --local user.email "action@github.com"
|
|
||||||
git config --local user.name "GitHub Action"
|
|
||||||
git add *
|
|
||||||
git commit -m "Auto renew the anti-AD list." -a
|
|
||||||
- name: Push changes
|
|
||||||
uses: ad-m/github-push-action@master
|
|
||||||
with:
|
|
||||||
github_token: ${{ secrets.PERSON_TOKEN }}
|
|
||||||
branch: 'master'
|
|
||||||
50
.github/workflows/sync-to-dist.yml
vendored
50
.github/workflows/sync-to-dist.yml
vendored
@ -1,50 +0,0 @@
|
|||||||
name: sync list to dist
|
|
||||||
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: "16 13 */3 * *"
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- 'master'
|
|
||||||
paths:
|
|
||||||
- 'anti-ad-*.txt'
|
|
||||||
- 'anti-ad-*.conf'
|
|
||||||
- 'anti-ad-*.yaml'
|
|
||||||
- 'adblock-for-dnsmasq.conf'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: clone the website
|
|
||||||
run: git clone https://github.com/privacy-protection-tools/anti-ad.github.io.git ~/website
|
|
||||||
- name: copy some list files
|
|
||||||
run: |
|
|
||||||
cp ./anti-ad-easylist.txt ~/website/docs/easylist.txt
|
|
||||||
cp ./anti-ad-easylist.txt.md5 ~/website/docs/easylist.txt.md5
|
|
||||||
cp ./anti-ad-adguard.txt ~/website/docs/adguard.txt
|
|
||||||
cp ./anti-ad-adguard.txt.md5 ~/website/docs/adguard.txt.md5
|
|
||||||
cp ./adblock-for-dnsmasq.conf ~/website/docs/dnsmasq.conf
|
|
||||||
cp ./adblock-for-dnsmasq.conf ~/website/docs/anti-ad-for-dnsmasq.conf
|
|
||||||
cp ./anti-ad-smartdns.conf ~/website/docs/anti-ad-for-smartdns.conf
|
|
||||||
cp ./anti-ad-surge.txt ~/website/docs/surge.txt
|
|
||||||
cp ./anti-ad-surge2.txt ~/website/docs/surge2.txt
|
|
||||||
cp ./anti-ad-clash.yaml ~/website/docs/clash.yaml
|
|
||||||
cp ./anti-ad-domains.txt ~/website/docs/domains.txt
|
|
||||||
- name: Commit files
|
|
||||||
run: |
|
|
||||||
cd ~/website
|
|
||||||
git config --local user.email "action@github.com"
|
|
||||||
git config --local user.name "GitHub Action"
|
|
||||||
git add .
|
|
||||||
git commit -m "pull newest list." -a
|
|
||||||
- name: Push changes
|
|
||||||
uses: ad-m/github-push-action@master
|
|
||||||
with:
|
|
||||||
github_token: ${{ secrets.PERSON_TOKEN }}
|
|
||||||
branch: 'master'
|
|
||||||
directory: '/home/runner/website'
|
|
||||||
repository: 'privacy-protection-tools/anti-ad.github.io'
|
|
||||||
@ -1,76 +0,0 @@
|
|||||||
# Contributor Covenant Code of Conduct
|
|
||||||
|
|
||||||
## Our Pledge
|
|
||||||
|
|
||||||
In the interest of fostering an open and welcoming environment, we as
|
|
||||||
contributors and maintainers pledge to making participation in our project and
|
|
||||||
our community a harassment-free experience for everyone, regardless of age, body
|
|
||||||
size, disability, ethnicity, sex characteristics, gender identity and expression,
|
|
||||||
level of experience, education, socio-economic status, nationality, personal
|
|
||||||
appearance, race, religion, or sexual identity and orientation.
|
|
||||||
|
|
||||||
## Our Standards
|
|
||||||
|
|
||||||
Examples of behavior that contributes to creating a positive environment
|
|
||||||
include:
|
|
||||||
|
|
||||||
* Using welcoming and inclusive language
|
|
||||||
* Being respectful of differing viewpoints and experiences
|
|
||||||
* Gracefully accepting constructive criticism
|
|
||||||
* Focusing on what is best for the community
|
|
||||||
* Showing empathy towards other community members
|
|
||||||
|
|
||||||
Examples of unacceptable behavior by participants include:
|
|
||||||
|
|
||||||
* The use of sexualized language or imagery and unwelcome sexual attention or
|
|
||||||
advances
|
|
||||||
* Trolling, insulting/derogatory comments, and personal or political attacks
|
|
||||||
* Public or private harassment
|
|
||||||
* Publishing others' private information, such as a physical or electronic
|
|
||||||
address, without explicit permission
|
|
||||||
* Other conduct which could reasonably be considered inappropriate in a
|
|
||||||
professional setting
|
|
||||||
|
|
||||||
## Our Responsibilities
|
|
||||||
|
|
||||||
Project maintainers are responsible for clarifying the standards of acceptable
|
|
||||||
behavior and are expected to take appropriate and fair corrective action in
|
|
||||||
response to any instances of unacceptable behavior.
|
|
||||||
|
|
||||||
Project maintainers have the right and responsibility to remove, edit, or
|
|
||||||
reject comments, commits, code, wiki edits, issues, and other contributions
|
|
||||||
that are not aligned to this Code of Conduct, or to ban temporarily or
|
|
||||||
permanently any contributor for other behaviors that they deem inappropriate,
|
|
||||||
threatening, offensive, or harmful.
|
|
||||||
|
|
||||||
## Scope
|
|
||||||
|
|
||||||
This Code of Conduct applies both within project spaces and in public spaces
|
|
||||||
when an individual is representing the project or its community. Examples of
|
|
||||||
representing a project or community include using an official project e-mail
|
|
||||||
address, posting via an official social media account, or acting as an appointed
|
|
||||||
representative at an online or offline event. Representation of a project may be
|
|
||||||
further defined and clarified by project maintainers.
|
|
||||||
|
|
||||||
## Enforcement
|
|
||||||
|
|
||||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
|
||||||
reported by contacting the project team at anti-ad@outlook.com. All
|
|
||||||
complaints will be reviewed and investigated and will result in a response that
|
|
||||||
is deemed necessary and appropriate to the circumstances. The project team is
|
|
||||||
obligated to maintain confidentiality with regard to the reporter of an incident.
|
|
||||||
Further details of specific enforcement policies may be posted separately.
|
|
||||||
|
|
||||||
Project maintainers who do not follow or enforce the Code of Conduct in good
|
|
||||||
faith may face temporary or permanent repercussions as determined by other
|
|
||||||
members of the project's leadership.
|
|
||||||
|
|
||||||
## Attribution
|
|
||||||
|
|
||||||
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
|
|
||||||
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
|
|
||||||
|
|
||||||
[homepage]: https://www.contributor-covenant.org
|
|
||||||
|
|
||||||
For answers to common questions about this code of conduct, see
|
|
||||||
https://www.contributor-covenant.org/faq
|
|
||||||
68
README.md
68
README.md
@ -1,69 +1,3 @@
|
|||||||
# anti-AD
|
# anti-AD
|
||||||
|
|
||||||
#### 致力于成为中文区命中率最高的广告过滤列表，实现精确的广告屏蔽和隐私保护。anti-AD现已支持AdGuardHome，dnsmasq， Surge，Pi-Hole，smartdns等网络组件。完全兼容常见的广告过滤工具所支持的各种广告过滤列表格式
|
#### 致力于成为中文区命中率最高的广告过滤列表，实现精确的广告屏蔽和隐私保护。anti-AD现已支持AdGuardHome，dnsmasq， Surge，Pi-Hole，smartdns等网络组件。
|
||||||
|
|
||||||
使用anti-AD能够屏蔽广告域名，能屏蔽电视盒子广告，屏蔽app内置广告，同时屏蔽了一些日志收集、大数据统计等涉及个人隐私信息的站点，能够保护个人隐私不被偷偷上传。
|
|
||||||
|
|
||||||
本工具是通过域名解析层来屏蔽广告和保护隐私的，其将各大著名的hosts，ad filter lists，adblock list等的列表进行合并去重，再进行一系列的抽象化，例如主动剔除失效域名、easylist优化模糊匹配、增强的黑白名单机制等措施，最终生成期望的高命中率列表。
|
|
||||||
|
|
||||||
## 快速使用(使用官网地址，速度更稳定)
|
|
||||||
|
|
||||||
| 文件 | raw | 官网地址 | 适用于 |
|
|
||||||
| -------------------------------- |:------------------: | ---------------- |--------------------------------------------- |
|
|
||||||
| `adblock-for-dnsmasq.conf` | [link](https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/adblock-for-dnsmasq.conf) | [官网地址，更稳定](https://anti-ad.net/anti-ad-for-dnsmasq.conf) | dnsmasq及其衍生版本 |
|
|
||||||
| `anti-ad-easylist.txt` | [link](https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/anti-ad-easylist.txt) | [官网地址，更稳定](https://anti-ad.net/easylist.txt) | AdGuardHome（DNS过滤） |
|
|
||||||
| `anti-ad-adguard.txt` | [link](https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/anti-ad-adguard.txt) | [官网地址，更稳定](https://anti-ad.net/adguard.txt) | AdGuard（匹配整个URL的域名部分） |
|
|
||||||
| `anti-ad-domains.txt` | [link](https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/anti-ad-domains.txt) | [官网地址，更稳定](https://anti-ad.net/domains.txt) | Pi-Hole或其他。 |
|
|
||||||
| `anti-ad-surge.txt` | [link](https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/anti-ad-surge.txt) | [官网地址，更稳定](https://anti-ad.net/surge.txt) | Surge或其他工具。 |
|
|
||||||
| `anti-ad-surge2.txt` | [link](https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/anti-ad-surge2.txt) | [官网地址，更稳定](https://anti-ad.net/surge2.txt) | Surge或其他工具，DOMAIN-SET 格式性能更好。 |
|
|
||||||
| `anti-ad-clash.yaml` | [link](https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/anti-ad-clash.yaml) | [官网地址，更稳定](https://anti-ad.net/clash.yaml) | Clash Premium。 |
|
|
||||||
| `anti-ad-smartdns.conf` | [link](https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/anti-ad-smartdns.conf) | [官网地址，更稳定](https://anti-ad.net/anti-ad-for-smartdns.conf) | SmartDNS |
|
|
||||||
|
|
||||||
## 版本历史
|
|
||||||
|
|
||||||
#### v4.5.0 (2021.05.02)
|
|
||||||
- 重构工具`easylist-extend.php`，优化提升3倍执行效率
|
|
||||||
- 修复一部分小bug
|
|
||||||
- 开始支持[AdGuardHome新的modifiers](https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#modifiers)语法(目前测试阶段，adgh本身解析还有bug)
|
|
||||||
|
|
||||||
|
|
||||||
#### v4.3 (2020.02.04)
|
|
||||||
- 引入无效域名、无效hosts剔除机制，大幅提升各过滤列表命中率
|
|
||||||
- 为了更好的支持pi-hole，加入一个新的全域名列表 - `anti-ad-domains.txt`
|
|
||||||
- 根据网友 [@xlighting2017](https://github.com/privacy-protection-tools/anti-AD/issues/29) 建议，更新surge的格式
|
|
||||||
- 引入数个新的配置参数，对输出结果精确控制
|
|
||||||
- 若干bug和逻辑修复
|
|
||||||
|
|
||||||
#### [更多版本演进历史>>>](https://github.com/privacy-protection-tools/anti-AD/blob/master/changelog.md)
|
|
||||||
|
|
||||||
## 一些补充的话
|
|
||||||
|
|
||||||
anti-AD在自我认知上始终是一个非主流的小众项目，受众群体较为狭窄。项目一直坚持每一行代码开源！anti-AD过滤列表的所有规则均来自上游列表和网友提交的issues，欢迎各界朋友审阅。在没有阅读代码或没有完全理解代码意图之前，本项目以及作者不再接受任何无端的质疑、猜忌，作者也不打算再浪费时间作出任何解释。
|
|
||||||
|
|
||||||
## 欢迎提issue
|
|
||||||
|
|
||||||
对于anti-AD，大家伙儿有任何建议，或者存在误杀，bug，其他错误，各种意见 [请开issue](https://github.com/privacy-protection-tools/anti-AD/issues/new/choose)
|
|
||||||
|
|
||||||
加入QQ群更实时的交流：716981535 <br>
|
|
||||||
|
|
||||||
|
|
||||||
## Special Thanks to
|
|
||||||
|
|
||||||
- [notracking/hosts-blocklists-scripts](https://github.com/notracking/hosts-blocklists-scripts) - 提供无效域名和无效hosts列表
|
|
||||||
- [Adblock Plus](https://adblockplus.org/) - 畅游清爽洁净的网络！
|
|
||||||
- [neoFelhz/neohosts](https://github.com/neoFelhz/neohosts) - 自由·负责·克制 去广告 Hosts 项目
|
|
||||||
- [vokins/yhosts](https://github.com/vokins/yhosts) - yhosts（该源已停止维护）
|
|
||||||
- [cjx82630/cjxlist](https://github.com/cjx82630/cjxlist) - Adblock Plus EasyList Lite与CJX's Annoyance List
|
|
||||||
- _[@rufengsuixing](https://github.com/rufengsuixing) 提出的jsDelivr加速过滤列表下载的建议_
|
|
||||||
- _[@xlighting2017](https://github.com/xlighting2017) 提供的[surge格式建议](https://github.com/privacy-protection-tools/anti-AD/issues/29)_
|
|
||||||
- [ACL4SSR/ACL4SSR](https://github.com/ACL4SSR/ACL4SSR) - 一些常见APP的广告 @[wchqybs](https://github.com/wchqybs) in [#79](https://github.com/privacy-protection-tools/anti-AD/issues/79)
|
|
||||||
- [ADgk.txt](https://github.com/banbendalao/ADgk) - 鸣谢 坂本dalao
|
|
||||||
- [jdlingyu/ad-wars](https://github.com/jdlingyu/ad-wars) - 只是 ad-wars 的帮助文档
|
|
||||||
- [hoshsadiq/adblock-nocoin-list](https://github.com/hoshsadiq/adblock-nocoin-list) - 恶意挖矿屏蔽列表
|
|
||||||
- [easylist.to](https://easylist.to/) - 感谢提供出色的easylist
|
|
||||||
- [ZeroDot1/CoinBlockerLists](https://gitlab.com/ZeroDot1/CoinBlockerLists) - 屏蔽恶意劫持挖矿
|
|
||||||
- [crazy-max/WindowsSpyBlocker](https://github.com/crazy-max/WindowsSpyBlocker/) - to block spying and tracking on Windows systems.
|
|
||||||
|
|
||||||
## 本项目使用PHPStorm开发，特此感谢
|
|
||||||
|
|
||||||
[](https://www.jetbrains.com/zh-cn/opensource/)
|
|
||||||
42505
adblock-for-dnsmasq.conf
42505
adblock-for-dnsmasq.conf
File diff suppressed because it is too large
Load Diff
41830
anti-ad-adguard.txt
41830
anti-ad-adguard.txt
File diff suppressed because it is too large
Load Diff
@ -1 +0,0 @@
|
|||||||
4b0aab9d347bfac2fc0d7e623901fb2d
|
|
||||||
42508
anti-ad-clash.yaml
42508
anti-ad-clash.yaml
File diff suppressed because it is too large
Load Diff
48113
anti-ad-domains.txt
48113
anti-ad-domains.txt
File diff suppressed because it is too large
Load Diff
39435
anti-ad-easylist.txt
39435
anti-ad-easylist.txt
File diff suppressed because it is too large
Load Diff
@ -1 +0,0 @@
|
|||||||
097152dc6e2ed412e7e77f0eb5514402
|
|
||||||
42505
anti-ad-smartdns.conf
42505
anti-ad-smartdns.conf
File diff suppressed because it is too large
Load Diff
42505
anti-ad-surge.txt
42505
anti-ad-surge.txt
File diff suppressed because it is too large
Load Diff
42507
anti-ad-surge2.txt
42507
anti-ad-surge2.txt
File diff suppressed because it is too large
Load Diff
57
changelog.md
57
changelog.md
@ -1,57 +0,0 @@
|
|||||||
# anti-AD change log
|
|
||||||
|
|
||||||
#### v4.5.0 (2021.05.02)
|
|
||||||
- 重构工具`easylist-extend.php`，优化提升3倍执行效率
|
|
||||||
- 修复一部分小bug
|
|
||||||
- 开始支持[AdGuardHome新的modifiers](https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#modifiers)语法(目前测试阶段，adgh本身解析还有bug)
|
|
||||||
|
|
||||||
#### v4.3 (2020.02.04)
|
|
||||||
- 引入无效域名、无效hosts剔除机制，大幅提升各过滤列表命中率
|
|
||||||
- 为了更好的支持pi-hole，加入一个新的全域名列表 - `anti-ad-domains.txt`
|
|
||||||
- 根据网友 @xlighting2017 建议，更新surge的格式
|
|
||||||
- 引入数个新的配置参数，对输出结果精确控制
|
|
||||||
- 若干bug和逻辑修复
|
|
||||||
|
|
||||||
#### v4.2.2 (2020.02.02)
|
|
||||||
|
|
||||||
- 传统白名单增强模式，支持根域名单独加白而不影响其子域名
|
|
||||||
- 开始支持自动同步到另一个repo，自动发布更新
|
|
||||||
- 开始引入官网，逐步建设完善
|
|
||||||
- 修复一些逻辑bug
|
|
||||||
|
|
||||||
#### v4.2.1 (2020.01.19)
|
|
||||||
|
|
||||||
- 增加对恶意挖矿域名列表的屏蔽
|
|
||||||
- 引入严格模式，对恶意挖矿程序屏蔽时，默认屏蔽其主域名，例如www.baidu.com,严格模式启用时屏蔽baidu.com及其所有子域名
|
|
||||||
- 修复.cn域名匹配中发现的bug
|
|
||||||
- 一些正则表达式规则的进一步提取优化
|
|
||||||
|
|
||||||
#### v4.2 (2020.01.16)
|
|
||||||
|
|
||||||
- easylist支持正则表达式语法
|
|
||||||
- easylist白名单机制增强
|
|
||||||
|
|
||||||
#### v4.1 (2019.12.24)
|
|
||||||
|
|
||||||
- easylist支持通配符匹配域名
|
|
||||||
- easylist引入白名单赦免机制
|
|
||||||
|
|
||||||
#### v4.0 (2019.12.14)
|
|
||||||
|
|
||||||
- 开始支持主动探测无效域名，进一步降低最终生成文件（位于dist目录）的体积，提升命中率
|
|
||||||
- 开始支持dnsmasq，easylist，surge等多种格式
|
|
||||||
- 分离出国内域名的精简配置(`dist/*-basic.*`)和优化后的完整配置(`dist/*-full.*`)，可以根据需求选择屏蔽等级
|
|
||||||
- 代码重构，工程化，分离class，分离工具，逻辑更清晰
|
|
||||||
|
|
||||||
|
|
||||||
#### v3.0 (2019.10.19)
|
|
||||||
|
|
||||||
- 严格匹配域名，增强生成列表的有效性
|
|
||||||
- 黑名单逻辑优化
|
|
||||||
- 重复域名剔除算法优化，进一步精简列表
|
|
||||||
- 代码bug修复
|
|
||||||
|
|
||||||
|
|
||||||
#### 3.0之前(2017年某日开始)
|
|
||||||
|
|
||||||
单个文件生成列表，主要做了更新各种靠谱来源的收集
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 27 KiB |
Loading…
Reference in New Issue
Block a user