From 743583fe4c00fd229dc709dbdbaaaf90a497f535 Mon Sep 17 00:00:00 2001 From: Norbert Date: Mon, 15 May 2023 00:06:19 +0200 Subject: [PATCH] fixup --- cf_list_create.js | 6 ++--- get_recommended_whitelist.sh | 48 +++++++++++++++++++----------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/cf_list_create.js b/cf_list_create.js index 1945b4a..fc87b6a 100644 --- a/cf_list_create.js +++ b/cf_list_create.js @@ -11,8 +11,6 @@ if (!process.env.CI) console.log(`List item limit set to ${LIST_ITEM_LIMIT}`); let whitelist = []; // Define an empty array for the whitelist - - // Read whitelist.csv and parse fs.readFile('whitelist.csv', 'utf8', async (err, data) => { if (err) { @@ -63,7 +61,9 @@ fs.readFile('input.csv', 'utf8', async (err, data) => { .replace('0.0.0.0 ', '') .replace('127.0.0.1 ', '') .replace('::1 ', '') - .replace(':: ', ''); + .replace(':: ', '') + .replace('^', '') + .replace('||', ''); }).filter(domain => { return domainValidationPattern.test(domain); }); diff --git a/get_recommended_whitelist.sh b/get_recommended_whitelist.sh index 95e61f8..df3e095 100644 --- a/get_recommended_whitelist.sh +++ b/get_recommended_whitelist.sh @@ -1,33 +1,35 @@ #!/bin/bash +# +# Uncomment the provided list or add you own # https://oisd.nl/includedlists/whitelists # create an empty whitelist.csv file touch whitelist.csv # declare an array of urls urls=( - https://raw.githubusercontent.com/im-sm/Pi-hole-Torrent-Blocklist/main/all-torrent-trackres.txt - https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/banks.txt - https://raw.githubusercontent.com/hagezi/dns-blocklists/main/whitelist.txt - https://raw.githubusercontent.com/TogoFire-Home/AD-Settings/main/Filters/whitelist.txt - https://raw.githubusercontent.com/freekers/whitelist/master/domains/whitelist.txt - https://raw.githubusercontent.com/DandelionSprout/AdGuard-Home-Whitelist/master/whitelist.txt - https://www.aadvantageeshopping.com/adBlockWhitelist.php - https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt - https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/optional-list.txt - https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/issues.txt - https://raw.githubusercontent.com/hagezi/dns-blocklists/main/whitelist-referral.txt - https://raw.githubusercontent.com/mawenjian/china-cdn-domain-whitelist/master/china-cdn-domain-whitelist.txt - https://raw.githubusercontent.com/notracking/hosts-blocklists-scripts/master/hostnames.whitelist.txt - https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/mac.txt - https://raw.githubusercontent.com/boutetnico/url-shorteners/master/list.txt - https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/windows.txt - https://raw.githubusercontent.com/Dogino/Discord-Phishing-URLs/main/official-domains.txt - https://raw.githubusercontent.com/ookangzheng/blahdns/master/hosts/whitelist.txt - https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/android.txt - https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/sensitive.txt - https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt - https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/firefox.txt - https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/referral-sites.txt + # https://raw.githubusercontent.com/im-sm/Pi-hole-Torrent-Blocklist/main/all-torrent-trackres.txt + # https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/banks.txt + # https://raw.githubusercontent.com/hagezi/dns-blocklists/main/whitelist.txt + # https://raw.githubusercontent.com/TogoFire-Home/AD-Settings/main/Filters/whitelist.txt + # https://raw.githubusercontent.com/freekers/whitelist/master/domains/whitelist.txt + # https://raw.githubusercontent.com/DandelionSprout/AdGuard-Home-Whitelist/master/whitelist.txt + # https://www.aadvantageeshopping.com/adBlockWhitelist.php + # https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt + # https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/optional-list.txt + # https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/issues.txt + # https://raw.githubusercontent.com/hagezi/dns-blocklists/main/whitelist-referral.txt + # https://raw.githubusercontent.com/mawenjian/china-cdn-domain-whitelist/master/china-cdn-domain-whitelist.txt + # https://raw.githubusercontent.com/notracking/hosts-blocklists-scripts/master/hostnames.whitelist.txt + # https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/mac.txt + # https://raw.githubusercontent.com/boutetnico/url-shorteners/master/list.txt + # https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/windows.txt + # https://raw.githubusercontent.com/Dogino/Discord-Phishing-URLs/main/official-domains.txt + # https://raw.githubusercontent.com/ookangzheng/blahdns/master/hosts/whitelist.txt + # https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/android.txt + # https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/sensitive.txt + # https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt + # https://raw.githubusercontent.com/AdguardTeam/HttpsExclusions/master/exclusions/firefox.txt + # https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/referral-sites.txt )