From 8ea332e157b5cec3b5bcf180f1e66ef7ff008e97 Mon Sep 17 00:00:00 2001 From: Ming Di Leom <2809763-curben@users.noreply.gitlab.com> Date: Sat, 21 May 2022 03:11:05 +0000 Subject: [PATCH] fix: migrate to malware-filter group - BREAKING CHANGE - gitlab.com/malware-filter/vn-badsite-filter --- README.md | 100 ++++++++++++++++++++++--------------------- src/build.js | 4 +- src/gitlab_status.sh | 4 +- src/script.sh | 9 ++-- 4 files changed, 60 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index 058c7ca..b120903 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # VN Malicious Domains Blocklist +> Announcement (2022/05/21): curben.gitlab.io has been migrated to malware-filter.gitlab.io + A blocklist of malicious (malware, scam, phishing) websites that are targeting Vietnamese users. Sourced from [api.chongluadao.vn](https://chongluadao.vn). There are multiple formats available, refer to the appropriate section according to the program used: @@ -19,27 +21,27 @@ There are multiple formats available, refer to the appropriate section according - [Snort3](#snort3) - [Suricata](#suricata) -Not sure which format to choose? See [Compatibility](https://gitlab.com/curben/malware-filter/wikis/compatibility) page in the wiki. +Not sure which format to choose? See [Compatibility](https://gitlab.com/malware-filter/malware-filter/wikis/compatibility) page in the wiki. Check out my other filters: -- [urlhaus-filter](https://gitlab.com/curben/urlhaus-filter) -- [phishing-filter](https://gitlab.com/curben/phishing-filter) -- [pup-filter](https://gitlab.com/curben/pup-filter) -- [tracking-filter](https://gitlab.com/curben/tracking-filter) +- [urlhaus-filter](https://gitlab.com/malware-filter/urlhaus-filter) +- [phishing-filter](https://gitlab.com/malware-filter/phishing-filter) +- [pup-filter](https://gitlab.com/malware-filter/pup-filter) +- [tracking-filter](https://gitlab.com/malware-filter/tracking-filter) ## URL-based Import the following URL into uBO to subscribe: -- https://curben.gitlab.io/malware-filter/vn-badsite-filter.txt +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter.txt
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter.txt - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter.txt -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter.txt +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter.txt - https://malware-filter.pages.dev/vn-badsite-filter.txt - https://vn-badsite-filter.pages.dev/vn-badsite-filter.txt @@ -51,14 +53,14 @@ Import the following URL into uBO to subscribe: Import the following URL into AdGuard browser extensions to subscribe (includes online and **offline** malicious websites): -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-ag.txt +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-ag.txt
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter-ag.txt - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-ag.txt -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-ag.txt +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-ag.txt - https://malware-filter.pages.dev/vn-badsite-filter-ag.txt - https://vn-badsite-filter.pages.dev/vn-badsite-filter-ag.txt @@ -70,14 +72,14 @@ _Requires Vivaldi Desktop/Android 3.3+, blocking level must be at least "Block T Import the following URL into Vivaldi's **Tracker Blocking Sources** to subscribe (includes online and **offline** malicious websites): -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-vivaldi.txt +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-vivaldi.txt
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter-vivaldi.txt - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-vivaldi.txt -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-vivaldi.txt +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-vivaldi.txt - https://malware-filter.pages.dev/vn-badsite-filter-vivaldi.txt - https://vn-badsite-filter.pages.dev/vn-badsite-filter-vivaldi.txt @@ -87,14 +89,14 @@ Import the following URL into Vivaldi's **Tracker Blocking Sources** to subscrib This blocklist includes domains and IP addresses. -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-domains.txt +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-domains.txt
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter-domains.txt - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-domains.txt -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-domains.txt +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-domains.txt - https://malware-filter.pages.dev/vn-badsite-filter-domains.txt - https://vn-badsite-filter.pages.dev/vn-badsite-filter-domains.txt @@ -104,14 +106,14 @@ This blocklist includes domains and IP addresses. This AdGuard Home-compatible blocklist includes domains and IP addresses. -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-agh.txt +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-agh.txt
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter-agh.txt - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-agh.txt -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-agh.txt +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-agh.txt - https://malware-filter.pages.dev/vn-badsite-filter-agh.txt - https://vn-badsite-filter.pages.dev/vn-badsite-filter-agh.txt @@ -121,14 +123,14 @@ This AdGuard Home-compatible blocklist includes domains and IP addresses. This blocklist includes domains only. -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-hosts.txt +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-hosts.txt
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter-hosts.txt - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-hosts.txt -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-hosts.txt +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-hosts.txt - https://malware-filter.pages.dev/vn-badsite-filter-hosts.txt - https://vn-badsite-filter.pages.dev/vn-badsite-filter-hosts.txt @@ -145,7 +147,7 @@ This blocklist includes domains only. mkdir -p /usr/local/etc/dnsmasq/ # Create a new cron job for daily update -printf '#!/bin/sh\ncurl -L "https://curben.gitlab.io/malware-filter/vn-badsite-filter-dnsmasq.conf" -o "/usr/local/etc/dnsmasq/vn-badsite-filter-dnsmasq.conf"\n' > /etc/cron.daily/vn-badsite-filter +printf '#!/bin/sh\ncurl -L "https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-dnsmasq.conf" -o "/usr/local/etc/dnsmasq/vn-badsite-filter-dnsmasq.conf"\n' > /etc/cron.daily/vn-badsite-filter # cron job requires execution permission chmod 755 /etc/cron.daily/vn-badsite-filter @@ -154,14 +156,14 @@ chmod 755 /etc/cron.daily/vn-badsite-filter printf "\nconf-file=/usr/local/etc/dnsmasq/vn-badsite-filter-dnsmasq.conf\n" >> /etc/dnsmasq.conf ``` -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-dnsmasq.conf +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-dnsmasq.conf
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter-dnsmasq.conf - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-dnsmasq.conf -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-dnsmasq.conf +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-dnsmasq.conf - https://malware-filter.pages.dev/vn-badsite-filter-dnsmasq.conf - https://vn-badsite-filter.pages.dev/vn-badsite-filter-dnsmasq.conf @@ -178,7 +180,7 @@ This blocklist includes domains only. mkdir -p /usr/local/etc/bind/ # Create a new cron job for daily update -printf '#!/bin/sh\ncurl -L "https://curben.gitlab.io/malware-filter/vn-badsite-filter-bind.conf" -o "/usr/local/etc/bind/vn-badsite-filter-bind.conf"\n' > /etc/cron.daily/vn-badsite-filter +printf '#!/bin/sh\ncurl -L "https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-bind.conf" -o "/usr/local/etc/bind/vn-badsite-filter-bind.conf"\n' > /etc/cron.daily/vn-badsite-filter # cron job requires execution permission chmod 755 /etc/cron.daily/vn-badsite-filter @@ -205,14 +207,14 @@ $TTL 86400 ; one day Zone file is derived from [here](https://github.com/tomzuu/blacklist-named/blob/master/null.zone.file). -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-bind.conf +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-bind.conf
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter-bind.conf - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-bind.conf -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-bind.conf +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-bind.conf - https://malware-filter.pages.dev/vn-badsite-filter-bind.conf - https://vn-badsite-filter.pages.dev/vn-badsite-filter-bind.conf @@ -222,14 +224,14 @@ Zone file is derived from [here](https://github.com/tomzuu/blacklist-named/blob/ This blocklist includes domains only. -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-rpz.conf +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-rpz.conf
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter-rpz.conf - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-rpz.conf -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-rpz.conf +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-rpz.conf - https://malware-filter.pages.dev/vn-badsite-filter-rpz.conf - https://vn-badsite-filter.pages.dev/vn-badsite-filter-rpz.conf @@ -246,7 +248,7 @@ This blocklist includes domains only. mkdir -p /usr/local/etc/unbound/ # Create a new cron job for daily update -printf '#!/bin/sh\ncurl -L "https://curben.gitlab.io/malware-filter/vn-badsite-filter-unbound.conf" -o "/usr/local/etc/unbound/vn-badsite-filter-unbound.conf"\n' > /etc/cron.daily/vn-badsite-filter +printf '#!/bin/sh\ncurl -L "https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-unbound.conf" -o "/usr/local/etc/unbound/vn-badsite-filter-unbound.conf"\n' > /etc/cron.daily/vn-badsite-filter # cron job requires execution permission chmod 755 /etc/cron.daily/vn-badsite-filter @@ -255,14 +257,14 @@ chmod 755 /etc/cron.daily/vn-badsite-filter printf '\n include: "/usr/local/etc/unbound/vn-badsite-filter-unbound.conf"\n' >> /etc/unbound/unbound.conf ``` -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-unbound.conf +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-unbound.conf
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter-unbound.conf - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-unbound.conf -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-unbound.conf +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-unbound.conf - https://malware-filter.pages.dev/vn-badsite-filter-unbound.conf - https://vn-badsite-filter.pages.dev/vn-badsite-filter-unbound.conf @@ -277,8 +279,8 @@ printf '\n include: "/usr/local/etc/unbound/vn-badsite-filter-unbound.conf"\n' mkdir -p /etc/dnscrypt-proxy/ # Create a new cron job for daily update -printf '#!/bin/sh\ncurl -L "https://curben.gitlab.io/malware-filter/vn-badsite-filter-dnscrypt-blocked-names.txt" -o "/etc/dnscrypt-proxy/vn-badsite-filter-dnscrypt-blocked-names.txt"\n' > /etc/cron.daily/vn-badsite-filter -printf '\ncurl -L "https://curben.gitlab.io/malware-filter/vn-badsite-filter-dnscrypt-blocked-ips.txt" -o "/etc/dnscrypt-proxy/vn-badsite-filter-dnscrypt-blocked-ips.txt"\n' >> /etc/cron.daily/vn-badsite-filter +printf '#!/bin/sh\ncurl -L "https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-dnscrypt-blocked-names.txt" -o "/etc/dnscrypt-proxy/vn-badsite-filter-dnscrypt-blocked-names.txt"\n' > /etc/cron.daily/vn-badsite-filter +printf '\ncurl -L "https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-dnscrypt-blocked-ips.txt" -o "/etc/dnscrypt-proxy/vn-badsite-filter-dnscrypt-blocked-ips.txt"\n' >> /etc/cron.daily/vn-badsite-filter # cron job requires execution permission chmod 755 /etc/cron.daily/vn-badsite-filter @@ -294,21 +296,21 @@ Configure dnscrypt-proxy to use the blocklist: + blocked_ips_file = '/etc/dnscrypt-proxy/vn-badsite-filter-dnscrypt-blocked-ips.txt' ``` -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-dnscrypt-blocked-names.txt -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-dnscrypt-blocked-ips.txt +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-dnscrypt-blocked-names.txt +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-dnscrypt-blocked-ips.txt
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter-dnscrypt-blocked-names.txt - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-dnscrypt-blocked-names.txt -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-dnscrypt-blocked-names.txt +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-dnscrypt-blocked-names.txt - https://malware-filter.pages.dev/vn-badsite-filter-dnscrypt-blocked-names.txt - https://vn-badsite-filter.pages.dev/vn-badsite-filter-dnscrypt-blocked-names.txt - https://curbengh.github.io/malware-filter/vn-badsite-filter-dnscrypt-blocked-ips.txt - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-dnscrypt-blocked-ips.txt -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-dnscrypt-blocked-ips.txt +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-dnscrypt-blocked-ips.txt - https://malware-filter.pages.dev/vn-badsite-filter-dnscrypt-blocked-ips.txt - https://vn-badsite-filter.pages.dev/vn-badsite-filter-dnscrypt-blocked-ips.txt @@ -318,14 +320,14 @@ Configure dnscrypt-proxy to use the blocklist: This blocklist includes domains only. Supported in Internet Explorer 9+. -- https://curben.gitlab.io/malware-filter/vn-badsite-filter.tpl +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter.tpl
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter.tpl - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter.tpl -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter.tpl +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter.tpl - https://malware-filter.pages.dev/vn-badsite-filter.tpl - https://vn-badsite-filter.pages.dev/vn-badsite-filter.tpl @@ -339,10 +341,10 @@ This ruleset includes online URLs only. Not compatible with [Snort3](#snort3). ``` # Download ruleset -curl -L "https://curben.gitlab.io/malware-filter/vn-badsite-filter-snort2.rules" -o "/etc/snort/rules/vn-badsite-filter-snort2.rules" +curl -L "https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-snort2.rules" -o "/etc/snort/rules/vn-badsite-filter-snort2.rules" # Create a new cron job for daily update -printf '#!/bin/sh\ncurl -L "https://curben.gitlab.io/malware-filter/vn-badsite-filter-snort2.rules" -o "/etc/snort/rules/vn-badsite-filter-snort2.rules"\n' > /etc/cron.daily/vn-badsite-filter +printf '#!/bin/sh\ncurl -L "https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-snort2.rules" -o "/etc/snort/rules/vn-badsite-filter-snort2.rules"\n' > /etc/cron.daily/vn-badsite-filter # cron job requires execution permission chmod 755 /etc/cron.daily/vn-badsite-filter @@ -351,14 +353,14 @@ chmod 755 /etc/cron.daily/vn-badsite-filter printf "\ninclude \$RULE_PATH/vn-badsite-filter-snort2.rules\n" >> /etc/snort/snort.conf ``` -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-snort2.rules +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-snort2.rules
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter-snort2.rules - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-snort2.rules -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-snort2.rules +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-snort2.rules - https://malware-filter.pages.dev/vn-badsite-filter-snort2.rules - https://vn-badsite-filter.pages.dev/vn-badsite-filter-snort2.rules @@ -372,10 +374,10 @@ This ruleset includes online URLs only. Not compatible with [Snort2](#snort2). ``` # Download ruleset -curl -L "https://curben.gitlab.io/malware-filter/vn-badsite-filter-snort3.rules" -o "/etc/snort/rules/vn-badsite-filter-snort3.rules" +curl -L "https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-snort3.rules" -o "/etc/snort/rules/vn-badsite-filter-snort3.rules" # Create a new cron job for daily update -printf '#!/bin/sh\ncurl -L "https://curben.gitlab.io/malware-filter/vn-badsite-filter-snort3.rules" -o "/etc/snort/rules/vn-badsite-filter-snort3.rules"\n' > /etc/cron.daily/vn-badsite-filter +printf '#!/bin/sh\ncurl -L "https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-snort3.rules" -o "/etc/snort/rules/vn-badsite-filter-snort3.rules"\n' > /etc/cron.daily/vn-badsite-filter # cron job requires execution permission chmod 755 /etc/cron.daily/vn-badsite-filter @@ -392,14 +394,14 @@ ips = } ``` -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-snort3.rules +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-snort3.rules
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter-snort3.rules - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-snort3.rules -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-snort3.rules +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-snort3.rules - https://malware-filter.pages.dev/vn-badsite-filter-snort3.rules - https://vn-badsite-filter.pages.dev/vn-badsite-filter-snort3.rules @@ -413,10 +415,10 @@ This ruleset includes online URLs only. ``` # Download ruleset -curl -L "https://curben.gitlab.io/malware-filter/vn-badsite-filter-suricata.rules" -o "/etc/suricata/rules/vn-badsite-filter-suricata.rules" +curl -L "https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-suricata.rules" -o "/etc/suricata/rules/vn-badsite-filter-suricata.rules" # Create a new cron job for daily update -printf '#!/bin/sh\ncurl -L "https://curben.gitlab.io/malware-filter/vn-badsite-filter-suricata.rules" -o "/etc/suricata/rules/vn-badsite-filter-suricata.rules"\n' > /etc/cron.daily/vn-badsite-filter +printf '#!/bin/sh\ncurl -L "https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-suricata.rules" -o "/etc/suricata/rules/vn-badsite-filter-suricata.rules"\n' > /etc/cron.daily/vn-badsite-filter # cron job requires execution permission chmod 755 /etc/cron.daily/vn-badsite-filter @@ -431,14 +433,14 @@ rule-files: + - vn-badsite-filter-suricata.rules ``` -- https://curben.gitlab.io/malware-filter/vn-badsite-filter-suricata.rules +- https://malware-filter.gitlab.io/malware-filter/vn-badsite-filter-suricata.rules
Mirrors - https://curbengh.github.io/malware-filter/vn-badsite-filter-suricata.rules - https://curbengh.github.io/vn-badsite-filter/vn-badsite-filter-suricata.rules -- https://curben.gitlab.io/vn-badsite-filter/vn-badsite-filter-suricata.rules +- https://malware-filter.gitlab.io/vn-badsite-filter/vn-badsite-filter-suricata.rules - https://malware-filter.pages.dev/vn-badsite-filter-suricata.rules - https://vn-badsite-filter.pages.dev/vn-badsite-filter-suricata.rules @@ -446,7 +448,7 @@ rule-files: ## FAQ and Guides -See [wiki](https://gitlab.com/curben/malware-filter/-/wikis/home) +See [wiki](https://gitlab.com/malware-filter/malware-filter/-/wikis/home) ## License diff --git a/src/build.js b/src/build.js index 98610a2..53de0e1 100644 --- a/src/build.js +++ b/src/build.js @@ -14,8 +14,8 @@ const rootPath = join(__dirname, '..') const tmpPath = join(rootPath, 'tmp') const publicPath = join(rootPath, 'public') const zipPath = join(tmpPath, 'artifacts.zip') -const artifactsUrl = 'https://gitlab.com/curben/vn-badsite-filter/-/jobs/artifacts/main/download?job=pages' -const pipelineUrl = 'https://gitlab.com/curben/vn-badsite-filter/badges/main/pipeline.svg' +const artifactsUrl = 'https://gitlab.com/malware-filter/vn-badsite-filter/-/jobs/artifacts/main/download?job=pages' +const pipelineUrl = 'https://gitlab.com/malware-filter/vn-badsite-filter/badges/main/pipeline.svg' const ghMirror = 'https://nightly.link/curbengh/vn-badsite-filter/workflows/pages/main/public.zip' const pipelineStatus = async (url) => { diff --git a/src/gitlab_status.sh b/src/gitlab_status.sh index 68317ac..f736e00 100644 --- a/src/gitlab_status.sh +++ b/src/gitlab_status.sh @@ -1,7 +1,7 @@ #!/bin/sh -ARTIFACT_STATUS=$(curl -sSIL "https://gitlab.com/curben/vn-badsite-filter/-/jobs/artifacts/main/download?job=pages" | grep -F "HTTP/2 200") -PIPELINE_STATUS=$(curl -sSL "https://gitlab.com/curben/vn-badsite-filter/badges/main/pipeline.svg" | grep -F "failed") +ARTIFACT_STATUS=$(curl -sSIL "https://gitlab.com/malware-filter/vn-badsite-filter/-/jobs/artifacts/main/download?job=pages" | grep -F "HTTP/2 200") +PIPELINE_STATUS=$(curl -sSL "https://gitlab.com/malware-filter/vn-badsite-filter/badges/main/pipeline.svg" | grep -F "failed") GITLAB_STATUS="up" if [ -z "$ARTIFACT_STATUS" ] || [ -n "$PIPELINE_STATUS" ]; then diff --git a/src/script.sh b/src/script.sh index c5541ba..bba5fb1 100644 --- a/src/script.sh +++ b/src/script.sh @@ -41,10 +41,11 @@ CURRENT_TIME="$(date -R -u)" FIRST_LINE="! Title: VN Malicious Domains Blocklist\n! Description: Block malicious domains targeting Vietnamese users" SECOND_LINE="! Updated: $CURRENT_TIME" THIRD_LINE="! Expires: 1 day (update frequency)" -FOURTH_LINE="! Homepage: https://gitlab.com/curben/vn-badsite-filter" -FIFTH_LINE="! License: https://gitlab.com/curben/vn-badsite-filter#license" +FOURTH_LINE="! Homepage: https://gitlab.com/malware-filter/vn-badsite-filter" +FIFTH_LINE="! License: https://gitlab.com/malware-filter/vn-badsite-filter#license" SIXTH_LINE="! Source: https://api.chongluadao.vn/v2/blacklistdomains & https://api.chongluadao.vn/v2/blacklistlinks" -COMMENT_UBO="$FIRST_LINE\n$SECOND_LINE\n$THIRD_LINE\n$FOURTH_LINE\n$FIFTH_LINE\n$SIXTH_LINE" +ANNOUNCEMENT="\n! Announcement (2022/05/21): curben.gitlab.io has been migrated to malware-filter.gitlab.io" +COMMENT_UBO="$FIRST_LINE\n$SECOND_LINE\n$THIRD_LINE\n$FOURTH_LINE\n$FIFTH_LINE\n$SIXTH_LINE\n$ANNOUNCEMENT" mkdir -p "../public/" @@ -111,7 +112,7 @@ sed "1s/Blocklist/BIND Blocklist/" > "../public/vn-badsite-filter-bind.conf" ## DNS Response Policy Zone (RPZ) CURRENT_UNIX_TIME="$(date +%s)" -RPZ_SYNTAX="\n\$TTL 30\n@ IN SOA rpz.curben.gitlab.io. hostmaster.rpz.curben.gitlab.io. $CURRENT_UNIX_TIME 86400 3600 604800 30\n NS localhost.\n" +RPZ_SYNTAX="\n\$TTL 30\n@ IN SOA rpz.malware-filter.gitlab.io. hostmaster.rpz.malware-filter.gitlab.io. $CURRENT_UNIX_TIME 86400 3600 604800 30\n NS localhost.\n" cat "domains.txt" | \ sed "s/$/ CNAME ./g" | \