prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge w/master

Browse source
This commit is contained in:
Collin M. Barrett 2019-09-02 15:11:24 -05:00
commit 472f5d4100
23 changed files with 1648 additions and 1207 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/CONTRIBUTING.md vendored
View file

@ -8,6 +8,11 @@ Check out the <a href="https://hub.filterlists.com">FilterLists Hub</a>, a place
To submit a new list or update data about an existing list, please submit a pull request to [data](https://github.com/collinbarrett/FilterLists/tree/master/data) in conjunction with the data model described [here](https://github.com/collinbarrett/FilterLists/wiki/Data-Model_sidebar). Alternatively, you can [open a new issue](https://github.com/collinbarrett/FilterLists/issues/new) providing information for all of the fields described in the [data model](https://github.com/collinbarrett/FilterLists/wiki/Data-Model_sidebar).
While we are generally very open and welcoming of any new or changed lists, a few conditions apply (although loosely):
* Adding the smaller text files that make up one complete list, e.g. *[EasyList General Block Popup](https://raw.githubusercontent.com/easylist/easylist/master/easylist/easylist_general_block_popup.txt)*, is not usually done. We do however do it for the language files of *[ABP Anti-Circumvention Filter List](https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt)*; but due to its often-changing entries, those files should have ≥5 entries that cover ≥3 sites at the time of addition.
* Since `CHEF-KOCH` has a registered history of behaving aggressively and unfairly towards other filterlist makers and the FilterLists.com community, a case to add any of his lists would have had to be very strong, and mass additions are out of the question.
## Adding or Updating Rules
FilterLists does not maintain any of these lists. It serves only as a discovery tool to direct users to lists that they may want to use. If you want to request addition, modification, or removal of a rule from a list, you will need to contact the maintainers of that list directly. FilterLists provides a variety of ways you can get in contact with the maintainers to do so.
@ -84,4 +89,4 @@ The Agent takes the following command line arguments:
### Debugging
1. Execute `docker container ls -a` to find the `CONTAINER ID` of the container in question.
2. Execute `docker logs [CONTAINER ID]` replacing `[CONTAINER ID]` with the hash from step 1 to view the logs from that container.
2. Execute `docker logs [CONTAINER ID]` replacing `[CONTAINER ID]` with the hash from step 1 to view the logs from that container.

16
.github/README.md vendored
View file

@ -12,20 +12,20 @@
<a href="https://dev.azure.com/collinbarrett/FilterLists/_build/latest?definitionId=3"><img src="https://img.shields.io/azure-devops/build/collinbarrett/FilterLists/3.svg" alt="Azure DevOps builds" /></a>
<a href="https://dev.azure.com/collinbarrett/FilterLists/_test/analytics?definitionId=3&contextType=build"><img alt="Azure DevOps tests" src="https://img.shields.io/azure-devops/tests/collinbarrett/FilterLists/3.svg"></a>
<a href="https://dev.azure.com/collinbarrett/FilterLists/_release?definitionId=3"><img src="https://img.shields.io/azure-devops/release/collinbarrett/b06a3d5c-459e-4789-9735-0f5969006fe8/3/4.svg" alt="Azure DevOps releases" /></a>
<a href="https://hub.docker.com/r/collinbarrett/filterlists.api"><img src="https://img.shields.io/docker/pulls/collinbarrett/filterlists.api.svg" alt="Docker Pulls" /></a>
<a href="https://hub.docker.com/r/collinbarrett2/filterlists.api"><img src="https://img.shields.io/docker/pulls/collinbarrett/filterlists.api.svg" alt="Docker Pulls" /></a>
<br/>An ASP.NET Core API CRUD-ing with a MariaDB instance via EF Core.</p>
<p align="center"><b>Website:</b> <a href="https://filterlists.com/"><img src="https://img.shields.io/website-up-down-green-red/http/shields.io.svg" alt="Website" /></a>
<a href="https://dev.azure.com/collinbarrett/FilterLists/_build/latest?definitionId=12"><img src="https://img.shields.io/azure-devops/build/collinbarrett/FilterLists/12.svg" alt="Azure DevOps builds" /></a>
<a href="https://dev.azure.com/collinbarrett/FilterLists/_release?definitionId=4"><img src="https://img.shields.io/azure-devops/release/collinbarrett/b06a3d5c-459e-4789-9735-0f5969006fe8/4/5.svg" alt="Azure DevOps releases" /></a>
<a href="https://hub.docker.com/r/collinbarrett/filterlists.web"><img src="https://img.shields.io/docker/pulls/collinbarrett/filterlists.web.svg" alt="Docker Pulls" /></a>
<a href="https://hub.docker.com/r/collinbarrett2/filterlists.web"><img src="https://img.shields.io/docker/pulls/collinbarrett/filterlists.web.svg" alt="Docker Pulls" /></a>
<br/>A React & TypeScript UI primarily featuring a <a href="https://www.npmjs.com/package/react-table">react-table</a> instance.</p>
<p align="center"><b>Agent:</b>
<a href="https://dev.azure.com/collinbarrett/FilterLists/_build/latest?definitionId=17"><img src="https://img.shields.io/azure-devops/build/collinbarrett/FilterLists/17.svg" alt="Azure DevOps builds" /></a>
<a href="https://dev.azure.com/collinbarrett/FilterLists/_test/analytics?definitionId=17&contextType=build"><img alt="Azure DevOps tests" src="https://img.shields.io/azure-devops/tests/collinbarrett/FilterLists/17.svg"></a>
<a href="https://dev.azure.com/collinbarrett/FilterLists/_release?definitionId=6"><img src="https://img.shields.io/azure-devops/release/collinbarrett/b06a3d5c-459e-4789-9735-0f5969006fe8/6/7.svg" alt="Azure DevOps releases" /></a>
<a href="https://hub.docker.com/r/collinbarrett/filterlists.agent"><img src="https://img.shields.io/docker/pulls/collinbarrett/filterlists.agent.svg" alt="Docker Pulls" /></a>
<a href="https://hub.docker.com/r/collinbarrett2/filterlists.agent"><img src="https://img.shields.io/docker/pulls/collinbarrett/filterlists.agent.svg" alt="Docker Pulls" /></a>
<br/>A .NET Core console application performing crawling, archiving, and URL validation.</p>
# Background
@ -128,10 +128,10 @@ The Agent takes the following command line arguments:
# Acknowledgements
- Imre Kristoffer Eilertsen [@DandelionSprout](https://github.com/DandelionSprout) : major contributor
- Raymond Hill [@gorhill](https://github.com/gorhill) : uBlock Origin owner, advised on some technical aspects of FilterLists
- Andrey Meshkov [@ameshkov](https://github.com/ameshkov) : AdGuard CTO, advised on some technical aspects of FilterLists
- [More contributors](https://github.com/collinbarrett/FilterLists/graphs/contributors)
- Imre Kristoffer Eilertsen [@DandelionSprout](https://github.com/DandelionSprout) : major contributor
- Raymond Hill [@gorhill](https://github.com/gorhill) : uBlock Origin owner, advised on some technical aspects of FilterLists
- Andrey Meshkov [@ameshkov](https://github.com/ameshkov) : AdGuard CTO, advised on some technical aspects of FilterLists
- [More contributors](https://github.com/collinbarrett/FilterLists/graphs/contributors)
# Miscellany
@ -152,4 +152,4 @@ We respect your privacy. That is the whole point of this project. The only minor
## Internet Explorer
FilterLists does not support Internet Explorer. To view a smaller, TPL-only archive with subscribable links, right-click on [this link](https://raw.githubusercontent.com/collinbarrett/FilterLists/master/data/TPLSubscriptionAssistant.html), choose to save it as an HTML file, and open it in Internet Explorer ≥9.
FilterLists does not support Internet Explorer. To view a smaller, TPL-only archive with subscribable links, right-click on [this link](https://raw.githubusercontent.com/collinbarrett/FilterLists/master/data/TPLSubscriptionAssistant.html), choose to save it as an HTML file, and open it in Internet Explorer ≥9.

12
data/Dependent.json
View file

@ -1,8 +1,4 @@
[
{
"dependentFilterListId": 344,
"dependencyFilterListId": 30
},
{
"dependentFilterListId": 344,
"dependencyFilterListId": 301
@ -22,5 +18,13 @@
{
"dependentFilterListId": 853,
"dependencyFilterListId": 97
},
{
"dependentFilterListId": 1816,
"dependencyFilterListId": 60
},
{
"dependentFilterListId": 1817,
"dependencyFilterListId": 347
}
]

662
data/FilterList.json
View file

File diff suppressed because it is too large Load diff

72
data/FilterListLanguage.json
View file

@ -703,14 +703,6 @@
"filterListId": 570,
"languageId": 105
},
{
"filterListId": 571,
"languageId": 106
},
{
"filterListId": 572,
"languageId": 108
},
{
"filterListId": 573,
"languageId": 110
@ -723,18 +715,6 @@
"filterListId": 575,
"languageId": 167
},
{
"filterListId": 577,
"languageId": 177
},
{
"filterListId": 579,
"languageId": 159
},
{
"filterListId": 582,
"languageId": 11
},
{
"filterListId": 583,
"languageId": 13
@ -747,14 +727,6 @@
"filterListId": 586,
"languageId": 79
},
{
"filterListId": 587,
"languageId": 83
},
{
"filterListId": 588,
"languageId": 48
},
{
"filterListId": 593,
"languageId": 110
@ -2362,5 +2334,49 @@
{
"filterListId": 1739,
"languageId": 141
},
{
"filterListId": 1108,
"languageId": 179
},
{
"filterListId": 1144,
"languageId": 108
},
{
"filterListId": 1153,
"languageId": 79
},
{
"filterListId": 1154,
"languageId": 139
},
{
"filterListId": 1165,
"languageId": 27
},
{
"filterListId": 1167,
"languageId": 122
},
{
"filterListId": 1799,
"languageId": 122
},
{
"filterListId": 1816,
"languageId": 11
},
{
"filterListId": 1817,
"languageId": 11
},
{
"filterListId": 1820,
"languageId": 113
},
{
"filterListId": 1821,
"languageId": 113
}
]

58
data/FilterListMaintainer.json
View file

@ -483,14 +483,6 @@
"filterListId": 570,
"maintainerId": 15
},
{
"filterListId": 571,
"maintainerId": 15
},
{
"filterListId": 572,
"maintainerId": 15
},
{
"filterListId": 573,
"maintainerId": 15
@ -503,18 +495,6 @@
"filterListId": 575,
"maintainerId": 15
},
{
"filterListId": 577,
"maintainerId": 15
},
{
"filterListId": 579,
"maintainerId": 15
},
{
"filterListId": 582,
"maintainerId": 15
},
{
"filterListId": 583,
"maintainerId": 15
@ -528,11 +508,7 @@
"maintainerId": 15
},
{
"filterListId": 587,
"maintainerId": 15
},
{
"filterListId": 588,
"filterListId": 1799,
"maintainerId": 15
},
{
@ -875,6 +851,18 @@
"filterListId": 1738,
"maintainerId": 22
},
{
"filterListId": 1814,
"maintainerId": 22
},
{
"filterListId": 1815,
"maintainerId": 22
},
{
"filterListId": 1832,
"maintainerId": 22
},
{
"filterListId": 21,
"maintainerId": 23
@ -4547,6 +4535,10 @@
"filterListId": 1639,
"maintainerId": 139
},
{
"filterListId": 1819,
"maintainerId": 139
},
{
"filterListid": 1470,
"maintainerid": 84
@ -4786,5 +4778,21 @@
{
"filterListid": 1798,
"maintainerid": 84
},
{
"filterListid": 508,
"maintainerid": 34
},
{
"filterListid": 1816,
"maintainerid": 34
},
{
"filterListid": 1817,
"maintainerid": 32
},
{
"filterListid": 1818,
"maintainerid": 140
}
]

1892
data/FilterListTag.json
View file

File diff suppressed because it is too large Load diff

4
data/Language.json
View file

@ -216,7 +216,7 @@
"iso6392B": "snd",
"iso6392T": "snd",
"iso6393": "snd",
"localName": "سنڌي‎",
"localName": "سنڌي",
"name": "Sindhi"
},
{
@ -1799,4 +1799,4 @@
"localName": "isiZulu",
"name": "Zulu"
}
]
]

9
data/License.json
View file

@ -215,7 +215,7 @@
},
{
"id": 32,
"name": "Permissive but non-commercial",
"name": "Permissive non-commercial",
"permissiveAdaptation": true,
"permissiveCommercial": false
},
@ -265,5 +265,12 @@
"name": "Generic copyleft",
"permissiveAdaptation": true,
"permissiveCommercial": true
},
{
"id": 40,
"descriptionUrl": "https://pgl.yoyo.org/license/",
"name": "McRae General Public License",
"permissiveAdaptation": true,
"permissiveCommercial": false
}
]

5
data/Maintainer.json
View file

@ -733,5 +733,10 @@
"id": 139,
"homeUrl": "https://www.github.developerdan.com/hosts/",
"name": "lightswitch05"
},
{
"id": 140,
"homeUrl": "https://github.com/mmotti",
"name": "mmotti"
}
]

30
data/Merge.json
View file

@ -315,14 +315,6 @@
"mergeFilterListId": 566,
"upstreamFilterListId": 570
},
{
"mergeFilterListId": 566,
"upstreamFilterListId": 571
},
{
"mergeFilterListId": 566,
"upstreamFilterListId": 572
},
{
"mergeFilterListId": 566,
"upstreamFilterListId": 573
@ -335,18 +327,6 @@
"mergeFilterListId": 566,
"upstreamFilterListId": 575
},
{
"mergeFilterListId": 566,
"upstreamFilterListId": 577
},
{
"mergeFilterListId": 566,
"upstreamFilterListId": 579
},
{
"mergeFilterListId": 566,
"upstreamFilterListId": 582
},
{
"mergeFilterListId": 566,
"upstreamFilterListId": 583
@ -358,13 +338,5 @@
{
"mergeFilterListId": 566,
"upstreamFilterListId": 586
},
{
"mergeFilterListId": 566,
"upstreamFilterListId": 587
},
{
"mergeFilterListId": 566,
"upstreamFilterListId": 588
}
]
]

23
data/Software.json
View file

@ -217,5 +217,26 @@
"id": 34,
"isAbpSubscribable": false,
"name": "Windows command line"
},
{
"id": 35,
"downloadUrl": "https://shadowsocks.org/en/download/clients.html",
"homeUrl": "https://shadowsocks.org/en/index.html",
"isAbpSubscribable": false,
"name": "Shadowsocks"
},
{
"id": 36,
"downloadUrl": "https://github.com/shadowsocksrr/shadowsocksr-csharp/releases",
"homeUrl": "https://github.com/shadowsocksrr/shadowsocksr-csharp",
"isAbpSubscribable": false,
"name": "ShadowsocksR"
},
{
"id": 37,
"downloadUrl": "https://apps.apple.com/app/shadowrocket/id932747118",
"homeUrl": "https://liguangming.com/Shadowrocket",
"isAbpSubscribable": false,
"name": "Shadowrocket"
}
]
]

