ci: update ipset generation workflow

Aetherinox · Nov 4, 2024 · 3a7a978 · 3a7a978
1 parent d8da1ae
commit 3a7a978
Show file tree

Hide file tree

Showing 138 changed files with 2,384 additions and 199 deletions.
diff --git a/.github/blocks/isp/aol.ipset b/.github/blocks/isp/aol.ipset
@@ -0,0 +1,3 @@
+62.51.0.0/16
+62.78.0.0/19
+195.93.0.0/17
diff --git a/.github/blocks/privacy/01.ipset b/.github/blocks/privacy/01.ipset
@@ -22,6 +22,7 @@
 #   a wide variety of bots come from this company (or customers of the company),
 #   including scrapers, brute-forcing, email spam, data collection, etc.
 #
+#   https://raw.githubusercontent.com/cbuijs/ipasn/master/asn/as10439.list
 # #
 
 135.84.216.0/24

diff --git a/.github/categories/01_highrisk_ipset.txt → .github/categories/highrisk_ipset.txt b/.github/categories/01_highrisk_ipset.txt → .github/categories/highrisk_ipset.txt
diff --git a/.github/categories/isp_aol_ipset.txt b/.github/categories/isp_aol_ipset.txt
@@ -0,0 +1 @@
+Internet Service Provider (ISP)
diff --git a/.github/categories/isp_att_ipset.txt b/.github/categories/isp_att_ipset.txt
@@ -0,0 +1 @@
+Internet Service Provider (ISP)
diff --git a/.github/categories/isp_cablevision_ipset.txt b/.github/categories/isp_cablevision_ipset.txt
@@ -0,0 +1 @@
+Internet Service Provider (ISP)
diff --git a/.github/categories/isp_charter_spectrum_timewarnercable_ipset.txt b/.github/categories/isp_charter_spectrum_timewarnercable_ipset.txt
@@ -0,0 +1 @@
+Internet Service Provider (ISP)
diff --git a/.github/categories/01_master_ipset.txt → .github/categories/master_ipset.txt b/.github/categories/01_master_ipset.txt → .github/categories/master_ipset.txt
diff --git a/...ub/categories/02_privacy_ahrefs_ipset.txt → .github/categories/privacy_ahrefs_ipset.txt b/...ub/categories/02_privacy_ahrefs_ipset.txt → .github/categories/privacy_ahrefs_ipset.txt
diff --git a/...ategories/02_privacy_amazon_aws_ipset.txt → ...b/categories/privacy_amazon_aws_ipset.txt b/...ategories/02_privacy_amazon_aws_ipset.txt → ...b/categories/privacy_amazon_aws_ipset.txt
diff --git a/...ategories/02_privacy_amazon_ec2_ipset.txt → ...b/categories/privacy_amazon_ec2_ipset.txt b/...ategories/02_privacy_amazon_ec2_ipset.txt → ...b/categories/privacy_amazon_ec2_ipset.txt
diff --git a/.../categories/02_privacy_applebot_ipset.txt → ...hub/categories/privacy_applebot_ipset.txt b/.../categories/02_privacy_applebot_ipset.txt → ...hub/categories/privacy_applebot_ipset.txt
diff --git a/.github/categories/02_privacy_bing_ipset.txt → .github/categories/privacy_bing_ipset.txt b/.github/categories/02_privacy_bing_ipset.txt → .github/categories/privacy_bing_ipset.txt
diff --git a/.../categories/02_privacy_bunnycdn_ipset.txt → ...hub/categories/privacy_bunnycdn_ipset.txt b/.../categories/02_privacy_bunnycdn_ipset.txt → ...hub/categories/privacy_bunnycdn_ipset.txt
diff --git a/...gories/02_privacy_cloudflarecdn_ipset.txt → ...ategories/privacy_cloudflarecdn_ipset.txt b/...gories/02_privacy_cloudflarecdn_ipset.txt → ...ategories/privacy_cloudflarecdn_ipset.txt
diff --git a/...ategories/02_privacy_cloudfront_ipset.txt → ...b/categories/privacy_cloudfront_ipset.txt b/...ategories/02_privacy_cloudfront_ipset.txt → ...b/categories/privacy_cloudfront_ipset.txt
diff --git a/...ategories/02_privacy_duckduckgo_ipset.txt → ...b/categories/privacy_duckduckgo_ipset.txt b/...ategories/02_privacy_duckduckgo_ipset.txt → ...b/categories/privacy_duckduckgo_ipset.txt
diff --git a/.../categories/02_privacy_facebook_ipset.txt → ...hub/categories/privacy_facebook_ipset.txt b/.../categories/02_privacy_facebook_ipset.txt → ...hub/categories/privacy_facebook_ipset.txt
diff --git a/...ub/categories/02_privacy_fastly_ipset.txt → .github/categories/privacy_fastly_ipset.txt b/...ub/categories/02_privacy_fastly_ipset.txt → .github/categories/privacy_fastly_ipset.txt
diff --git a/...b/categories/02_privacy_general_ipset.txt → .github/categories/privacy_general_ipset.txt b/...b/categories/02_privacy_general_ipset.txt → .github/categories/privacy_general_ipset.txt
diff --git a/...ub/categories/02_privacy_google_ipset.txt → .github/categories/privacy_google_ipset.txt b/...ub/categories/02_privacy_google_ipset.txt → .github/categories/privacy_google_ipset.txt
diff --git a/...b/categories/02_privacy_pingdom_ipset.txt → .github/categories/privacy_pingdom_ipset.txt b/...b/categories/02_privacy_pingdom_ipset.txt → .github/categories/privacy_pingdom_ipset.txt
diff --git a/...ub/categories/02_privacy_rssapi_ipset.txt → .github/categories/privacy_rssapi_ipset.txt b/...ub/categories/02_privacy_rssapi_ipset.txt → .github/categories/privacy_rssapi_ipset.txt
diff --git a/...ategories/02_privacy_stripe_api_ipset.txt → ...b/categories/privacy_stripe_api_ipset.txt b/...ategories/02_privacy_stripe_api_ipset.txt → ...b/categories/privacy_stripe_api_ipset.txt
diff --git a/.../02_privacy_stripe_armada_gator_ipset.txt → ...ies/privacy_stripe_armada_gator_ipset.txt b/.../02_privacy_stripe_armada_gator_ipset.txt → ...ies/privacy_stripe_armada_gator_ipset.txt
diff --git a/...ries/02_privacy_stripe_webhooks_ipset.txt → ...egories/privacy_stripe_webhooks_ipset.txt b/...ries/02_privacy_stripe_webhooks_ipset.txt → ...egories/privacy_stripe_webhooks_ipset.txt
diff --git a/.../categories/02_privacy_telegram_ipset.txt → ...hub/categories/privacy_telegram_ipset.txt b/.../categories/02_privacy_telegram_ipset.txt → ...hub/categories/privacy_telegram_ipset.txt
diff --git a/...tegories/02_privacy_uptimerobot_ipset.txt → .../categories/privacy_uptimerobot_ipset.txt b/...tegories/02_privacy_uptimerobot_ipset.txt → .../categories/privacy_uptimerobot_ipset.txt
diff --git a/...tegories/02_privacy_webpagetest_ipset.txt → .../categories/privacy_webpagetest_ipset.txt b/...tegories/02_privacy_webpagetest_ipset.txt → .../categories/privacy_webpagetest_ipset.txt
diff --git a/...ub/categories/02_privacy_yandex_ipset.txt → .github/categories/privacy_yandex_ipset.txt b/...ub/categories/02_privacy_yandex_ipset.txt → .github/categories/privacy_yandex_ipset.txt
diff --git a/.github/categories/03_spam_forums_ipset.txt → .github/categories/spam_forums_ipset.txt b/.github/categories/03_spam_forums_ipset.txt → .github/categories/spam_forums_ipset.txt
diff --git a/...hub/categories/03_spam_spamhaus_ipset.txt → .github/categories/spam_spamhaus_ipset.txt b/...hub/categories/03_spam_spamhaus_ipset.txt → .github/categories/spam_spamhaus_ipset.txt
diff --git a/.github/descriptions/01_highrisk_ipset.txt → .github/descriptions/highrisk_ipset.txt b/.github/descriptions/01_highrisk_ipset.txt → .github/descriptions/highrisk_ipset.txt
diff --git a/.github/descriptions/isp_aol_ipset.txt b/.github/descriptions/isp_aol_ipset.txt
@@ -0,0 +1,12 @@
+#   Historic AOL LLC (Internet Service Provider)
+#   Oath Holdings Inc.
+#
+#   Website 	          https://aol.com
+#   Parent organization:  Warner Bros. Discovery
+#   Founded               1985
+#   Registry		  RIPE
+#
+#   This ISP has slowly been winding down over the years, with less and less servers. This is
+#   especially true since the messenger service ICQ was shut down on June 26, 2024.
+#
+#   Be aware that this ASN may disappear in the future as less IP blocks are assigned.
diff --git a/.github/descriptions/isp_att_ipset.txt b/.github/descriptions/isp_att_ipset.txt
@@ -0,0 +1,10 @@
+#   AT&T Internet (Internet Service Provider)
+#
+#   Website 	          https://att.com/internet/
+#   Parent organization:  AT&T Communications
+#   Founded               September 19, 2016
+#
+#   AT&T Internet is an AT&T brand of broadband internet service. Previously, AT&T Internet was
+#   branded as U-verse Internet and bundled with U-verse TV, which was spun off into the newly
+#   independent DirecTV in 2021. AT&T Internet plans powered by fiber-optic cable use the AT&T
+#   Fiber brand. 
diff --git a/.github/descriptions/isp_cablevision_ipset.txt b/.github/descriptions/isp_cablevision_ipset.txt
@@ -0,0 +1,17 @@
+#   Cablevision (Internet Service Provider)
+#
+#   Website 	          https://cablevision.com
+#   Founded               1973
+#   Status                Acquired by Altice (June 21, 2016)
+#
+#   If you wish to block this internet service provider, it is recommended that you use both this blocklist,
+#   as well as the blocklist for Suddenlink / Optimum.
+#      - https://raw.githubusercontent.com/Aetherinox/blocklists/main/blocklists/isp/isp_suddenlink_optimum.ipset
+#
+#   After Altice acquired Cablevision Systems Corporation on November 30, 2016, Suddenlink was combined with
+#   Cablevision. Together with Optimum, the name used by Cablevision for its products, Altice USA became the
+#   United States' fourth largest cable operator with 4.6 million subscribers, and the sixth largest Pay TV
+#   service provider with 3.5 million subscribers. On August 1, 2022, Suddenlink rebranded into Optimum.
+#
+#   This blocklist contains mostly Cablevision IP addresses, however, it also includes some blocks which
+#   carried over from the acquisition of Suddenlink and Optimum which are registered as the same ASN.
diff --git a/.github/descriptions/isp_charter_spectrum_timewarnercable_ipset.txt b/.github/descriptions/isp_charter_spectrum_timewarnercable_ipset.txt
@@ -0,0 +1,10 @@
+#   Time Warner Cable, Charter Communications, Spectrum (Internet Service Provider)
+#
+#   Website 	          https://spectrum.com
+#   Founded               Time Warner Cable (1973), Spectrum (2014)
+#   Status                Merged into Charter Spectrum as of 2016.
+#
+#   Time Warner Cable, Inc. was acquired by Charter Communications on May 18, 2016, which formed Charter Spectrum.
+#      - https://ir.charter.com/news-releases/news-release-details/charter-communications-merge-time-warner-cable-and-acquire
+#
+#   This list merges all three companies together to block the overall network.
diff --git a/.github/descriptions/01_master_ipset.txt → .github/descriptions/master_ipset.txt b/.github/descriptions/01_master_ipset.txt → .github/descriptions/master_ipset.txt
diff --git a/.../descriptions/02_privacy_ahrefs_ipset.txt → ...hub/descriptions/privacy_ahrefs_ipset.txt b/.../descriptions/02_privacy_ahrefs_ipset.txt → ...hub/descriptions/privacy_ahrefs_ipset.txt
diff --git a/...criptions/02_privacy_amazon_aws_ipset.txt → ...descriptions/privacy_amazon_aws_ipset.txt b/...criptions/02_privacy_amazon_aws_ipset.txt → ...descriptions/privacy_amazon_aws_ipset.txt
diff --git a/...criptions/02_privacy_amazon_ec2_ipset.txt → ...descriptions/privacy_amazon_ec2_ipset.txt b/...criptions/02_privacy_amazon_ec2_ipset.txt → ...descriptions/privacy_amazon_ec2_ipset.txt
diff --git a/...scriptions/02_privacy_apple_bot_ipset.txt → .../descriptions/privacy_apple_bot_ipset.txt b/...scriptions/02_privacy_apple_bot_ipset.txt → .../descriptions/privacy_apple_bot_ipset.txt
diff --git a/...ub/descriptions/02_privacy_bing_ipset.txt → .github/descriptions/privacy_bing_ipset.txt b/...ub/descriptions/02_privacy_bing_ipset.txt → .github/descriptions/privacy_bing_ipset.txt
diff --git a/...escriptions/02_privacy_bunnycdn_ipset.txt → ...b/descriptions/privacy_bunnycdn_ipset.txt b/...escriptions/02_privacy_bunnycdn_ipset.txt → ...b/descriptions/privacy_bunnycdn_ipset.txt
diff --git a/...ptions/02_privacy_cloudflarecdn_ipset.txt → ...criptions/privacy_cloudflarecdn_ipset.txt b/...ptions/02_privacy_cloudflarecdn_ipset.txt → ...criptions/privacy_cloudflarecdn_ipset.txt
diff --git a/...criptions/02_privacy_cloudfront_ipset.txt → ...descriptions/privacy_cloudfront_ipset.txt b/...criptions/02_privacy_cloudfront_ipset.txt → ...descriptions/privacy_cloudfront_ipset.txt
diff --git a/...criptions/02_privacy_duckduckgo_ipset.txt → ...descriptions/privacy_duckduckgo_ipset.txt b/...criptions/02_privacy_duckduckgo_ipset.txt → ...descriptions/privacy_duckduckgo_ipset.txt
diff --git a/...escriptions/02_privacy_facebook_ipset.txt → ...b/descriptions/privacy_facebook_ipset.txt b/...escriptions/02_privacy_facebook_ipset.txt → ...b/descriptions/privacy_facebook_ipset.txt
diff --git a/.../descriptions/02_privacy_fastly_ipset.txt → ...hub/descriptions/privacy_fastly_ipset.txt b/.../descriptions/02_privacy_fastly_ipset.txt → ...hub/descriptions/privacy_fastly_ipset.txt
diff --git a/...descriptions/02_privacy_general_ipset.txt → ...ub/descriptions/privacy_general_ipset.txt b/...descriptions/02_privacy_general_ipset.txt → ...ub/descriptions/privacy_general_ipset.txt
diff --git a/.../descriptions/02_privacy_google_ipset.txt → ...hub/descriptions/privacy_google_ipset.txt b/.../descriptions/02_privacy_google_ipset.txt → ...hub/descriptions/privacy_google_ipset.txt
diff --git a/...descriptions/02_privacy_pingdom_ipset.txt → ...ub/descriptions/privacy_pingdom_ipset.txt b/...descriptions/02_privacy_pingdom_ipset.txt → ...ub/descriptions/privacy_pingdom_ipset.txt
diff --git a/.../descriptions/02_privacy_rssapi_ipset.txt → ...hub/descriptions/privacy_rssapi_ipset.txt b/.../descriptions/02_privacy_rssapi_ipset.txt → ...hub/descriptions/privacy_rssapi_ipset.txt
diff --git a/...criptions/02_privacy_stripe_api_ipset.txt → ...descriptions/privacy_stripe_api_ipset.txt b/...criptions/02_privacy_stripe_api_ipset.txt → ...descriptions/privacy_stripe_api_ipset.txt
diff --git a/.../02_privacy_stripe_armada_gator_ipset.txt → ...ons/privacy_stripe_armada_gator_ipset.txt b/.../02_privacy_stripe_armada_gator_ipset.txt → ...ons/privacy_stripe_armada_gator_ipset.txt
diff --git a/...ions/02_privacy_stripe_webhooks_ipset.txt → ...iptions/privacy_stripe_webhooks_ipset.txt b/...ions/02_privacy_stripe_webhooks_ipset.txt → ...iptions/privacy_stripe_webhooks_ipset.txt
diff --git a/...escriptions/02_privacy_telegram_ipset.txt → ...b/descriptions/privacy_telegram_ipset.txt b/...escriptions/02_privacy_telegram_ipset.txt → ...b/descriptions/privacy_telegram_ipset.txt
diff --git a/...riptions/02_privacy_uptimerobot_ipset.txt → ...escriptions/privacy_uptimerobot_ipset.txt b/...riptions/02_privacy_uptimerobot_ipset.txt → ...escriptions/privacy_uptimerobot_ipset.txt
diff --git a/...riptions/02_privacy_webpagetest_ipset.txt → ...escriptions/privacy_webpagetest_ipset.txt b/...riptions/02_privacy_webpagetest_ipset.txt → ...escriptions/privacy_webpagetest_ipset.txt
diff --git a/.../descriptions/02_privacy_yandex_ipset.txt → ...hub/descriptions/privacy_yandex_ipset.txt b/.../descriptions/02_privacy_yandex_ipset.txt → ...hub/descriptions/privacy_yandex_ipset.txt
diff --git a/...hub/descriptions/03_spam_forums_ipset.txt → .github/descriptions/spam_forums_ipset.txt b/...hub/descriptions/03_spam_forums_ipset.txt → .github/descriptions/spam_forums_ipset.txt
diff --git a/...b/descriptions/03_spam_spamhaus_ipset.txt → .github/descriptions/spam_spamhaus_ipset.txt b/...b/descriptions/03_spam_spamhaus_ipset.txt → .github/descriptions/spam_spamhaus_ipset.txt
diff --git a/.github/expires/01_highrisk_ipset.txt → .github/expires/highrisk_ipset.txt b/.github/expires/01_highrisk_ipset.txt → .github/expires/highrisk_ipset.txt
diff --git a/.github/expires/isp_aol_ipset.txt b/.github/expires/isp_aol_ipset.txt
@@ -0,0 +1 @@
+7 days
diff --git a/.github/expires/isp_att_ipset.txt b/.github/expires/isp_att_ipset.txt
@@ -0,0 +1 @@
+7 days
diff --git a/.github/expires/isp_cablevision_ipset.txt b/.github/expires/isp_cablevision_ipset.txt
@@ -0,0 +1 @@
+7 days
diff --git a/.github/expires/isp_charter_spectrum_timewarnercable_ipset.txt b/.github/expires/isp_charter_spectrum_timewarnercable_ipset.txt
@@ -0,0 +1 @@
+7 days
diff --git a/.github/expires/isp_suddenlink_optimum_ipset.txt b/.github/expires/isp_suddenlink_optimum_ipset.txt
@@ -0,0 +1 @@
+7 days
diff --git a/.github/expires/01_master_ipset.txt → .github/expires/master_ipset.txt b/.github/expires/01_master_ipset.txt → .github/expires/master_ipset.txt
diff --git a/.github/expires/02_privacy_ahrefs_ipset.txt → .github/expires/privacy_ahrefs_ipset.txt b/.github/expires/02_privacy_ahrefs_ipset.txt → .github/expires/privacy_ahrefs_ipset.txt
diff --git a/...b/expires/02_privacy_amazon_aws_ipset.txt → .github/expires/privacy_amazon_aws_ipset.txt b/...b/expires/02_privacy_amazon_aws_ipset.txt → .github/expires/privacy_amazon_aws_ipset.txt
diff --git a/...b/expires/02_privacy_amazon_ec2_ipset.txt → .github/expires/privacy_amazon_ec2_ipset.txt b/...b/expires/02_privacy_amazon_ec2_ipset.txt → .github/expires/privacy_amazon_ec2_ipset.txt
diff --git a/...ub/expires/02_privacy_apple_bot_ipset.txt → .github/expires/privacy_apple_bot_ipset.txt b/...ub/expires/02_privacy_apple_bot_ipset.txt → .github/expires/privacy_apple_bot_ipset.txt
diff --git a/.github/expires/02_privacy_bing_ipset.txt → .github/expires/privacy_bing_ipset.txt b/.github/expires/02_privacy_bing_ipset.txt → .github/expires/privacy_bing_ipset.txt
diff --git a/...hub/expires/02_privacy_bunnycdn_ipset.txt → .github/expires/privacy_bunnycdn_ipset.txt b/...hub/expires/02_privacy_bunnycdn_ipset.txt → .github/expires/privacy_bunnycdn_ipset.txt
diff --git a/...xpires/02_privacy_cloudflarecdn_ipset.txt → ...b/expires/privacy_cloudflarecdn_ipset.txt b/...xpires/02_privacy_cloudflarecdn_ipset.txt → ...b/expires/privacy_cloudflarecdn_ipset.txt
diff --git a/...b/expires/02_privacy_cloudfront_ipset.txt → .github/expires/privacy_cloudfront_ipset.txt b/...b/expires/02_privacy_cloudfront_ipset.txt → .github/expires/privacy_cloudfront_ipset.txt
diff --git a/...b/expires/02_privacy_duckduckgo_ipset.txt → .github/expires/privacy_duckduckgo_ipset.txt b/...b/expires/02_privacy_duckduckgo_ipset.txt → .github/expires/privacy_duckduckgo_ipset.txt
diff --git a/...hub/expires/02_privacy_facebook_ipset.txt → .github/expires/privacy_facebook_ipset.txt b/...hub/expires/02_privacy_facebook_ipset.txt → .github/expires/privacy_facebook_ipset.txt
diff --git a/.github/expires/02_privacy_fastly_ipset.txt → .github/expires/privacy_fastly_ipset.txt b/.github/expires/02_privacy_fastly_ipset.txt → .github/expires/privacy_fastly_ipset.txt
diff --git a/.github/expires/02_privacy_general_ipset.txt → .github/expires/privacy_general_ipset.txt b/.github/expires/02_privacy_general_ipset.txt → .github/expires/privacy_general_ipset.txt
diff --git a/.github/expires/02_privacy_google_ipset.txt → .github/expires/privacy_google_ipset.txt b/.github/expires/02_privacy_google_ipset.txt → .github/expires/privacy_google_ipset.txt
diff --git a/.github/expires/02_privacy_pingdom_ipset.txt → .github/expires/privacy_pingdom_ipset.txt b/.github/expires/02_privacy_pingdom_ipset.txt → .github/expires/privacy_pingdom_ipset.txt
diff --git a/.github/expires/02_privacy_rssapi_ipset.txt → .github/expires/privacy_rssapi_ipset.txt b/.github/expires/02_privacy_rssapi_ipset.txt → .github/expires/privacy_rssapi_ipset.txt
diff --git a/...b/expires/02_privacy_stripe_api_ipset.txt → .github/expires/privacy_stripe_api_ipset.txt b/...b/expires/02_privacy_stripe_api_ipset.txt → .github/expires/privacy_stripe_api_ipset.txt
diff --git a/.../02_privacy_stripe_armada_gator_ipset.txt → ...res/privacy_stripe_armada_gator_ipset.txt b/.../02_privacy_stripe_armada_gator_ipset.txt → ...res/privacy_stripe_armada_gator_ipset.txt
diff --git a/...ires/02_privacy_stripe_webhooks_ipset.txt → ...expires/privacy_stripe_webhooks_ipset.txt b/...ires/02_privacy_stripe_webhooks_ipset.txt → ...expires/privacy_stripe_webhooks_ipset.txt
diff --git a/...hub/expires/02_privacy_telegram_ipset.txt → .github/expires/privacy_telegram_ipset.txt b/...hub/expires/02_privacy_telegram_ipset.txt → .github/expires/privacy_telegram_ipset.txt
diff --git a/.../expires/02_privacy_uptimerobot_ipset.txt → ...hub/expires/privacy_uptimerobot_ipset.txt b/.../expires/02_privacy_uptimerobot_ipset.txt → ...hub/expires/privacy_uptimerobot_ipset.txt
diff --git a/.../expires/02_privacy_webpagetest_ipset.txt → ...hub/expires/privacy_webpagetest_ipset.txt b/.../expires/02_privacy_webpagetest_ipset.txt → ...hub/expires/privacy_webpagetest_ipset.txt
diff --git a/.github/expires/02_privacy_yandex_ipset.txt → .github/expires/privacy_yandex_ipset.txt b/.github/expires/02_privacy_yandex_ipset.txt → .github/expires/privacy_yandex_ipset.txt
diff --git a/.github/expires/03_spam_forums_ipset.txt → .github/expires/spam_forums_ipset.txt b/.github/expires/03_spam_forums_ipset.txt → .github/expires/spam_forums_ipset.txt
diff --git a/.github/expires/03_spam_spamhaus_ipset.txt → .github/expires/spam_spamhaus_ipset.txt b/.github/expires/03_spam_spamhaus_ipset.txt → .github/expires/spam_spamhaus_ipset.txt
diff --git a/.github/scripts/bl-block.sh b/.github/scripts/bl-block.sh
@@ -8,9 +8,13 @@
 #                       copies local ipsets from .github/blocks/${ARG_BLOCKS_CAT}/*.ipset
 #   
 #   @terminal           .github/scripts/bl-block.sh \
