Commit Graph

65 Commits

Author SHA1 Message Date
Frank Denis 252b10c996 Remove blacklisted names due to globbing patterns
This is very clumsy, as it doesn't handle time-based rules properly,
and doesn't handle whitelists at all.

Adding globs to the "names" list is also an ugly hack just to have
them included in the final output.
2020-04-22 17:55:24 +02:00
Frank Denis a71b531d2e Re-add -o / --output-file 2020-04-21 23:40:58 +02:00
Frank Denis dcd6f8448d Revert "Improve generate-domains-blacklist.py to remove redundant lines (#1184)"
This reverts commit 58871de725.
2020-04-21 23:08:40 +02:00
Huhni 58871de725
Improve generate-domains-blacklist.py to remove redundant lines (#1184)
* Improve script to remove redundant lines

Let the script remove those lines that are covered by regular expressions already

* add optional "-o OUTPUT_FILE" argument 

This ensures that UTF-8 is used.
The redirect to file functionality from before is maintained, because "default=None" is used for the -o argument

I also fixed the formatting slightly to avoid newlines at the beginning of the file.

* improve glob matching

- rename regexes into globs 
- only check trusted (local) files for globs
- use fnmatch instead of manually converting globs into regular expressions and matching them
- modify is_glob function to check only for the following characters: * [ ] ?
- improve get_lines_with_globs function, by using the native filter and lambda functions
- improve covered_by_glob function, by checking if line is part of glob_list, instead of calling is_glob again
- print "ignored entries due to globs in local-additions" to the output as well to better differentiate from other duplicates
2020-04-21 23:07:32 +02:00
Frank Denis abfd195e51 Use Kadhosts without controversies
Fixes #1288
2020-04-19 17:55:46 +02:00
Frank Denis 69a7d832c4 Remove lists that are pretty much empty 2020-04-19 17:52:16 +02:00
Frank Denis ccc91e28a3 Try enabling energized blu by default
Quite a lot of domains in that list don't exist any more, though.
2020-04-19 17:46:18 +02:00
Frank Denis 900ed13ff1 Remove banbenek's list 2020-04-19 17:39:53 +02:00
Frank Denis 2779d92f01 Add some blacklists 2020-04-18 21:18:40 +02:00
Frank Denis 4f41fc3fee Add Geoffrey Frogeye's block list 2020-04-12 23:34:15 +02:00
Linuxfreak 76f6d02e52
Change URL of Block Spotify ads (#1266)
The url of the Spotify-HOSTS.txt is changed. Path of "/filter/" is now "/filters/"
2020-04-04 22:18:21 +02:00
Frank Denis 5930b45116 Farewall host-files.net domain list
Fixes #1262
2020-04-02 14:56:38 +02:00
Frank Denis 1d090eb194 Unfortunately, blocking stats.* has too many implications 2020-03-25 20:33:36 +01:00
Frank Denis 5bb5a26150 Update notracking list URL
Fixes #1174
2020-03-13 17:37:50 +01:00
Frank Denis 4f03575943 ransomware tracker is no more 2020-01-11 08:55:22 -07:00
Cristian-J 05593a8bbd Ignore links that start with a hyphen or a dot
If you use filter blacklists you'll end up with many invalid links that start with a hyphen or a dot in the final blacklist.
2020-01-08 12:57:22 -07:00
Frank Denis 1c45d9e156 Blacklist motd.ubuntu.com 2019-12-27 21:21:05 +01:00
Frank Denis 69f00ca977 Don't use the message attribute to get an error message
Fixes #1123
2019-12-23 18:58:39 +01:00
Frank Denis a308c76191 Format 2019-12-23 18:55:37 +01:00
Frank Denis ffb1a1b718 People really blacklist cdn.cloudflare.net ¯\_(ツ)_/¯ 2019-12-18 23:21:50 +01:00
Frank Denis 4d5c940616 Remove domains-blacklist-all.conf 2019-12-10 15:51:04 +01:00
Frank Denis 2d28e5808d Add fastly.net 2019-12-08 12:30:52 +01:00
Frank Denis de10601a8e Add edgesuite.net to the example whitelist 2019-12-08 10:59:19 +01:00
Frank Denis 98eb5ccd49 whitelist 2019-12-01 17:56:48 +01:00
Frank Denis 941cd63508 Add some extra blacklists 2019-12-01 16:01:17 +01:00
Frank Denis 77f2eef886 Change the user agent 2019-08-27 18:26:29 +02:00
Frank Denis 5f29677400 Format 2019-08-27 18:25:47 +02:00
Frank Denis 9a6cc0e137 Add tracker.debian.org to example-whitelist.txt
Fixes #890
2019-07-22 15:15:02 +02:00
encrypt.town da48434483 regex isn't fully parsing the complicated csv file
Not all URLs are extracted from the complicated csv file.
However, they do offer a txt file for the same list, which does work correctly with the current regex:
https://www.malwaredomainlist.com/forums/index.php?topic=3270.0
This url replacement pull request is easier than rewriting the entire regex (which then breaks other lists).
2019-05-29 09:31:16 +02:00
Simon R f3e032f88a fix remaining urllib2 reference (#830) 2019-05-22 20:50:45 +02:00
Simon R bc5e4f0544 make generate-domains-blacklist.py compatible to both python2 and python3 (#828)
* update domains-blacklist-all.conf: Quidsup NoTrack moved to gitlab

* make generate-domains-blacklist.py python3 compatible

* fix whitespace
2019-05-22 10:15:08 +02:00
encrypt.town dcce060ef2 Whitelist Server Source Domains (#829)
A malicious blacklist, or accidental block, could prevent dnscrypt-proxy users from being able to fetch public resolvers and important certificate updates. Both URLs are taken from the default config:

[sources.'public-resolvers']
urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
2019-05-22 10:14:37 +02:00
Frank Denis fb7f16c902 quidsup notrack moved to gitlab
Thanks to @simonfxr for reporting this
2019-05-21 20:29:02 +02:00
Frank Denis 864476b835 Update Quidsup URLs
Fixes #743
2019-03-03 17:43:25 +01:00
Frank Denis 5ee3512460 generate-domains-blacklist.py: properly handle time restrictions
Fixes #710
2019-02-15 00:03:02 +01:00
Frank Denis c142923b46 Add a dedicated function for trusted lists 2019-02-14 23:27:19 +01:00
Frank Denis 8377d491f6 Whitelist revinate.com 2019-01-29 20:03:04 +01:00
Frank Denis 1871690832 polyfill.io is not a tracker 2019-01-29 19:14:30 +01:00
losuler c8156829c5 Minor domains-blacklist fixes (#697)
* Removed unnecessary characters from hosts-file URLs

* Added HTTPS to various URLs that were missing it
2019-01-16 10:17:44 +01:00
joonas.fi 30da550307 domains-blacklist.conf: change one URL to https (#674) 2018-12-28 15:42:31 +01:00
Mike Conrad 0d7de697cc Removed securemecca.com as it has expired and does not currently host content (#655) 2018-11-29 12:58:14 +01:00
Frank Denis a4f5e98f63 Revert "abuse.ch ransomware tracker seems to have issues"
This reverts commit 0646e1b904.
2018-11-13 14:38:14 +01:00
Frank Denis 0646e1b904 abuse.ch ransomware tracker seems to have issues 2018-11-09 16:45:29 +01:00
Chris Lane da5ee45b8c Correct CoinblockerLists URL (#583) 2018-09-03 18:35:06 +02:00
jfoboss d7454b38b9 Added link to RU AdList (supplement for EasyList) (#424)
Specialization: русский, українська
2018-05-03 08:19:20 +02:00
Frank Denis 84593c1341 Add liveinternet.ru to the whitelist 2018-03-27 00:22:13 +02:00
Frank Denis 9224e79c59 Add NoTracking's list to the example blacklist configuration
Implement dnsmasq-style filters by the way
2018-03-26 20:43:42 +02:00
Frank Denis 6bca9eb795 malwaredomainslist seems to be hard to reach over HTTPS 2018-03-26 20:37:22 +02:00
Frank Denis 5de18b5274 Sorry, but eucookie.internetbrands.com makes modelmayhem unusable 2018-02-24 19:49:57 +01:00
Frank Denis 0c2154af83 ibpxl.com is often having issues making websites unusable 2018-02-23 18:49:45 +01:00