18
data/SoftwareSyntax.json
View file

@ -370,5 +370,21 @@
{
"softwareId": 32,
"syntaxId": 28
},
{
"softwareId": 35,
"syntaxId": 29
},
{
"softwareId": 36,
"syntaxId": 29
},
{
"softwareId": 37,
"syntaxId": 29
},
{
"softwareId": 14,
"syntaxId": 30
}
]
]

9
data/Syntax.json
View file

@ -119,5 +119,14 @@
{
"id": 28,
"name": "Adblocker-syntax domains"
},
{
"id": 29,
"name": "Socks5"
},
{
"id": 30,
"definitionUrl": "https://docs.pi-hole.net/ftldns/regex/tutorial/",
"name": "Pi-hole regular expressions"
}
]

4
docker-compose.agent.tests.yml
View file

@ -2,7 +2,7 @@ version: "3.7"
services:
agent:
image: collinbarrett/filterlists.agent:test-agent
image: collinbarrett2/filterlists.agent:test-agent
build:
context: .
dockerfile: src/FilterLists.Agent/Dockerfile
@ -14,7 +14,7 @@ services:
networks:
test-agent:
volumes:
test-agent-results:
external: true

4
docker-compose.data.tests.yml
View file

@ -2,7 +2,7 @@ version: "3.7"
services:
api:
image: collinbarrett/filterlists.api:test-data
image: collinbarrett2/filterlists.api:test-data
build:
context: .
dockerfile: src/FilterLists.Api/Dockerfile
@ -27,7 +27,7 @@ services:
[
"mysqld",
"--character-set-server=utf8mb4",
"--collation-server=utf8mb4_unicode_520_ci"
"--collation-server=utf8mb4_unicode_520_ci",
]
networks:

4
docker-compose.services.tests.yml
View file

@ -2,7 +2,7 @@ version: "3.7"
services:
api:
image: collinbarrett/filterlists.api:test-services
image: collinbarrett2/filterlists.api:test-services
build:
context: .
dockerfile: src/FilterLists.Api/Dockerfile
@ -14,7 +14,7 @@ services:
networks:
test-services:
volumes:
test-services-results:
external: true

8
docker-compose.yml
View file

@ -13,7 +13,7 @@ services:
- ./ops/nginx/svr-includes:/etc/nginx/svr-includes:ro
web:
image: collinbarrett/filterlists.web:latest
image: collinbarrett2/filterlists.web:latest
restart: always
build:
context: .
@ -23,7 +23,7 @@ services:
- reverse-proxy
api:
image: collinbarrett/filterlists.api:latest
image: collinbarrett2/filterlists.api:latest
restart: always
build:
context: .
@ -53,11 +53,11 @@ services:
[
"mysqld",
"--character-set-server=utf8mb4",
"--collation-server=utf8mb4_unicode_520_ci"
"--collation-server=utf8mb4_unicode_520_ci",
]
agent:
image: collinbarrett/filterlists.agent:latest
image: collinbarrett2/filterlists.agent:latest
build:
context: .
dockerfile: src/FilterLists.Agent/Dockerfile