-#                           blocklists/02_privacy_general.ipset \
+#                           blocklists/privacy/privacy_general.ipset \
 #                           privacy
 #
+#   @terminal           .github/scripts/bl-block.sh \
+#                           blocklists/isp/isp_aol.ipset \
+#                           isp/aol.ipset
+#
 #   @workflow           # Privacy › General
 #                       chmod +x ".github/scripts/bl-block.sh"
 #                       run_general=".github/scripts/bl-block.sh 02_privacy_general.ipset privacy"
@@ -31,7 +35,8 @@
 # #
 
 APP_THIS_FILE=$(basename "$0")                          # current script file
-APP_THIS_DIR="${PWD}"                                   # Current script directory
+APP_THIS_DIR="${PWD}"                                   # current script directory
+APP_GITHUB_DIR="${APP_THIS_DIR}/.github"                # .github folder
 
 # #
 #   vars > colors
@@ -68,6 +73,40 @@ GREY1="\e[38;5;240m"
 GREY2="\e[38;5;244m"
 GREY3="\e[38;5;250m"
 
+# #
+#   print an error and exit with failure
+#   $1: error message
+# #
+
+function error()
+{
+    echo -e "  ⭕ ${GREY2}${APP_THIS_FILE}${RESET}: \n     ${BOLD}${RED}Error${NORMAL}: ${RESET}$1"
+    echo -e
+    exit 0
+}
+
+# #
+#   Sort Results
+#
+#   @usage          line=$(parse_spf_record "${ip}" | sort_results)
+# #
+
+sort_results()
+{
+	declare -a ipv4 ipv6
+
+	while read -r line ; do
+		if [[ ${line} =~ : ]] ; then
+			ipv6+=("${line}")
+		else
+			ipv4+=("${line}")
+		fi
+	done
+
+	[[ -v ipv4[@] ]] && printf '%s\n' "${ipv4[@]}" | sort -g -t. -k1,1 -k 2,2 -k 3,3 -k 4,4 | uniq
+	[[ -v ipv6[@] ]] && printf '%s\n' "${ipv6[@]}" | sort -g -t: -k1,1 -k 2,2 -k 3,3 -k 4,4 -k 5,5 -k 6,6 -k 7,7 -k 8,8 | uniq
+}
+
 # #
 #   Arguments
 #
@@ -189,8 +228,27 @@ fi
 # #
 
 if [ -d .github/blocks/ ]; then
-	for APP_FILE_TEMP in .github/blocks/${ARG_BLOCKS_CAT}/*.ipset; do
-		echo -e "  📒 Reading static block ${ORANGE2}${APP_FILE_TEMP}${RESET}"
+
+    # #
+    #   Determines if the category provided is either a folder, or a file ending with `.ipset`.
+    #
+    #   if a folder is provided, all files in the folder will be looped and loaded.
+    #   if a file is provided, only that one file will be loaded.
+    # #
+
+    APP_BLOCK_TARGET=".github/blocks/${ARG_BLOCKS_CAT}/*.ipset"
+    if [[ "$ARG_BLOCKS_CAT" == *ipset ]]; then
+        APP_BLOCK_TARGET=".github/blocks/${ARG_BLOCKS_CAT}"
+    fi
+
+    # #
+    #   Block folder specified. Each file in folder will be loaded. does not have .ipset at the end
+    #
+    #   @usage      .github/scripts/bl-block.sh blocklists/isp/isp_aol.ipset isp/aol
+    # #
+
+    for APP_FILE_TEMP in ${APP_BLOCK_TARGET}; do
+        echo -e "  📒 Reading static block ${ORANGE2}${APP_FILE_TEMP}${RESET}"
 
         # #
         #   calculate how many IPs are in a subnet
@@ -261,7 +319,7 @@ if [ -d .github/blocks/ ]; then
 
         echo -e "  ➕ Added ${FUCHSIA2}${BLOCKS_COUNT_TOTAL_IP} IPs${RESET} and ${FUCHSIA2}${BLOCKS_COUNT_TOTAL_SUBNET} Subnets${RESET} to ${BLUE2}${APP_FILE_PERM}${RESET}"
         echo -e
-	done
+    done
 fi
 
 # #
@@ -271,7 +329,7 @@ fi
 #       - remove .sort temp file
 # #
 
-APP_OUT=$(cat ${APP_FILE_PERM} | grep -v "^#" | sort -n | awk '{if (++dup[$0] == 1) print $0;}' > ${APP_FILE_PERM}.sort)
+APP_OUT=$(cat ${APP_FILE_PERM} | grep -vi "^#|^;|^$" | sort -n | awk '{if (++dup[$0] == 1) print $0;}' > ${APP_FILE_PERM}.sort)
 sed -i 's/[[:blank:]]*$//' ${APP_FILE_PERM}.sort
 > ${APP_FILE_PERM}
 cat ${APP_FILE_PERM}.sort >> ${APP_FILE_PERM}

diff --git a/.github/scripts/bl-format.sh b/.github/scripts/bl-format.sh
@@ -27,9 +27,10 @@
 # #
 
 APP_THIS_FILE=$(basename "$0")                          # current script file
-APP_THIS_DIR="${PWD}"                                   # Current script directory
+APP_THIS_DIR="${PWD}"                                   # current script directory
+APP_GITHUB_DIR="${APP_THIS_DIR}/.github"                # .github folder
 
-# #
+## #
 #   vars > colors
 #
 #   Use the color table at:
@@ -64,6 +65,40 @@ GREY1="\e[38;5;240m"
 GREY2="\e[38;5;244m"
 GREY3="\e[38;5;250m"
 
+# #
+#   print an error and exit with failure
+#   $1: error message
+# #
+
+function error()
+{
+    echo -e "  ⭕ ${GREY2}${APP_THIS_FILE}${RESET}: \n     ${BOLD}${RED}Error${NORMAL}: ${RESET}$1"
+    echo -e
+    exit 0
+}
+
+# #
+#   Sort Results
+#
+#   @usage          line=$(parse_spf_record "${ip}" | sort_results)
+# #
+
+sort_results()
+{
+	declare -a ipv4 ipv6
+
+	while read -r line ; do
+		if [[ ${line} =~ : ]] ; then
+			ipv6+=("${line}")
+		else
+			ipv4+=("${line}")
+		fi
+	done
+
+	[[ -v ipv4[@] ]] && printf '%s\n' "${ipv4[@]}" | sort -g -t. -k1,1 -k 2,2 -k 3,3 -k 4,4 | uniq
+	[[ -v ipv6[@] ]] && printf '%s\n' "${ipv6[@]}" | sort -g -t: -k1,1 -k 2,2 -k 3,3 -k 4,4 -k 5,5 -k 6,6 -k 7,7 -k 8,8 | uniq
+}
+
 # #
 #   Arguments
 #
@@ -244,7 +279,7 @@ done
 #   Get IP list
 # #
 
-list_ips=$(echo "${APP_OUT}" | grep -v "^#" | sort -n | awk '{if (++dup[$0] == 1) print $0;}' > ${APP_FILE_TEMP})
+list_ips=$(echo "${APP_OUT}" | grep -vi "^#|^;|^$" | sort -n | awk '{if (++dup[$0] == 1) print $0;}' > ${APP_FILE_TEMP})
 sed -i '/[#;]/{s/#.*//;s/;.*//;/^$/d}' ${APP_FILE_TEMP}                 # remove # and ; comments
 sed -i 's/\-.*//' ${APP_FILE_TEMP}                                      # remove hyphens for ip ranges
 sed -i 's/[[:blank:]]*$//' ${APP_FILE_TEMP}                             # remove space / tab from EOL