10
src/FilterLists.Agent/FilterLists.Agent.csproj
View file

@ -36,7 +36,7 @@
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.6.0" />
<PackageReference Include="LibGit2Sharp" Version="0.26.0" />
<PackageReference Include="LibGit2Sharp" Version="0.26.1" />
<PackageReference Include="MediatR" Version="7.0.0" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0" />
@ -51,14 +51,14 @@
<PackageReference Include="Microsoft.Extensions.Localization" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.7.12" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.2" />
<PackageReference Include="Octokit" Version="0.32.0" />
<PackageReference Include="Polly" Version="7.1.0" />
<PackageReference Include="RestSharp" Version="106.6.10" />
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.4" />
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="3.0.3" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="3.0.4" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="SharpCompress" Version="0.23.0" />
<PackageReference Include="SharpCompress" Version="0.24.0" />
</ItemGroup>
<ItemGroup>

4
src/FilterLists.Api/FilterLists.Api.csproj
View file

@ -43,10 +43,10 @@
<PackageReference Include="Humanizer.Core" Version="2.6.2" />
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="3.1.6" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4" />
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.7.12" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.2" />
</ItemGroup>
</Project>

2
src/FilterLists.Services/FilterLists.Services.csproj
View file

@ -31,7 +31,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4" />
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
<PackageReference Include="morelinq" Version="3.2.0" />
<PackageReference Include="SharpCompress" Version="0.23.0" />
<PackageReference Include="SharpCompress" Version="0.24.0" />
</ItemGroup>
</Project>

BIN
src/FilterLists.Web/package-lock.json generated
View file

Binary file not shown.

2
src/FilterLists.Web/src/components/softwareCloud/SoftwareIcon.tsx
View file

@ -88,4 +88,4 @@ const icons: { [id: number]: Icon; } = {
32: { image: img32, imageTitle: "AdNauseam" },
33: { image: img33, imageTitle: "Legacy Unix derivatives" },
34: { image: img34, imageTitle: "Windows command line" }
};
};